From e60f18554bc3924f2796b08bb90dcac7cb5d08fe Mon Sep 17 00:00:00 2001 From: in1tiate Date: Wed, 4 Aug 2021 05:30:22 -0500 Subject: [PATCH 1/4] add notice box command for moderators to get attention quickly --- core/include/aoclient.h | 17 ++++++++++++++++- core/src/commands/moderation.cpp | 8 ++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/core/include/aoclient.h b/core/include/aoclient.h index 4a16167..a857490 100644 --- a/core/include/aoclient.h +++ b/core/include/aoclient.h @@ -231,6 +231,7 @@ class AOClient : public QObject { {"FORCE_CHARSELECT",1ULL << 13}, {"BYPASS_LOCKS", 1ULL << 14}, {"IGNORE_BGLIST", 1ULL << 15}, + {"SEND_NOTICE", 1ULL << 16}, {"SUPER", ~0ULL } }; @@ -1223,6 +1224,19 @@ class AOClient : public QObject { */ void cmdUpdateBan(int argc, QStringList argv); + /** + * @brief Pops up a notice for all clients in the targeted area with a given message. + * + * @details The only argument is the message to send. This command only works on clients with support for the BB#% + * + * generic message box packet (i.e. Attorney Online versions 2.9 and up). To support earlier versions (as well as to make the message + * + * re-readable if a user clicks out of it too fast) the message will also be sent in OOC to all affected clients. + * + * @iscommand + */ + void cmdNotice(int argc, QStringList argv); + ///@} /** @@ -2074,7 +2088,8 @@ class AOClient : public QObject { {"update_ban", {ACLFlags.value("BAN"), 3, &AOClient::cmdUpdateBan}}, {"changepass", {ACLFlags.value("NONE"), 1, &AOClient::cmdChangePassword}}, {"ignorebglist", {ACLFlags.value("IGNORE_BGLIST"),0, &AOClient::cmdIgnoreBgList}}, - {"ignore_bglist", {ACLFlags.value("IGNORE_BGLIST"),0, &AOClient::cmdIgnoreBgList}} + {"ignore_bglist", {ACLFlags.value("IGNORE_BGLIST"),0, &AOClient::cmdIgnoreBgList}}, + {"notice", {ACLFlags.value("SEND_NOTICE"), 1, &AOClient::cmdNotice}}, }; /** diff --git a/core/src/commands/moderation.cpp b/core/src/commands/moderation.cpp index 699b803..d0b81e6 100644 --- a/core/src/commands/moderation.cpp +++ b/core/src/commands/moderation.cpp @@ -514,3 +514,11 @@ void AOClient::cmdUpdateBan(int argc, QStringList argv) } sendServerMessage("Ban updated."); } + +void AOClient::cmdNotice(int argc, QStringList argv) +{ + QString message = "A moderator sent this notice:\n\n" + argv.join(" "); + sendServerMessageArea(message); + server->broadcast(AOPacket("BB", {message}), current_area); + +} From 7b1845aa8dcae882bed03d266a09a605d3f89030 Mon Sep 17 00:00:00 2001 From: in1tiate Date: Wed, 4 Aug 2021 06:12:25 -0500 Subject: [PATCH 2/4] add global version of/notice --- core/include/aoclient.h | 12 ++++++++++++ core/src/commands/moderation.cpp | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/core/include/aoclient.h b/core/include/aoclient.h index a857490..00d1a7a 100644 --- a/core/include/aoclient.h +++ b/core/include/aoclient.h @@ -1237,6 +1237,17 @@ class AOClient : public QObject { */ void cmdNotice(int argc, QStringList argv); + /** + * @brief Pops up a notice for all clients in the server with a given message. + * + * @details Unlike cmdNotice, this command will send its notice to every client connected to the server. + * + * @see #cmdNotice + * + * @iscommand + */ + void cmdNoticeGlobal(int argc, QStringList argv); + ///@} /** @@ -2090,6 +2101,7 @@ class AOClient : public QObject { {"ignorebglist", {ACLFlags.value("IGNORE_BGLIST"),0, &AOClient::cmdIgnoreBgList}}, {"ignore_bglist", {ACLFlags.value("IGNORE_BGLIST"),0, &AOClient::cmdIgnoreBgList}}, {"notice", {ACLFlags.value("SEND_NOTICE"), 1, &AOClient::cmdNotice}}, + {"noticeg", {ACLFlags.value("SEND_NOTICE"), 1, &AOClient::cmdNoticeGlobal}}, }; /** diff --git a/core/src/commands/moderation.cpp b/core/src/commands/moderation.cpp index d0b81e6..cf98fd8 100644 --- a/core/src/commands/moderation.cpp +++ b/core/src/commands/moderation.cpp @@ -520,5 +520,10 @@ void AOClient::cmdNotice(int argc, QStringList argv) QString message = "A moderator sent this notice:\n\n" + argv.join(" "); sendServerMessageArea(message); server->broadcast(AOPacket("BB", {message}), current_area); - +} +void AOClient::cmdNoticeGlobal(int argc, QStringList argv) +{ + QString message = "A moderator sent this server-wide notice:\n\n" + argv.join(" "); + sendServerBroadcast(message); + server->broadcast(AOPacket("BB", {message})); } From c6b0c5f6de325ca4db01dd8b31bf7af45864b5db Mon Sep 17 00:00:00 2001 From: in1tiate Date: Tue, 10 Aug 2021 00:28:36 -0500 Subject: [PATCH 3/4] move notice functionality to helper function --- core/include/aoclient.h | 10 ++++++++++ core/src/commands/command_helper.cpp | 13 +++++++++++++ core/src/commands/moderation.cpp | 8 ++------ 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/core/include/aoclient.h b/core/include/aoclient.h index 00d1a7a..7dd5f78 100644 --- a/core/include/aoclient.h +++ b/core/include/aoclient.h @@ -1929,6 +1929,16 @@ class AOClient : public QObject { * @return True if the password meets the requirements, otherwise false. */ bool checkPasswordRequirements(QString username, QString password); + + /** + * @brief Sends a server notice. + * + * @param notice The notice to send out. + * + * @param global Whether or not the notice should be server-wide. + */ + void sendNotice(QString notice, bool global = false); + /** * @brief Checks if a testimony contains '<' or '>'. diff --git a/core/src/commands/command_helper.cpp b/core/src/commands/command_helper.cpp index 617dd1a..6f17f0b 100644 --- a/core/src/commands/command_helper.cpp +++ b/core/src/commands/command_helper.cpp @@ -208,3 +208,16 @@ bool AOClient::checkPasswordRequirements(QString username, QString password) } return true; } + +void AOClient::sendNotice(QString notice, bool global) +{ + QString message = "A moderator sent this "; + message += (global ? "server-wide " : ""); + message += "notice:\n\n" + notice; + sendServerMessageArea(message); + AOPacket packet("BB", {message}); + if (global) + server->broadcast(packet); + else + server->broadcast(packet, current_area); +} diff --git a/core/src/commands/moderation.cpp b/core/src/commands/moderation.cpp index cf98fd8..d4b0433 100644 --- a/core/src/commands/moderation.cpp +++ b/core/src/commands/moderation.cpp @@ -517,13 +517,9 @@ void AOClient::cmdUpdateBan(int argc, QStringList argv) void AOClient::cmdNotice(int argc, QStringList argv) { - QString message = "A moderator sent this notice:\n\n" + argv.join(" "); - sendServerMessageArea(message); - server->broadcast(AOPacket("BB", {message}), current_area); + sendNotice(argv.join(" ")); } void AOClient::cmdNoticeGlobal(int argc, QStringList argv) { - QString message = "A moderator sent this server-wide notice:\n\n" + argv.join(" "); - sendServerBroadcast(message); - server->broadcast(AOPacket("BB", {message})); + sendNotice(argv.join(" "), true); } From 91131c8970ebd68d196a2fa0987431982a7fc553 Mon Sep 17 00:00:00 2001 From: in1tiate Date: Tue, 10 Aug 2021 00:29:58 -0500 Subject: [PATCH 4/4] swap out ternary for simpler if --- core/src/commands/command_helper.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/commands/command_helper.cpp b/core/src/commands/command_helper.cpp index 6f17f0b..eda5890 100644 --- a/core/src/commands/command_helper.cpp +++ b/core/src/commands/command_helper.cpp @@ -212,7 +212,8 @@ bool AOClient::checkPasswordRequirements(QString username, QString password) void AOClient::sendNotice(QString notice, bool global) { QString message = "A moderator sent this "; - message += (global ? "server-wide " : ""); + if (global) + message += "server-wide "; message += "notice:\n\n" + notice; sendServerMessageArea(message); AOPacket packet("BB", {message});