First commit refactor

diff --git a/aptbot/__main__.py b/aptbot/__main__.py
index bfedd57331bf4a1bc438e8c1d1293992e155421a..370a1277160a7cb022eb20cf99b21ef221432895 100644 (file)
--- a/aptbot/__main__.py
+++ b/aptbot/__main__.py
@@ -1,16 +1,18 @@
-import socket
-import aptbot.args
-import time
-import aptbot.args_logic
-import aptbot.bot
-import os
-import sys
 import importlib
 import importlib.util
+import os
+import socket
+import sys
+import time
 import traceback
 from threading import Thread
-from dotenv import load_dotenv
 from types import ModuleType
+
+from dotenv import load_dotenv
+
+import aptbot.args
+import aptbot.args_logic
+import aptbot.bot
 from aptbot import *
 
 load_dotenv()
@@ -40,7 +42,6 @@ def handle_message(bot: aptbot.bot.Bot, modules: dict[str, ModuleType]):
             else:
                 method.daemon = True
                 method.start()
-        time.sleep(0.1)
 
 
 def start(bot: aptbot.bot.Bot, modules: dict[str, ModuleType]):

diff --git a/aptbot/bot.py b/aptbot/bot.py
index 80210147ae69e3b3c3ce6e2829786ffb0e468a10..28ec5563f1591ef7ab0a7cb9b62e24ede26f4213 100644 (file)
--- a/aptbot/bot.py
+++ b/aptbot/bot.py
@@ -1,10 +1,11 @@
-import websocket
-import time
 import re
-from enum import Enum
+import time
 from dataclasses import dataclass, field
+from enum import Enum
 from typing import Optional, Union
 
+import websocket
+
 
 class Commands(Enum):
     CLEARCHAT = "CLEARCHAT"
@@ -115,7 +116,11 @@ class Bot:
         message.value = " ".join(message.value.split())
 
         if not message.tags.get("reply-parent-msg-body", None):
-            print(message)
+            # print(message)
+            try:
+                print(f"#{message.channel} | {message.tags['display-name']}: {message.value}")
+            except KeyError:
+                pass
             return message
 
         rep = message.tags["reply-parent-msg-body"]
@@ -140,7 +145,11 @@ class Bot:
 
         message.tags["reply-parent-msg-body"] = " ".join(new_rep.split())
 
-        print(message)
+        # print(message)
+        try:
+            print(f"#{message.channel} | {message.tags['display-name']}: {message.value}")
+        except KeyError:
+            pass
         return message
 
     def _handle_message(self, received_msg: str) -> Message:

diff --git a/setup.py b/setup.py
index 4ee98d9a1d4b059520c8adac368282798ed0b771..22a081417ad013411cc550613e782be996397677 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,5 @@
 import setuptools
 
-
 with open("README.md", "r", encoding="utf-8") as fh:
     long_description = fh.read()
 
@@ -25,6 +24,7 @@ setuptools.setup(
     install_requires=[
         "python-dotenv",
         "urllib3",
+        "websocket-client"
     ],
     python_requires=">=3.7",
 )