refactor(bots): rename discord and reddit bots

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():

src/discord/bot.py → 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,
         )

src/discord/cogs/base_commands.py → 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):

src/discord/cogs/fun_commands.py → 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):

src/discord/cogs/support_commands.py → 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):

src/discord/tasks.py → 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)

src/discord/views.py → 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 @@
         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)
 

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')

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

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)