From d2890e6e86ce2494e36662f9d76c7799e0a2007e Mon Sep 17 00:00:00 2001
From: in1tiate <radwoodward@vikings.grayson.edu>
Date: Tue, 9 Mar 2021 14:35:23 -0600
Subject: [PATCH] some fiddling

---
 src/commands.cpp | 14 +++++++-------
 src/packets.cpp  |  7 ++++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/commands.cpp b/src/commands.cpp
index 50fa0cb..1d9727a 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -40,12 +40,12 @@ void AOClient::cmdLogin(int argc, QStringList argv)
     // TODO: tell the user if no modpass is set
     if (auth_type == "simple") {
         if(argv[0] == modpass) {
-            //sendServerMessage("Logged in as a moderator."); // This string has to be exactly this, because it is hardcoded in the client
-            sendPacket("AUTH", {"1"});
+            sendPacket("AUTH", {"1"}); // Client: "You were granted the Disable Modcalls button."
+            sendServerMessage("Logged in as a moderator."); // for old clients, this is hardcoded to display the mod UI
             authenticated = true;
         } else {
+            sendPacket("AUTH", {"0"}); // Client: "Login unsuccessful."
             sendServerMessage("Incorrect password.");
-            sendPacket("AUTH", {"0"});
         }
         server->areas.value(current_area)->logger->logLogin(this, authenticated, "moderator");
     }
@@ -59,12 +59,13 @@ void AOClient::cmdLogin(int argc, QStringList argv)
         if (server->db_manager->authenticate(username, password)) {
             moderator_name = username;
             authenticated = true;
-            sendPacket("AUTH", {"1"});
+            sendPacket("AUTH", {"1"}); // Client: "You were granted the Disable Modcalls button."
+            sendServerMessage("Logged in as a moderator."); // for old clients, this is hardcoded to display the mod UI
             sendServerMessage("Welcome, " + username);
         }
         else {
+            sendPacket("AUTH", {"0"}); // Client: "Login unsuccessful."
             sendServerMessage("Incorrect password.");
-            sendPacket("AUTH", {"0"});
         }
         server->areas.value(current_area)->logger->logLogin(this, authenticated, username);
     }
@@ -361,8 +362,7 @@ void AOClient::cmdLogout(int argc, QStringList argv)
     }
     authenticated = false;
     moderator_name = "";
-    sendServerMessage("You have been logged out.");
-    sendPacket("AUTH", {"-1"});
+    sendPacket("AUTH", {"-1"}); // Client: "You were logged out."
 }
 
 void AOClient::cmdPos(int argc, QStringList argv)
diff --git a/src/packets.cpp b/src/packets.cpp
index feaa203..9766578 100644
--- a/src/packets.cpp
+++ b/src/packets.cpp
@@ -346,9 +346,10 @@ AOPacket AOClient::validateIcPacket(AOPacket packet)
     }
 
     // desk modifier
-    QStringList allowed_desk_mods = ["chat", "0", "1", "2", "3", "4", "5"];
-    if (allowed_desk_mods.contains(incoming_args[0])) {
-        args.append(incoming_args[0]);
+    QStringList allowed_desk_mods;
+    allowed_desk_mods << "chat" << "0" << "1" << "2" << "3" << "4" << "5";
+    if (allowed_desk_mods.contains(incoming_args[0].toString())) {
+        args.append(incoming_args[0].toString());
     }
     else
         return invalid;