Merge pull request #116 from AttorneyOnline/kicking-changes

Add /kickuid

include/aoclient.h

@@ -1176,6 +1176,20 @@ class AOClient : public QObject {
     */
     void cmdPermitSaving(int argc, QStringList argv);
 
+    /**
+     * @brief Kicks a client from the server, forcibly severing its connection to the server.
+     *
+     * @details The first argument is the **target's UID**, while the remaining arguments are the **reason**
+     * the client was kicked. Both arguments are mandatory.
+     *
+     * Unlike cmdKick, this command will only kick a single client, thus a multiclienting user will not have all their clients kicked.
+     *
+     * @iscommand
+     *
+     * @see #cmdKick
+     */
+    void cmdKickUid(int argc, QStringList argv);
+
     ///@}
 
     /**
@@ -2000,6 +2014,8 @@ class AOClient : public QObject {
         {"togglemusic",        {ACLFlags.value("CM"),           0, &AOClient::cmdToggleMusic}},
         {"a",                  {ACLFlags.value("NONE"),         2, &AOClient::cmdA}},
         {"s",                  {ACLFlags.value("NONE"),         0, &AOClient::cmdS}},
+        {"kickuid",            {ACLFlags.value("NONE"),         2, &AOClient::cmdKickUid}},
+        {"kick_uid",           {ACLFlags.value("NONE"),         2, &AOClient::cmdKickUid}},
         {"firstperson",        {ACLFlags.value("NONE"),         0, &AOClient::cmdFirstPerson}},
     };
 

src/commands/moderation.cpp

@@ -413,3 +413,26 @@ void AOClient::cmdPermitSaving(int argc, QStringList argv)
     }
     client->testimony_saving = true;
 }
+
+void AOClient::cmdKickUid(int argc, QStringList argv)
+{
+    QString reason = argv[1];
+
+    if (argc > 2) {
+        for (int i = 2; i < argv.length(); i++) {
+            reason += " " + argv[i];
+        }
+    }
+
+    bool conv_ok = false;
+    int uid = argv[0].toInt(&conv_ok);
+    if (!conv_ok) {
+        sendServerMessage("Invalid user ID.");
+        return;
+    }
+
+    AOClient* target = server->getClientByID(uid);
+    target->sendPacket("KK", {reason});
+    target->socket->close();
+    sendServerMessage("Kicked client with UID " + argv[0] + " for reason: " + reason);
+}