diff options
| author | Christophe Romain <christophe.romain@process-one.net> | 2017-08-11 10:32:36 +0200 |
|---|---|---|
| committer | Christophe Romain <christophe.romain@process-one.net> | 2017-08-11 10:32:36 +0200 |
| commit | 32fbfe198129fbed409765ef080ac8c7a7e7810e (patch) | |
| tree | 5315ff5ee62239ed7ee6c857db14655aa76490a4 | |
| parent | PubSub: refactor send_last_items remove send_loop (diff) | |
Use correct c2s process sending PEP with multi devices
| -rw-r--r-- | src/mod_pubsub.erl | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/mod_pubsub.erl b/src/mod_pubsub.erl index 054770829..40c6e3d06 100644 --- a/src/mod_pubsub.erl +++ b/src/mod_pubsub.erl @@ -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))). |