From 182416d665e8147a41de2a0e737e0901f3d2ded3 Mon Sep 17 00:00:00 2001 From: qrexpy <117946311+qrexpy@users.noreply.github.com> Date: Tue, 24 Jun 2025 15:37:53 +0300 Subject: [PATCH 1/6] Update requirements.txt to include pypresence --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2a2c056..9f63d35 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,4 +14,5 @@ cupcake-editor filetype toml pygments -certifi \ No newline at end of file +certifi +pypresence \ No newline at end of file From c5b0f56f6ece3b8b980111032f3c109cd002d658 Mon Sep 17 00:00:00 2001 From: qrexpy <117946311+qrexpy@users.noreply.github.com> Date: Tue, 24 Jun 2025 15:41:24 +0300 Subject: [PATCH 2/6] Remove unused and invalid import of ActivityType from pypresence in BotController --- bot/controller.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot/controller.py b/bot/controller.py index 1f2feb5..b26603f 100644 --- a/bot/controller.py +++ b/bot/controller.py @@ -15,7 +15,7 @@ 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 pypresence import Presence if getattr(sys, 'frozen', False): os.chdir(os.path.dirname(sys.executable)) From 8a52b834bebea230d2688bafe0ef8ad910f25b94 Mon Sep 17 00:00:00 2001 From: qrexpy <117946311+qrexpy@users.noreply.github.com> Date: Tue, 24 Jun 2025 15:50:01 +0300 Subject: [PATCH 3/6] Add temporary spypet attribute to BotController to prevent attribute error --- bot/controller.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bot/controller.py b/bot/controller.py index b26603f..abade7c 100644 --- a/bot/controller.py +++ b/bot/controller.py @@ -21,6 +21,8 @@ os.chdir(os.path.dirname(sys.executable)) class BotController: + spypet = None + def __init__(self): self.cfg = Config() self.bot = None From d816bf2684aaee3b8d8e59a1ecc7a3329a198fbc Mon Sep 17 00:00:00 2001 From: qrexpy <117946311+qrexpy@users.noreply.github.com> Date: Tue, 24 Jun 2025 15:53:13 +0300 Subject: [PATCH 4/6] Add Spypet class --- bot/controller.py | 2 ++ bot/helpers/spypet.py | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 bot/helpers/spypet.py diff --git a/bot/controller.py b/bot/controller.py index abade7c..fdfd014 100644 --- a/bot/controller.py +++ b/bot/controller.py @@ -16,6 +16,7 @@ import utils.webhook as webhook_client from gui.helpers.images import resize_and_sharpen from pypresence import Presence +from bot.helpers.spypet import Spypet if getattr(sys, 'frozen', False): os.chdir(os.path.dirname(sys.executable)) @@ -33,6 +34,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) diff --git a/bot/helpers/spypet.py b/bot/helpers/spypet.py new file mode 100644 index 0000000..91f219f --- /dev/null +++ b/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 = {} \ No newline at end of file From 40bde753c846b0b2736c2e102cb7f28d053736b9 Mon Sep 17 00:00:00 2001 From: qrexpy <117946311+qrexpy@users.noreply.github.com> Date: Tue, 24 Jun 2025 17:10:57 +0300 Subject: [PATCH 5/6] Fix ThemingPanel.save_theme to accept optional argument for compatibility with all callers --- gui/components/settings/theming.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/components/settings/theming.py b/gui/components/settings/theming.py index ab09126..141f1c1 100644 --- a/gui/components/settings/theming.py +++ b/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()) From 66bdfe7198961f9b0c89478014de917f057a902b Mon Sep 17 00:00:00 2001 From: qrexpy <117946311+qrexpy@users.noreply.github.com> Date: Tue, 24 Jun 2025 19:43:44 +0300 Subject: [PATCH 6/6] Remove pypresence dependency --- bot/controller.py | 1 - requirements.txt | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/bot/controller.py b/bot/controller.py index fdfd014..54ef80b 100644 --- a/bot/controller.py +++ b/bot/controller.py @@ -15,7 +15,6 @@ from bot.helpers import cmdhelper, imgembed import utils.webhook as webhook_client from gui.helpers.images import resize_and_sharpen -from pypresence import Presence from bot.helpers.spypet import Spypet if getattr(sys, 'frozen', False): diff --git a/requirements.txt b/requirements.txt index 9f63d35..2a2c056 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,5 +14,4 @@ cupcake-editor filetype toml pygments -certifi -pypresence \ No newline at end of file +certifi \ No newline at end of file