user.d: add methods for membership/operator added and removed

Author: mathiascode

src/server/room.d

@@ -37,8 +37,8 @@ final class Room
     void disband()
     {
         foreach (ref user ; users) {
-            enum permanent = true;
-            user.leave_room(name, permanent);
+            user.leave_room(name);
+            if (type == RoomType._private) user.room_membership_canceled(name);
         }
     }
 

src/server/server.d

@@ -531,9 +531,7 @@ final class Server
         foreach (ref room_username ; members) send_user_msg(room_username);
         send_user_msg(owner);
 
-        scope msg = new SPrivateRoomAdded(room_name);
-        target_user.send_message(msg);
-        send_room_list(target);
+        target_user.room_membership_granted(room_name);
 
         send_pm(
             server_username, actor,
@@ -601,8 +599,8 @@ final class Server
 
         auto target_user = get_user(target);
         if (target_user !is null) {
-            enum permanent = true;
-            target_user.leave_room(room_name, permanent);
+            target_user.leave_room(room_name);
+            target_user.room_membership_canceled(room_name);
         }
     }
 
@@ -661,9 +659,7 @@ final class Server
         foreach (ref room_username ; members) send_user_msg(room_username);
         send_user_msg(owner);
 
-        scope msg = new SPrivateRoomOperatorAdded(room_name);
-        target_user.send_message(msg);
-        send_room_list(target);
+        target_user.room_operator_added(room_name);
 
         send_pm(
             server_username, owner,
@@ -704,12 +700,8 @@ final class Server
         );
 
         auto target_user = get_user(target);
-        if (target_user !is null) {
-            scope msg = new SPrivateRoomOperatorRemoved(room_name);
-            target_user.send_message(msg);
-
-            send_room_list(target);
-        }
+        if (target_user !is null)
+            target_user.room_operator_removed(room_name);
     }
 
     auto joined_rooms()

src/server/user.d

@@ -614,32 +614,51 @@ final class User
         room.add_user(this);
     }
 
-    bool leave_room(string room_name, bool permanent = false)
+    bool leave_room(string room_name)
     {
         if (room_name !in joined_rooms)
             return false;
 
         auto room = server.get_room(room_name);
 
-        if (permanent && room.type == RoomType._private) {
-            scope room_removed_msg = new SPrivateRoomRemoved(room_name);
-            send_message(room_removed_msg);
-        }
-
         room.remove_user(username);
         joined_rooms.remove(room_name);
 
         if (room.num_users == 0) {
-            const del_permanent = (
+            const permanent = (
                 room.type == RoomType._public && room.num_tickers == 0
             );
-            server.del_room(room_name, del_permanent);
+            server.del_room(room_name, permanent);
         }
+        return true;
+    }
 
-        if (permanent && room.type == RoomType._private)
-            server.send_room_list(username);
+    void room_membership_granted(string room_name)
+    {
+        scope msg = new SPrivateRoomAdded(room_name);
+        send_message(msg);
+        server.send_room_list(username);
+    }
 
-        return true;
+    void room_membership_canceled(string room_name)
+    {
+        scope msg = new SPrivateRoomRemoved(room_name);
+        send_message(msg);
+        server.send_room_list(username);
+    }
+
+    void room_operator_added(string room_name)
+    {
+        scope msg = new SPrivateRoomOperatorAdded(room_name);
+        send_message(msg);
+        server.send_room_list(username);
+    }
+
+    void room_operator_removed(string room_name)
+    {
+        scope msg = new SPrivateRoomRemoved(room_name);
+        send_message(msg);
+        server.send_room_list(username);
     }
 
     string[] joined_room_names(RoomType type)()