Core/Packets: Added most of the chat packets

5 files changed, 255 insertions, 25 deletions

diff --git a/src/server/game/Server/Packets/ChatPackets.cpp b/src/server/game/Server/Packets/ChatPackets.cpp
index 6b544480a71..7b6cf236f11 100644
--- a/src/server/game/Server/Packets/ChatPackets.cpp
+++ b/src/server/game/Server/Packets/ChatPackets.cpp
@@ -24,6 +24,61 @@ void WorldPackets::Chat::ChatMessage::Read()
     Text = _worldPacket.ReadString(len);
 }
 
+void WorldPackets::Chat::ChatMessageWhisper::Read()
+{
+    _worldPacket >> Language;
+    uint32 targetLen = _worldPacket.ReadBits(9);
+    uint32 textLen = _worldPacket.ReadBits(8);
+    Target = _worldPacket.ReadString(targetLen);
+    Text = _worldPacket.ReadString(textLen);
+}
+
+void WorldPackets::Chat::ChatMessageChannel::Read()
+{
+    _worldPacket >> Language;
+    uint32 targetLen = _worldPacket.ReadBits(9);
+    uint32 textLen = _worldPacket.ReadBits(8);
+    _worldPacket.ResetBitPos();
+    Target = _worldPacket.ReadString(targetLen);
+    Text = _worldPacket.ReadString(textLen);
+}
+
+void WorldPackets::Chat::ChatAddonMessage::Read()
+{
+    uint32 prefixLen = _worldPacket.ReadBits(5);
+    uint32 textLen = _worldPacket.ReadBits(8);
+    Prefix = _worldPacket.ReadString(prefixLen);
+    Text = _worldPacket.ReadString(textLen);
+}
+
+void WorldPackets::Chat::ChatAddonMessageWhisper::Read()
+{
+    uint32 targetLen = _worldPacket.ReadBits(9);
+    uint32 prefixLen = _worldPacket.ReadBits(5);
+    uint32 textLen = _worldPacket.ReadBits(8);
+    Target = _worldPacket.ReadString(targetLen);
+    Prefix = _worldPacket.ReadString(prefixLen);
+    Text = _worldPacket.ReadString(textLen);
+}
+
+void WorldPackets::Chat::ChatMessageDND::Read()
+{
+    uint32 len = _worldPacket.ReadBits(8);
+    Text = _worldPacket.ReadString(len);
+}
+
+void WorldPackets::Chat::ChatMessageAFK::Read()
+{
+    uint32 len = _worldPacket.ReadBits(8);
+    Text = _worldPacket.ReadString(len);
+}
+
+void WorldPackets::Chat::ChatMessageEmote::Read()
+{
+    uint32 len = _worldPacket.ReadBits(8);
+    Text = _worldPacket.ReadString(len);
+}
+
 WorldPacket const* WorldPackets::Chat::Chat::Write()
 {
     _worldPacket << SlashCmd;
@@ -53,3 +108,29 @@ WorldPacket const* WorldPackets::Chat::Chat::Write()
 
     return &_worldPacket;
 }
