Use consistent naming for room membership and operatorship

Author: mathiascode

src/server/msghandler.d

@@ -660,7 +660,7 @@ final class MessageHandler
             if (!msg.is_valid)
                 break;
 
-            server.add_room_operator(
+            server.grant_room_operatorship(
                 msg.room_name, user.username, msg.username
             );
             break;
@@ -670,7 +670,7 @@ final class MessageHandler
             if (!msg.is_valid)
                 break;
 
-            server.remove_room_operator(
+            server.cancel_room_operatorship(
                 msg.room_name, user.username, msg.username
             );
             break;

src/server/server.d

@@ -564,7 +564,7 @@ final class Server
         }
 
         if (target_type == RoomMemberType.operator)
-            remove_room_operator(room_name, actor, target);
+            cancel_room_operatorship(room_name, actor, target);
 
         db.del_room_member(room_name, target);
 
@@ -595,7 +595,7 @@ final class Server
         }
     }
 
-   void add_room_operator(string room_name, string actor, string target)
+   void grant_room_operatorship(string room_name, string actor, string target)
     {
         if (actor == target)
             return;
@@ -650,15 +650,16 @@ final class Server
         foreach (ref room_username ; members) send_user_msg(room_username);
         send_user_msg(owner);
 
-        target_user.room_operator_added(room_name);
+        target_user.room_operatorship_granted(room_name);
 
         send_pm(
             server_username, owner,
             text("User ", target, " is now an operator of room ", room_name)
         );
     }
 
-    void remove_room_operator(string room_name, string actor, string target)
+    void cancel_room_operatorship(string room_name, string actor,
+                                  string target)
     {
         const target_type = db.get_room_member_type(room_name, target);
         if (target_type != RoomMemberType.operator)
@@ -692,7 +693,7 @@ final class Server
 
         auto target_user = get_user(target);
         if (target_user !is null)
-            target_user.room_operator_removed(room_name);
+            target_user.room_operatorship_canceled(room_name);
     }
 
     auto joined_rooms()

src/server/user.d

@@ -658,14 +658,14 @@ final class User
         server.send_room_list(username);
     }
 
-    void room_operator_added(string room_name)
+    void room_operatorship_granted(string room_name)
     {
         scope msg = new SPrivateRoomOperatorAdded(room_name);
         send_message(msg);
         server.send_room_list(username);
     }
 
-    void room_operator_removed(string room_name)
+    void room_operatorship_canceled(string room_name)
     {
         scope msg = new SPrivateRoomOperatorRemoved(room_name);
         send_message(msg);