mirror of
https://github.com/processone/ejabberd.git
synced 2024-06-12 21:52:07 +02:00
Use jid() instead of ljid()
This commit is contained in:
parent
7a622c3392
commit
0715e62a41
|
@ -4046,7 +4046,8 @@ process_iq_mucsub(From, #iq{type = set, lang = Lang,
|
||||||
end;
|
end;
|
||||||
process_iq_mucsub(From, #iq{type = set, sub_els = [#muc_unsubscribe{}]},
|
process_iq_mucsub(From, #iq{type = set, sub_els = [#muc_unsubscribe{}]},
|
||||||
StateData) ->
|
StateData) ->
|
||||||
LBareJID = jid:tolower(jid:remove_resource(From)),
|
BareJID = jid:remove_resource(From),
|
||||||
|
LBareJID = jid:tolower(BareJID),
|
||||||
try maps:get(LBareJID, StateData#state.subscribers) of
|
try maps:get(LBareJID, StateData#state.subscribers) of
|
||||||
#subscriber{nick = Nick} ->
|
#subscriber{nick = Nick} ->
|
||||||
Nicks = maps:remove(Nick, StateData#state.subscriber_nicks),
|
Nicks = maps:remove(Nick, StateData#state.subscriber_nicks),
|
||||||
|
@ -4054,7 +4055,7 @@ process_iq_mucsub(From, #iq{type = set, sub_els = [#muc_unsubscribe{}]},
|
||||||
NewStateData = StateData#state{subscribers = Subscribers,
|
NewStateData = StateData#state{subscribers = Subscribers,
|
||||||
subscriber_nicks = Nicks},
|
subscriber_nicks = Nicks},
|
||||||
store_room(NewStateData, [{del_subscription, LBareJID}]),
|
store_room(NewStateData, [{del_subscription, LBareJID}]),
|
||||||
send_subscriptions_change_notifications(LBareJID, Nick, unsubscribe, StateData),
|
send_subscriptions_change_notifications(BareJID, Nick, unsubscribe, StateData),
|
||||||
NewStateData2 = case close_room_if_temporary_and_empty(NewStateData) of
|
NewStateData2 = case close_room_if_temporary_and_empty(NewStateData) of
|
||||||
{stop, normal, _} -> stop;
|
{stop, normal, _} -> stop;
|
||||||
{next_state, normal_state, SD} -> SD
|
{next_state, normal_state, SD} -> SD
|
||||||
|
|
Loading…
Reference in New Issue
Block a user