Don't set affiliation to 'none' if it's already 'none' in mod_muc_room:process_item_change/3
This commit is contained in:
parent
e10c67a74a
commit
99d9e315a3
|
@ -3014,6 +3014,9 @@ process_item_change(Item, SD, UJID) ->
|
||||||
send_kickban_presence(UJID, JID, Reason, 307, SD),
|
send_kickban_presence(UJID, JID, Reason, 307, SD),
|
||||||
set_role(JID, none, SD);
|
set_role(JID, none, SD);
|
||||||
{JID, affiliation, none, Reason} ->
|
{JID, affiliation, none, Reason} ->
|
||||||
|
case get_affiliation(JID, SD) of
|
||||||
|
none -> SD;
|
||||||
|
_ ->
|
||||||
case (SD#state.config)#config.members_only of
|
case (SD#state.config)#config.members_only of
|
||||||
true ->
|
true ->
|
||||||
send_kickban_presence(UJID, JID, Reason, 321, none, SD),
|
send_kickban_presence(UJID, JID, Reason, 321, none, SD),
|
||||||
|
@ -3029,6 +3032,7 @@ process_item_change(Item, SD, UJID) ->
|
||||||
send_update_presence(JID, Reason, SD2, SD),
|
send_update_presence(JID, Reason, SD2, SD),
|
||||||
maybe_send_affiliation(JID, none, SD2),
|
maybe_send_affiliation(JID, none, SD2),
|
||||||
SD2
|
SD2
|
||||||
|
end
|
||||||
end;
|
end;
|
||||||
{JID, affiliation, outcast, Reason} ->
|
{JID, affiliation, outcast, Reason} ->
|
||||||
send_kickban_presence(UJID, JID, Reason, 301, outcast, SD),
|
send_kickban_presence(UJID, JID, Reason, 301, outcast, SD),
|
||||||
|
|
Loading…
Reference in New Issue