Merge pull request #29 from qrexpy/main

Bug Fixes

Author: bennyscripts

bot/controller.py

@@ -15,12 +15,14 @@
 from bot.helpers import cmdhelper, imgembed
 import utils.webhook as webhook_client
 from gui.helpers.images import resize_and_sharpen
-from pypresence import Presence, ActivityType
+from bot.helpers.spypet import Spypet
 
 if getattr(sys, 'frozen', False):
     os.chdir(os.path.dirname(sys.executable))
 
 class BotController:
+    spypet = None
+
     def __init__(self):
         self.cfg = Config()
         self.bot = None
@@ -31,6 +33,7 @@ def __init__(self):
         self.bot_running = False
         self.startup_scripts = []
         self.presence = self.cfg.get_rich_presence()
+        self.spypet = Spypet()
 
     def add_startup_script(self, script):
         self.startup_scripts.append(script)

bot/helpers/spypet.py

@@ -0,0 +1,17 @@
+class Spypet:
+    def __init__(self):
+        self.bot = None
+        self.messages = {}
+
+    def set_bot(self, bot):
+        self.bot = bot
+
+    def add_message(self, guild, channel, message):
+        if guild.name not in self.messages:
+            self.messages[guild.name] = {}
+        if channel.name not in self.messages[guild.name]:
+            self.messages[guild.name][channel.name] = []
+        self.messages[guild.name][channel.name].append(message)
+
+    def clear_messages(self):
+        self.messages = {} 

gui/components/settings/theming.py

@@ -13,7 +13,7 @@ def __init__(self, root, parent, images, config):
         self.themes = self.cfg.get_themes()
         self.theme_dict = self.cfg.theme.to_dict()
 
-    def _save_theme(self, _):
+    def _save_theme(self, _=None):
         for index, (key, _) in enumerate(self.theme_dict.items()):
             self.cfg.theme.set(key, self.theme_tk_entries[index].get())