+
+WorldPacket const* WorldPackets::Chat::Emote::Write()
+{
+    _worldPacket << Guid;
+    _worldPacket << EmoteID;
+    
+    return &_worldPacket;
+}
+
+void WorldPackets::Chat::CTextEmote::Read()
+{
+    _worldPacket >> Target;
+    _worldPacket >> EmoteID;
+    _worldPacket >> SoundIndex;
+}
+
+WorldPacket const* WorldPackets::Chat::STextEmote::Write()
+{
+    _worldPacket << SourceGUID;
+    _worldPacket << SourceAccountGUID;
+    _worldPacket << SoundIndex;
+    _worldPacket << EmoteID;
+    _worldPacket << TargetGUID;
+    
+    return &_worldPacket;
+}
diff --git a/src/server/game/Server/Packets/ChatPackets.h b/src/server/game/Server/Packets/ChatPackets.h
index 4aa49312daf..47735177dd9 100644
--- a/src/server/game/Server/Packets/ChatPackets.h
+++ b/src/server/game/Server/Packets/ChatPackets.h
@@ -24,6 +24,13 @@ namespace WorldPackets
 {
     namespace Chat
     {
+        // CMSG_MESSAGECHAT_GUILD
+        // CMSG_MESSAGECHAT_OFFICER
+        // CMSG_MESSAGECHAT_YELL
+        // CMSG_MESSAGECHAT_SAY
+        // CMSG_MESSAGECHAT_PARTY
+        // CMSG_MESSAGECHAT_RAID
+        // CMSG_MESSAGECHAT_RAID_WARNING
         class ChatMessage final : public ClientPacket
         {
         public:
@@ -35,6 +42,91 @@ namespace WorldPackets
             int32 Language = LANG_UNIVERSAL;
         };
 
+        // CMSG_MESSAGECHAT_WHISPER
+        class ChatMessageWhisper final : public ClientPacket
+        {
+        public:
+            ChatMessageWhisper(WorldPacket&& packet) : ClientPacket(std::move(packet)) { }
+
+            void Read() override;
+
+            int32 Language = LANG_UNIVERSAL;
+            std::string Text;
+            std::string Target;
+        };
+
+        // CMSG_MESSAGECHAT_CHANNEL
+        class ChatMessageChannel final : public ClientPacket
+        {
+        public:
+            ChatMessageChannel(WorldPacket&& packet) : ClientPacket(std::move(packet)) { }
+
+            void Read() override;
+
+            int32 Language = LANG_UNIVERSAL;
+            std::string Text;
+            std::string Target;
+        };
+
+        // CMSG_MESSAGECHAT_ADDON_GUILD
+        // CMSG_MESSAGECHAT_ADDON_OFFICER
+        // CMSG_MESSAGECHAT_ADDON_PARTY
+        // CMSG_MESSAGECHAT_ADDON_RAID
+        class ChatAddonMessage final : public ClientPacket
+        {
+        public:
+            ChatAddonMessage(WorldPacket&& packet) : ClientPacket(std::move(packet)) { }
+
+            void Read() override;
+
+            std::string Prefix;
+            std::string Text;
+        };
+
+        // CMSG_MESSAGECHAT_ADDON_WHISPER
+        class ChatAddonMessageWhisper final : public ClientPacket
+        {
+        public:
+            ChatAddonMessageWhisper(WorldPacket&& packet) : ClientPacket(std::move(packet)) { }
+
+            void Read() override;
+
+            std::string Prefix;
+            std::string Target;
+            std::string Text;
+        };
+
+        class ChatMessageDND final : public ClientPacket
+        {
+        public:
+            ChatMessageDND(WorldPacket&& packet) : ClientPacket(CMSG_MESSAGECHAT_DND, std::move(packet)) { }
+
+            void Read() override;
+
+            std::string Text;
+        };
+
+        class ChatMessageAFK final : public ClientPacket
+        {
+        public:
+            ChatMessageAFK(WorldPacket&& packet) : ClientPacket(CMSG_MESSAGECHAT_AFK, std::move(packet)) { }
+
+            void Read() override;
+
+            std::string Text;
+        };
+
+        class ChatMessageEmote final : public ClientPacket
+        {
+        public:
+            ChatMessageEmote(WorldPacket&& packet) : ClientPacket(CMSG_MESSAGECHAT_EMOTE, std::move(packet)) { }
+
+            void Read() override;
+
+            std::string Text;
+        };
+
+        // SMSG_MESSAGECHAT
         class Chat final : public ServerPacket
         {
         public:
@@ -62,6 +154,43 @@ namespace WorldPackets
             bool HideChatLog = false;
             bool FakeSenderName = false;
         };
+
+        class Emote final : public ServerPacket
+        {
+        public:
+            Emote() : ServerPacket(SMSG_EMOTE, 8+4) { }
+
+            WorldPacket const* Write() override;
+
+            ObjectGuid Guid;
+            int32 EmoteID;
+        };
+
+        class CTextEmote final : public ClientPacket
+        {
+        public:
+            CTextEmote(WorldPacket&& packet) : ClientPacket(CMSG_TEXT_EMOTE, std::move(packet)) { }
+
+            void Read() override;
+
+            ObjectGuid Target;
+            int32 EmoteID;
+            int32 SoundIndex;
+        };
+
+        class STextEmote final : public ServerPacket
+        {
+        public:
+            STextEmote() : ServerPacket(SMSG_TEXT_EMOTE, 8+8+4+4) { }
+
+            WorldPacket const* Write() override;
+
+            ObjectGuid SourceGUID;
+            ObjectGuid SourceAccountGUID; // Not in JAM
+            ObjectGuid TargetGUID;
+            int32 SoundIndex;
+            int32 EmoteID;
+        };
     }
 }
 
diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp
index 99e46f6f591..6e506e2544e 100644
--- a/src/server/game/Server/Protocol/Opcodes.cpp
+++ b/src/server/game/Server/Protocol/Opcodes.cpp
@@ -19,6 +19,7 @@
 #include "Opcodes.h"
 #include "WorldSession.h"
 #include "Packets/CharacterPackets.h"
+#include "Packets/ChannelPackets.h"
 #include "Packets/ChatPackets.h"
 #include "Packets/ClientConfigPackets.h"
 #include "Packets/CombatPackets.h"
@@ -404,25 +405,23 @@ void OpcodeTable::Initialize()
     DEFINE_OPCODE_HANDLER_OLD(CMSG_MAIL_RETURN_TO_SENDER,                   STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleMailReturnToSender        );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_MAIL_TAKE_ITEM,                          STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleMailTakeItem              );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_MAIL_TAKE_MONEY,                         STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleMailTakeMoney             );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_MESSAGECHAT_ADDON_BATTLEGROUND,          STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleAddonMessagechatOpcode    );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_MESSAGECHAT_ADDON_GUILD,                 STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleAddonMessagechatOpcode    );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_MESSAGECHAT_ADDON_OFFICER,               STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleAddonMessagechatOpcode    );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_MESSAGECHAT_ADDON_PARTY,                 STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleAddonMessagechatOpcode    );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_MESSAGECHAT_ADDON_RAID,                  STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleAddonMessagechatOpcode    );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_MESSAGECHAT_ADDON_WHISPER,               STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleAddonMessagechatOpcode    );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_MESSAGECHAT_AFK,                         STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL                     );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_MESSAGECHAT_BATTLEGROUND,                STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL                     );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_MESSAGECHAT_CHANNEL,                     STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL                     );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_MESSAGECHAT_DND,                         STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL                     );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_MESSAGECHAT_EMOTE,                       STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL                     );
