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

Use correct c2s process sending PEP with multi devices

Browse Source
This commit is contained in:
Christophe Romain 2017-08-11 10:32:36 +02:00
parent 9c5427e0c2
commit 32fbfe1981
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/mod_pubsub.erl
View File

@ -2870,11 +2870,10 @@ send_items(Host, Node, Nidx, Type, Options, Publisher, SubLJID, ToLJID, Number)
ok;
Items ->
Stanza = items_event_stanza(Node, Options, Items),
send_stanza(Host, Publisher, ToLJID, Node, Stanza)
send_stanza(Publisher, ToLJID, Node, Stanza)
end.
send_stanza({LUser, LServer, LResource}, Publisher, USR, Node, BaseStanza) ->
SenderResource = user_resource(LUser, LServer, LResource),
send_stanza({LUser, LServer, _} = Publisher, USR, Node, BaseStanza) ->
Stanza = xmpp:set_from(BaseStanza, jid:make(LUser, LServer)),
USRs = case USR of
{PUser, PServer, <<>>} ->
@ -2883,12 +2882,12 @@ send_stanza({LUser, LServer, LResource}, Publisher, USR, Node, BaseStanza) ->
_ ->
[USR]
end,
[ejabberd_sm:route(jid:make(LUser, LServer, SenderResource),
[ejabberd_sm:route(jid:make(Publisher),
{pep_message, <<((Node))/binary, "+notify">>,
add_extended_headers(
Stanza, extended_headers([Publisher])),
To}) || To <- USRs];
send_stanza(Host, _Publisher, USR, _Node, Stanza) ->
send_stanza(Host, USR, _Node, Stanza) ->
ejabberd_router:route(
xmpp:set_from_to(Stanza, service_jid(Host), jid:make(USR))).