Fix: Correct command catching

Author: DirectiveAthena

src/AthenaTwitchBot/functions/twitch_message_constructors.py

@@ -5,6 +5,7 @@
 from __future__ import annotations
 from typing import Callable
 from datetime import datetime
+import time
 
 # Custom Library
 from AthenaColor import StyleNest, ForeNest, HEX
@@ -41,14 +42,14 @@ def _find_bot_only(content:list[str],message:str, bot_name:str) -> TwitchMessage
     "emotes": lambda tm, tag_value: setattr(tm, "emotes", tag_value),
     "first-msg": lambda tm, tag_value: setattr(tm, "first_msg", bool(tag_value)),
     "flags": lambda tm, tag_value: setattr(tm, "flags", tag_value),
-    "id": lambda tm, tag_value: setattr(tm, "message_id", int(tag_value)),
+    "id": lambda tm, tag_value: setattr(tm, "message_id", tag_value),
     "mod": lambda tm, tag_value: setattr(tm, "mod", bool(tag_value)),
     "room-id": lambda tm, tag_value: setattr(tm, "room_id", tag_value),
     "subscriber": lambda tm, tag_value: setattr(tm, "subscriber", bool(tag_value)),
-    "tmi-sent-ts": lambda tm, tag_value: setattr(tm, "tmi_sent_ts", datetime.fromtimestamp(int(tag_value))),
+    "tmi-sent-ts": lambda tm, tag_value: setattr(tm, "tmi_sent_ts", int(tag_value)),
     "turbo": lambda tm, tag_value: setattr(tm, "turbo", bool(tag_value)),
     "user-id": lambda tm, tag_value: setattr(tm, "user_id", int(tag_value)),
-    "user-type": lambda tm, tag_value: setattr(tm, "user-type", tag_value),
+    "user-type": lambda tm, tag_value: setattr(tm, "user_type", tag_value),
 }
 
 # ----------------------------------------------------------------------------------------------------------------------
@@ -83,7 +84,7 @@ def twitch_message_constructor_tags(message_bytes:bytearray, bot_name:str) -> Tw
         message=message,
         message_type=irc_message,
         channel=channel,
-        text=" ".join(text)
+        text=" ".join(text).replace(":", "", 1) #only remove the first ":"
     )
 
 

src/AthenaTwitchBot/models/twitch_bot_protocol.py

@@ -54,22 +54,15 @@ def data_received(self, data: bytearray) -> None:
                     print(pong_message)
 
                 # catch a message which starts with a command:
-                case TwitchMessage(message=[_,_,_,str(user_message),*user_message_other]) if user_message.startswith(f":{self.bot.prefix}"):
+                case TwitchMessage(text=user_message) if user_message.startswith(f"{self.bot.prefix}"):
                     user_message:str
                     print(ForeNest.ForestGreen("COMMAND CAUGHT"))
                     try:
-                        user_cmd = user_message.replace(f":{self.bot.prefix}", "")
-                        result = self.bot.commands[user_cmd](self=self.bot,transport=self.transport)
-                        print(result)
+                        user_cmd = user_message.replace(f"{self.bot.prefix}", "")
+                        self.bot.commands[user_cmd](self=self.bot,message=twitch_message,transport=self.transport)
                     except KeyError:
                         pass
 
-                # catch a message which has a command within it:
-                case TwitchMessage(message=[_,_,_,*messages_parts]):
-                    for message in messages_parts:
-                        if message.startswith(self.bot.prefix):
-                            print(ForeNest.ForestGreen("COMMAND CAUGHT"))
-
     def connection_lost(self, exc: Exception | None) -> None:
         self.main_loop.stop()
 

src/AthenaTwitchBot/models/twitch_message.py

@@ -28,15 +28,16 @@ class TwitchMessage:
     color:HEX=field(default_factory=HEX)
     display_name:str=""
     first_msg:bool=False
-    message_id:int=0
+    message_id:str=""
     mod:bool=False
     room_id:str=""
     subscriber:bool=False
-    tmi_sent_ts:datetime=field(default_factory=datetime.now)
+    tmi_sent_ts:int=0
     turbo:bool=False
     user_id:int=0
     emotes:str=""
     flags:str=""
+    user_type:str=""
 # ----------------------------------------------------------------------------------------------------------------------
 # - Special message types -
 # ----------------------------------------------------------------------------------------------------------------------