move notice functionality to helper function

core/include/aoclient.h

@@ -1930,6 +1930,16 @@ class AOClient : public QObject {
      */
     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 '>'.
      *

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);
+}

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(" ");
+    sendNotice(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(" ");
+    sendNotice(argv.join(" "), true);
-    sendServerBroadcast(message);
-    server->broadcast(AOPacket("BB", {message}));
 }