From 5277a7dd7c5a59f08e1ce6d1999128bec7c40d54 Mon Sep 17 00:00:00 2001
From: in1tiate <radwoodward@vikings.grayson.edu>
Date: Tue, 23 Mar 2021 20:42:53 -0500
Subject: [PATCH 01/24] i was supposed to not commit this all at once but i
 forgot

---
 include/aoclient.h |  56 ++++++++----
 src/commands.cpp   | 211 ++++++++++++++++++++++++++++++++++++++-------
 src/packets.cpp    |  17 ++++
 3 files changed, 237 insertions(+), 47 deletions(-)

diff --git a/include/aoclient.h b/include/aoclient.h
index 690adbb..11ea067 100644
--- a/include/aoclient.h
+++ b/include/aoclient.h
@@ -46,10 +46,9 @@ class AOClient : public QObject {
     QString getIpid();
     void calculateIpid();
 
+    // user metadata
     int id;
-
     QHostAddress remote_ip;
-    QString password;
     bool joined;
     int current_area;
     QString current_char;
@@ -57,8 +56,9 @@ class AOClient : public QObject {
     QString moderator_name = "";
     QString ooc_name = "";
     QString showname = "";
-    bool global_enabled = true;
-    bool is_muted = false;
+
+    QString password; // for character passwords
+
     struct ClientVersion {
       QString string;
       int release = -1;
@@ -67,6 +67,21 @@ class AOClient : public QObject {
     };
     ClientVersion version;
 
+    // user preferences
+    bool global_enabled = true;
+    bool adverts_enabled = true;
+    bool pm_enabled = true;
+
+    // punitive conditions
+    bool is_muted = false;
+    bool is_ooc_muted = false;
+    bool is_dj_blocked = false;
+    bool is_wtce_blocked = false;
+    bool is_shaken = false;
+    bool is_disemvoweled = false;
+    bool is_gimped = false;
+    int char_curse = -1;
+
     QMap<QString, unsigned long long> ACLFlags {
         {"NONE", 0ULL},
         {"KICK", 1ULL << 0},
@@ -83,10 +98,6 @@ class AOClient : public QObject {
         {"SUPER", ~0ULL}
     };
 
-    bool is_shaken;
-    bool is_disemvoweled;
-    bool is_gimped;
-
   public slots:
     void clientDisconnected();
     void clientData();
@@ -118,9 +129,9 @@ class AOClient : public QObject {
     void changePosition(QString new_pos);
     void arup(ARUPType type, bool broadcast);
     void fullArup();
-    void sendServerMessage(QString message);
-    void sendServerMessageArea(QString message);
-    void sendServerBroadcast(QString message);
+    void sendServerMessage(QString message); // send a server OOC message to just this client
+    void sendServerMessageArea(QString message); // send a server OOC message to all clients in current area
+    void sendServerBroadcast(QString message); // send a server OOC message to all clients in the server
     bool checkAuth(unsigned long long acl_mask);
 
     // Packet headers
@@ -229,9 +240,15 @@ class AOClient : public QObject {
     void cmdAnnounce(int argc, QStringList argv);
     void cmdM(int argc, QStringList argv);
     void cmdGM(int argc, QStringList argv);
-    void cmdMute(int argc, QStringList argv);
-    void cmdUnmute(int argc, QStringList argv);
     void cmdBans(int argc, QStringList argv);
+    void cmdMute(int argc, QStringList argv);
+    void cmdUnMute(int argc, QStringList argv);
+    void cmdOocMute(int argc, QStringList argv);
+    void cmdOocUnMute(int argc, QStringList argv);
+    void cmdBlockDj(int argc, QStringList argv);
+    void cmdUnBlockDj(int argc, QStringList argv);
+    void cmdBlockWtce(int argc, QStringList argv);
+    void cmdUnBlockWtce(int argc, QStringList argv);
     // Casing/RP
     void cmdPlay(int argc, QStringList argv);
     void cmdNeed(int argc, QStringList argv);
@@ -258,6 +275,7 @@ class AOClient : public QObject {
     int genRand(int min, int max);
     void diceThrower(int argc, QStringList argv, RollType Type);
     long long parseTime(QString input);
+    QString getReprimand(bool positive = false);
 
     // Command function global variables
     bool change_auth_started = false;
@@ -324,12 +342,20 @@ class AOClient : public QObject {
         {"m", {ACLFlags.value("MODCHAT"), 1, &AOClient::cmdM}},
         {"gm", {ACLFlags.value("MODCHAT"), 1, &AOClient::cmdGM}},
         {"mute", {ACLFlags.value("MUTE"), 1, &AOClient::cmdMute}},
-        {"unmute", {ACLFlags.value("MUTE"), 1, &AOClient::cmdUnmute}},
+        {"unmute", {ACLFlags.value("MUTE"), 1, &AOClient::cmdUnMute}},
         {"bans", {ACLFlags.value("BAN"), 0, &AOClient::cmdBans}},
         {"unban", {ACLFlags.value("BAN"), 1, &AOClient::cmdUnBan}},
         {"removeuser", {ACLFlags.value("MODIFY_USERS"), 1, &AOClient::cmdRemoveUser}},
         {"subtheme", {ACLFlags.value("CM"), 1, &AOClient::cmdSubTheme}},
-        {"about", {ACLFlags.value("NONE"), 0, &AOClient::cmdAbout}}
+        {"about", {ACLFlags.value("NONE"), 0, &AOClient::cmdAbout}},
+        {"oocmute", {ACLFlags.value("MUTE"), 1, &AOClient::cmdOocMute}},
+        {"ooc_mute", {ACLFlags.value("MUTE"), 1, &AOClient::cmdOocMute}},
+        {"oocunmute", {ACLFlags.value("MUTE"), 1, &AOClient::cmdOocUnMute}},
+        {"ooc_unmute", {ACLFlags.value("MUTE"), 1, &AOClient::cmdOocUnMute}},
+        {"blockdj", {ACLFlags.value("MUTE"), 1, &AOClient::cmdBlockDj}},
+        {"unblockdj", {ACLFlags.value("MUTE"), 1, &AOClient::cmdUnBlockDj}},
+        {"blockwtce", {ACLFlags.value("MUTE"), 1, &AOClient::cmdBlockWtce}},
+        {"unblockwtce", {ACLFlags.value("MUTE"), 1, &AOClient::cmdUnBlockWtce}},
     };
 
     QString partial_packet;
diff --git a/src/commands.cpp b/src/commands.cpp
index 2455016..3f3aa4e 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -953,38 +953,6 @@ void AOClient::cmdGM(int argc, QStringList argv)
     }
 }
 
-void AOClient::cmdMute(int argc, QStringList argv)
-{
-    bool conv_ok = false;
-    int uid = argv[0].toInt(&conv_ok);
-    if (!conv_ok) {
-        sendServerMessage("Invalid user ID.");
-        return;
-    }
-
-    if (server->getClientByID(uid)->is_muted)
-        sendServerMessage("That player is already muted!");
-    else
-        sendServerMessage("Muted player.");
-    server->getClientByID(uid)->is_muted = true;
-}
-
-void AOClient::cmdUnmute(int argc, QStringList argv)
-{
-    bool conv_ok = false;
-    int uid = argv[0].toInt(&conv_ok);
-    if (!conv_ok) {
-        sendServerMessage("Invalid user ID.");
-        return;
-    }
-
-    if (!server->getClientByID(uid)->is_muted)
-        sendServerMessage("That player is already unmuted!");
-    else
-        sendServerMessage("Unmuted player.");
-    server->getClientByID(uid)->is_muted = false;
-}
-
 void AOClient::cmdBans(int argc, QStringList argv)
 {
     QStringList recent_bans;
@@ -1035,6 +1003,167 @@ void AOClient::cmdAbout(int argc, QStringList argv)
     sendPacket("CT", {"The akashi dev team", "Thank you for using akashi! Made with love by scatterflower, with help from in1tiate and Salanto. akashi " + QCoreApplication::applicationVersion()});
 }
 
+
+void AOClient::cmdMute(int argc, QStringList argv)
+{
+    bool conv_ok = false;
+    int uid = argv[0].toInt(&conv_ok);
+    if (!conv_ok) {
+        sendServerMessage("Invalid user ID.");
+        return;
+    }
+
+    AOClient* target = server->getClientByID(uid);
+
+    if (target->is_muted)
+        sendServerMessage("That player is already muted!");
+    else {
+        sendServerMessage("Muted player.");
+        target->sendServerMessage("You were muted by a moderator. " + getReprimand());
+    }
+    target->is_muted = true;
+}
+
+void AOClient::cmdUnMute(int argc, QStringList argv)
+{
+    bool conv_ok = false;
+    int uid = argv[0].toInt(&conv_ok);
+    if (!conv_ok) {
+        sendServerMessage("Invalid user ID.");
+        return;
+    }
+
+    AOClient* target = server->getClientByID(uid);
+
+    if (!target->is_muted)
+        sendServerMessage("That player is not muted!");
+    else {
+        sendServerMessage("Unmuted player.");
+        target->sendServerMessage("You were unmuted by a moderator. " + getReprimand(true));
+    }
+    target->is_muted = false;
+}
+
+void AOClient::cmdOocMute(int argc, QStringList argv)
+{
+    bool conv_ok = false;
+    int uid = argv[0].toInt(&conv_ok);
+    if (!conv_ok) {
+        sendServerMessage("Invalid user ID.");
+        return;
+    }
+
+    AOClient* target = server->getClientByID(uid);
+
+    if (target->is_ooc_muted)
+        sendServerMessage("That player is already OOC muted!");
+    else {
+        sendServerMessage("OOC muted player.");
+        target->sendServerMessage("You were OOC muted by a moderator. " + getReprimand());
+    }
+    target->is_ooc_muted = true;
+}
+
+void AOClient::cmdOocUnMute(int argc, QStringList argv)
+{
+    bool conv_ok = false;
+    int uid = argv[0].toInt(&conv_ok);
+    if (!conv_ok) {
+        sendServerMessage("Invalid user ID.");
+        return;
+    }
+
+    AOClient* target = server->getClientByID(uid);
+
+    if (!target->is_ooc_muted)
+        sendServerMessage("That player is not OOC muted!");
+    else {
+        sendServerMessage("OOC unmuted player.");
+        target->sendServerMessage("You were OOC unmuted by a moderator. " + getReprimand(true));
+    }
+    target->is_ooc_muted = false;
+}
+
+void AOClient::cmdBlockDj(int argc, QStringList argv)
+{
+    bool conv_ok = false;
+    int uid = argv[0].toInt(&conv_ok);
+    if (!conv_ok) {
+        sendServerMessage("Invalid user ID.");
+        return;
+    }
+
+    AOClient* target = server->getClientByID(uid);
+
+    if (target->is_dj_blocked)
+        sendServerMessage("That player is already DJ blocked!");
+    else {
+        sendServerMessage("DJ blocked player.");
+        target->sendServerMessage("You were blocked from changing the music by a moderator. " + getReprimand());
+    }
+    target->is_dj_blocked = true;
+}
+
+void AOClient::cmdUnBlockDj(int argc, QStringList argv)
+{
+    bool conv_ok = false;
+    int uid = argv[0].toInt(&conv_ok);
+    if (!conv_ok) {
+        sendServerMessage("Invalid user ID.");
+        return;
+    }
+
+    AOClient* target = server->getClientByID(uid);
+
+    if (!target->is_dj_blocked)
+        sendServerMessage("That player is not DJ blocked!");
+    else {
+        sendServerMessage("DJ permissions restored to player.");
+        target->sendServerMessage("A moderator restored your music permissions. " + getReprimand(true));
+    }
+    target->is_dj_blocked = false;
+}
+
+void AOClient::cmdBlockWtce(int argc, QStringList argv)
+{
+    bool conv_ok = false;
+    int uid = argv[0].toInt(&conv_ok);
+    if (!conv_ok) {
+        sendServerMessage("Invalid user ID.");
+        return;
+    }
+
+    AOClient* target = server->getClientByID(uid);
+
+    if (target->is_wtce_blocked)
+        sendServerMessage("That player is already judge blocked!");
+    else {
+        sendServerMessage("Revoked player's access to judge controls.");
+        target->sendServerMessage("A moderator revoked your judge controls access. " + getReprimand());
+    }
+    target->is_wtce_blocked = true;
+}
+
+void AOClient::cmdUnBlockWtce(int argc, QStringList argv)
+{
+    bool conv_ok = false;
+    int uid = argv[0].toInt(&conv_ok);
+    if (!conv_ok) {
+        sendServerMessage("Invalid user ID.");
+        return;
+    }
+
+    AOClient* target = server->getClientByID(uid);
+
+    if (!target->is_wtce_blocked)
+        sendServerMessage("That player is not judge blocked!");
+    else {
+        sendServerMessage("Restored player's access to judge controls.");
+        target->sendServerMessage("A moderator restored your judge controls access. " + getReprimand(true));
+    }
+    target->is_wtce_blocked = false;
+}
+
 QStringList AOClient::buildAreaList(int area_idx)
 {
     QStringList entries;
@@ -1193,3 +1322,21 @@ long long AOClient::parseTime(QString input)
 
     return total;
 }
+
+QString AOClient::getReprimand(bool positive)
+{
+    QString filename = positive ? "praise" : "reprimands";
+    QFileInfo reprimands_info("config/text/" + filename + ".txt");
+    if (!(reprimands_info.exists() && reprimands_info.isFile())) {
+        qWarning() << filename + ".txt doesn't exist!";
+        return "";
+    }
+    QStringList reprimands;
+    QFile file("config/text/" + filename + ".txt");
+    file.open(QIODevice::ReadOnly | QIODevice::Text);
+    while (!file.atEnd()) {
+        reprimands.append(file.readLine().trimmed());
+    }
+    file.close();
+    return reprimands[genRand(0, reprimands.size() - 1)];
+}
diff --git a/src/packets.cpp b/src/packets.cpp
index 80e89ce..3ed0fd9 100644
--- a/src/packets.cpp
+++ b/src/packets.cpp
@@ -172,6 +172,11 @@ void AOClient::pktIcChat(AreaData* area, int argc, QStringList argv, AOPacket pa
 
 void AOClient::pktOocChat(AreaData* area, int argc, QStringList argv, AOPacket packet)
 {
+    if (is_ooc_muted) {
+        sendServerMessage("You are OOC muted, and cannot speak.");
+        return;
+    }
+
     ooc_name = dezalgo(argv[0]).replace(QRegExp("\\[|\\]|\\{|\\}|\\#|\\$|\\%|\\&"), ""); // no fucky wucky shit here
     if (ooc_name.isEmpty() || ooc_name == server->getServerName()) // impersonation & empty name protection
         return;
@@ -203,6 +208,10 @@ void AOClient::pktPing(AreaData* area, int argc, QStringList argv, AOPacket pack
 
 void AOClient::pktChangeMusic(AreaData* area, int argc, QStringList argv, AOPacket packet)
 {
+    if (is_dj_blocked) {
+        sendServerMessage("You are blocked from changing the music.");
+        return;
+    }
     // Due to historical reasons, this
     // packet has two functions:
     // Change area, and set music.
@@ -243,6 +252,10 @@ void AOClient::pktChangeMusic(AreaData* area, int argc, QStringList argv, AOPack
 
 void AOClient::pktWtCe(AreaData* area, int argc, QStringList argv, AOPacket packet)
 {
+    if (is_wtce_blocked) {
+        sendServerMessage("You are blocked from using the judge controls.");
+        return;
+    }
     if (QDateTime::currentDateTime().toSecsSinceEpoch() - last_wtce_time <= 5)
         return;
     last_wtce_time = QDateTime::currentDateTime().toSecsSinceEpoch();
@@ -251,6 +264,10 @@ void AOClient::pktWtCe(AreaData* area, int argc, QStringList argv, AOPacket pack
 
 void AOClient::pktHpBar(AreaData* area, int argc, QStringList argv, AOPacket packet)
 {
+    if (is_wtce_blocked) {
+        sendServerMessage("You are blocked from using the judge controls.");
+        return;
+    }
     if (argv[0] == "1") {
         area->def_hp = std::min(std::max(0, argv[1].toInt()), 10);
     }

From 7e28cb0bdf85526928dc837783ff593ff45de5a9 Mon Sep 17 00:00:00 2001
From: in1tiate <radwoodward@vikings.grayson.edu>
Date: Tue, 23 Mar 2021 20:44:13 -0500
Subject: [PATCH 02/24] add config sample files

---
 bin/config_sample/text/praise.txt     | 10 ++++++++++
 bin/config_sample/text/reprimands.txt | 11 +++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 bin/config_sample/text/praise.txt
 create mode 100644 bin/config_sample/text/reprimands.txt

diff --git a/bin/config_sample/text/praise.txt b/bin/config_sample/text/praise.txt
new file mode 100644
index 0000000..5cad5b1
--- /dev/null
+++ b/bin/config_sample/text/praise.txt
@@ -0,0 +1,10 @@
+:3
+\o/
+Be safe!
+Have fun!
+Be careful!
+Have a nice day!
+Be responsible!
+Be good!
+I believe in you!
+
diff --git a/bin/config_sample/text/reprimands.txt b/bin/config_sample/text/reprimands.txt
new file mode 100644
index 0000000..9ed1548
--- /dev/null
+++ b/bin/config_sample/text/reprimands.txt
@@ -0,0 +1,11 @@
+>:(
+;w;
+I should have you held in contempt.
+You should be ashamed of yourself.
+Tsk, tsk.
+What did you do this time?
+You're better than this.
+*sigh*
+Didn't anyone ever teach you manners?
+Really?
+Shameful.
\ No newline at end of file

From ed3b043f40b2a2b09ea01193a20935e79af5eff4 Mon Sep 17 00:00:00 2001
From: in1tiate <radwoodward@vikings.grayson.edu>
Date: Tue, 30 Mar 2021 22:06:02 -0500
Subject: [PATCH 03/24] use iniswaps for pairing

---
 include/aoclient.h | 5 +++++
 src/packets.cpp    | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/include/aoclient.h b/include/aoclient.h
index effbfcf..069ccf0 100644
--- a/include/aoclient.h
+++ b/include/aoclient.h
@@ -123,6 +123,11 @@ class AOClient : public QObject {
      */
     QString current_char;
 
+    /**
+     * @brief The internal name of the character the client is iniswapped to.
+     */
+    QString current_iniswap;
+
     /**
      * @brief If true, the client is a logged-in moderator.
      */
diff --git a/src/packets.cpp b/src/packets.cpp
index 80e89ce..8c2465f 100644
--- a/src/packets.cpp
+++ b/src/packets.cpp
@@ -404,6 +404,7 @@ AOPacket AOClient::validateIcPacket(AOPacket packet)
         }
         qDebug() << "INI swap detected from " << getIpid();
     }
+    current_iniswap = incoming_args[2].toString();
     args.append(incoming_args[2].toString());
 
     // emote
@@ -513,7 +514,7 @@ AOPacket AOClient::validateIcPacket(AOPacket packet)
         QString other_flip = "0";
         for (AOClient* client : server->clients) {
             if (client->pairing_with == char_id && other_charid != char_id && client->char_id == pairing_with) {
-                other_name = server->characters.at(other_charid);
+                other_name = client->current_iniswap;
                 other_emote = client->emote;
                 other_offset = client->offset;
                 other_flip = client->flipping;

From ba56eaa66dd7d83feab95fff66cbbc17155b8d67 Mon Sep 17 00:00:00 2001
From: Salanto <support@salanto.de>
Date: Tue, 16 Mar 2021 23:14:11 +0100
Subject: [PATCH 04/24] Add /evidence_swap

---
 include/aoclient.h | 14 ++++++++++++++
 src/commands.cpp   | 18 ++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/include/aoclient.h b/include/aoclient.h
index effbfcf..0652801 100644
--- a/include/aoclient.h
+++ b/include/aoclient.h
@@ -1146,6 +1146,18 @@ class AOClient : public QObject {
      */
     void cmdEvidenceMod(int argc, QStringList argv);
 
+    /**
+     * @brief Changes position of two pieces of evidence in the area.
+     *
+     * @details The two arguments are the indices of the evidence items you want to swap the position of.
+     *
+     * @iscommand
+     *
+     * @see Area::Evidence_Swap
+     *
+     */
+    void cmdEvidence_Swap(int argc, QStringList argv);
+
     /**
      * @brief Changes the subtheme of the clients in the current area.
      *
@@ -1153,6 +1165,7 @@ class AOClient : public QObject {
      *
      * @iscommand
      */
+
     void cmdSubTheme(int argc, QStringList argv);
     
     ///@}
@@ -1423,6 +1436,7 @@ class AOClient : public QObject {
         {"removeuser",    {ACLFlags.value("MODIFY_USERS"), 1, &AOClient::cmdRemoveUser}},
         {"subtheme",      {ACLFlags.value("CM"),           1, &AOClient::cmdSubTheme}},
         {"about",         {ACLFlags.value("NONE"),         0, &AOClient::cmdAbout}},
+        {"evidence_swap", {ACLFlags.value("CM"),           2, &AOClient::cmdEvidence_Swap}}
     };
 
     /**
diff --git a/src/commands.cpp b/src/commands.cpp
index 2455016..9519169 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -1035,6 +1035,24 @@ void AOClient::cmdAbout(int argc, QStringList argv)
     sendPacket("CT", {"The akashi dev team", "Thank you for using akashi! Made with love by scatterflower, with help from in1tiate and Salanto. akashi " + QCoreApplication::applicationVersion()});
 }
 
+void AOClient::cmdEvidence_Swap(int argc, QStringList argv)
+{
+    AreaData* area = server->areas[current_area];
+    bool ok, ok2; // This is btw a perfectly valid way to declare.
+    int EvID1 = argv[0].toInt(&ok), EvID2 = argv[1].toInt(&ok2);
+    int EvSize = area->evidence.size()-1;
+    if ((ok && ok2) && (EvID2 <= EvSize) && (EvID1 <= EvSize)) {
+        AreaData::Evidence EvData = area->evidence[EvID1];
+        area->evidence[EvID1] = area->evidence[EvID2];
+        area->evidence[EvID2] = EvData;
+        sendEvidenceList(area);
+        sendServerMessage("The evidence has been swapped.");
+    }
+    else {
+        sendServerMessage("Invalid evidence ID.");
+    }
+}
+
 QStringList AOClient::buildAreaList(int area_idx)
 {
     QStringList entries;

From e8240e455d5c7913e7bf68ac1ab3a4a434dc2ff9 Mon Sep 17 00:00:00 2001
From: Salanto <62221668+Salanto@users.noreply.github.com>
Date: Tue, 16 Mar 2021 23:58:09 +0100
Subject: [PATCH 05/24] Trailing comma

Co-authored-by: in1tiate <32779090+in1tiate@users.noreply.github.com>
---
 include/aoclient.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/aoclient.h b/include/aoclient.h
index 0652801..10af409 100644
--- a/include/aoclient.h
+++ b/include/aoclient.h
@@ -1436,7 +1436,7 @@ class AOClient : public QObject {
         {"removeuser",    {ACLFlags.value("MODIFY_USERS"), 1, &AOClient::cmdRemoveUser}},
         {"subtheme",      {ACLFlags.value("CM"),           1, &AOClient::cmdSubTheme}},
         {"about",         {ACLFlags.value("NONE"),         0, &AOClient::cmdAbout}},
-        {"evidence_swap", {ACLFlags.value("CM"),           2, &AOClient::cmdEvidence_Swap}}
+        {"evidence_swap", {ACLFlags.value("CM"),           2, &AOClient::cmdEvidence_Swap}},
     };
 
     /**

From f18c8733d06d89ed266371eb3c5b163f02151896 Mon Sep 17 00:00:00 2001
From: Salanto <support@salanto.de>
Date: Tue, 16 Mar 2021 23:59:12 +0100
Subject: [PATCH 06/24] Negative numbers not needed.

---
 src/commands.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/commands.cpp b/src/commands.cpp
index 9519169..1ee0c3c 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -1039,8 +1039,8 @@ void AOClient::cmdEvidence_Swap(int argc, QStringList argv)
 {
     AreaData* area = server->areas[current_area];
     bool ok, ok2; // This is btw a perfectly valid way to declare.
-    int EvID1 = argv[0].toInt(&ok), EvID2 = argv[1].toInt(&ok2);
-    int EvSize = area->evidence.size()-1;
+    uint EvID1 = argv[0].toInt(&ok), EvID2 = argv[1].toInt(&ok2);
+    uint EvSize = area->evidence.size()-1;
     if ((ok && ok2) && (EvID2 <= EvSize) && (EvID1 <= EvSize)) {
         AreaData::Evidence EvData = area->evidence[EvID1];
         area->evidence[EvID1] = area->evidence[EvID2];

From 27103e962014417f51f1210802f88755ad0ba224 Mon Sep 17 00:00:00 2001
From: Salanto <support@salanto.de>
Date: Wed, 17 Mar 2021 20:59:43 +0100
Subject: [PATCH 07/24] Fix crash on empty evidence list

---
 src/commands.cpp | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/commands.cpp b/src/commands.cpp
index 1ee0c3c..014242f 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -1039,14 +1039,26 @@ void AOClient::cmdEvidence_Swap(int argc, QStringList argv)
 {
     AreaData* area = server->areas[current_area];
     bool ok, ok2; // This is btw a perfectly valid way to declare.
-    uint EvID1 = argv[0].toInt(&ok), EvID2 = argv[1].toInt(&ok2);
-    uint EvSize = area->evidence.size()-1;
-    if ((ok && ok2) && (EvID2 <= EvSize) && (EvID1 <= EvSize)) {
-        AreaData::Evidence EvData = area->evidence[EvID1];
-        area->evidence[EvID1] = area->evidence[EvID2];
-        area->evidence[EvID2] = EvData;
-        sendEvidenceList(area);
-        sendServerMessage("The evidence has been swapped.");
+    int ev_id1 = argv[0].toInt(&ok), ev_id2 = argv[1].toInt(&ok2);
+    int ev_size = area->evidence.size() -1;
+
+    if ((ok && ok2) && (ev_size > 0)) {
+        if ((ev_id1 > 0) && (ev_id2 > 0)) {
+            if ((ev_id2 <= ev_size) && (ev_id1 <= ev_size)) {
+                AreaData::Evidence EvData = area->evidence[ev_id1];
+                area->evidence[ev_id1] = area->evidence[ev_id2];
+                area->evidence[ev_id2] = EvData;
+                sendEvidenceList(area);
+                sendServerMessage("The evidence " + QString::number(ev_id1) + " and " + QString::number(ev_id2) + " has been swapped.");
+            }
+            else {
+                sendServerMessage("Unable to swap evidence. No reference to evidence ID found.");
+            }
+        }
+        else {
+            sendServerMessage("Invalid evidence ID.");
+        }
+
     }
     else {
         sendServerMessage("Invalid evidence ID.");

From a2153e58a586ab8be1e306300c30948049d1e6ee Mon Sep 17 00:00:00 2001
From: Salanto <support@salanto.de>
Date: Wed, 17 Mar 2021 21:02:10 +0100
Subject: [PATCH 08/24] Remove empty line

---
 src/commands.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/commands.cpp b/src/commands.cpp
index 014242f..14ea635 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -1058,7 +1058,6 @@ void AOClient::cmdEvidence_Swap(int argc, QStringList argv)
         else {
             sendServerMessage("Invalid evidence ID.");
         }
-
     }
     else {
         sendServerMessage("Invalid evidence ID.");

From 6b4a19ca66b92a31238cb1267613379a37762e05 Mon Sep 17 00:00:00 2001
From: Salanto <support@salanto.de>
Date: Fri, 19 Mar 2021 11:17:22 +0100
Subject: [PATCH 09/24] English is hard

---
 src/commands.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/commands.cpp b/src/commands.cpp
index 14ea635..fddaffd 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -1049,7 +1049,7 @@ void AOClient::cmdEvidence_Swap(int argc, QStringList argv)
                 area->evidence[ev_id1] = area->evidence[ev_id2];
                 area->evidence[ev_id2] = EvData;
                 sendEvidenceList(area);
-                sendServerMessage("The evidence " + QString::number(ev_id1) + " and " + QString::number(ev_id2) + " has been swapped.");
+                sendServerMessage("The evidence " + QString::number(ev_id1) + " and " + QString::number(ev_id2) + " have been swapped.");
             }
             else {
                 sendServerMessage("Unable to swap evidence. No reference to evidence ID found.");

From 1ed233b26a03500e140f6c4bc85e634bf0d19cc0 Mon Sep 17 00:00:00 2001
From: Salanto <support@salanto.de>
Date: Sat, 20 Mar 2021 00:38:48 +0100
Subject: [PATCH 10/24] Add guard statements

---
 src/commands.cpp | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/commands.cpp b/src/commands.cpp
index fddaffd..bf571b1 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -1038,29 +1038,31 @@ void AOClient::cmdAbout(int argc, QStringList argv)
 void AOClient::cmdEvidence_Swap(int argc, QStringList argv)
 {
     AreaData* area = server->areas[current_area];
-    bool ok, ok2; // This is btw a perfectly valid way to declare.
-    int ev_id1 = argv[0].toInt(&ok), ev_id2 = argv[1].toInt(&ok2);
     int ev_size = area->evidence.size() -1;
 
-    if ((ok && ok2) && (ev_size > 0)) {
-        if ((ev_id1 > 0) && (ev_id2 > 0)) {
-            if ((ev_id2 <= ev_size) && (ev_id1 <= ev_size)) {
-                AreaData::Evidence EvData = area->evidence[ev_id1];
-                area->evidence[ev_id1] = area->evidence[ev_id2];
-                area->evidence[ev_id2] = EvData;
-                sendEvidenceList(area);
-                sendServerMessage("The evidence " + QString::number(ev_id1) + " and " + QString::number(ev_id2) + " have been swapped.");
-            }
-            else {
-                sendServerMessage("Unable to swap evidence. No reference to evidence ID found.");
-            }
-        }
-        else {
-            sendServerMessage("Invalid evidence ID.");
-        }
+    if (ev_size < 0) {
+        sendServerMessage("No evidence in area.");
+        return;
+    }
+
+    bool ok, ok2;
+    int ev_id1 = argv[0].toInt(&ok), ev_id2 = argv[1].toInt(&ok2);
+
+    if ((!ok || !ok2)) {
+        sendServerMessage("Invalid evidence ID.");
+        return;
+    }
+    if ((ev_id1 < 0) || (ev_id2 < 0)) {
+        sendServerMessage("Evidence ID can't be negative.");
+        return;
+    }
+    if ((ev_id2 <= ev_size) && (ev_id1 <= ev_size)) {
+        area->evidence.swapItemsAt(ev_id1, ev_id2);
+        sendEvidenceList(area);
+        sendServerMessage("The evidence " + QString::number(ev_id1) + " and " + QString::number(ev_id2) + " have been swapped.");
     }
     else {
-        sendServerMessage("Invalid evidence ID.");
+        sendServerMessage("Unable to swap evidence. Evidence ID out of range.");
     }
 }
 

From 173e9b3f7b92f806bcd7cbb426edcc7d9ecc1f2a Mon Sep 17 00:00:00 2001
From: Salanto <support@salanto.de>
Date: Sat, 20 Mar 2021 01:13:08 +0100
Subject: [PATCH 11/24] Add check for older Qt versions

---
 src/commands.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/commands.cpp b/src/commands.cpp
index bf571b1..6b92dca 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -1057,7 +1057,12 @@ void AOClient::cmdEvidence_Swap(int argc, QStringList argv)
         return;
     }
     if ((ev_id2 <= ev_size) && (ev_id1 <= ev_size)) {
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
+        //swapItemsAt does not exist in Qt older than 5.13
+        area->evidence.swap(ev_id1, ev_id2);
+#else
         area->evidence.swapItemsAt(ev_id1, ev_id2);
+#endif
         sendEvidenceList(area);
         sendServerMessage("The evidence " + QString::number(ev_id1) + " and " + QString::number(ev_id2) + " have been swapped.");
     }

From 43b12ea5aa875829d8a5f43180708c492f35402a Mon Sep 17 00:00:00 2001
From: Salanto <support@salanto.de>
Date: Wed, 31 Mar 2021 19:16:34 +0200
Subject: [PATCH 12/24] Update packets.cpp

The AO Client supports up to twelve colors by default.
---
 src/packets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/packets.cpp b/src/packets.cpp
index 80e89ce..6eb3438 100644
--- a/src/packets.cpp
+++ b/src/packets.cpp
@@ -486,7 +486,7 @@ AOPacket AOClient::validateIcPacket(AOPacket packet)
 
     // text color
     int text_color = incoming_args[14].toInt();
-    if (text_color != 0 && text_color != 1 && text_color != 2 && text_color != 3 && text_color != 4 && text_color != 5 && text_color != 6)
+    if (text_color < 0 || text_color > 11)
         return invalid;
     args.append(QString::number(text_color));
 

From 327f6c0060fa70d9e365fcead0024b90f54dac07 Mon Sep 17 00:00:00 2001
From: in1tiate <32779090+in1tiate@users.noreply.github.com>
Date: Wed, 31 Mar 2021 14:31:03 -0500
Subject: [PATCH 13/24] fix capitalization

---
 include/aoclient.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/aoclient.h b/include/aoclient.h
index f003eb7..3541cc5 100644
--- a/include/aoclient.h
+++ b/include/aoclient.h
@@ -1039,7 +1039,7 @@ class AOClient : public QObject {
      *
      * @see #is_muted
      */
-    void cmdUnmute(int argc, QStringList argv);
+    void cmdUnMute(int argc, QStringList argv);
 
     /**
      * @brief OOC-mutes a client.

From c49c71a7d4a2fc271a4ea0e578d1773450ad0f09 Mon Sep 17 00:00:00 2001
From: in1tiate <32779090+in1tiate@users.noreply.github.com>
Date: Wed, 31 Mar 2021 14:32:29 -0500
Subject: [PATCH 14/24] fix capitalization 2 electric boogaloo

---
 include/aoclient.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/aoclient.h b/include/aoclient.h
index 3541cc5..89ced81 100644
--- a/include/aoclient.h
+++ b/include/aoclient.h
@@ -1500,7 +1500,7 @@ class AOClient : public QObject {
         {"m",             {ACLFlags.value("MODCHAT"),      1, &AOClient::cmdM}},
         {"gm",            {ACLFlags.value("MODCHAT"),      1, &AOClient::cmdGM}},
         {"mute",          {ACLFlags.value("MUTE"),         1, &AOClient::cmdMute}},
-        {"unmute",        {ACLFlags.value("MUTE"),         1, &AOClient::cmdUnmute}},
+        {"unmute",        {ACLFlags.value("MUTE"),         1, &AOClient::cmdUnMute}},
         {"oocmute",       {ACLFlags.value("MUTE"),         1, &AOClient::cmdOocMute}},
         {"ooc_mute",      {ACLFlags.value("MUTE"),         1, &AOClient::cmdOocMute}},
         {"oocunmute",     {ACLFlags.value("MUTE"),         1, &AOClient::cmdOocUnMute}},

From bb103d009ea3ff54f9eee29633b6c3344934ad8b Mon Sep 17 00:00:00 2001
From: in1tiate <radwoodward@vikings.grayson.edu>
Date: Thu, 1 Apr 2021 13:12:20 -0500
Subject: [PATCH 15/24] dox

---
 include/aoclient.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/aoclient.h b/include/aoclient.h
index 069ccf0..214189c 100644
--- a/include/aoclient.h
+++ b/include/aoclient.h
@@ -125,6 +125,8 @@ class AOClient : public QObject {
 
     /**
      * @brief The internal name of the character the client is iniswapped to.
+     *
+     * @note This will be the same as current_char if the client is not iniswapped.
      */
     QString current_iniswap;
 

From ca7fe9095842186760cdc315d421c555d2a6619b Mon Sep 17 00:00:00 2001
From: in1tiate <radwoodward@vikings.grayson.edu>
Date: Thu, 1 Apr 2021 13:14:14 -0500
Subject: [PATCH 16/24] check the other client's pos against ours before
 pairing

---
 src/packets.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/packets.cpp b/src/packets.cpp
index 80e89ce..96a81dc 100644
--- a/src/packets.cpp
+++ b/src/packets.cpp
@@ -512,7 +512,10 @@ AOPacket AOClient::validateIcPacket(AOPacket packet)
         QString other_offset = "0";
         QString other_flip = "0";
         for (AOClient* client : server->clients) {
-            if (client->pairing_with == char_id && other_charid != char_id && client->char_id == pairing_with) {
+            if (client->pairing_with == char_id
+                    && other_charid != char_id
+                    && client->char_id == pairing_with
+                    && client->pos == pos) {
                 other_name = server->characters.at(other_charid);
                 other_emote = client->emote;
                 other_offset = client->offset;

From 953e9a50c754a14c90213e0053e47b3690621f26 Mon Sep 17 00:00:00 2001
From: scatterflower <marisaposs@gameboyprinter.moe>
Date: Sat, 3 Apr 2021 03:10:06 -0500
Subject: [PATCH 17/24] fix ipids not being generated

---
 src/server.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/server.cpp b/src/server.cpp
index 148dce2..5bf4403 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -134,6 +134,7 @@ void Server::clientConnected()
                                                     // tsuserver4. It should disable fantacrypt
                                                     // completely in any client 2.4.3 or newer
     client->sendPacket(decryptor);
+    client->calculateIpid();
 #ifdef NET_DEBUG
     qDebug() << client->remote_ip.toString() << "connected";
 #endif

From 5e79cf3f9f314e0f46c68f9941d407cd25186996 Mon Sep 17 00:00:00 2001
From: scatterflower <marisaposs@gameboyprinter.moe>
Date: Sat, 3 Apr 2021 03:29:52 -0500
Subject: [PATCH 18/24] allow blank showname

---
 src/packets.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/packets.cpp b/src/packets.cpp
index 7d24fe4..ac6dce0 100644
--- a/src/packets.cpp
+++ b/src/packets.cpp
@@ -512,6 +512,8 @@ AOPacket AOClient::validateIcPacket(AOPacket packet)
     if (incoming_args.length() > 15) {
         // showname
         QString incoming_showname = dezalgo(incoming_args[15].toString().trimmed());
+        if (incoming_showname.length() == 0)
+            incoming_showname = " ";
         args.append(incoming_showname);
         showname = incoming_showname;
 

From 737f2f102e3d56b152ee3f8dfa041dd7ad7db65d Mon Sep 17 00:00:00 2001
From: scatterflower <marisaposs@gameboyprinter.moe>
Date: Sat, 3 Apr 2021 03:49:36 -0500
Subject: [PATCH 19/24] update ver string

---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 8560141..d754691 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -36,7 +36,7 @@ int main(int argc, char* argv[])
 {
     QCoreApplication app(argc, argv);
     QCoreApplication::setApplicationName("akashi");
-    QCoreApplication::setApplicationVersion("apricot r2 prerelease");
+    QCoreApplication::setApplicationVersion("apricot r2");
     std::atexit(cleanup);
 
     ConfigManager config_manager;

From 026c9e778e2f5f1d8a55323ddcc8700f1600d9d4 Mon Sep 17 00:00:00 2001
From: Salanto <support@salanto.de>
Date: Sat, 3 Apr 2021 17:11:58 +0200
Subject: [PATCH 20/24] Add missing bracket

That closing bracket is kinda important
---
 src/commands.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/commands.cpp b/src/commands.cpp
index 77c8b88..d14924c 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -1037,6 +1037,7 @@ void AOClient::cmdEvidence_Swap(int argc, QStringList argv)
     else {
         sendServerMessage("Unable to swap evidence. Evidence ID out of range.");
     }
+}
 
 void AOClient::cmdMute(int argc, QStringList argv)
 {

From 57b32819e73dba3675675c107b762f071dd361aa Mon Sep 17 00:00:00 2001
From: in1tiate <radwoodward@vikings.grayson.edu>
Date: Sat, 3 Apr 2021 13:01:34 -0500
Subject: [PATCH 21/24] fix showname being set to " " when it shouldn't

---
 src/packets.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/packets.cpp b/src/packets.cpp
index ac6dce0..8f501d0 100644
--- a/src/packets.cpp
+++ b/src/packets.cpp
@@ -512,7 +512,8 @@ AOPacket AOClient::validateIcPacket(AOPacket packet)
     if (incoming_args.length() > 15) {
         // showname
         QString incoming_showname = dezalgo(incoming_args[15].toString().trimmed());
-        if (incoming_showname.length() == 0)
+        // if the raw input is not empty but the trimmed input is, use a single space
+        if (incoming_showname.isEmpty() && !incoming_args[15].toString().isEmpty())
             incoming_showname = " ";
         args.append(incoming_showname);
         showname = incoming_showname;

From f09adf4901a612f5f672d29e55f9a9e435ef228f Mon Sep 17 00:00:00 2001
From: MangosArentLiterature
 <58055358+MangosArentLiterature@users.noreply.github.com>
Date: Sat, 3 Apr 2021 16:24:34 -0500
Subject: [PATCH 22/24] check for valid auth_type

Actually check if auth_type is set to advanced, otherwise warn about invalid settings
---
 src/commands.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/commands.cpp b/src/commands.cpp
index 3f3aa4e..11688a2 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -52,7 +52,7 @@ void AOClient::cmdLogin(int argc, QStringList argv)
         }
         server->areas.value(current_area)->logger->logLogin(this, authenticated, "moderator");
     }
-    else {
+    else if (auth_type == "advanced") {
         if (argc < 2) {
             sendServerMessage("You must specify a username and a password");
             return;
@@ -73,6 +73,10 @@ void AOClient::cmdLogin(int argc, QStringList argv)
         }
         server->areas.value(current_area)->logger->logLogin(this, authenticated, username);
     }
+    else {
+        qWarning() << "config.ini has an unrecognized auth_type!";
+        sendServerMessage("Config.ini contains an invalid auth_type, please check your config.");
+    }
 }
 
 void AOClient::cmdGetAreas(int argc, QStringList argv)

From febaf21c0d24e50bcde81718fd7d1c46e23b2f0e Mon Sep 17 00:00:00 2001
From: MangosArentLiterature
 <58055358+MangosArentLiterature@users.noreply.github.com>
Date: Sat, 3 Apr 2021 17:00:45 -0500
Subject: [PATCH 23/24] Check for correct auth_type in config.ini

When initializing config.ini, ensure auth_type is set to a recognzied value.
---
 src/config_manager.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/config_manager.cpp b/src/config_manager.cpp
index 69de3cf..d6893a8 100644
--- a/src/config_manager.cpp
+++ b/src/config_manager.cpp
@@ -84,6 +84,14 @@ bool ConfigManager::initConfig()
                                                      // This means the config is invalid
         return false;
     }
+    config.beginGroup("Options");
+    QString auth_type = config.value("auth", "simple").toString();
+    config.endGroup();
+    if (!(auth_type == "simple" || auth_type == "advanced")) {
+        qCritical() << "config.ini is invalid!";
+        return false;
+    }
+
     else {
         // Config is valid and up to date, so let's go ahead
         return true;

From b12cec09da43b0e8a1e7a19b3eecc63478755e82 Mon Sep 17 00:00:00 2001
From: scatterflower <marisaposs@gameboyprinter.moe>
Date: Sat, 3 Apr 2021 23:57:45 -0500
Subject: [PATCH 24/24] increment ver string and fix off by one out of bounds
 char selection

---
 src/aoclient.cpp | 2 +-
 src/main.cpp     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/aoclient.cpp b/src/aoclient.cpp
index b9207bc..c06da28 100644
--- a/src/aoclient.cpp
+++ b/src/aoclient.cpp
@@ -142,7 +142,7 @@ void AOClient::changeCharacter(int char_id)
         area->characters_taken.removeAll(server->getCharID(current_char));
     }
 
-    if(char_id > server->characters.length())
+    if(char_id >= server->characters.length())
         return;
 
     if (char_id >= 0) {
diff --git a/src/main.cpp b/src/main.cpp
index d754691..defcf23 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -36,7 +36,7 @@ int main(int argc, char* argv[])
 {
     QCoreApplication app(argc, argv);
     QCoreApplication::setApplicationName("akashi");
-    QCoreApplication::setApplicationVersion("apricot r2");
+    QCoreApplication::setApplicationVersion("apricot r3 prerelease");
     std::atexit(cleanup);
 
     ConfigManager config_manager;