Improve muc#roomconfig_presencebroadcast support

diff --git a/src/mod_muc_room.erl b/src/mod_muc_room.erl
index 38fed6eab2c330338eb90b4d0ab13809763e9e11..dd7f78163fff8536703e29c1712045c58751da81 100644 (file)
--- a/src/mod_muc_room.erl
+++ b/src/mod_muc_room.erl
@@ -2085,16 +2085,16 @@ presence_broadcast_allowed(JID, StateData) ->
     Role = get_role(JID, StateData),
     lists:member(Role, (StateData#state.config)#config.presence_broadcast).
 
-send_update_presence(JID, StateData) ->
-    send_update_presence(JID, <<"">>, StateData).
+send_update_presence(JID, StateData, OldStateData) ->
+    send_update_presence(JID, <<"">>, StateData, OldStateData).
 
-send_update_presence(JID, Reason, StateData) ->
+send_update_presence(JID, Reason, StateData, OldStateData) ->
     case is_room_overcrowded(StateData) of
        true -> ok;
-       false -> send_update_presence1(JID, Reason, StateData)
+       false -> send_update_presence1(JID, Reason, StateData, OldStateData)
     end.
 
-send_update_presence1(JID, Reason, StateData) ->
+send_update_presence1(JID, Reason, StateData, OldStateData) ->
     LJID = jid:tolower(JID),
     LJIDs = case LJID of
              {U, S, <<"">>} ->
@@ -2112,7 +2112,7 @@ send_update_presence1(JID, Reason, StateData) ->
                  end
            end,
     lists:foreach(fun (J) ->
-                         send_new_presence(J, Reason, StateData, StateData)
+                         send_new_presence(J, Reason, StateData, OldStateData)
                  end,
                  LJIDs).
 
@@ -2120,27 +2120,47 @@ send_new_presence(NJID, StateData, OldStateData) ->
     send_new_presence(NJID, <<"">>, StateData, OldStateData).
 
 send_new_presence(NJID, Reason, StateData, OldStateData) ->
-    case is_room_overcrowded(StateData) orelse
-        not (presence_broadcast_allowed(NJID, StateData) orelse
-             presence_broadcast_allowed(NJID, OldStateData)) of
+    case is_room_overcrowded(StateData) of
        true -> ok;
-       false -> send_new_presence1(NJID, Reason, StateData)
+       false -> send_new_presence1(NJID, Reason, StateData, OldStateData)
     end.
 
-send_new_presence1(NJID, Reason, StateData) ->
-    #user{nick = Nick} =
-       (?DICT):fetch(jid:tolower(NJID),
-                     StateData#state.users),
+send_new_presence1(NJID, Reason, StateData, OldStateData) ->
+    LNJID = jid:tolower(NJID),
+    #user{nick = Nick} = (?DICT):fetch(LNJID, StateData#state.users),
     LJID = find_jid_by_nick(Nick, StateData),
     {ok,
-     #user{jid = RealJID, role = Role,
-          last_presence = Presence}} =
+     #user{jid = RealJID, role = Role0,
+          last_presence = Presence0} = UserInfo} =
        (?DICT):find(jid:tolower(LJID),
                     StateData#state.users),
+    {Role1, Presence1} =
+        case presence_broadcast_allowed(NJID, StateData) of
+            true -> {Role0, Presence0};
+            false ->
+                {none,
+                 #xmlel{name = <<"presence">>,
+                        attrs = [{<<"type">>, <<"unavailable">>}],
+                        children = []}
+                }
+        end,
     Affiliation = get_affiliation(LJID, StateData),
     SAffiliation = affiliation_to_list(Affiliation),
-    SRole = role_to_list(Role),
-    lists:foreach(fun ({_LJID, Info}) ->
+    UserList =
+        case not (presence_broadcast_allowed(NJID, StateData) orelse
+             presence_broadcast_allowed(NJID, OldStateData)) of
+            true ->
+                [{LNJID, UserInfo}];
+            false ->
+                (?DICT):to_list(StateData#state.users)
+        end,
+    lists:foreach(fun ({LUJID, Info}) ->
+                          {Role, Presence} =
+                              if
+                                  LNJID == LUJID -> {Role0, Presence0};
+                                  true -> {Role1, Presence1}
+                              end,
+                          SRole = role_to_list(Role),
                          ItemAttrs = case Info#user.role == moderator orelse
                                             (StateData#state.config)#config.anonymous
                                               == false
@@ -2220,7 +2240,7 @@ send_new_presence1(NJID, Reason, StateData) ->
                                                                 Nick),
                                       Info#user.jid, Packet)
                  end,
-                 (?DICT):to_list(StateData#state.users)).
+                 UserList).
 
 send_existing_presences(ToJID, StateData) ->
     case is_room_overcrowded(StateData) of
@@ -2238,8 +2258,12 @@ send_existing_presences1(ToJID, StateData) ->
                                last_presence = Presence} =
                              (?DICT):fetch(jid:tolower(LJID),
                                            StateData#state.users),
-                         case RealToJID of
-                           FromJID -> ok;
+                          PresenceBroadcast =
+                              lists:member(
+                                FromRole, (StateData#state.config)#config.presence_broadcast),
+                         case {RealToJID, PresenceBroadcast} of
+                           {FromJID, _} -> ok;
+                           {_, false} -> ok;
                            _ ->
                                FromAffiliation = get_affiliation(LJID,
                                                                  StateData),
@@ -2666,7 +2690,7 @@ process_item_change(E, SD, UJID) ->
                     set_role(JID, none, SD1);
                 _ ->
                     SD1 = set_affiliation(JID, none, SD),
-                    send_update_presence(JID, SD1),
+                    send_update_presence(JID, SD1, SD),
                     SD1
             end;
         {JID, affiliation, outcast, Reason} ->
@@ -2684,12 +2708,12 @@ process_item_change(E, SD, UJID) ->
             when (A == admin) or (A == owner) ->
             SD1 = set_affiliation(JID, A, SD, Reason),
             SD2 = set_role(JID, moderator, SD1),
-            send_update_presence(JID, Reason, SD2),
+            send_update_presence(JID, Reason, SD2, SD),
             SD2;
         {JID, affiliation, member, Reason} ->
             SD1 = set_affiliation(JID, member, SD, Reason),
             SD2 = set_role(JID, participant, SD1),
-            send_update_presence(JID, Reason, SD2),
+            send_update_presence(JID, Reason, SD2, SD),
             SD2;
         {JID, role, Role, Reason} ->
             SD1 = set_role(JID, Role, SD),
@@ -2698,7 +2722,7 @@ process_item_change(E, SD, UJID) ->
             SD1;
         {JID, affiliation, A, _Reason} ->
             SD1 = set_affiliation(JID, A, SD),
-            send_update_presence(JID, SD1),
+            send_update_presence(JID, SD1, SD),
             SD1
     end
     of