-    DEFINE_HANDLER(CMSG_MESSAGECHAT_GUILD,                                  STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Chat::ChatMessage, &WorldSession::HandleMessagechatOpcode);
-    DEFINE_HANDLER(CMSG_MESSAGECHAT_OFFICER,                                STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Chat::ChatMessage, &WorldSession::HandleMessagechatOpcode);
-    DEFINE_HANDLER(CMSG_MESSAGECHAT_PARTY,                                  STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Chat::ChatMessage, &WorldSession::HandleMessagechatOpcode);
-    DEFINE_HANDLER(CMSG_MESSAGECHAT_RAID,                                   STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Chat::ChatMessage, &WorldSession::HandleMessagechatOpcode);
-    DEFINE_HANDLER(CMSG_MESSAGECHAT_RAID_WARNING,                           STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Chat::ChatMessage, &WorldSession::HandleMessagechatOpcode);
-    DEFINE_HANDLER(CMSG_MESSAGECHAT_SAY,                                    STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Chat::ChatMessage, &WorldSession::HandleMessagechatOpcode);
-    DEFINE_HANDLER(CMSG_MESSAGECHAT_YELL,                                   STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Chat::ChatMessage, &WorldSession::HandleMessagechatOpcode);
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_MESSAGECHAT_WHISPER,                     STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL                     );
+    DEFINE_HANDLER(CMSG_MESSAGECHAT_ADDON_GUILD,                            STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Chat::ChatAddonMessage, &WorldSession::HandleChatAddonMessageOpcode);
+    DEFINE_HANDLER(CMSG_MESSAGECHAT_ADDON_OFFICER,                          STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Chat::ChatAddonMessage, &WorldSession::HandleChatAddonMessageOpcode);
+    DEFINE_HANDLER(CMSG_MESSAGECHAT_ADDON_PARTY,                            STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Chat::ChatAddonMessage, &WorldSession::HandleChatAddonMessageOpcode);
+    DEFINE_HANDLER(CMSG_MESSAGECHAT_ADDON_RAID,                             STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Chat::ChatAddonMessage, &WorldSession::HandleChatAddonMessageOpcode);
+    DEFINE_HANDLER(CMSG_MESSAGECHAT_ADDON_WHISPER,                          STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Chat::ChatAddonMessageWhisper, &WorldSession::HandleChatAddonMessageWhisperOpcode);
+    DEFINE_HANDLER(CMSG_MESSAGECHAT_AFK,                                    STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Chat::ChatMessageAFK, &WorldSession::HandleChatMessageAFKOpcode);
+    DEFINE_HANDLER(CMSG_MESSAGECHAT_CHANNEL,                                STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Chat::ChatMessageChannel, &WorldSession::HandleChatMessageChannelOpcode);
+    DEFINE_HANDLER(CMSG_MESSAGECHAT_DND,                                    STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Chat::ChatMessageDND, &WorldSession::HandleChatMessageDNDOpcode);
+    DEFINE_HANDLER(CMSG_MESSAGECHAT_EMOTE,                                  STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Chat::ChatMessageEmote, &WorldSession::HandleChatMessageEmoteOpcode);
+    DEFINE_HANDLER(CMSG_MESSAGECHAT_GUILD,                                  STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Chat::ChatMessage, &WorldSession::HandleChatMessageOpcode);
+    DEFINE_HANDLER(CMSG_MESSAGECHAT_OFFICER,                                STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Chat::ChatMessage, &WorldSession::HandleChatMessageOpcode);
+    DEFINE_HANDLER(CMSG_MESSAGECHAT_PARTY,                                  STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Chat::ChatMessage, &WorldSession::HandleChatMessageOpcode);
+    DEFINE_HANDLER(CMSG_MESSAGECHAT_RAID,                                   STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Chat::ChatMessage, &WorldSession::HandleChatMessageOpcode);
+    DEFINE_HANDLER(CMSG_MESSAGECHAT_RAID_WARNING,                           STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Chat::ChatMessage, &WorldSession::HandleChatMessageOpcode);
+    DEFINE_HANDLER(CMSG_MESSAGECHAT_SAY,                                    STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Chat::ChatMessage, &WorldSession::HandleChatMessageOpcode);
+    DEFINE_HANDLER(CMSG_MESSAGECHAT_YELL,                                   STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Chat::ChatMessage, &WorldSession::HandleChatMessageOpcode);
+    DEFINE_HANDLER(CMSG_MESSAGECHAT_WHISPER,                                STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Chat::ChatMessageWhisper, &WorldSession::HandleChatMessageWhisperOpcode);
     DEFINE_OPCODE_HANDLER_OLD(CMSG_MINIGAME_MOVE,                           STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_MINIMAP_PING,                            STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleMinimapPingOpcode         );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_MOUNTSPECIAL_ANIM,                       STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleMountSpecialAnimOpcode    );
@@ -623,7 +622,7 @@ void OpcodeTable::Initialize()
     DEFINE_OPCODE_HANDLER_OLD(CMSG_TAXINODE_STATUS_QUERY,                   STATUS_UNHANDLED, PROCESS_THREADSAFE,   &WorldSession::HandleTaxiNodeStatusQueryOpcode );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_TAXIQUERYAVAILABLENODES,                 STATUS_UNHANDLED, PROCESS_THREADSAFE,   &WorldSession::HandleTaxiQueryAvailableNodes   );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_TELEPORT_TO_UNIT,                        STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_TEXT_EMOTE,                              STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleTextEmoteOpcode           );
