Scripts/Commands: Convert argument parsing of message commands to new system (#25305)

(cherry picked from commit f17b9b20f10ed8e14cdddef395ff467053068d35)

1 files changed, 54 insertions, 56 deletions

diff --git a/src/server/scripts/Commands/cs_message.cpp b/src/server/scripts/Commands/cs_message.cpp
index 91182dbb2d7..8fbf85fda83 100644
--- a/src/server/scripts/Commands/cs_message.cpp
+++ b/src/server/scripts/Commands/cs_message.cpp
@@ -37,6 +37,8 @@ EndScriptData */
 #include "World.h"
 #include "WorldSession.h"
 
+using namespace Trinity::ChatCommands;
+
 class message_commandscript : public CommandScript
 {
 public:
@@ -66,16 +68,8 @@ public:
         return commandTable;
     }
 
-    static bool HandleChannelSetOwnership(ChatHandler* handler, char const* args)
+    static bool HandleChannelSetOwnership(ChatHandler* handler, std::string channelName, bool grantOwnership)
     {
-        if (!*args)
-            return false;
-        char const* channelStr = strtok((char*)args, " ");
-        char const* argStr = strtok(nullptr, "");
-
-        if (!channelStr || !argStr)
-            return false;
-
         uint32 channelId = 0;
         for (uint32 i = 0; i < sChatChannelsStore.GetNumRows(); ++i)
         {
@@ -83,7 +77,7 @@ public:
             if (!channelEntry)
                 continue;
 
-            if (strstr(channelEntry->Name[handler->GetSessionDbcLocale()], channelStr))
+            if (StringContainsStringI(channelEntry->Name[handler->GetSessionDbcLocale()], channelName))
             {
                 channelId = i;
                 break;
@@ -97,7 +91,7 @@ public:
             if (!entry)
                 continue;
 
-            if (strstr(entry->AreaName[handler->GetSessionDbcLocale()], channelStr))
+            if (StringContainsStringI(entry->AreaName[handler->GetSessionDbcLocale()], channelName))
             {
                 zoneEntry = entry;
                 break;
@@ -108,37 +102,35 @@ public:
         Channel* channel = nullptr;
 
         if (ChannelMgr* cMgr = ChannelMgr::ForTeam(player->GetTeam()))
-            channel = cMgr->GetChannel(channelId, channelStr, player, false, zoneEntry);
+            channel = cMgr->GetChannel(channelId, channelName, player, false, zoneEntry);
 
-        if (strcmp(argStr, "on") == 0)
+        if (grantOwnership)
         {
             if (channel)
                 channel->SetOwnership(true);
 
             CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_CHANNEL_OWNERSHIP);
             stmt->setUInt8 (0, 1);
-            stmt->setString(1, channelStr);
+            stmt->setString(1, channelName);
             CharacterDatabase.Execute(stmt);
-            handler->PSendSysMessage(LANG_CHANNEL_ENABLE_OWNERSHIP, channelStr);
+            handler->PSendSysMessage(LANG_CHANNEL_ENABLE_OWNERSHIP, channelName.c_str());
         }
-        else if (strcmp(argStr, "off") == 0)
+        else
         {
             if (channel)
                 channel->SetOwnership(false);
 
             CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_CHANNEL_OWNERSHIP);
             stmt->setUInt8 (0, 0);
-            stmt->setString(1, channelStr);
+            stmt->setString(1, channelName);
             CharacterDatabase.Execute(stmt);
-            handler->PSendSysMessage(LANG_CHANNEL_DISABLE_OWNERSHIP, channelStr);
+            handler->PSendSysMessage(LANG_CHANNEL_DISABLE_OWNERSHIP, channelName.c_str());
         }
-        else
-            return false;
 
         return true;
     }
 
-    static bool HandleNameAnnounceCommand(ChatHandler* handler, char const* args)
+    static bool HandleNameAnnounceCommand(ChatHandler* handler, CommandArgs* args)
     {
         if (!*args)
             return false;
@@ -147,11 +139,11 @@ public:
         if (WorldSession* session = handler->GetSession())
             name = session->GetPlayer()->GetName();
 
-        sWorld->SendWorldText(LANG_ANNOUNCE_COLOR, name.c_str(), args);
+        sWorld->SendWorldText(LANG_ANNOUNCE_COLOR, name.c_str(), args->GetFullArgs());
         return true;
     }
 
-    static bool HandleGMNameAnnounceCommand(ChatHandler* handler, char const* args)
+    static bool HandleGMNameAnnounceCommand(ChatHandler* handler, CommandArgs* args)
     {
         if (!*args)
             return false;
@@ -160,9 +152,10 @@ public:
         if (WorldSession* session = handler->GetSession())
             name = session->GetPlayer()->GetName();
 
-        sWorld->SendGMText(LANG_GM_ANNOUNCE_COLOR, name.c_str(), args);
+        sWorld->SendGMText(LANG_GM_ANNOUNCE_COLOR, name.c_str(), args->GetFullArgs());
         return true;
     }
+
     // global announce
     static bool HandleAnnounceCommand(ChatHandler* handler, char const* args)
     {
@@ -174,83 +167,88 @@ public:
         sWorld->SendServerMessage(SERVER_MSG_STRING, str);
         return true;
     }
+
     // announce to logged in GMs
-    static bool HandleGMAnnounceCommand(ChatHandler* /*handler*/, char const* args)
+    static bool HandleGMAnnounceCommand(ChatHandler* /*handler*/, CommandArgs* args)
     {
         if (!*args)
             return false;
 
-        sWorld->SendGMText(LANG_GM_BROADCAST, args);
+        sWorld->SendGMText(LANG_GM_BROADCAST, args->GetFullArgs());
         return true;
     }
-    // notification player at the screen
-    static bool HandleNotifyCommand(ChatHandler* handler, char const* args)
+
+    // send on-screen notification to players
+    static bool HandleNotifyCommand(ChatHandler* handler, CommandArgs* args)
     {
         if (!*args)
             return false;
 
         std::string str = handler->GetTrinityString(LANG_GLOBAL_NOTIFY);
-        str += args;
+        str += args->GetFullArgs();
 
         sWorld->SendGlobalMessage(WorldPackets::Chat::PrintNotification(str).Write());
 
         return true;
     }
-    // notification GM at the screen
-    static bool HandleGMNotifyCommand(ChatHandler* handler, char const* args)
+
+    // send on-screen notification to GMs
+    static bool HandleGMNotifyCommand(ChatHandler* handler, CommandArgs* args)
     {
         if (!*args)
             return false;
 
         std::string str = handler->GetTrinityString(LANG_GM_NOTIFY);
-        str += args;
+        str += args->GetFullArgs();
 
         sWorld->SendGlobalGMMessage(WorldPackets::Chat::PrintNotification(str).Write());
 
         return true;
     }
-    // Enable\Dissable accept whispers (for GM)
-    static bool HandleWhispersCommand(ChatHandler* handler, char const* args)
+
+    // Enable/Disable accepting whispers (for GM)
+    static bool HandleWhispersCommand(ChatHandler* handler, Optional<Variant<bool, ExactSequence<'r', 'e', 'm', 'o', 'v', 'e'>>> operationArg, Optional<std::string> playerNameArg)
     {
-        if (!*args)
+        if (!operationArg)
         {
             handler->PSendSysMessage(LANG_COMMAND_WHISPERACCEPTING, handler->GetSession()->GetPlayer()->isAcceptWhispers() ?  handler->GetTrinityString(LANG_ON) : handler->GetTrinityString(LANG_OFF));
             return true;
         }
 
-        std::string argStr = strtok((char*)args, " ");
-        // whisper on
-        if (argStr == "on")
+        if (operationArg->holds_alternative<bool>())
         {
-            handler->GetSession()->GetPlayer()->SetAcceptWhispers(true);
-            handler->SendSysMessage(LANG_COMMAND_WHISPERON);
-            return true;
+            if (operationArg->get<bool>())
+            {
+                handler->GetSession()->GetPlayer()->SetAcceptWhispers(true);
+                handler->SendSysMessage(LANG_COMMAND_WHISPERON);
+                return true;
+            }
+            else
+            {
+                // Remove all players from the Gamemaster's whisper whitelist
+                handler->GetSession()->GetPlayer()->ClearWhisperWhiteList();
+                handler->GetSession()->GetPlayer()->SetAcceptWhispers(false);
+                handler->SendSysMessage(LANG_COMMAND_WHISPEROFF);
+                return true;
+            }
         }
 
-        // whisper off
-        if (argStr == "off")
+        if (operationArg->holds_alternative<ExactSequence<'r', 'e', 'm', 'o', 'v', 'e'>>())
         {
-            // Remove all players from the Gamemaster's whisper whitelist
-            handler->GetSession()->GetPlayer()->ClearWhisperWhiteList();
-            handler->GetSession()->GetPlayer()->SetAcceptWhispers(false);
-            handler->SendSysMessage(LANG_COMMAND_WHISPEROFF);
-            return true;
-        }
+            if (!playerNameArg)
+                return false;
 
-        if (argStr == "remove")
-        {
-            std::string name = strtok(nullptr, " ");
-            if (normalizePlayerName(name))
+            if (normalizePlayerName(*playerNameArg))
             {
-                if (Player* player = ObjectAccessor::FindPlayerByName(name))
+                if (Player* player = ObjectAccessor::FindPlayerByName(*playerNameArg))
                 {
                     handler->GetSession()->GetPlayer()->RemoveFromWhisperWhiteList(player->GetGUID());
-                    handler->PSendSysMessage(LANG_COMMAND_WHISPEROFFPLAYER, name.c_str());
+                    handler->PSendSysMessage(LANG_COMMAND_WHISPEROFFPLAYER, playerNameArg->c_str());
                     return true;
                 }
                 else
                 {
-                    handler->PSendSysMessage(LANG_PLAYER_NOT_FOUND, name.c_str());
+                    handler->PSendSysMessage(LANG_PLAYER_NOT_FOUND, playerNameArg->c_str());
                     handler->SetSentErrorMessage(true);
                     return false;
                 }