Define mam_send_message behaviour

esl · Apr 27, 2021 · e406ffb · e406ffb
1 parent 3a1b896
commit e406ffb
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/src/mam/mam_lookup.erl b/src/mam/mam_lookup.erl
@@ -157,7 +157,6 @@ rsm_to_regular_lookup_vars(RSM, Filter, Offset, PageSize) ->
 decode_rows(MessageRows, Env) ->
     [decode_row(Row, Env) || Row <- MessageRows].
 
-%% First element of the tuple is decoded message ID
 -spec decoded_row_to_message_id(mod_mam:message_row()) -> mod_mam:message_id().
 decoded_row_to_message_id(#{id := MessId}) -> MessId.
 

diff --git a/src/mam/mam_send_message.erl b/src/mam/mam_send_message.erl
@@ -0,0 +1,19 @@
+%% Forwards extracted messages to the client.
+%% The default implementation is in mod_mam_utils.
+-module(mam_send_message).
+-export([call_send_message/5]).
+
+-callback send_message(
+            Row :: mod_mam:message_row(),
+            ArcJID :: jid:jid(),
+            From :: jid:jid(),
+            Packet :: exml:element()) -> Acc :: mongoose_acc:t().
+
+-spec call_send_message(
+            SendModule :: module(),
+            Row :: mod_mam:message_row(),
+            ArcJID :: jid:jid(),
+            From :: jid:jid(),
+            Packet :: exml:element()) -> Acc :: mongoose_acc:t().
+call_send_message(SendModule, Row, ArcJID, From, Packet) ->
+    SendModule:send_message(Row, ArcJID, From, Packet).
diff --git a/src/mam/mod_mam.erl b/src/mam/mod_mam.erl
@@ -457,7 +457,7 @@ forward_messages(From, ArcJID, MamNs, QueryID, MessageRows, SetClientNs) ->
     {FirstMessID, LastMessID}.
 
 send_message(SendModule, Row, ArcJID, From, Packet) ->
-    SendModule:send_message(Row, ArcJID, From, Packet).
+    mam_send_message:call_send_message(SendModule, Row, ArcJID, From, Packet).
 
 -spec handle_get_message_form(jid:jid(), jid:jid(), jlib:iq()) ->
                                      jlib:iq().
@@ -614,9 +614,11 @@ archive_message(Host, Params) ->
 
 -spec message_row_to_xml(binary(), message_row(), QueryId :: binary(), boolean()) ->
     exml:element().
-message_row_to_xml(MamNs, #{id := MessID, jid := SrcJID, packet := Packet}, QueryID, SetClientNs)  ->
+message_row_to_xml(MamNs, #{id := MessID, jid := SrcJID, packet := Packet},
+                   QueryID, SetClientNs)  ->
     {Microseconds, _NodeMessID} = decode_compact_uuid(MessID),
-    TS = calendar:system_time_to_rfc3339(erlang:convert_time_unit(Microseconds, microsecond, second), [{offset, "Z"}]),
+    Secs = erlang:convert_time_unit(Microseconds, microsecond, second),
+    TS = calendar:system_time_to_rfc3339(Secs, [{offset, "Z"}]),
     BExtMessID = mess_id_to_external_binary(MessID),
     Packet1 = mod_mam_utils:maybe_set_client_xmlns(SetClientNs, Packet),
     wrap_message(MamNs, Packet1, QueryID, BExtMessID, TS, SrcJID).

diff --git a/src/mam/mod_mam_muc.erl b/src/mam/mod_mam_muc.erl
@@ -426,7 +426,7 @@ forward_messages(From, ArcJID, MamNs, QueryID, MessageRows, SetClientNs) ->
     {FirstMessID, LastMessID}.
 
 send_message(SendModule, Row, ArcJID, From, Packet) ->
-    SendModule:send_message(Row, ArcJID, From, Packet).
+    mam_send_message:call_send_message(SendModule, Row, ArcJID, From, Packet).
 
 -spec handle_get_message_form(jid:jid(), jid:jid(), jlib:iq()) ->
                                      jlib:iq().