fixed a bug that only read one auto_message

diff --git a/skgyorugo/analyze_auto_message.py b/skgyorugo/analyze_auto_message.py
index fc3b0a335975bfc9e27b87a572e56752e6d136b4..f0566643d36091e1106e5e3d69b72ba6c0aa51b8 100644 (file)
--- a/skgyorugo/analyze_auto_message.py
+++ b/skgyorugo/analyze_auto_message.py
@@ -35,41 +35,40 @@ def do_auto_message(bot: Bot, message: Message, auto_message_modules: dict):
             last_used ASC
         """
     )
-    fetched = c.fetchone()
-    if not fetched:
-        conn.close()
-        return
+    while True:
+        fetched = c.fetchone()
+        if not fetched:
+            break
 
-    name, cooldown, end_time, last_used, value = fetched
-    print(fetched)
-    if time.time() < last_used + cooldown:
-        return
-    if time.time() > start_stream_ts + end_time and end_time != 0:
-        return
-    if value:
-        tools.smart_privmsg.send(bot, message, value)
-    else:
-        try:
-            auto_message_modules[name].main(bot, message)
-        except KeyError:
-            c.execute(
-                """
-                    DELETE FROM
-                        auto_messages
-                    WHERE
-                        name = ?
-                """,
-                (name, )
-            )
-            conn.commit()
-            return
+        name, cooldown, end_time, last_used, value = fetched
+        if time.time() < last_used + cooldown:
+            continue
+        if time.time() > start_stream_ts + end_time and end_time != 0:
+            continue
+        if value:
+            tools.smart_privmsg.send(bot, message, value)
+        else:
+            try:
+                auto_message_modules[name].main(bot, message)
+            except KeyError:
+                c.execute(
+                    """
+                        DELETE FROM
+                            auto_messages
+                        WHERE
+                            name = ?
+                    """,
+                    (name, )
+                )
+                conn.commit()
+                continue
 
-    c.execute(
-        "UPDATE auto_messages SET last_used = ? WHERE name = ?",
-        (
-            int(time.time()),
-            name,
+        c.execute(
+            "UPDATE auto_messages SET last_used = ? WHERE name = ?",
+            (
+                int(time.time()),
+                name,
+            )
         )
-    )
-    conn.commit()
+        conn.commit()
     conn.close()

diff --git a/skgyorugo/main.py b/skgyorugo/main.py
index 01b376b6ec9abc6093228c947abe78171adc81a7..58994a69e3ccd0528107587ae7a82f2f913b5e58 100644 (file)
--- a/skgyorugo/main.py
+++ b/skgyorugo/main.py
@@ -26,7 +26,11 @@ reload(scripts.chatting)
 reload(database_manager)
 reload(analyze_auto_message)
 
-logging.basicConfig(filename="/var/log/aptbot/logs.log", level=logging.DEBUG)
+logging.basicConfig(
+    filename="/var/log/aptbot/logs.log",
+    level=logging.DEBUG,
+    format="[%(levelname)s] %(asctime)s: %(message)s"
+)
 
 PATH = os.path.dirname(os.path.realpath(__file__))
 logging.info(f"Defined PATH: {PATH}")