diff options
| author | Badlop <badlop@process-one.net> | 2010-12-02 20:14:54 +0100 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2010-12-02 20:14:54 +0100 |
| commit | c6e0cff144ca7764a4c875a63eb9103c24c9aa46 (patch) | |
| tree | bad2fa8c0f93d7a0a843c07083800ac8b2ee29fd /src | |
| parent | Fix cyrsasl_digest RFC-2831 2.1.2.1 (EJAB-476) (diff) | |
Fix use of exmpp
Diffstat (limited to 'src')
| -rw-r--r-- | src/mod_pubsub/mod_pubsub.erl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl index bea393a89..b4d58a67b 100644 --- a/src/mod_pubsub/mod_pubsub.erl +++ b/src/mod_pubsub/mod_pubsub.erl @@ -893,7 +893,7 @@ disco_items(#jid{raw = JID, node = U, domain = S, resource = R} = Host, NodeId, %% ------- %% presence hooks handling functions %% -caps_update(#jid{luser = U, lserver = S, lresource = R} = From, To, _Features) -> +caps_update(#jid{node = U, domain = S, resource = R} = From, To, _Features) -> Pid = ejabberd_sm:get_session_pid(U, S, R), presence_probe(From, To, Pid). @@ -3666,9 +3666,10 @@ broadcast_stanza({LUser, LServer, LResource}, Publisher, Node, NodeId, Type, Nod %% See XEP-0163 1.1 section 4.3.1 ejabberd_c2s:broadcast(C2SPid, {pep_message, binary_to_list(Node)++"+notify"}, - _Sender = jlib:make_jid(LUser, LServer, ""), + _Sender = exmpp_jid:make(LUser, LServer), _StanzaToSend = add_extended_headers(Stanza, - _ReplyTo = extended_headers([jlib:jid_to_string(Publisher)]))); + _ReplyTo = extended_headers([exmpp_jid:make(Publisher)]))); + _ -> ?DEBUG("~p@~p has no session; can't deliver ~p to contacts", [LUser, LServer, BaseStanza]) end; |