Fix a bunch of failed imports and types from previous changes

matchy.py

@@ -24,8 +24,8 @@ bot = commands.Bot(command_prefix='$',
 
 @bot.event
 async def setup_hook():
-    await bot.add_cog(matchy.cogs.matchy.Cog(bot, state))
-    await bot.add_cog(matchy.cogs.owner.Cog(bot, state))
+    await bot.add_cog(matchy.cogs.matchy.MatchyCog(bot, state))
+    await bot.add_cog(matchy.cogs.owner.OwnerCog(bot, state))
 
 
 @bot.event

matchy/cogs/matchy.py

@@ -8,15 +8,15 @@ from discord.ext import commands, tasks
 from datetime import datetime, timedelta, time
 
 import matchy.views.match as match
-import matching
+import matchy.matching as matching
 from matchy.files.state import State, AuthScope
-import util
+import matchy.util as util
 
 logger = logging.getLogger("cog")
 logger.setLevel(logging.INFO)
 
 
-class Cog(commands.Cog):
+class MatchyCog(commands.Cog):
     def __init__(self, bot: commands.Bot, state: State):
         self.bot = bot
         self.state = state

matchy/cogs/owner.py

@@ -9,7 +9,7 @@ logger = logging.getLogger("owner")
 logger.setLevel(logging.INFO)
 
 
-class Cog(commands.Cog):
+class OwnerCog(commands.Cog):
     def __init__(self, bot: commands.Bot, state: State):
         self._bot = bot
         self._state = state

matchy/views/match.py

@@ -6,7 +6,7 @@ import discord
 import re
 
 import matchy.files.state as state
-import matching
+import matchy.matching as matching
 
 logger = logging.getLogger("match_button")
 logger.setLevel(logging.INFO)

tests/owner_cog_test.py

@@ -5,7 +5,7 @@ import pytest_asyncio
 import matchy.files.state as state
 import discord.ext.test as dpytest
 
-from matchy.cogs.owner import Cog
+from matchy.cogs.owner import OwnerCog
 
 # Primarily borrowing from https://dpytest.readthedocs.io/en/latest/tutorials/using_pytest.html
 # TODO: Test more somehow, though it seems like dpytest is pretty incomplete
@@ -20,7 +20,7 @@ async def bot():
     b = commands.Bot(command_prefix="$",
                      intents=intents)
     await b._async_setup_hook()
-    await b.add_cog(Cog(b, state.State(state._EMPTY_DICT)))
+    await b.add_cog(OwnerCog(b, state.State(state._EMPTY_DICT)))
     dpytest.configure(b)
     yield b
     await dpytest.empty_queue()