]> granicus.if.org Git - ejabberd/commitdiff
Fix get_affiliation/2
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>
Tue, 24 Apr 2018 09:07:10 +0000 (12:07 +0300)
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>
Tue, 24 Apr 2018 09:07:10 +0000 (12:07 +0300)
src/mod_muc_room.erl

index e76106d29628f5b410d6fc3e65fe8ba21d686918..cf065ba44f687cb913aa8af9e6796970600f2fa2 100644 (file)
@@ -1312,8 +1312,8 @@ set_affiliations(Affiliations, StateData) ->
 set_affiliations_fallback(Affiliations, StateData) ->
     StateData#state{affiliations = Affiliations}.
 
--spec get_affiliation(jid(), state()) -> affiliation().
-get_affiliation(JID, StateData) ->
+-spec get_affiliation(ljid() | jid(), state()) -> affiliation().
+get_affiliation(#jid{} = JID, StateData) ->
     case get_service_affiliation(JID, StateData) of
         owner ->
             owner;
@@ -1322,7 +1322,9 @@ get_affiliation(JID, StateData) ->
                 {Affiliation, _Reason} -> Affiliation;
                 Affiliation -> Affiliation
             end
-    end.
+    end;
+get_affiliation(LJID, StateData) ->
+    get_affiliation(jid:make(LJID), StateData).
 
 -spec do_get_affiliation(jid(), state()) -> affiliation().
 do_get_affiliation(JID, #state{config = #config{persistent = false}} = StateData) ->