diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-02-25 10:01:01 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-02-25 10:01:01 +0300 |
| commit | 603ec9cb19ec8664ca75dd74b1cb3541878a27da (patch) | |
| tree | 89e0802baeeda5859938e089733d2d426746cfbf /src/mod_pubsub.erl | |
| parent | Don't pass 'from' and 'to' along with stanza in hooks' arguments (diff) | |
Don't pass empty resource to jid:make()
Diffstat (limited to 'src/mod_pubsub.erl')
| -rw-r--r-- | src/mod_pubsub.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mod_pubsub.erl b/src/mod_pubsub.erl index e512afa0..970ef522 100644 --- a/src/mod_pubsub.erl +++ b/src/mod_pubsub.erl @@ -723,7 +723,7 @@ presence(ServerHost, Presence) -> binary(), binary(), jid(), subscribed | unsubscribed | subscribe | unsubscribe) -> boolean(). out_subscription(User, Server, JID, subscribed) -> - Owner = jid:make(User, Server, <<>>), + Owner = jid:make(User, Server), {PUser, PServer, PResource} = jid:tolower(JID), PResources = case PResource of <<>> -> user_resources(PUser, PServer); @@ -738,7 +738,7 @@ out_subscription(_, _, _, _) -> subscribe | subscribed | unsubscribe | unsubscribed, binary()) -> true. in_subscription(_, User, Server, Owner, unsubscribed, _) -> - unsubscribe_user(jid:make(User, Server, <<>>), Owner), + unsubscribe_user(jid:make(User, Server), Owner), true; in_subscription(_, _, _, _, _, _) -> true. @@ -789,7 +789,7 @@ unsubscribe_user(Host, Entity, Owner) -> remove_user(User, Server) -> LUser = jid:nodeprep(User), LServer = jid:nameprep(Server), - Entity = jid:make(LUser, LServer, <<>>), + Entity = jid:make(LUser, LServer), Host = host(LServer), HomeTreeBase = <<"/home/", LServer/binary, "/", LUser/binary>>, spawn(fun () -> @@ -3023,7 +3023,7 @@ broadcast_stanza({LUser, LServer, LResource}, Publisher, Node, Nidx, Type, NodeO %% See XEP-0163 1.1 section 4.3.1 ejabberd_sm:route(jid:make(LUser, LServer, SenderResource), {pep_message, <<((Node))/binary, "+notify">>, - jid:make(LUser, LServer, <<"">>), + jid:make(LUser, LServer), add_extended_headers( Stanza, extended_headers([Publisher]))}); broadcast_stanza(Host, _Publisher, Node, Nidx, Type, NodeOptions, SubsByDepth, NotifyType, BaseStanza, SHIM) -> |