From ba56eaa66dd7d83feab95fff66cbbc17155b8d67 Mon Sep 17 00:00:00 2001 From: Salanto Date: Tue, 16 Mar 2021 23:14:11 +0100 Subject: [PATCH 1/9] 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 2/9] 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 Date: Tue, 16 Mar 2021 23:59:12 +0100 Subject: [PATCH 3/9] 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 Date: Wed, 17 Mar 2021 20:59:43 +0100 Subject: [PATCH 4/9] 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 Date: Wed, 17 Mar 2021 21:02:10 +0100 Subject: [PATCH 5/9] 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 Date: Fri, 19 Mar 2021 11:17:22 +0100 Subject: [PATCH 6/9] 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 Date: Sat, 20 Mar 2021 00:38:48 +0100 Subject: [PATCH 7/9] 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 Date: Sat, 20 Mar 2021 01:13:08 +0100 Subject: [PATCH 8/9] 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 026c9e778e2f5f1d8a55323ddcc8700f1600d9d4 Mon Sep 17 00:00:00 2001 From: Salanto Date: Sat, 3 Apr 2021 17:11:58 +0200 Subject: [PATCH 9/9] 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) {