fix(Commands): chat and triggers individual cooldown (#100)

Co-authored-by: Rushaway <11679883+Rushaway@users.noreply.github.com>

Author: Dolly132

src/torchlight/Commands.py

@@ -608,6 +608,9 @@ async def _func(self, message: list[str], player: Player) -> int:
         if self.check_disabled(player):
             return -1
 
+        if self.check_chat_cooldown(player):
+            return -1
+
         voice_trigger = message[0].lower()
         trigger_number = message[1].lower()
 
@@ -633,6 +636,7 @@ async def _func(self, message: list[str], player: Player) -> int:
         if self.random_trigger_name:
             self.torchlight.SayChat(f"Now playing {{olive}}{self.random_trigger_name}")
 
+        self.torchlight.SetPlayerCooldown(player, self.torchlight.config["AntiSpam"]["ChatCooldown"])
         return audio_clip.Play()
 
     def get_sound_path(self, player: Player, voice_trigger: str, trigger_number: str) -> str | None:
@@ -709,6 +713,9 @@ def get_sound_path(self, player: Player, voice_trigger: str, trigger_number: str
 
 
 class Random(VoiceTrigger):
+    def _setup(self) -> None:
+        self.logger.debug(sys._getframe().f_code.co_name)
+
     def get_sound_path(self, player: Player, voice_trigger: str, trigger_number: str) -> str | None:
         trigger_name, trigger = secrets.choice(list(self.trigger_manager.voice_triggers.items()))
 
@@ -909,6 +916,9 @@ async def _func(self, message: list[str], player: Player) -> int:
         if self.check_disabled(player):
             return -1
 
+        if self.check_chat_cooldown(player):
+            return -1
+
         if not message[1]:
             return 1
 
@@ -930,6 +940,7 @@ async def _func(self, message: list[str], player: Player) -> int:
             return 1
 
         asyncio.ensure_future(self.Say(player, language, tld, message[1]))
+        self.torchlight.SetPlayerCooldown(player, self.torchlight.config["AntiSpam"]["ChatCooldown"])
         return 0
 
 
@@ -973,10 +984,14 @@ async def _func(self, message: list[str], player: Player) -> int:
         if self.check_disabled(player):
             return -1
 
+        if self.check_chat_cooldown(player):
+            return -1
+
         if not message[1]:
             return 1
 
         asyncio.ensure_future(self.Say(player, message[1]))
+        self.torchlight.SetPlayerCooldown(player, self.torchlight.config["AntiSpam"]["ChatCooldown"])
         return 0
 
 

src/torchlight/Torchlight.py

@@ -72,14 +72,7 @@ def SayChat(self, message: str, player: Player | None = None) -> None:
             asyncio.ensure_future(self.sourcemod_api.CPrintToChatAll(line))
 
         if player:
-            level = player.admin.level
-
-            if level < self.config["AntiSpam"]["ImmunityLevel"]:
-                cooldown = len(lines) * self.config["AntiSpam"]["ChatCooldown"]
-                if player.chat_cooldown > self.loop.time():
-                    player.chat_cooldown += cooldown
-                else:
-                    player.chat_cooldown = self.loop.time() + cooldown
+            self.SetPlayerCooldown(player, len(lines) * self.config["AntiSpam"]["ChatCooldown"])
 
     # @profile
     def SayPrivate(self, player: Player, message: str) -> None:
@@ -93,5 +86,18 @@ def SayPrivate(self, player: Player, message: str) -> None:
         for line in lines:
             asyncio.ensure_future(self.sourcemod_api.CPrintToChat(player.index, line))
 
+    def SetPlayerCooldown(self, player: Player, cooldown: Any) -> None:
+        if player.index == 0:
+            return
+
+        level = player.admin.level
+        if level >= self.config["AntiSpam"]["ImmunityLevel"]:
+            return
+
+        if player.chat_cooldown > self.loop.time():
+            player.chat_cooldown += cooldown
+        else:
+            player.chat_cooldown = self.loop.time() + cooldown
+
     def __del__(self) -> None:
         self.logger.debug("~Torchlight()")

src/torchlight/__init__.py

@@ -1 +1 @@
-__version__ = "1.2.3"
+__version__ = "1.2.4"