From 86d704a514061fcecab2f4350fc3deb0db81bb16 Mon Sep 17 00:00:00 2001
From: Tristan 'Natrist' Cormier <natrist@users.noreply.github.com>
Date: Fri, 24 Nov 2023 07:03:30 -0500
Subject: [PATCH] chore(Core/Chat): add Channel::ShouldAnnouncePlayer() method
 (#17819)

---
 src/server/game/Chat/Channels/Channel.cpp | 28 +++++++++--------------
 src/server/game/Chat/Channels/Channel.h   |  2 ++
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/server/game/Chat/Channels/Channel.cpp b/src/server/game/Chat/Channels/Channel.cpp
index 67ea787ae..a789133ca 100644
--- a/src/server/game/Chat/Channels/Channel.cpp
+++ b/src/server/game/Chat/Channels/Channel.cpp
@@ -198,8 +198,7 @@ void Channel::JoinChannel(Player* player, std::string const& pass)
 
     player->JoinedChannel(this);
 
-    if (_announce && (!AccountMgr::IsGMAccount(player->GetSession()->GetSecurity()) ||
-                      !sWorld->getBoolConfig(CONFIG_SILENTLY_GM_JOIN_TO_CHANNEL)))
+    if (_announce && ShouldAnnouncePlayer(player))
     {
         WorldPacket data;
         MakeJoined(&data, guid);
@@ -276,8 +275,7 @@ void Channel::LeaveChannel(Player* player, bool send)
     bool changeowner = playersStore[guid].IsOwner();
 
     playersStore.erase(guid);
-    if (_announce && (!AccountMgr::IsGMAccount(player->GetSession()->GetSecurity()) ||
-                      !sWorld->getBoolConfig(CONFIG_SILENTLY_GM_JOIN_TO_CHANNEL)))
+    if (_announce && ShouldAnnouncePlayer(player))
     {
         WorldPacket data;
         MakeLeft(&data, guid);
@@ -422,8 +420,6 @@ void Channel::KickOrBan(Player const* player, std::string const& badname, bool b
         }
     }
 
-    bool notify = !(AccountMgr::IsGMAccount(sec) && sWorld->getBoolConfig(CONFIG_SILENTLY_GM_JOIN_TO_CHANNEL));
-
     if (ban)
     {
         if (!IsBanned(victim))
@@ -431,7 +427,7 @@ void Channel::KickOrBan(Player const* player, std::string const& badname, bool b
             bannedStore[victim] = GameTime::GetGameTime().count() + CHANNEL_BAN_DURATION;
             AddChannelBanToDB(victim, GameTime::GetGameTime().count() + CHANNEL_BAN_DURATION);
 
-            if (notify)
+            if (ShouldAnnouncePlayer(player))
             {
                 WorldPacket data;
                 MakePlayerBanned(&data, victim, good);
@@ -439,7 +435,7 @@ void Channel::KickOrBan(Player const* player, std::string const& badname, bool b
             }
         }
     }
-    else if (notify)
+    else if (ShouldAnnouncePlayer(player))
     {
         WorldPacket data;
         MakePlayerKicked(&data, victim, good);
@@ -896,18 +892,11 @@ void Channel::SetOwner(ObjectGuid guid, bool exclaim)
         uint8 oldFlag = pinfo.flags;
         pinfo.SetOwner(true);
 
-        bool notify = true;
         Player* player = ObjectAccessor::FindPlayer(_ownerGUID);
 
-        if (player)
-        {
-            uint32 sec = player->GetSession()->GetSecurity();
-            notify = !(AccountMgr::IsGMAccount(sec) && sWorld->getBoolConfig(CONFIG_SILENTLY_GM_JOIN_TO_CHANNEL));
-        }
-
         WorldPacket data;
 
-        if (notify)
+        if (ShouldAnnouncePlayer(player))
         {
             MakeModeChange(&data, _ownerGUID, oldFlag);
             SendToAll(&data);
@@ -915,7 +904,7 @@ void Channel::SetOwner(ObjectGuid guid, bool exclaim)
 
         FlagsNotify(pinfo.plrPtr);
 
-        if (exclaim && notify)
+        if (exclaim && ShouldAnnouncePlayer(player))
         {
             MakeOwnerChanged(&data, _ownerGUID);
             SendToAll(&data);
@@ -949,6 +938,11 @@ void Channel::SendToAllWatching(WorldPacket* data)
         (*i)->GetSession()->SendPacket(data);
 }
 
+bool Channel::ShouldAnnouncePlayer(const Player* pPlayer) const
+{
+    return !(AccountMgr::IsGMAccount(pPlayer->GetSession()->GetSecurity()) && sWorld->getBoolConfig(CONFIG_SILENTLY_GM_JOIN_TO_CHANNEL));
+}
+
 void Channel::Voice(ObjectGuid /*guid1*/, ObjectGuid /*guid2*/)
 {
 }
diff --git a/src/server/game/Chat/Channels/Channel.h b/src/server/game/Chat/Channels/Channel.h
index 5ec955bc7..e84d25786 100644
--- a/src/server/game/Chat/Channels/Channel.h
+++ b/src/server/game/Chat/Channels/Channel.h
@@ -271,6 +271,8 @@ private:
     void SendToOne(WorldPacket* data, ObjectGuid who);
     void SendToAllWatching(WorldPacket* data);
 
+    bool ShouldAnnouncePlayer(const Player* pPlayer) const;
+
     [[nodiscard]] bool IsOn(ObjectGuid who) const { return playersStore.find(who) != playersStore.end(); }
     [[nodiscard]] bool IsBanned(ObjectGuid guid) const;