Merge pull request #3682 from esl/mam_jid_rfc_trust

Mam jid rfc trust
esl · Jun 14, 2022 · 96839a5 · 96839a5
2 parents 330bd81 + 579538f
commit 96839a5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/doc/modules/mod_mam.md b/doc/modules/mod_mam.md
@@ -354,7 +354,7 @@ This sets the maximum page size of returned results.
 
 #### `modules.mod_mam_meta.db_jid_format`
 
-* **Syntax:** string, one of `"mam_jid_rfc"`, `"mam_jid_mini"` or a module implementing `mam_jid` behaviour
+* **Syntax:** string, one of `"mam_jid_rfc"`, `"mam_jid_rfc_trust"`, `"mam_jid_mini"` or a module implementing `mam_jid` behaviour
 * **Default:** `"mam_jid_rfc"` for MUC archive, `"mam_jid_mini"` for PM archive
 * **Example:** `modules.mod_mam_meta.db_jid_format = "mam_jid_mini"`
 

diff --git a/src/mam/mam_encoder.erl b/src/mam/mam_encoder.erl
@@ -5,9 +5,7 @@
 -export([encode_packet/2]).
 -export([extend_lookup_params/2]).
 
--include("mongoose.hrl").
 -include("jlib.hrl").
--include_lib("exml/include/exml.hrl").
 -include("mongoose_mam.hrl").
 
 -type value_type() :: int | maybe_string | direction | bare_jid | jid | jid_resource | xml | search.

diff --git a/src/mam/mam_jid_rfc_trust.erl b/src/mam/mam_jid_rfc_trust.erl
@@ -0,0 +1,11 @@
+%%% @doc Encoding and decoding using encoding described in XMPP RFC specification
+-module(mam_jid_rfc_trust).
+-behaviour(mam_jid).
+
+-export([encode/2, decode/2]).
+
+encode(_UserJID, JID) ->
+    jid:to_binary(JID).
+
+decode(_UserJID, BSrcJID) ->
+    jid:from_binary_noprep(BSrcJID).
diff --git a/src/mam/mod_mam_rdbms_arch.erl b/src/mam/mod_mam_rdbms_arch.erl
@@ -40,8 +40,6 @@
 
 -include("mongoose.hrl").
 -include("jlib.hrl").
--include_lib("exml/include/exml.hrl").
--include("mongoose_rsm.hrl").
 -include("mongoose_mam.hrl").
 
 %% ----------------------------------------------------------------------