updated for newer version of aptbot

diff --git a/skgyorugo/auto_messages/queuehelp.py b/skgyorugo/auto_messages/queuehelp.py
index 41bb449dee4aa5d8f01ae87ab6af9280d01df865..473d5501f6ebfee5dced03197320a892017321bb 100644 (file)
--- a/skgyorugo/auto_messages/queuehelp.py
+++ b/skgyorugo/auto_messages/queuehelp.py
@@ -5,5 +5,5 @@ END_TIME = 2 * 60 * 60
 
 
 def main(bot: Bot, message: Message):
-    msg = "IF YOU WANT TO PLAY WITH PEKS TYPE: ?join ------------------------------------------------------------------------------- You can find more info here: https://i.imgur.com/hqW5OOn.png"
+    msg = "IF YOU WANT TO PLAY WITH PEKS TYPE: ?join ------------------------------------------------------------------------------- You can find more info here: https://i.imgur.com/mv89SMr.png"
     bot.send_privmsg(message.channel, msg)

diff --git a/skgyorugo/main.py b/skgyorugo/main.py
index 1c2dd35c7a66fa29a87fffceb4d28d9db17f2dec..1d1b327ddfcb35575c9ef26cec0d71a45777f1fe 100644 (file)
--- a/skgyorugo/main.py
+++ b/skgyorugo/main.py
@@ -1,4 +1,4 @@
-from aptbot.bot import Bot, Message, Commands
+from aptbot import Bot, Message, Commands
 import os
 import importlib
 import importlib.util
@@ -15,6 +15,7 @@ import database_manager
 import analyze_auto_message
 import time
 import logging
+from threading import Event
 from importlib import reload
 
 reload(tools.raid)
@@ -104,10 +105,10 @@ database_manager.update_commands_in_database(commands_modules, commands)
 database_manager.update_auto_messages_in_database(auto_message_modules, auto_messages)
 
 
-def start(bot: Bot, message: Message):
+def start(bot: Bot, message: Message, stop_event: Event):
     i = 0
     wait = 5
-    while True:
+    while not stop_event.is_set():
         i += wait
         started = tools.smart_start_stream_time.update_start_stream_timestamp()
         if started == "START":

diff --git a/skgyorugo/tools/smart_start_stream_time.py b/skgyorugo/tools/smart_start_stream_time.py
index dc8a7293dc4766d8272cdad0cac2b69ff645225c..a2307790f66b78cd1708c9092023dc357ed39d4d 100644 (file)
--- a/skgyorugo/tools/smart_start_stream_time.py
+++ b/skgyorugo/tools/smart_start_stream_time.py
@@ -17,8 +17,8 @@ logger.debug(f"TOOLS_PATH set to: {TOOLS_PATH}")
 PATH = os.path.join(TOOLS_PATH, "..")
 logger.debug(f"PATH set to: {PATH}")
 
-streamer_login = os.path.split(STREAMER_PATH)[1]
-logger.debug(f"streamer_login set to: {streamer_login}")
+STREAMER_LOGIN = os.path.split(STREAMER_PATH)[1]
+logger.debug(f"streamer_login set to: {STREAMER_LOGIN}")
 
 
 CHECK_STREAMTIME_CD = 5 * 60
@@ -26,14 +26,12 @@ MAX_OFF_STREAM_MARGIN = 60 * 60
 
 
 def end_stream():
-    logger.info("STREAM ENDED")
-    print("STREAM ENDED")
+    logger.info(f"{STREAMER_LOGIN} has ended their stream")
     clean_queue.clean_queue()
 
 
 def start_stream():
-    logger.info("STREAM STARTED")
-    print("STREAM STARTED")
+    logger.info(f"{STREAMER_LOGIN} has started their stream")
     clean_queue.clean_queue()
 
 
@@ -86,28 +84,18 @@ def update_start_stream_timestamp() -> Optional[str]:
 
     if fetched:
         start_stream_ts, last_checked = fetched
-        logger.debug(f"start_stream_ts set to: {start_stream_ts}")
-        logger.debug(f"last_checked set to: {last_checked}")
         if time.time() < last_checked + CHECK_STREAMTIME_CD:
-            logger.info(f"returned cached start stream time: {start_stream_ts}")
             conn.close()
             return
 
-    stream_info = ttv_api.stream.get_streams(user_logins=[streamer_login])
-    logger.info(f"used twitch api to get stream info")
+    stream_info = ttv_api.stream.get_streams(user_logins=[STREAMER_LOGIN])
     if not stream_info and not fetched:
-        logger.info(f"streamer {streamer_login} is currently not streaming")
         conn.close()
         return
 
     if not stream_info:
         start_stream_ts, last_checked = fetched
-        logger.debug(f"start_stream_ts set to: {start_stream_ts}")
-        logger.debug(f"last_checked set to: {last_checked}")
         if time.time() < last_checked + MAX_OFF_STREAM_MARGIN:
-            logger.info(
-                f"streamer {streamer_login} is currently not streaming, stream not considered ended yet"
-            )
             conn.close()
             return
 
@@ -120,7 +108,6 @@ def update_start_stream_timestamp() -> Optional[str]:
             ),
         )
         conn.commit()
-        logger.info(f"streamer {streamer_login} has ended stream")
         conn.close()
         # TODO add hook, streamer ended stream
         end_stream()
@@ -138,12 +125,7 @@ def update_start_stream_timestamp() -> Optional[str]:
             ),
         )
         conn.commit()
-        logger.info(
-            f"inserted database with start stream {start_stream_ts}, last updated {current_time}"
-        )
         conn.close()
-        logger.info(f"returned api start stream time: {start_stream_ts}")
-        # TODO add hook, streamer started streaming
         start_stream()
         return "START"
 
@@ -158,9 +140,5 @@ def update_start_stream_timestamp() -> Optional[str]:
         ),
     )
     conn.commit()
-    logger.info(
-        f"updated database with cached start stream {start_stream_ts}, last updated {current_time}"
-    )
     conn.close()
-    logger.info(f"returned cached start stream time: {start_stream_ts}")
     return