From b6b35d6b555ec73ece59623721bcd72a15296e02 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 11 May 2025 09:52:27 -0400 Subject: [PATCH] refactor(bots): rename discord and reddit bots --- src/__main__.py | 4 ++-- src/{discord => discord_bot}/__init__.py | 0 src/{discord => discord_bot}/bot.py | 6 +++--- src/{discord => discord_bot}/cogs/base_commands.py | 4 ++-- src/{discord => discord_bot}/cogs/fun_commands.py | 4 ++-- src/{discord => discord_bot}/cogs/github_commands.py | 0 src/{discord => discord_bot}/cogs/moderator_commands.py | 0 src/{discord => discord_bot}/cogs/support_commands.py | 4 ++-- src/{discord => discord_bot}/cogs_common.py | 0 src/{discord => discord_bot}/helpers.py | 0 src/{discord => discord_bot}/modals.py | 0 src/{discord => discord_bot}/tasks.py | 4 ++-- src/{discord => discord_bot}/views.py | 6 +++--- src/{reddit => reddit_bot}/__init__.py | 0 src/{reddit => reddit_bot}/bot.py | 0 tests/conftest.py | 2 +- tests/unit/discord/test_tasks.py | 6 +++--- tests/unit/reddit/test_reddit_bot.py | 2 +- 18 files changed, 21 insertions(+), 21 deletions(-) rename src/{discord => discord_bot}/__init__.py (100%) rename src/{discord => discord_bot}/bot.py (98%) rename src/{discord => discord_bot}/cogs/base_commands.py (97%) rename src/{discord => discord_bot}/cogs/fun_commands.py (96%) rename src/{discord => discord_bot}/cogs/github_commands.py (100%) rename src/{discord => discord_bot}/cogs/moderator_commands.py (100%) rename src/{discord => discord_bot}/cogs/support_commands.py (98%) rename src/{discord => discord_bot}/cogs_common.py (100%) rename src/{discord => discord_bot}/helpers.py (100%) rename src/{discord => discord_bot}/modals.py (100%) rename src/{discord => discord_bot}/tasks.py (98%) rename src/{discord => discord_bot}/views.py (98%) rename src/{reddit => reddit_bot}/__init__.py (100%) rename src/{reddit => reddit_bot}/bot.py (100%) diff --git a/src/__main__.py b/src/__main__.py index 5411ceb..6b9f950 100644 --- a/src/__main__.py +++ b/src/__main__.py @@ -7,9 +7,9 @@ # local imports, import after env loaded from src.common import globals # noqa: E402 -from src.discord import bot as d_bot # noqa: E402 +from src.discord_bot import bot as d_bot # noqa: E402 from src.common import webapp # noqa: E402 -from src.reddit import bot as r_bot # noqa: E402 +from src.reddit_bot import bot as r_bot # noqa: E402 def main(): diff --git a/src/discord/__init__.py b/src/discord_bot/__init__.py similarity index 100% rename from src/discord/__init__.py rename to src/discord_bot/__init__.py diff --git a/src/discord/bot.py b/src/discord_bot/bot.py similarity index 98% rename from src/discord/bot.py rename to src/discord_bot/bot.py index 8b5cba5..3382c94 100644 --- a/src/discord/bot.py +++ b/src/discord_bot/bot.py @@ -10,7 +10,7 @@ # local imports from src.common.common import bot_name, data_dir, get_avatar_bytes, org_name from src.common.database import Database -from src.discord.views import DonateCommandView +from src.discord_bot.views import DonateCommandView class Bot(discord.Bot): @@ -23,7 +23,7 @@ class Bot(discord.Bot): """ def __init__(self, *args, **kwargs): # tasks need to be imported here to avoid circular imports - from src.discord import tasks + from src.discord_bot import tasks if 'intents' not in kwargs: intents = discord.Intents.all() @@ -43,7 +43,7 @@ def __init__(self, *args, **kwargs): self.role_update_task = tasks.role_update_task self.load_extension( - name='src.discord.cogs', + name='src.discord_bot.cogs', recursive=True, store=False, ) diff --git a/src/discord/cogs/base_commands.py b/src/discord_bot/cogs/base_commands.py similarity index 97% rename from src/discord/cogs/base_commands.py rename to src/discord_bot/cogs/base_commands.py index fd87cf7..768aca2 100644 --- a/src/discord/cogs/base_commands.py +++ b/src/discord_bot/cogs/base_commands.py @@ -4,8 +4,8 @@ # local imports from src.common.common import avatar, bot_name, colors, org_name, version -from src.discord.views import DonateCommandView -from src.discord import cogs_common +from src.discord_bot.views import DonateCommandView +from src.discord_bot import cogs_common class BaseCommandsCog(discord.Cog): diff --git a/src/discord/cogs/fun_commands.py b/src/discord_bot/cogs/fun_commands.py similarity index 96% rename from src/discord/cogs/fun_commands.py rename to src/discord_bot/cogs/fun_commands.py index 395595d..0d940cb 100644 --- a/src/discord/cogs/fun_commands.py +++ b/src/discord_bot/cogs/fun_commands.py @@ -8,8 +8,8 @@ # local imports from src.common.common import avatar, bot_name, colors -from src.discord.views import RefundCommandView -from src.discord import cogs_common +from src.discord_bot.views import RefundCommandView +from src.discord_bot import cogs_common class FunCommandsCog(discord.Cog): diff --git a/src/discord/cogs/github_commands.py b/src/discord_bot/cogs/github_commands.py similarity index 100% rename from src/discord/cogs/github_commands.py rename to src/discord_bot/cogs/github_commands.py diff --git a/src/discord/cogs/moderator_commands.py b/src/discord_bot/cogs/moderator_commands.py similarity index 100% rename from src/discord/cogs/moderator_commands.py rename to src/discord_bot/cogs/moderator_commands.py diff --git a/src/discord/cogs/support_commands.py b/src/discord_bot/cogs/support_commands.py similarity index 98% rename from src/discord/cogs/support_commands.py rename to src/discord_bot/cogs/support_commands.py index ace82f8..be91faf 100644 --- a/src/discord/cogs/support_commands.py +++ b/src/discord_bot/cogs/support_commands.py @@ -12,8 +12,8 @@ # local imports from src.common.common import avatar, bot_name, colors, data_dir -from src.discord.views import DocsCommandView -from src.discord import cogs_common +from src.discord_bot.views import DocsCommandView +from src.discord_bot import cogs_common class SupportCommandsCog(discord.Cog): diff --git a/src/discord/cogs_common.py b/src/discord_bot/cogs_common.py similarity index 100% rename from src/discord/cogs_common.py rename to src/discord_bot/cogs_common.py diff --git a/src/discord/helpers.py b/src/discord_bot/helpers.py similarity index 100% rename from src/discord/helpers.py rename to src/discord_bot/helpers.py diff --git a/src/discord/modals.py b/src/discord_bot/modals.py similarity index 100% rename from src/discord/modals.py rename to src/discord_bot/modals.py diff --git a/src/discord/tasks.py b/src/discord_bot/tasks.py similarity index 98% rename from src/discord/tasks.py rename to src/discord_bot/tasks.py index 705dce2..592c533 100644 --- a/src/discord/tasks.py +++ b/src/discord_bot/tasks.py @@ -13,8 +13,8 @@ # local imports from src.common.common import avatar, bot_name, bot_url, colors from src.common import sponsors -from src.discord.bot import Bot -from src.discord.helpers import igdb_authorization, month_dictionary +from src.discord_bot.bot import Bot +from src.discord_bot.helpers import igdb_authorization, month_dictionary @tasks.loop(seconds=30) diff --git a/src/discord/views.py b/src/discord_bot/views.py similarity index 98% rename from src/discord/views.py rename to src/discord_bot/views.py index c756e1c..8ebe0fa 100644 --- a/src/discord/views.py +++ b/src/discord_bot/views.py @@ -8,8 +8,8 @@ # local imports from src.common.common import avatar, bot_name, colors -from src.discord.helpers import get_json -from src.discord.modals import RefundModal +from src.discord_bot.helpers import get_json +from src.discord_bot.modals import RefundModal class DocsCommandDefaultProjects: @@ -212,7 +212,7 @@ async def callback(self, select: Select, interaction: discord.Interaction): if select == self.children[0]: # chose the docs project self.docs_version = None - complete, embed = self.check_completion_status() + _, embed = self.check_completion_status() await interaction.response.edit_message(embed=embed, view=self) diff --git a/src/reddit/__init__.py b/src/reddit_bot/__init__.py similarity index 100% rename from src/reddit/__init__.py rename to src/reddit_bot/__init__.py diff --git a/src/reddit/bot.py b/src/reddit_bot/bot.py similarity index 100% rename from src/reddit/bot.py rename to src/reddit_bot/bot.py diff --git a/tests/conftest.py b/tests/conftest.py index f732902..9905c86 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -13,7 +13,7 @@ dotenv.load_dotenv(override=False) # environment secrets take priority over .env file # import after env loaded -from src.discord import bot as d_bot # noqa: E402 +from src.discord_bot import bot as d_bot # noqa: E402 @pytest.fixture(scope='session') diff --git a/tests/unit/discord/test_tasks.py b/tests/unit/discord/test_tasks.py index 2f22b24..e3130d4 100644 --- a/tests/unit/discord/test_tasks.py +++ b/tests/unit/discord/test_tasks.py @@ -6,7 +6,7 @@ import pytest # local imports -from src.discord import tasks +from src.discord_bot import tasks def set_env_variable(env_var_name, request): @@ -98,7 +98,7 @@ async def test_daily_task(discord_bot, mocker, skip, set_daily_releases, set_dai THEN check that the task runs without error """ # Patch datetime.datetime at the location where it's imported in `tasks` - mock_datetime = mocker.patch('src.discord.tasks.datetime', autospec=True) + mock_datetime = mocker.patch('src.discord_bot.tasks.datetime', autospec=True) mock_datetime.now.return_value = datetime(2023, 1, 1, 1 if skip else 12, 0, 0, tzinfo=timezone.utc) # Run the daily task @@ -118,7 +118,7 @@ async def test_role_update_task(discord_bot, discord_db_users, mocker, skip): THEN check that the task runs without error """ # Patch datetime.datetime at the location where it's imported in `tasks` - mock_datetime = mocker.patch('src.discord.tasks.datetime', autospec=True) + mock_datetime = mocker.patch('src.discord_bot.tasks.datetime', autospec=True) mock_datetime.now.return_value = datetime(2023, 1, 1, 0, 1 if skip else 0, 0, tzinfo=timezone.utc) # Run the task diff --git a/tests/unit/reddit/test_reddit_bot.py b/tests/unit/reddit/test_reddit_bot.py index 07a38bc..45d4e01 100644 --- a/tests/unit/reddit/test_reddit_bot.py +++ b/tests/unit/reddit/test_reddit_bot.py @@ -17,7 +17,7 @@ import pytest # local imports -from src.reddit.bot import Bot +from src.reddit_bot.bot import Bot Betamax.register_serializer(PrettyJSONSerializer)