refactor(Packet): Add nice CMSG_JOIN_CHANNEL

Author: 0blu

src/game/CMakeLists.txt

@@ -196,6 +196,7 @@ set (game_SRCS
     PlayerBots/PlayerBotAI.cpp
     PlayerBots/PlayerBotMgr.cpp
     Server/Protocol/Opcodes.cpp
+    Server/Packets/Channel.cpp
     Server/Packets/Character.cpp
     Server/Packets/Group.cpp
     Server/Packets/Guild.cpp
@@ -424,6 +425,7 @@ set (game_SRCS
     PlayerBots/PlayerBotMgr.h
     Server/Protocol/Opcodes.h
     Server/Packet.h
+    Server/Packets/Channel.h
     Server/Packets/Character.h
     Server/Packets/Group.h
     Server/Packets/Guild.h

src/game/Commands/CharacterCommands.cpp

@@ -5425,9 +5425,9 @@ bool ChatHandler::HandlePetInfoCommand(char* args)
 
 bool ChatHandler::HandleChannelJoinCommand(char* c)
 {
-    WorldPacket pkt(CMSG_JOIN_CHANNEL, 4);
-    pkt << c;
-    pkt << ""; // Pass
+    WorldPackets::Channel::JoinChannel pkt;
+    pkt.channelName = c;
+    pkt.channelPassword = "";
     m_session->HandleJoinChannelOpcode(pkt);
     PSendSysMessage("Joined channel \"%s\"", c);
     return true;

src/game/Handlers/ChannelHandler.cpp

@@ -24,10 +24,10 @@
 #include "Chat.h"
 #include "World.h"
 
-void WorldSession::HandleJoinChannelOpcode(WorldPacket& recvPacket)
+void WorldSession::HandleJoinChannelOpcode(WorldPackets::Channel::JoinChannel const& packet)
 {
-    std::string channelname, pass;
-    recvPacket >> channelname;
+    std::string channelname = packet.channelName;
+    std::string pass = packet.channelPassword;
 
     // Channel name must begin with a letter.
     if (channelname.empty() || (uint8(channelname[0]) <= 127 && !isalpha(channelname[0])))
@@ -39,8 +39,6 @@ void WorldSession::HandleJoinChannelOpcode(WorldPacket& recvPacket)
         return;
     }
 
-    recvPacket >> pass;
-
     PlayerPointer player = GetPlayerPointer();
     if (ChannelMgr* cMgr = channelMgr(player->GetTeam()))
     {

src/game/Server/Packets/Channel.cpp

@@ -0,0 +1,6 @@
+#include "Channel.h"
+
+void WorldPackets::Channel::JoinChannel::ReadFromWorldPacket(WorldPacket& recv_data)
+{
+    recv_data >> channelName;
+}

src/game/Server/Packets/Channel.h

@@ -0,0 +1,18 @@
+#ifndef MANGOS_PACKETS_CHANNEL_H
+#define MANGOS_PACKETS_CHANNEL_H
+
+#include "Packet.h"
+
+namespace WorldPackets { namespace Channel
+{
+    class JoinChannel final : public ClientPacket
+    {
+    public:
+        std::string channelName;
+        std::string channelPassword;
+
+        void ReadFromWorldPacket(WorldPacket& recv_data) override;
+    };
+}} // namespace WorldPackets::Channel
+
+#endif // MANGOS_PACKETS_CHANNEL_H

src/game/Server/Protocol/Opcodes.cpp

@@ -227,7 +227,7 @@ constexpr Handlers BuildOpcodeList()
     LEGACY_HANDLER(MSG_UPDATE_GUILD,                  STATUS_NEVER,     PACKET_PROCESS_MAX_TYPE,      &WorldSession::Handle_NULL);
     LEGACY_HANDLER(CMSG_MESSAGECHAT,                  STATUS_LOGGEDIN,  PACKET_PROCESS_WORLD,         &WorldSession::HandleMessagechatOpcode);
     LEGACY_HANDLER(SMSG_MESSAGECHAT,                  STATUS_NEVER,     PACKET_PROCESS_MAX_TYPE,      &WorldSession::Handle_ServerSide);
-    LEGACY_HANDLER(CMSG_JOIN_CHANNEL,                 STATUS_LOGGEDIN,  PACKET_PROCESS_CHANNEL,       &WorldSession::HandleJoinChannelOpcode);
+    DEFINE_HANDLER(CMSG_JOIN_CHANNEL,                 STATUS_LOGGEDIN,  PACKET_PROCESS_CHANNEL,       &WorldSession::HandleJoinChannelOpcode);
     LEGACY_HANDLER(CMSG_LEAVE_CHANNEL,                STATUS_LOGGEDIN,  PACKET_PROCESS_CHANNEL,       &WorldSession::HandleLeaveChannelOpcode);
     LEGACY_HANDLER(SMSG_CHANNEL_NOTIFY,               STATUS_NEVER,     PACKET_PROCESS_MAX_TYPE,      &WorldSession::Handle_ServerSide);
     LEGACY_HANDLER(CMSG_CHANNEL_LIST,                 STATUS_LOGGEDIN,  PACKET_PROCESS_CHANNEL,       &WorldSession::HandleChannelListOpcode);

src/game/Server/WorldSession.h

@@ -36,6 +36,7 @@
 #include "PacketProcessing.h"
 #include "UpdateData.h"
 #include "LockedQueue.h"
+#include "Packets/Channel.h"
 #include "Packets/Character.h"
 #include "Packets/Group.h"
 #include "Packets/Guild.h"
@@ -717,7 +718,7 @@ class WorldSession
         void HandleResurrectResponseOpcode(WorldPacket& recvPacket);
         void HandleSummonResponseOpcode(WorldPacket& recv_data);
 
-        void HandleJoinChannelOpcode(WorldPacket& recvPacket);
+        void HandleJoinChannelOpcode(WorldPackets::Channel::JoinChannel const& packet);
         void HandleLeaveChannelOpcode(WorldPacket& recvPacket);
         void HandleChannelListOpcode(WorldPacket& recvPacket);
         void HandleChannelPasswordOpcode(WorldPacket& recvPacket);