mod_mam: Apply minor cosmetic changes
This commit is contained in:
parent
8376370ae1
commit
5ae23a7301
|
@ -321,7 +321,7 @@ user_send_packet(Acc) ->
|
||||||
-> {stanza(), c2s_state()}.
|
-> {stanza(), c2s_state()}.
|
||||||
user_send_packet_strip_tag({#message{} = Pkt, #{jid := JID} = C2SState}) ->
|
user_send_packet_strip_tag({#message{} = Pkt, #{jid := JID} = C2SState}) ->
|
||||||
LServer = JID#jid.lserver,
|
LServer = JID#jid.lserver,
|
||||||
{strip_my_archived_tag(Pkt, LServer), C2SState};
|
{strip_my_stanza_id(Pkt, LServer), C2SState};
|
||||||
user_send_packet_strip_tag(Acc) ->
|
user_send_packet_strip_tag(Acc) ->
|
||||||
Acc.
|
Acc.
|
||||||
|
|
||||||
|
@ -347,17 +347,17 @@ muc_filter_message(#message{from = From} = Pkt,
|
||||||
#state{config = Config, jid = RoomJID} = MUCState,
|
#state{config = Config, jid = RoomJID} = MUCState,
|
||||||
FromNick) ->
|
FromNick) ->
|
||||||
LServer = RoomJID#jid.lserver,
|
LServer = RoomJID#jid.lserver,
|
||||||
NewPkt = init_stanza_id(Pkt, LServer),
|
Pkt1 = init_stanza_id(Pkt, LServer),
|
||||||
if Config#config.mam ->
|
if Config#config.mam ->
|
||||||
StorePkt = strip_x_jid_tags(NewPkt),
|
StorePkt = strip_x_jid_tags(Pkt1),
|
||||||
case store_muc(MUCState, StorePkt, RoomJID, From, FromNick) of
|
case store_muc(MUCState, StorePkt, RoomJID, From, FromNick) of
|
||||||
ok ->
|
ok ->
|
||||||
mark_stored_msg(NewPkt, RoomJID);
|
mark_stored_msg(Pkt1, RoomJID);
|
||||||
_ ->
|
_ ->
|
||||||
NewPkt
|
Pkt1
|
||||||
end;
|
end;
|
||||||
true ->
|
true ->
|
||||||
NewPkt
|
Pkt1
|
||||||
end;
|
end;
|
||||||
muc_filter_message(Acc, _MUCState, _FromNick) ->
|
muc_filter_message(Acc, _MUCState, _FromNick) ->
|
||||||
Acc.
|
Acc.
|
||||||
|
@ -369,7 +369,7 @@ get_stanza_id(#message{meta = #{stanza_id := ID}}) ->
|
||||||
-spec init_stanza_id(stanza(), binary()) -> stanza().
|
-spec init_stanza_id(stanza(), binary()) -> stanza().
|
||||||
init_stanza_id(Pkt, LServer) ->
|
init_stanza_id(Pkt, LServer) ->
|
||||||
ID = p1_time_compat:system_time(micro_seconds),
|
ID = p1_time_compat:system_time(micro_seconds),
|
||||||
Pkt1 = strip_my_archived_tag(Pkt, LServer),
|
Pkt1 = strip_my_stanza_id(Pkt, LServer),
|
||||||
xmpp:put_meta(Pkt1, stanza_id, ID).
|
xmpp:put_meta(Pkt1, stanza_id, ID).
|
||||||
|
|
||||||
set_stanza_id(Pkt, JID, ID) ->
|
set_stanza_id(Pkt, JID, ID) ->
|
||||||
|
@ -464,7 +464,7 @@ message_is_archived(false, #{jid := JID}, Pkt) ->
|
||||||
Peer = xmpp:get_from(Pkt),
|
Peer = xmpp:get_from(Pkt),
|
||||||
case gen_mod:get_module_opt(LServer, ?MODULE, assume_mam_usage, false) of
|
case gen_mod:get_module_opt(LServer, ?MODULE, assume_mam_usage, false) of
|
||||||
true ->
|
true ->
|
||||||
should_archive(strip_my_archived_tag(Pkt, LServer), LServer)
|
should_archive(strip_my_stanza_id(Pkt, LServer), LServer)
|
||||||
andalso should_archive_peer(LUser, LServer,
|
andalso should_archive_peer(LUser, LServer,
|
||||||
get_prefs(LUser, LServer),
|
get_prefs(LUser, LServer),
|
||||||
Peer);
|
Peer);
|
||||||
|
@ -601,8 +601,8 @@ should_archive(#message{body = Body, subject = Subject,
|
||||||
should_archive(_, _LServer) ->
|
should_archive(_, _LServer) ->
|
||||||
false.
|
false.
|
||||||
|
|
||||||
-spec strip_my_archived_tag(stanza(), binary()) -> stanza().
|
-spec strip_my_stanza_id(stanza(), binary()) -> stanza().
|
||||||
strip_my_archived_tag(Pkt, LServer) ->
|
strip_my_stanza_id(Pkt, LServer) ->
|
||||||
Els = xmpp:get_els(Pkt),
|
Els = xmpp:get_els(Pkt),
|
||||||
NewEls = lists:filter(
|
NewEls = lists:filter(
|
||||||
fun(El) ->
|
fun(El) ->
|
||||||
|
@ -720,7 +720,6 @@ check_store_hint(Pkt) ->
|
||||||
end
|
end
|
||||||
end.
|
end.
|
||||||
|
|
||||||
|
|
||||||
-spec has_store_hint(message()) -> boolean().
|
-spec has_store_hint(message()) -> boolean().
|
||||||
has_store_hint(Message) ->
|
has_store_hint(Message) ->
|
||||||
xmpp:has_subtag(Message, #hint{type = 'store'}).
|
xmpp:has_subtag(Message, #hint{type = 'store'}).
|
||||||
|
@ -755,15 +754,15 @@ store_msg(Pkt, LUser, LServer, Peer, Dir) ->
|
||||||
Prefs = get_prefs(LUser, LServer),
|
Prefs = get_prefs(LUser, LServer),
|
||||||
case should_archive_peer(LUser, LServer, Prefs, Peer) of
|
case should_archive_peer(LUser, LServer, Prefs, Peer) of
|
||||||
true ->
|
true ->
|
||||||
US = {LUser, LServer},
|
|
||||||
case ejabberd_hooks:run_fold(store_mam_message, LServer, Pkt,
|
case ejabberd_hooks:run_fold(store_mam_message, LServer, Pkt,
|
||||||
[LUser, LServer, Peer, chat, Dir]) of
|
[LUser, LServer, Peer, chat, Dir]) of
|
||||||
drop ->
|
drop ->
|
||||||
pass;
|
pass;
|
||||||
NewPkt ->
|
Pkt1 ->
|
||||||
|
US = {LUser, LServer},
|
||||||
|
ID = get_stanza_id(Pkt1),
|
||||||
|
El = xmpp:encode(Pkt1),
|
||||||
Mod = gen_mod:db_mod(LServer, ?MODULE),
|
Mod = gen_mod:db_mod(LServer, ?MODULE),
|
||||||
ID = get_stanza_id(NewPkt),
|
|
||||||
El = xmpp:encode(NewPkt),
|
|
||||||
Mod:store(El, LServer, US, chat, Peer, <<"">>, Dir, ID)
|
Mod:store(El, LServer, US, chat, Peer, <<"">>, Dir, ID)
|
||||||
end;
|
end;
|
||||||
false ->
|
false ->
|
||||||
|
@ -779,11 +778,12 @@ store_muc(MUCState, Pkt, RoomJID, Peer, Nick) ->
|
||||||
[U, S, Peer, groupchat, recv]) of
|
[U, S, Peer, groupchat, recv]) of
|
||||||
drop ->
|
drop ->
|
||||||
pass;
|
pass;
|
||||||
NewPkt ->
|
Pkt1 ->
|
||||||
|
US = {U, S},
|
||||||
|
ID = get_stanza_id(Pkt1),
|
||||||
|
El = xmpp:encode(Pkt1),
|
||||||
Mod = gen_mod:db_mod(LServer, ?MODULE),
|
Mod = gen_mod:db_mod(LServer, ?MODULE),
|
||||||
ID = get_stanza_id(NewPkt),
|
Mod:store(El, LServer, US, groupchat, Peer, Nick, recv, ID)
|
||||||
El = xmpp:encode(NewPkt),
|
|
||||||
Mod:store(El, LServer, {U, S}, groupchat, Peer, Nick, recv, ID)
|
|
||||||
end;
|
end;
|
||||||
false ->
|
false ->
|
||||||
pass
|
pass
|
||||||
|
|
Loading…
Reference in New Issue