Fixes: various

Author: DirectiveAthena

README.md

@@ -41,20 +41,21 @@ class newBot(AthenaTwitchBot.TwitchBot):
   # - Command -
   #   A command is only ran when it is invoked by a user in chat
   #   In the following case this would be by typing "!ping" in chat
-  @AthenaTwitchBot.command_method(name="ping")
+  @AthenaTwitchBot.TwitchBotMethod.command(names="ping")
   def command_ping(self, context: AthenaTwitchBot.TwitchContext):
-    context.reply("pong!")  # a "context.reply" function will reply to the user whi invoked the command
+    context.reply("pong!")  # a "context.reply" function will reply to the user who invoked the command
 
   # - Task -
   #   A task is run automatically every "delay" amount of seconds
   #   In the following case, the method will be run every minute
-  #   The "wait_before" kwarg defines if the asyncio.sleep runs before or after the first call of the callback
-  @AthenaTwitchBot.scheduled_task_method(delay=60, wait_before=True)
+  #   The "call_on_startup" kwarg defines if the task has to be run on bot startup
+  @AthenaTwitchBot.TwitchBotMethod.scheduled_task(interval=AthenaLib.models.Minute(1), call_on_startup=True)
   def task_post_github(self, context: AthenaTwitchBot.TwitchContext):
     context.write(f"This bot is made possible by: https://github.com/DirectiveAthena/AthenaTwitchBot")
 
 # --- Main function ---
 def main():
+  # the launch function handles everything about the protocol setup and command handling
   AthenaTwitchBot.launch(
     bot=newBot(),
     ssl=True  # set to true to enable ssl connection to Twitch

src/AthenaTwitchBot/__init__.py

@@ -4,6 +4,7 @@
 from AthenaTwitchBot.models.twitch_bot import TwitchBot
 from AthenaTwitchBot.models.twitch_bot_protocol import TwitchBotProtocol
 from AthenaTwitchBot.models.twitch_context import TwitchContext
+from AthenaTwitchBot.models.twitch_bot_method import TwitchBotMethod
 
 from AthenaTwitchBot.functions.launch import launch
 

src/AthenaTwitchBot/models/outputs/output_console.py

@@ -9,6 +9,7 @@
 
 # Custom Packages
 from AthenaTwitchBot.models.outputs.abstract_output import AbstractOutput
+# noinspection PyProtectedMember
 from AthenaTwitchBot._info._v import VERSION
 
 from AthenaTwitchBot.data.output_console import PING_RECEIVED

src/AthenaTwitchBot/models/twitch_bot_method.py

@@ -7,8 +7,8 @@
 from typing import Callable
 
 # Custom Library
-from AthenaLib.models import Second, Minute, Hour
-from AthenaLib.functions.time import convert_time_to_seconds
+from AthenaLib.models import Hour
+from AthenaLib.models.time import TimeValue
 
 # Custom Packages
 from AthenaTwitchBot.models.twitch_channel import TwitchChannel
@@ -79,12 +79,12 @@ def command(
     def scheduled_task(
             self=None,
             *,
-            interval:int|Second|Minute|Hour=Hour(1),
+            interval:TimeValue=Hour(1),
             call_on_startup:bool=False
     ) -> TwitchBotMethod:
         kwargs: dict = {
             "is_scheduled_task": True,
-            "task_interval": convert_time_to_seconds(interval, to_int=True),
+            "task_interval": interval.to_int_as_seconds(),
             "task_call_on_startup": call_on_startup
         }
 

src/AthenaTwitchBot/models/twitch_bot_protocol.py

@@ -243,6 +243,10 @@ def parse_data(self, data: bytearray):
                         text=" ".join(d_split)
                     )
 
+                case str(a), if not a:
+                    # skip empty lines
+                    continue
+
                 case _:
                     self.output_handler(
                         callback=output_undefined,