From b7f8f78690156ca0101ae1407c5b42e6a4931f60 Mon Sep 17 00:00:00 2001
From: MangosArentLiterature
 <58055358+MangosArentLiterature@users.noreply.github.com>
Date: Fri, 16 Apr 2021 18:25:12 -0500
Subject: [PATCH] Allow moderators to uncm other clients

- Adds "UNCM" permissions for uncming
---
 include/aoclient.h    |  1 +
 src/commands/area.cpp | 33 ++++++++++++++++++++++++++++++---
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/include/aoclient.h b/include/aoclient.h
index 3ab8429..9a67200 100644
--- a/include/aoclient.h
+++ b/include/aoclient.h
@@ -219,6 +219,7 @@ class AOClient : public QObject {
         {"ANNOUNCE",        1ULL << 8 },
         {"MODCHAT",         1ULL << 9 },
         {"MUTE",            1ULL << 10},
+        {"UNCM",            1ULL << 11},
         {"SUPER",          ~0ULL      },
     };
 
diff --git a/src/commands/area.cpp b/src/commands/area.cpp
index f81c618..87e5d22 100644
--- a/src/commands/area.cpp
+++ b/src/commands/area.cpp
@@ -61,9 +61,36 @@ void AOClient::cmdCM(int argc, QStringList argv)
 void AOClient::cmdUnCM(int argc, QStringList argv)
 {
     AreaData* area = server->areas[current_area];
-    int removed = area->owners.removeAll(id);
-    area->invited.removeAll(id);
-    sendServerMessage("You are no longer CM in this area.");
+    int uid;
+
+    if (area->owners.isEmpty()) {
+        sendServerMessage("There are no CMs in this area.");
+        return;
+    }
+    else if (argc == 0) {
+        uid = id;
+        sendServerMessage("You are no longer CM in this area.");
+    }
+    else if (checkAuth(ACLFlags.value("UNCM")) && argc == 1) {
+        bool conv_ok = false;
+        uid = argv[0].toInt(&conv_ok);
+        if (!conv_ok) {
+            sendServerMessage("Invalid user ID.");
+            return;
+        }
+        if (!area->owners.contains(uid)) {
+            sendServerMessage("That user is not CMed.");
+            return;
+        }
+        AOClient* target = server->getClientByID(uid);
+        target->sendServerMessage("You have been unCMed by a moderator.");
+    }
+    else {
+        sendServerMessage("Invalid command.");
+        return;
+    }
+    area->owners.removeAll(uid);
+    area->invited.removeAll(uid);
     arup(ARUPType::CM, true);
     if (area->owners.isEmpty()) {
         area->invited.clear();