From 6dfffe76f1d66c706aaa30ab1cd9bcbd95e4edb7 Mon Sep 17 00:00:00 2001
From: AwesomeAim <30537683+AwesomeAim@users.noreply.github.com>
Date: Wed, 29 Jun 2022 03:21:10 -0700
Subject: [PATCH] Improve feedback and behaviour from /uncm

allow multiple arguments (discarding the rest and using the first)
give the moderator feedback that they successfully unCMed someone rather than only telling the target
tell those without permission they lack it rather than saying the command is invalid, as that implied /uncm didn't exist
---
 core/src/commands/area.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/commands/area.cpp b/core/src/commands/area.cpp
index d7409ba..731cff8 100644
--- a/core/src/commands/area.cpp
+++ b/core/src/commands/area.cpp
@@ -78,7 +78,7 @@ void AOClient::cmdUnCM(int argc, QStringList argv)
         l_uid = m_id;
         sendServerMessage("You are no longer CM in this area.");
     }
-    else if (checkPermission(ACLRole::UNCM) && argc == 1) {
+    else if (checkPermission(ACLRole::UNCM) && argc >= 1) {
         bool conv_ok = false;
         l_uid = argv[0].toInt(&conv_ok);
         if (!conv_ok) {
@@ -94,10 +94,11 @@ void AOClient::cmdUnCM(int argc, QStringList argv)
             sendServerMessage("No client with that ID found.");
             return;
         }
+        sendServerMessage(l_target->m_ooc_name + " was successfully unCMed.");
         l_target->sendServerMessage("You have been unCMed by a moderator.");
     }
     else {
-        sendServerMessage("Invalid command.");
+        sendServerMessage("You do not have permission to unCM others.");
         return;
     }