Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-22 17:28:25 +01:00
Code Releases Activity

mod_mam: Make sure archived message isn't bounced

Browse Source 
If mod_offline is disabled but a message is archived by mod_mam, no
error bounce should be generated.  This functionality got lost when
mod_mam stopped using the 'offline_message_hook'.
This commit is contained in:
Holger Weiss 2017-11-10 18:09:33 +01:00
parent 5c6a37b20f
commit 54c8ae4d2b
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mod_mam.erl
View File

@ -38,7 +38,7 @@
remove_user/2, remove_room/3, mod_opt_type/1, muc_process_iq/2, remove_user/2, remove_room/3, mod_opt_type/1, muc_process_iq/2,
muc_filter_message/3, message_is_archived/3, delete_old_messages/2, muc_filter_message/3, message_is_archived/3, delete_old_messages/2,
get_commands_spec/0, msg_to_el/4, get_room_config/4, set_room_option/3, get_commands_spec/0, msg_to_el/4, get_room_config/4, set_room_option/3,
export/1]). offline_message/1, export/1]).
-include("xmpp.hrl"). -include("xmpp.hrl").
-include("logger.hrl"). -include("logger.hrl").
@ -84,6 +84,8 @@ start(Host, Opts) ->
user_send_packet, 88), user_send_packet, 88),
ejabberd_hooks:add(user_send_packet, Host, ?MODULE, ejabberd_hooks:add(user_send_packet, Host, ?MODULE,
user_send_packet_strip_tag, 500), user_send_packet_strip_tag, 500),
ejabberd_hooks:add(offline_message_hook, Host, ?MODULE,
offline_message, 50),
ejabberd_hooks:add(muc_filter_message, Host, ?MODULE, ejabberd_hooks:add(muc_filter_message, Host, ?MODULE,
muc_filter_message, 50), muc_filter_message, 50),
ejabberd_hooks:add(muc_process_iq, Host, ?MODULE, ejabberd_hooks:add(muc_process_iq, Host, ?MODULE,
@ -145,6 +147,8 @@ stop(Host) ->
user_send_packet, 88), user_send_packet, 88),
ejabberd_hooks:delete(user_send_packet, Host, ?MODULE, ejabberd_hooks:delete(user_send_packet, Host, ?MODULE,
user_send_packet_strip_tag, 500), user_send_packet_strip_tag, 500),
ejabberd_hooks:delete(offline_message_hook, Host, ?MODULE,
offline_message, 50),
ejabberd_hooks:delete(muc_filter_message, Host, ?MODULE, ejabberd_hooks:delete(muc_filter_message, Host, ?MODULE,
muc_filter_message, 50), muc_filter_message, 50),
ejabberd_hooks:delete(muc_process_iq, Host, ?MODULE, ejabberd_hooks:delete(muc_process_iq, Host, ?MODULE,
@ -313,6 +317,12 @@ user_send_packet_strip_tag({#message{} = Pkt, #{jid := JID} = C2SState}) ->
user_send_packet_strip_tag(Acc) -> user_send_packet_strip_tag(Acc) ->
Acc. Acc.
-spec offline_message({any(), message()}) -> {any(), message()}.
offline_message({_Action, #message{meta = #{mam_archived := true}} = Pkt}) ->
{archived, Pkt};
offline_message(Acc) ->
Acc.
-spec muc_filter_message(message(), mod_muc_room:state(), -spec muc_filter_message(message(), mod_muc_room:state(),
binary()) -> message(). binary()) -> message().
muc_filter_message(#message{from = From} = Pkt, muc_filter_message(#message{from = From} = Pkt,