fix(twitch): Fix followage and whisper ctxvars.

data/customcmd.sql

@@ -13,7 +13,7 @@ CREATE TABLE customcmds(
   cooldown_bucket_dur INTEGER,
   permlevel INTEGER,
   maskperms BOOLEAN DEFAULT FALSE,
-  creatorid INTEGER NOT NULL REFERENCES profiles(profileid) ON DELETE CASCADE ON UPDATE CASCADE,
+  creatorid INTEGER NOT NULL REFERENCES user_profiles(profileid) ON DELETE CASCADE ON UPDATE CASCADE,
   description TEXT,
   docstring TEXT,
   created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
@@ -52,7 +52,6 @@ SELECT
   cmds.maskperms,
   cmds.creatorid,
   cmds.description,
-  cmds.description,
   cmds.docstring,
   cmds.created_at,
   cmds._timestamp,

twitch/client.py

@@ -54,6 +54,7 @@ class TwitchCmdClient(ExecClient):
                     alias=maybe_command,
                     used_prefix=prefix,
                     message=message,
+                    content=message.text,
                     initial_globals={
                         "author": CustomCmdUser(message.chatter),
                         "channel": CustomCmdUser(message.broadcaster),

twitch/component.py

@@ -5,16 +5,19 @@ from twitchio import PartialUser
 from twitchio.ext import commands as cmds
 
 from meta import Bot
-from twitch.client import TwitchCmdClient
 from utils.lib import utc_now
 
-from . import logger
 from ..customcmd.data import CustomCmd, CustomCmdData
 from ..customcmd.client import ExecClient
 from ..customcmd.parser import ExecContext
 
+from . import logger
+from .client import TwitchCmdClient
+
 # TODO: Make an alphacroc or croccyalpha client for testing
 # TODO: Fix the tracker not actually guarding the commands properly
+# TODO: Fix suffix of result not printing
+# TODO When command produces None don't stringify to 'None'
 
 
 class CustomCmdComponent(cmds.Component):
@@ -58,13 +61,16 @@ class CustomCmdComponent(cmds.Component):
 
         # Make sure the command parses (can't guarantee it runs, but at least it can parse)
         try:
-            await self.cmdclient.run_command(ExecContext(args=[], content=""), response)
+            await self.cmdclient.run_command(
+                ExecContext(alias="testing", args=[], content=""), response, dryrun=True
+            )
         except Exception:
             # TODO: Nicer errors for pinpointing problem
             await ctx.reply(f"Sorry, could not parse your command!")
             logger.info(
                 f"Failed to parse attempted customcmd '{response}'", exc_info=True
             )
+            return
 
         # If everything is good, add it to the table
         # TODO: Again, permission resolution

twitch/context.py

@@ -1,7 +1,7 @@
 import twitchio
 
 from meta import Bot
-from utils.lib import utc_now, strfdur
+from utils.lib import utc_now, strfdelta
 
 from ..customcmd.parser import ExecContext
 from ..customcmd.client import ExecClient
@@ -25,21 +25,21 @@ class CustomCmdUser:
         return self.user.display_name or self.user.name or self.user.id
 
     async def _exec_attr_whisper(self, ctx, message: str):
-        await self.user.send_whisper(to_user=self.user, message=message)
+        await ctx.bot.user.send_whisper(to_user=self.user, message=message)
 
-    async def _exec_attr_followage(self, ctx, channel: twitchio.PartialUser):
+    async def _exec_attr_followage(self, ctx, channel: "CustomCmdUser"):
         followed_at = None
-        query = await channel.fetch_followers(user=self.user)
+        query = await channel.user.fetch_followers(
+            user=self.user, token_for=ctx.bot.user
+        )
         async for follower in query.followers:
             followed_at = follower.followed_at
 
         if followed_at:
-            durstr = strfdur(utc_now() - followed_at)
-            resp = (
-                f"{self.user.mention} has been following {channel.mention} for {durstr}"
-            )
+            durstr = strfdelta(utc_now() - followed_at)
+            return durstr
         else:
-            return f"{self.user.mention} is not following {channel.mention}"
+            return None
 
     @classmethod
     def from_user(cls, user: twitchio.PartialUser):
@@ -59,7 +59,7 @@ class CustomContext(ExecContext):
         used_prefix: str,
         **kwargs,
     ):
-        super().__init__(**kwargs)
+        super().__init__(alias=alias, **kwargs)
         self.bot = bot
         self.message = message
         self.alias = alias

twitch/ctxvars.py

@@ -4,23 +4,28 @@ from typing import Optional
 
 stuff = {}
 
+
 def register_var(name: str | None = None):
     def wrapper(coro):
         varname = name or coro.__name__
         stuff[varname] = coro
         return coro
+
     return wrapper
 
 
-@register_var('random')
+@register_var("random")
 async def random_func(ctx, a: int, b: Optional[int] = None):
+    a = int(a)
+    b = int(b) if b is not None else None
     if b is not None:
         low, high = a, b
     else:
         low, high = 0, a
     return random.randint(low, high)
 
-@register_var('user')
+
+@register_var("user")
 async def user_func(ctx, userstr: int | str):
     """
     Attempt to turn the given userstr into a user.