Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-22 16:20:52 +01:00
Code Releases Activity

Expand rule "mucsub subscribers are members in members only rooms" to more places

Browse Source
This commit is contained in:
Paweł Chmielowski 2023-05-24 11:26:48 +02:00
parent 1818a29c29
commit 4a53d4cb56
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/mod_muc_room.erl
View File

@ -1695,13 +1695,23 @@ set_affiliations_fallback(Affiliations, StateData) ->
-spec get_affiliation(ljid() | jid(), state()) -> affiliation(). -spec get_affiliation(ljid() | jid(), state()) -> affiliation().
get_affiliation(#jid{} = JID, StateData) -> get_affiliation(#jid{} = JID, StateData) ->
case get_service_affiliation(JID, StateData) of case get_service_affiliation(JID, StateData) of
owner -> owner ->
owner; owner;
none -> none ->
case do_get_affiliation(JID, StateData) of Aff = case do_get_affiliation(JID, StateData) of
{Affiliation, _Reason} -> Affiliation; {Affiliation, _Reason} -> Affiliation;
Affiliation -> Affiliation Affiliation -> Affiliation
end end,
case {Aff, (StateData#state.config)#config.members_only} of
% Subscribers should be have members affiliation in this case
{none, true} ->
case is_subscriber(JID, StateData) of
true -> member;
_ -> none
end;
_ ->
Aff
end
end; end;
get_affiliation(LJID, StateData) -> get_affiliation(LJID, StateData) ->
get_affiliation(jid:make(LJID), StateData). get_affiliation(jid:make(LJID), StateData).