fixes

diff --git a/pyproject.toml b/pyproject.toml
index 9baac8c0b848b058f3e14fd39fb39138d113c966..aefb6c59bc232d05d896e56c35be73c95ad62ca0 100644 (file)
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -15,7 +15,7 @@ classifiers = [
 ]
 
 dependencies = [
-    "slixmpp",
+    "slixmpp>=1.10.0",
     "pika",
     "configobj",
     "requests",

diff --git a/src/distbot/bot/action_worker.py b/src/distbot/bot/action_worker.py
index 7fa624a447a3f84f53fd4ef02a0946bc9c41d3b0..14d91eb4096180127906acfe4c883648500ec585 100644 (file)
--- a/src/distbot/bot/action_worker.py
+++ b/src/distbot/bot/action_worker.py
@@ -119,6 +119,7 @@ class ActionWorker(object):
         """
         item = self.find_scheduled_action_by_mutex(event.mutex)
         if item:
+            logger.debug("canceling event %s", item)
             item.cancel()
 
     def run_action(self, action: Action):

diff --git a/src/distbot/bot/bot.py b/src/distbot/bot/bot.py
index 5b6aa2b3b22747cfded0bb9cd4e06f8162c557bf..ed1dde743fd800626c3c5593815133f7314bb6da 100644 (file)
--- a/src/distbot/bot/bot.py
+++ b/src/distbot/bot/bot.py
@@ -210,7 +210,7 @@ def run():
               nick=conf_get("bot_nickname"))
     bot.connect()
     try:
-        bot.process()
+        bot.loop.run_forever()
     except KeyboardInterrupt:
         bot.disconnect()
     finally:

diff --git a/src/distbot/common/message.py b/src/distbot/common/message.py
index a218f0ad4762915584b83b4edb598954a2ab7d65..c8e22d78a6dd8a45ecf8136816c86fc5004a5c20 100644 (file)
--- a/src/distbot/common/message.py
+++ b/src/distbot/common/message.py
@@ -17,7 +17,8 @@ def get_words(msg) -> List[str]:
     return shlex.split(msg["body"])
 
 
-def get_nick_from_message(message_obj) -> str:
+# TODO clear that up
+def get_nick_from_message(message_obj: Message | Presence | dict) -> str:
     """
     Extract the actual nick
     :type message_obj: Message