25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-11-24 16:23:40 +01:00

Fix last commit

This commit is contained in:
Paweł Chmielowski 2017-10-30 13:27:37 +01:00
parent 2b363c7aee
commit 0633dd5802

View File

@ -2731,7 +2731,7 @@ find_changed_items(UJID, UAffiliation, URole,
[#muc_item{jid = J, nick = Nick, reason = Reason, [#muc_item{jid = J, nick = Nick, reason = Reason,
role = Role, affiliation = Affiliation}|Items], role = Role, affiliation = Affiliation}|Items],
Lang, StateData, Res) -> Lang, StateData, Res) ->
[JID | _] = JIDs = [JID | _] = JIDs =
if J /= undefined -> if J /= undefined ->
[J]; [J];
Nick /= <<"">> -> Nick /= <<"">> ->
@ -4089,7 +4089,7 @@ send_subscriptions_change_notifications(From, Nick, Type, State) ->
true -> true; true -> true;
_ -> false _ -> false
end, end,
Packet = case {Type, ShowJid} of Payload = case {Type, ShowJid} of
{subscribe, true} -> {subscribe, true} ->
#muc_subscribe{jid = From, nick = Nick}; #muc_subscribe{jid = From, nick = Nick};
{subscribe, _} -> {subscribe, _} ->
@ -4099,8 +4099,14 @@ send_subscriptions_change_notifications(From, Nick, Type, State) ->
{unsubscribe, _} -> {unsubscribe, _} ->
#muc_unsubscribe{nick = Nick} #muc_unsubscribe{nick = Nick}
end, end,
NewPacket = wrap(From, JID, Packet, ?NS_MUCSUB_NODES_SUBSCRIBERS), Packet = #message{
ejabberd_router:route(xmpp:set_from_to(NewPacket, From, JID)); sub_els = [#ps_event{
items = #ps_items{
node = ?NS_MUCSUB_NODES_SUBSCRIBERS,
items = [#ps_item{
id = randoms:get_string(),
xml_els = [xmpp:encode(Payload)]}]}}]},
ejabberd_router:route(xmpp:set_from_to(Packet, From, JID));
false -> false ->
ok ok
end end