Merge disc and twitchio Cogs.

src/modules/__init__.py

@@ -26,12 +26,12 @@ active_discord = [
     '.premium',
     '.streamalerts',
     '.test',
+    '.counters',
 ]
 
 active_twitch = [
     '.nowdoing',
     '.shoutouts',
-    '.counters',
     '.tagstrings',
 ]
 

src/modules/counters/__init__.py

@@ -4,10 +4,5 @@ logger = logging.getLogger(__name__)
 
 from .cog import CounterCog
 
-def prepare(bot):
-    bot.add_cog(CounterCog(bot))
-
 async def setup(bot):
-    from .lion_cog import CounterCog
-
     await bot.add_cog(CounterCog(bot))

src/modules/counters/cog.py

@@ -3,11 +3,14 @@ from enum import Enum
 from typing import Optional
 from datetime import timedelta
 
+import discord
+from discord.ext import commands as cmds
 import twitchio
 from twitchio.ext import commands
 
+
 from data.queries import ORDER
-from meta import CrocBot
+from meta import LionCog, LionBot, CrocBot
 from utils.lib import utc_now
 from . import logger
 from .data import CounterData
@@ -22,10 +25,11 @@ class PERIOD(Enum):
     YEAR = ('this year', 'y', 'year', 'yearly')
 
 
-class CounterCog(commands.Cog):
-    def __init__(self, bot: CrocBot):
+class CounterCog(LionCog):
+    def __init__(self, bot: LionBot):
         self.bot = bot
-        self.data = bot.data.load_registry(CounterData())
+        self.crocbot: CrocBot = bot.crocbot
+        self.data = bot.db.load_registry(CounterData())
 
         self.loaded = asyncio.Event()
 
@@ -33,9 +37,18 @@ class CounterCog(commands.Cog):
         self.counters = {}
 
     async def cog_load(self):
+        self._load_twitch_methods(self.crocbot)
+
         await self.data.init()
+        await self.load_counters()
         self.loaded.set()
 
+    async def cog_unload(self):
+        self._unload_twitch_methods(self.crocbot)
+
+    async def cog_check(self, ctx):
+        return True
+
     async def load_counters(self):
         """
         Initialise counter name cache.
@@ -46,18 +59,6 @@ class CounterCog(commands.Cog):
             f"Loaded {len(self.counters)} counters."
         )
 
-    async def ensure_loaded(self):
-        if not self.loaded.is_set():
-            await self.cog_load()
-
-    @commands.Cog.event('event_ready')  # type: ignore
-    async def on_ready(self):
-        await self.ensure_loaded()
-
-    async def cog_check(self, ctx):
-        await self.ensure_loaded()
-        return True
-
     # Counters API
 
     async def fetch_counter(self, counter: str) -> CounterData.Counter:
@@ -171,7 +172,7 @@ class CounterCog(commands.Cog):
         if period is PERIOD.ALL:
             start_time = None
         elif period is PERIOD.STREAM:
-            streams = await self.bot.fetch_streams(user_ids=[userid])
+            streams = await self.crocbot.fetch_streams(user_ids=[userid])
             if streams:
                 stream = streams[0]
                 start_time = stream.started_at
@@ -199,7 +200,7 @@ class CounterCog(commands.Cog):
         lb = await self.leaderboard(counter, start_time=start_time)
         if lb:
             userids = list(lb.keys())
-            users = await self.bot.fetch_users(ids=userids)
+            users = await self.crocbot.fetch_users(ids=userids)
             name_map = {user.id: user.display_name for user in users}
             parts = []
             for userid, total in lb.items():
@@ -283,17 +284,9 @@ class CounterCog(commands.Cog):
         await ctx.reply(await self.formatted_lb('water', args, int(user.id)))
 
     @commands.command()
-    async def reload(self, ctx: commands.Context, *, args: str = ''):
-        if not (ctx.author.is_mod or ctx.author.is_broadcaster):
-            return
-        if not args:
-            await ctx.reply("Full reload not implemented yet.")
-        else:
-            try:
-                self.bot.reload_module(args)
-            except Exception:
-                logger.exception("Failed to reload")
-                await ctx.reply("Failed to reload module! Check console~")
-            else:
-                await ctx.reply("Reloaded!")
+    async def stuff(self, ctx: commands.Context, *, args: str = ''):
+        await ctx.reply(f"Stuff {args}")
 
+    @cmds.hybrid_command('water')
+    async def d_water_cmd(self, ctx):
+        await ctx.reply(repr(ctx))

src/modules/counters/lion_cog.py

@@ -1,23 +0,0 @@
-import asyncio
-from typing import Optional
-
-import discord
-from discord.ext import commands as cmds
-from discord import app_commands as appcmds
-
-from meta import LionBot, LionCog, LionContext
-from meta.errors import UserInputError
-from meta.logger import log_wrap
-from utils.lib import utc_now
-from data.conditions import NULL
-
-from . import logger
-from .data import CounterData
-
-
-class CounterCog(LionCog):
-
-    def __init__(self, bot: LionBot):
-        self.bot = bot 
-
-        self.counter_cog = bot.crocbot.get_cog('CounterCog')