From 3d6724e448f35ea981d64aff868ce700ab0cbde3 Mon Sep 17 00:00:00 2001
From: Kargatum <dowlandtop@yandex.com>
Date: Thu, 27 Jan 2022 17:58:59 +0700
Subject: [PATCH] feat(Core/Chat): delete delay for channels (#10365)

* feat(Core/Chat): delete delay for channels

* 1
---
 src/server/game/Chat/Channels/Channel.cpp | 36 ++++-------------------
 src/server/game/Chat/Channels/Channel.h   |  2 --
 2 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/src/server/game/Chat/Channels/Channel.cpp b/src/server/game/Chat/Channels/Channel.cpp
index de5f7401e..8d6251bb7 100644
--- a/src/server/game/Chat/Channels/Channel.cpp
+++ b/src/server/game/Chat/Channels/Channel.cpp
@@ -35,7 +35,6 @@ Channel::Channel(std::string const& name, uint32 channelId, uint32 channelDBId,
     _channelId(channelId),
     _channelDBId(channelDBId),
     _teamId(teamId),
-    _lastSpeakTime(0),
     _name(name),
     _password("")
 {
@@ -803,45 +802,20 @@ void Channel::Say(ObjectGuid guid, std::string const& what, uint32 lang)
     }
 
     Player* player = pinfo.plrPtr;
-
-    if (player && player->GetSession()->GetSecurity() == AccountTypes::SEC_PLAYER) // pussywizard: prevent spam on populated channels
-    {
-        uint32 speakDelay = 0;
-        if (_channelRights.speakDelay > 0)
-            speakDelay = _channelRights.speakDelay;
-        else if (playersStore.size() >= 10)
-            speakDelay = 5;
-
-        if (!IsAllowedToSpeak(speakDelay))
-        {
-            std::string timeStr = secsToTimeString(_lastSpeakTime + speakDelay - GameTime::GetGameTime().count());
-            if (_channelRights.speakMessage.length() > 0)
-                player->GetSession()->SendNotification("%s", _channelRights.speakMessage.c_str());
-            player->GetSession()->SendNotification("You must wait %s before speaking again.", timeStr.c_str());
-            return;
-        }
-    }
-
     WorldPacket data;
+
     if (player)
+    {
         ChatHandler::BuildChatPacket(data, CHAT_MSG_CHANNEL, Language(lang), player, player, what, 0, _name);
+    }
     else
+    {
         ChatHandler::BuildChatPacket(data, CHAT_MSG_CHANNEL, Language(lang), guid, guid, what, 0, "", "", 0, false, _name);
+    }
 
     SendToAll(&data, pinfo.IsModerator() ? ObjectGuid::Empty : guid);
 }
 
-bool Channel::IsAllowedToSpeak(uint32 speakDelay)
-{
-    if (_lastSpeakTime + speakDelay <= GameTime::GetGameTime().count())
-    {
-        _lastSpeakTime = GameTime::GetGameTime().count();
-        return true;
-    }
-
-    return false;
-}
-
 void Channel::Invite(Player const* player, std::string const& newname)
 {
     ObjectGuid guid = player->GetGUID();
diff --git a/src/server/game/Chat/Channels/Channel.h b/src/server/game/Chat/Channels/Channel.h
index 96a774e8d..83344b39e 100644
--- a/src/server/game/Chat/Channels/Channel.h
+++ b/src/server/game/Chat/Channels/Channel.h
@@ -223,7 +223,6 @@ public:
     // pussywizard:
     void AddWatching(Player* p);
     void RemoveWatching(Player* p);
-    bool IsAllowedToSpeak(uint32 speakDelay); // pussywizard
 
 private:
     // initial packet data (notify type and channel name)
@@ -329,7 +328,6 @@ private:
     uint32 _channelDBId;
     TeamId _teamId;
     ObjectGuid _ownerGUID;
-    uint32 _lastSpeakTime;
     std::string _name;
     std::string _password;
     ChannelRights _channelRights;