From a8121cd7e50787547d4bcc5a5defe194527c2ad4 Mon Sep 17 00:00:00 2001 From: Badlop Date: Wed, 7 Sep 2022 16:44:50 +0200 Subject: [PATCH] Don't persist 'none' role (thanks to Blake Miller)(#3330) --- src/mod_muc_room.erl | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/mod_muc_room.erl b/src/mod_muc_room.erl index 044725bd4..94d574962 100644 --- a/src/mod_muc_room.erl +++ b/src/mod_muc_room.erl @@ -1732,7 +1732,16 @@ set_role(JID, Role, StateData) -> end, StateData#state.users, LJIDs), StateData#state.nicks} end, - Roles = maps:put(jid:remove_resource(LJID), Role, StateData#state.roles), + Roles = case Role of + %% Don't persist 'none' role: if someone is kicked, they will + %% maintain the same role they had *before* they were kicked + none -> + StateData#state.roles; + NewRole -> + maps:put(jid:remove_resource(LJID), + NewRole, + StateData#state.roles) + end, StateData#state{users = Users, nicks = Nicks, roles = Roles}. -spec get_role(jid(), state()) -> role().