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

mod_push: Avoid notification duplicates

Browse Source 
Don't let mod_mam and mod_offline both trigger push notifications for
the same message.

Closes #2078.
This commit is contained in:
Holger Weiss 2017-11-06 00:26:20 +01:00
parent 7d8ad17fa1
commit 41c393466c
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mod_push.erl
View File

@ -195,7 +195,7 @@ register_hooks(Host) ->
ejabberd_hooks:add(store_mam_message, Host, ?MODULE, ejabberd_hooks:add(store_mam_message, Host, ?MODULE,
mam_message, 50), mam_message, 50),
ejabberd_hooks:add(offline_message_hook, Host, ?MODULE, ejabberd_hooks:add(offline_message_hook, Host, ?MODULE,
offline_message, 50), offline_message, 30),
ejabberd_hooks:add(remove_user, Host, ?MODULE, ejabberd_hooks:add(remove_user, Host, ?MODULE,
remove_user, 50). remove_user, 50).
@ -214,7 +214,7 @@ unregister_hooks(Host) ->
ejabberd_hooks:delete(store_mam_message, Host, ?MODULE, ejabberd_hooks:delete(store_mam_message, Host, ?MODULE,
mam_message, 50), mam_message, 50),
ejabberd_hooks:delete(offline_message_hook, Host, ?MODULE, ejabberd_hooks:delete(offline_message_hook, Host, ?MODULE,
offline_message, 50), offline_message, 30),
ejabberd_hooks:delete(remove_user, Host, ?MODULE, ejabberd_hooks:delete(remove_user, Host, ?MODULE,
remove_user, 50). remove_user, 50).
@ -354,13 +354,11 @@ mam_message(#message{} = Pkt, LUser, LServer, _Peer, chat, _Dir) ->
_ -> _ ->
ok ok
end, end,
xmpp:put_meta(Pkt, push_notified, true); Pkt;
mam_message(Pkt, _LUser, _LServer, _Peer, _Type, _Dir) -> mam_message(Pkt, _LUser, _LServer, _Peer, _Type, _Dir) ->
Pkt. Pkt.
-spec offline_message({any(), message()}) -> {any(), message()}. -spec offline_message({any(), message()}) -> {any(), message()}.
offline_message({_Action, #message{meta = #{push_notified := true}}} = Acc) ->
Acc;
offline_message({Action, #message{to = #jid{luser = LUser, offline_message({Action, #message{to = #jid{luser = LUser,
lserver = LServer}} = Pkt}) -> lserver = LServer}} = Pkt}) ->
case lookup_sessions(LUser, LServer) of case lookup_sessions(LUser, LServer) of