+    DEFINE_HANDLER(CMSG_TEXT_EMOTE,                                         STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Chat::CTextEmote, &WorldSession::HandleTextEmoteOpcode);
     DEFINE_OPCODE_HANDLER_OLD(CMSG_TIME_ADJUSTMENT_RESPONSE,                STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_HANDLER(CMSG_TIME_SYNC_RESP,                                     STATUS_LOGGEDIN,  PROCESS_INPLACE,      WorldPackets::Misc::TimeSyncResponse, &WorldSession::HandleTimeSyncResp);
     DEFINE_OPCODE_HANDLER_OLD(CMSG_TIME_SYNC_RESP_FAILED,                   STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h
index 413a99bb9c4..3e061cb0192 100644
--- a/src/server/game/Server/Protocol/Opcodes.h
+++ b/src/server/game/Server/Protocol/Opcodes.h
@@ -354,14 +354,12 @@ enum OpcodeClient : uint32
     CMSG_MAIL_TAKE_ITEM                               = 0xBADD,
     CMSG_MAIL_TAKE_MONEY                              = 0xBADD,
     CMSG_MEETINGSTONE_INFO                            = 0xBADD,
-    CMSG_MESSAGECHAT_ADDON_BATTLEGROUND               = 0xBADD,
     CMSG_MESSAGECHAT_ADDON_GUILD                      = 0x137C,
     CMSG_MESSAGECHAT_ADDON_OFFICER                    = 0x188A,
     CMSG_MESSAGECHAT_ADDON_PARTY                      = 0x015C,
     CMSG_MESSAGECHAT_ADDON_RAID                       = 0x082C,
     CMSG_MESSAGECHAT_ADDON_WHISPER                    = 0x18A2,
     CMSG_MESSAGECHAT_AFK                              = 0x1BDC,
-    CMSG_MESSAGECHAT_BATTLEGROUND                     = 0xBADD,
     CMSG_MESSAGECHAT_CHANNEL                          = 0x0913,
     CMSG_MESSAGECHAT_DND                              = 0x0AAB,
     CMSG_MESSAGECHAT_EMOTE                            = 0x113C,
diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h
index 011cfbaf6c4..14513730e84 100644
--- a/src/server/game/Server/WorldSession.h
+++ b/src/server/game/Server/WorldSession.h
@@ -102,9 +102,22 @@ namespace WorldPackets
         class UserClientUpdateAccountData;
     }
 
+    namespace Channel
+    {
+        class JoinChannel;
+    }
+
     namespace Chat
     {
         class ChatMessage;
+        class ChatMessageWhisper;
+        class ChatMessageChannel;
+        class ChatAddonMessage;
+        class ChatAddonMessageWhisper;
+        class ChatMessageAFK;
+        class ChatMessageDND;
+        class ChatMessageEmote;
+        class CTextEmote;
     }
 
     namespace Combat
@@ -308,7 +321,9 @@ class WorldSession
 
         AccountTypes GetSecurity() const { return _security; }
         uint32 GetAccountId() const { return _accountId; }
+        ObjectGuid GetAccountGUID() const { return ObjectGuid::Create<HighGuid::WowAccount>(GetAccountId()); }
         uint32 GetBattlenetAccountId() const { return _battlenetAccountId; }
+        ObjectGuid GetBattlenetAccountGUID() const { return ObjectGuid::Create<HighGuid::BNetAccount>(GetBattlenetAccountId()); }
         Player* GetPlayer() const { return _player; }
         std::string const& GetPlayerName() const;
         std::string GetPlayerInfo() const;
@@ -821,13 +836,21 @@ class WorldSession
         void HandlePushQuestToParty(WorldPacket& recvPacket);
         void HandleQuestPushResult(WorldPacket& recvPacket);
 
-        void HandleMessagechatOpcode(WorldPackets::Chat::ChatMessage& packet);
-        void HandleAddonMessagechatOpcode(WorldPacket& recvPacket);
+        void HandleChatMessageOpcode(WorldPackets::Chat::ChatMessage& packet);
+        void HandleChatMessageWhisperOpcode(WorldPackets::Chat::ChatMessageWhisper& packet);
+        void HandleChatMessageChannelOpcode(WorldPackets::Chat::ChatMessageChannel& packet);
+        void HandleChatMessage(ChatMsg type, uint32 lang, std::string msg, std::string target = "");
+        void HandleChatAddonMessageOpcode(WorldPackets::Chat::ChatAddonMessage& packet);
+        void HandleChatAddonMessageWhisperOpcode(WorldPackets::Chat::ChatAddonMessageWhisper& packet);
+        void HandleChatAddonMessage(ChatMsg type, std::string prefix, std::string text, std::string target = "");
+        void HandleChatMessageAFKOpcode(WorldPackets::Chat::ChatMessageAFK& packet);
+        void HandleChatMessageDNDOpcode(WorldPackets::Chat::ChatMessageDND& packet);
+        void HandleChatMessageEmoteOpcode(WorldPackets::Chat::ChatMessageEmote& packet);
         void SendPlayerNotFoundNotice(std::string const& name);
         void SendPlayerAmbiguousNotice(std::string const& name);
         void SendWrongFactionNotice();
         void SendChatRestrictedNotice(ChatRestrictionType restriction);
-        void HandleTextEmoteOpcode(WorldPacket& recvPacket);
+        void HandleTextEmoteOpcode(WorldPackets::Chat::CTextEmote& packet);
         void HandleChatIgnoredOpcode(WorldPacket& recvPacket);
 
         void HandleUnregisterAddonPrefixesOpcode(WorldPacket& recvPacket);