From c6b0c5f6de325ca4db01dd8b31bf7af45864b5db Mon Sep 17 00:00:00 2001
From: in1tiate <radwoodward@vikings.grayson.edu>
Date: Tue, 10 Aug 2021 00:28:36 -0500
Subject: [PATCH] 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);
 }