Fix: correct early message parsing

Author: DirectiveAthena

src/AthenaTwitchBot/functions/twitch_message_constructors.py

@@ -26,6 +26,10 @@ def _find_bot_only(content:list[str],message:str, bot_name:str) -> TwitchMessage
         return TwitchMessageOnlyForBot(text=message)
     elif content[0] == f":{bot_name}!{bot_name}@{bot_name}.tmi.twitch.tv":
         return TwitchMessageOnlyForBot(text=message)
+    elif content[0] == f":{bot_name}.tmi.twitch.tv":
+        return TwitchMessageOnlyForBot(text=message)
+    elif not message: # content is empty
+        return TwitchMessageOnlyForBot()
     return False
 
 TAG_MAPPING:dict[str:Callable] = {
@@ -45,15 +49,14 @@ def _find_bot_only(content:list[str],message:str, bot_name:str) -> TwitchMessage
     "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),
-
 }
 
 # ----------------------------------------------------------------------------------------------------------------------
 # - Code -
 # ----------------------------------------------------------------------------------------------------------------------
 def twitch_message_constructor_tags(message_bytes:bytearray, bot_name:str) -> TwitchMessage:
     print(message_bytes)
-    message = message_bytes.decode("UTF_8").replace("\r\n", "")
+    message = message_bytes.decode("UTF_8")
     content = message.split(" ")
 
     # Certain twitch sent messages have a different consistency than a regular user sent message

src/AthenaTwitchBot/models/twitch_bot_protocol.py

@@ -45,29 +45,30 @@ def connection_made(self, transport: asyncio.transports.Transport) -> None:
         self.transport.write(messages.request_tags)
 
     def data_received(self, data: bytearray) -> None:
-        match (twitch_message := self.message_constructor(data, bot_name=self.bot.nickname)):
-            # Keepalive messages : https://dev.twitch.tv/docs/irc#keepalive-messages
-            case TwitchMessagePing():
-                print(ForeNest.ForestGreen("PINGED BY TWITCH"))
-                self.transport.write(pong_message := messages.pong(message=twitch_message.text))
-                print(pong_message)
+        for message in data.split(b"\r\n"):
+            match (twitch_message := self.message_constructor(message, bot_name=self.bot.nickname)):
+                # Keepalive messages : https://dev.twitch.tv/docs/irc#keepalive-messages
+                case TwitchMessagePing():
+                    print(ForeNest.ForestGreen("PINGED BY TWITCH"))
+                    self.transport.write(pong_message := messages.pong(message=twitch_message.text))
+                    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}"):
-                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)
-                except KeyError:
-                    pass
+                # 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}"):
+                    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)
+                    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"))
+                # 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

@@ -35,6 +35,8 @@ class TwitchMessage:
     tmi_sent_ts:datetime=field(default_factory=datetime.now)
     turbo:bool=False
     user_id:int=0
+    emotes:str=""
+    flags:str=""
 # ----------------------------------------------------------------------------------------------------------------------
 # - Special message types -
 # ----------------------------------------------------------------------------------------------------------------------