From 85c7aeb3b6c797594ec2e77498042df6ba148e28 Mon Sep 17 00:00:00 2001
From: Interitio <cona@thewisewolf.dev>
Date: Sun, 8 Sep 2024 16:35:37 +1000
Subject: [PATCH] (nowdoing): Migrate to merged LionCog.

---
 src/modules/__init__.py          |  2 +-
 src/modules/nowdoing/__init__.py |  5 ++---
 src/modules/nowdoing/cog.py      | 31 ++++++++++++++++---------------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/modules/__init__.py b/src/modules/__init__.py
index b69e5289..83d889d8 100644
--- a/src/modules/__init__.py
+++ b/src/modules/__init__.py
@@ -27,10 +27,10 @@ active_discord = [
     '.streamalerts',
     '.test',
     '.counters',
+    '.nowdoing',
 ]
 
 active_twitch = [
-    '.nowdoing',
     '.shoutouts',
     '.tagstrings',
 ]
diff --git a/src/modules/nowdoing/__init__.py b/src/modules/nowdoing/__init__.py
index a2fad715..a0db8411 100644
--- a/src/modules/nowdoing/__init__.py
+++ b/src/modules/nowdoing/__init__.py
@@ -4,6 +4,5 @@ logger = logging.getLogger(__name__)
 
 from .cog import NowDoingCog
 
-def prepare(bot):
-    logger.info("Preparing the nowdoing module.")
-    bot.add_cog(NowDoingCog(bot))
+async def setup(bot):
+    await bot.add_cog(NowDoingCog(bot))
diff --git a/src/modules/nowdoing/cog.py b/src/modules/nowdoing/cog.py
index 068b16b9..19b12283 100644
--- a/src/modules/nowdoing/cog.py
+++ b/src/modules/nowdoing/cog.py
@@ -8,7 +8,8 @@ from attr import dataclass
 import twitchio
 from twitchio.ext import commands
 
-from meta import CrocBot
+from meta import CrocBot, LionCog
+from meta.LionBot import LionBot
 from meta.sockets import Channel, register_channel
 from utils.lib import strfdelta, utc_now
 from . import logger
@@ -78,10 +79,11 @@ class NowDoingChannel(Channel):
         })
 
 
-class NowDoingCog(commands.Cog):
-    def __init__(self, bot: CrocBot):
+class NowDoingCog(LionCog):
+    def __init__(self, bot: LionBot):
         self.bot = bot
-        self.data = bot.data.load_registry(NowListData())
+        self.crocbot = bot.crocbot
+        self.data = bot.db.load_registry(NowListData())
         self.channel = NowDoingChannel(self)
         register_channel(self.channel.name, self.channel)
 
@@ -94,21 +96,19 @@ class NowDoingCog(commands.Cog):
         await self.data.init()
 
         await self.load_tasks()
+
+        self._load_twitch_methods(self.crocbot)
         self.loaded.set()
 
-    async def ensure_loaded(self):
-        """
-        Hack because lib devs decided to remove async cog loading.
-        """
-        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_unload(self):
+        self.loaded.clear()
+        self.tasks.clear()
+        self._unload_twitch_methods(self.crocbot)
 
     async def cog_check(self, ctx):
-        await self.ensure_loaded()
+        if not self.loaded.is_set():
+            await ctx.reply("Tasklists are still loading! Please wait a moment~")
+            return False
         return True
 
     async def load_tasks(self):
@@ -130,6 +130,7 @@ class NowDoingCog(commands.Cog):
     @commands.command(aliases=['task', 'check'])
     async def now(self, ctx: commands.Context, *, args: Optional[str] = None):
         userid = int(ctx.author.id)
+        args = args.strip() if args else None
         if args:
             await self.data.Task.table.delete_where(userid=userid)
             task = await self.data.Task.create(