fix(counters): Fix alias creation not remove cmds.

data/schema.sql

@@ -287,14 +287,13 @@ CREATE TABLE tasklist(
   deleted_at TIMESTAMPTZ,
   completed_at TIMESTAMPTZ,
   created_at TIMESTAMPTZ,
-  last_updated_at TIMESTAMPTZ,
-  duration INTEGER
+  last_updated_at TIMESTAMPTZ
 );
 CREATE INDEX tasklist_users ON tasklist (userid);
 ALTER TABLE tasklist
   ADD CONSTRAINT fk_tasklist_users
   FOREIGN KEY (userid)
-  REFERENCES user_profiles (profileid)
+  REFERENCES user_config (userid)
   ON DELETE CASCADE
   NOT VALID;
 ALTER TABLE tasklist
@@ -318,20 +317,6 @@ CREATE TABLE tasklist_reward_history(
   reward_count INTEGER
 );
 CREATE INDEX tasklist_reward_history_users ON tasklist_reward_history (userid, reward_time);
-
-CREATE TABLE tasklist_current(
-  taskid INTEGER PRIMARY KEY REFERENCES tasklist (taskid) ON DELETE CASCADE ON UPDATE CASCADE,
-  started_at TIMESTAMPTZ NOT NULL
-);
-
-CREATE TABLE tasklist_planner(
-  taskid INTEGER PRIMARY KEY REFERENCES tasklist (taskid) ON DELETE CASCADE ON UPDATE CASCADE,
-  sortkey INTEGER
-);
-
-
-
-
 -- }}}
 
 -- Reminder data {{{

src/meta/LionBot.py

@@ -92,10 +92,6 @@ class LionBot(Bot):
     def core(self):
         return self.get_cog('CoreCog')
 
-    @property
-    def profiles(self):
-        return self.get_cog('ProfileCog')
-
     async def _handle_global_dispatch(self, event_name: str, *args, **kwargs):
         self.dispatch(event_name, *args, **kwargs)
 

src/meta/LionContext.py

@@ -13,8 +13,6 @@ if TYPE_CHECKING:
     from core.lion_member import LionMember
     from core.lion_user import LionUser
     from core.lion_guild import LionGuild
-    from modules.profiles.profile import UserProfile
-    from modules.profiles.community import Community
 
 
 logger = logging.getLogger(__name__)
@@ -56,8 +54,6 @@ class LionContext(Context['LionBot']):
     lguild: 'LionGuild'
     lmember: 'LionMember'
     alion: 'LionUser | LionMember'
-    profile: 'UserProfile'
-    community: 'Community'
 
     def __repr__(self):
         parts = {}

src/modules/counters/cog.py

@@ -5,12 +5,16 @@ from datetime import timedelta
 
 import discord
 from discord.ext import commands as cmds
+from discord import app_commands as appcmds
+
 import twitchio
 from twitchio.ext import commands
 
 
 from data.queries import ORDER
-from meta import LionCog, LionBot, CrocBot
+from meta import LionCog, LionBot, CrocBot, LionContext
+from modules.profiles.community import Community
+from modules.profiles.profile import UserProfile
 from utils.lib import utc_now
 from . import logger
 from .data import CounterData
@@ -25,6 +29,11 @@ class PERIOD(Enum):
     YEAR = ('this year', 'y', 'year', 'yearly')
 
 
+class ORIGIN(Enum):
+    DISCORD = 'discord'
+    TWITCH = 'twitch'
+
+
 def counter_cmd_factory(
     counter: str,
     response: str,
@@ -32,10 +41,16 @@ def counter_cmd_factory(
     context: Optional[str] = None
 ):
     context = context or f"cmd: {counter}"
-    async def counter_cmd(cog, ctx: commands.Context, *, args: Optional[str] = None):
-        userid = int(ctx.author.id)
-        channelid = int((await ctx.channel.user()).id)
-        period, start_time = await cog.parse_period(channelid, '', default=default_period)
+    async def counter_cmd(
+        cog,
+        ctx: commands.Context | LionContext,
+        origin: ORIGIN,
+        author: UserProfile,
+        community: Community,
+        args: Optional[str]
+    ):
+        userid = author.profileid
+        period, start_time = await cog.parse_period(community, '', default=default_period)
 
         args = (args or '').strip(" 󠀀 ")
         splits = args.split(maxsplit=1)
@@ -69,13 +84,25 @@ def counter_cmd_factory(
             )
         )
 
-    async def lb_cmd(cog, ctx: commands.Context, *, args: str = ''):
-        user = await ctx.channel.user()
-        await ctx.reply(await cog.formatted_lb(counter, args, int(user.id)))
+    async def lb_cmd(
+        cog,
+        ctx: commands.Context | LionContext,
+        origin: ORIGIN,
+        author: UserProfile,
+        community: Community,
+        args: Optional[str]
+    ):
+        await ctx.reply(await cog.formatted_lb(counter, args, community, origin))
 
-    async def undo_cmd(cog, ctx: commands.Context):
-        userid = int(ctx.author.id)
-        channelid = int((await ctx.channel.user()).id)
+    async def undo_cmd(
+        cog,
+        ctx: commands.Context | LionContext,
+        origin: ORIGIN,
+        author: UserProfile,
+        community: Community,
+        args: Optional[str]
+    ):
+        userid = author.profileid
         _counter = await cog.fetch_counter(counter)
         query = cog.data.CounterEntry.fetch_where(
             counterid=_counter.counterid,
@@ -113,6 +140,9 @@ class CounterCog(LionCog):
         await self.load_counters()
         self.loaded.set()
 
+        profiles = self.bot.get_cog('ProfileCog')
+        profiles.add_profile_migrator(self.migrate_profiles, name='counters')
+
     async def cog_unload(self):
         self._unload_twitch_methods(self.crocbot)
 
@@ -124,18 +154,49 @@ class CounterCog(LionCog):
                 counter.name,
                 row.response
             )
-            cmds = []
-            main_cmd = commands.command(name=row.name)(counter_cb)
-            cmds.append(main_cmd)
-            if row.lbname:
-                lb_cmd = commands.command(name=row.lbname)(lb_cb)
-                cmds.append(lb_cmd)
-            if row.undoname:
-                undo_cmd = commands.command(name=row.undoname)(undo_cb)
-                cmds.append(undo_cmd)
+            twitch_cmds = []
+            disc_cmds = []
+            twitch_cmds.append(
+                commands.command(
+                    name=row.name
+                )(self.twitch_callback(counter_cb))
+            )
+            disc_cmds.append(
+                cmds.hybrid_command(
+                    name=row.name
+                )(self.discord_callback(counter_cb))
+            )
 
-            for cmd in cmds:
+            if row.lbname:
+                twitch_cmds.append(
+                    commands.command(
+                        name=row.lbname
+                    )(self.twitch_callback(lb_cb))
+                )
+                disc_cmds.append(
+                    cmds.hybrid_command(
+                        name=row.lbname
+                    )(self.discord_callback(lb_cb))
+                )
+            if row.undoname:
+                twitch_cmds.append(
+                    commands.command(
+                        name=row.undoname
+                    )(self.twitch_callback(undo_cb))
+                )
+                disc_cmds.append(
+                    cmds.hybrid_command(
+                        name=row.undoname
+                    )(self.discord_callback(undo_cb))
+                )
+
+            for cmd in twitch_cmds:
                 self.add_twitch_command(self.crocbot, cmd)
+            for cmd in disc_cmds:
+                # cmd.cog = self
+                self.bot.remove_command(cmd.name)
+                self.bot.add_command(cmd)
+                print(f"Adding command: {cmd}")
 
         logger.info(f"(Re)Loaded {len(rows)} counter commands!")
 
@@ -152,6 +213,87 @@ class CounterCog(LionCog):
             f"Loaded {len(self.counters)} counters."
         )
 
+    async def migrate_profiles(self, source_profile: UserProfile, target_profile: UserProfile):
+        """
+        Move source profile entries to target profile entries
+        """
+        results = ["(Counters)"]
+
+        rows = await self.data.CounterEntry.table.update_where(userid=source_profile.profileid).set(userid=target_profile.profileid)
+        if rows:
+            results.append(
+                f"Migrated {len(rows)} counter entries from source profile."
+            )
+        else:
+            results.append(
+                "No counter entries to migrate in source profile."
+            )
+
+        return ' '.join(results)
+
+    async def user_profile_migration(self):
+        """
+        Manual single-use migration method from the old userid format to the new profileid format.
+        """
+        async with self.bot.db.connection() as conn:
+            self.bot.db.conn = conn
+            async with conn.transaction():
+                entries = await self.data.CounterEntry.fetch_where()
+                for entry in entries:
+                    if entry.userid > 1000:
+                        # Assume userid is a twitch userid
+                        profile = await UserProfile.fetch_from_twitchid(self.bot, entry.userid)
+                        if not profile:
+                            # Need to create
+                            users = await self.crocbot.fetch_users(ids=[entry.userid])
+                            if not users:
+                                continue
+                            user = users[0]
+                            profile = await UserProfile.create_from_twitch(self.bot, user)
+                        await entry.update(userid=profile.profileid)
+        logger.info("Completed single-shot user profile migration")
+
+    # General API
+    def twitch_callback(self, callback):
+        """
+        Generate a Twitch command callback from the given general callback.
+
+        General callback must be of the form 
+        callback(cog, ctx: GeneralContext, origin: ORIGIN, author: Profile, comm: Community, args: Optional[str])
+
+        Return will be a command callback of the form
+        callback(cog, ctx: Context, *, args: Optional[str] = None)
+        """
+        async def command_callback(cog: CounterCog, ctx: commands.Context, *, args: Optional[str] = None):
+            profiles = cog.bot.get_cog('ProfileCog')
+            # Compute author profile
+            author = await profiles.fetch_profile_twitch(ctx.author)
+            # Compute community profile
+            community = await profiles.fetch_community_twitch(await ctx.channel.user())
+            return await callback(cog, ctx, ORIGIN.TWITCH, author, community, args)
+        return command_callback
+
+    def discord_callback(self, callback):
+        """
+        Generate a Discord command callback from the given general callback.
+
+        General callback must be of the form 
+        callback(cog, ctx: GeneralContext, origin: ORIGIN, author: Profile, comm: Community, args: Optional[str])
+
+        Return will be a command callback of the form
+        callback(cog, ctx: LionContext, *, args: Optional[str] = None)
+        """
+        cog = self
+        async def command_callback(ctx: LionContext, *, args: Optional[str] = None):
+            profiles = cog.bot.get_cog('ProfileCog')
+            # Compute author profile
+            author = await profiles.fetch_profile_discord(ctx.author)
+            # Compute community profile
+            community = await profiles.fetch_community_discord(ctx.guild)
+            return await callback(cog, ctx, ORIGIN.DISCORD, author, community, args)
+
+        return command_callback
+
     # Counters API
 
     async def fetch_counter(self, counter: str) -> CounterData.Counter:
@@ -218,6 +360,14 @@ class CounterCog(LionCog):
         results = await query
         return results[0]['counter_total'] if results else 0
 
+    # Manage commands
+    @commands.command()
+    async def countermigration(self, ctx: commands.Context, *, args: Optional[str]=None):
+        if not (ctx.author.is_mod or ctx.author.is_broadcaster):
+            return
+        await self.user_profile_migration()
+        await ctx.reply("Counter userid->profileid migration done.")
+
     # Counters commands
     @commands.command()
     async def counter(self, ctx: commands.Context, name: str, subcmd: Optional[str], *, args: Optional[str]=None):
@@ -225,6 +375,10 @@ class CounterCog(LionCog):
             return
 
         name = name.lower()
+        profiles = self.bot.get_cog('ProfileCog')
+        author = await profiles.fetch_profile_twitch(ctx.author)
+        userid = author.profileid
+        community = await profiles.fetch_community_twitch(await ctx.channel.user())
 
         if subcmd is None or subcmd == 'show':
             # Show
@@ -241,15 +395,14 @@ class CounterCog(LionCog):
                     return
             await self.add_to_counter(
                 name,
-                int(ctx.author.id),
+                userid,
                 value,
                 context='cmd: counter add'
             )
             total = await self.totals(name)
             await ctx.reply(f"'{name}' counter is now: {total}")
         elif subcmd == 'lb':
-            user = await ctx.channel.user()
-            lbstr = await self.formatted_lb(name, args or '', int(user.id))
+            lbstr = await self.formatted_lb(name, args or '', community)
             await ctx.reply(lbstr)
         elif subcmd == 'clear':
             await self.reset_counter(name)
@@ -292,7 +445,7 @@ class CounterCog(LionCog):
         else:
             await ctx.reply(f"Unrecognised subcommand {subcmd}. Supported subcommands: 'show', 'add', 'lb', 'clear', 'alias'.")
 
-    async def parse_period(self, userid: int, periodstr: str, default=PERIOD.STREAM):
+    async def parse_period(self, community: Community, periodstr: str, default=PERIOD.STREAM):
         if periodstr:
             period = next((period for period in PERIOD if periodstr.lower() in period.value), None)
             if period is None:
@@ -306,9 +459,13 @@ class CounterCog(LionCog):
         if period is PERIOD.ALL:
             start_time = None
         elif period is PERIOD.STREAM:
-            streams = await self.crocbot.fetch_streams(user_ids=[userid])
-            if streams:
-                stream = streams[0]
+            twitches = await community.twitch_channels()
+            stream = None
+            if twitches:
+                twitch = twitches[0]
+                streams = await self.crocbot.fetch_streams(user_ids=[int(twitch.channelid)])
+                stream = streams[0] if streams else None
+            if stream:
                 start_time = stream.started_at
             else:
                 period = PERIOD.ALL
@@ -327,21 +484,33 @@ class CounterCog(LionCog):
 
         return (period, start_time)
 
-    async def formatted_lb(self, counter: str, periodstr: str, channelid: int):
+    async def formatted_lb(
+            self,
+            counter: str,
+            periodstr: str,
+            community: Community,
+            origin: ORIGIN = ORIGIN.TWITCH
+        ):
 
-        period, start_time = await self.parse_period(channelid, periodstr)
+        period, start_time = await self.parse_period(community, periodstr)
 
         lb = await self.leaderboard(counter, start_time=start_time)
         if lb:
-            userids = list(lb.keys())
-            users = await self.crocbot.fetch_users(ids=userids)
-            name_map = {user.id: user.display_name for user in users}
+            name_map = {}
+            for userid in lb.keys():
+                profile = await UserProfile.fetch(self.bot, userid)
+                name = await profile.get_name()
+                name_map[userid] = name
+
             parts = []
-            for userid, total in lb.items():
+            items = list(lb.items())
+            prefix = 'top 10 ' if len(items) > 10 else ''
+            items = items[:10]
+            for userid, total in items:
                 name = name_map.get(userid, str(userid))
                 part = f"{name}: {total}"
                 parts.append(part)
             lbstr = '; '.join(parts)
-            return f"{counter} {period.value[-1]} leaderboard --- {lbstr}"
+            return f"{counter} {period.value[-1]} {prefix}leaderboard --- {lbstr}"
         else:
             return f"{counter} {period.value[-1]} leaderboard is empty!"

src/modules/nowdoing/cog.py

@@ -202,7 +202,7 @@ class NowDoingCog(LionCog):
             await self.data.Task.table.delete_where(userid=userid)
             task = await self.data.Task.create(
                 userid=userid,
-                name=ctx.author.display_name,
+                name=await profile.get_name(),
                 task=args,
                 started_at=existing.started_at if (existing and edit) else utc_now(),
             )
@@ -272,7 +272,7 @@ class NowDoingCog(LionCog):
             await self.data.Task.table.delete_where(userid=userid)
             task = await self.data.Task.create(
                 userid=userid,
-                name=ctx.author.display_name,
+                name=await profile.get_name(),
                 task=args,
                 started_at=utc_now(),
             )

src/modules/profiles/cog.py

@@ -40,17 +40,6 @@ class ProfileCog(LionCog):
     async def cog_check(self, ctx):
         return True
 
-    async def bot_check_once(self, ctx: LionContext):
-        """
-        Inject the contextual UserProfile and Community into the LionContext.
-
-        Creates the profile and community if they do not exist.
-        """
-        if ctx.guild:
-            ctx.community = await self.fetch_community_discord(ctx.guild)
-        ctx.profile = await self.fetch_profile_discord(ctx.author)
-        return True
-
     # Profile API
     def add_profile_migrator(self, migrator, name=None):
         name = name or migrator.__name__

src/modules/profiles/profile.py

@@ -31,6 +31,30 @@ class UserProfile:
     def __repr__(self):
         return f"<UserProfile profileid={self.profileid} profile={self.profile_row}>"
 
+    async def get_name(self):
+        # TODO: Store a preferred name in the profile preferences
+        # TODO Should have a multi-fetch system
+        name = None
+        twitches = await self.twitch_accounts()
+        if twitches:
+            users = await self.bot.crocbot.fetch_users(
+                    ids=[int(twitch.userid) for twitch in twitches]
+            )
+            if users:
+                user = users[0]
+                name = user.display_name
+
+        if not name:
+            discords = await self.discord_accounts()
+            if discords:
+                user = await self.bot.fetch_user(discords[0].userid)
+                name = user.display_name
+
+        if not name:
+            name = 'Unknown'
+
+        return name
+
     async def attach_discord(self, user: discord.User | discord.Member):
         """
         Attach a new discord user to this profile.

src/modules/tasklist/cog.py

@@ -7,12 +7,9 @@ from discord.ext import commands as cmds
 from discord import app_commands as appcmds
 from discord.app_commands.transformers import AppCommandOptionType as cmdopt
 
-from data.queries import JOINTYPE
 from meta import LionBot, LionCog, LionContext
-from meta.CrocBot import CrocBot
 from meta.logger import log_wrap
 from meta.errors import UserInputError
-from modules.profiles.profile import UserProfile
 from utils.lib import utc_now, error_embed
 from utils.ui import ChoicedEnum, Transformed, AButton
 
@@ -129,7 +126,6 @@ class TasklistCog(LionCog):
 
     def __init__(self, bot: LionBot):
         self.bot = bot
-        self.crocbot: CrocBot = bot.crocbot
         self.data = bot.db.load_registry(TasklistData())
         self.babel = babel
         self.settings = TasklistSettings()
@@ -142,84 +138,10 @@ class TasklistCog(LionCog):
         self.bot.core.guild_config.register_model_setting(self.settings.task_reward_limit)
         self.bot.add_view(TasklistCaller(self.bot))
 
-        self.bot.profiles.add_profile_migrator(self.migrate_profiles, name='tasklist-migrator')
-
         configcog = self.bot.get_cog('ConfigCog')
         self.crossload_group(self.configure_group, configcog.config_group)
 
-        self._load_twitch_methods(self.crocbot)
-
-    async def cog_unload(self):
-        self.live_tasklists.clear()
-        if profiles := self.bot.get_cog('ProfileCog'):
-            profiles.del_profile_migrator('tasklist-migrator')
-        self._unload_twitch_methods(self.crocbot)
-
-    @log_wrap(action="Tasklist Profile Migration")
-    async def migrate_profiles(self, source_profile: UserProfile, target_profile: UserProfile):
-        """
-        Re-assign all tasklist tasks from source profile to target profile.
-        TODO: Probably wants some elegant handling of the cached or running tasklists.
-        """
-        results = ["(Tasklist)"]
-        sourceid = source_profile.profileid
-        targetid = target_profile.profileid
-        updated = await self.data.Task.table.update_where(userid=sourceid).set(userid=targetid)
-        if updated:
-            results.append(
-                f"Migrated {len(updated)} task row(s) from source profile."
-            )
-            for channel_lists in self.live_tasklists.get(sourceid, []):
-                for tasklist in list(channel_lists.values()):
-                    await tasklist.close()
-            self.bot.dispatch('tasklist_update', profileid=targetid, summon=False)
-        else:
-            results.append(
-                "No tasks found in source profile, nothing to migrate!"
-            )
-
-        return ' '.join(results)
-
-    async def user_profile_migration(self):
-        """
-        Manual one-shot migration method from old Discord userids to the new profileids.
-        """
-        # First collect all the distinct userids from the tasklist
-        # Then create a map of userids to profileids, creating the profiles if required
-        # Then do updates, we can just inefficiently do updates on each distinct userid
-        # As long as the userids and profileids never overlap, this is fine. Fine for a one-shot
-
-        # Extract all the userids that exist in the table
-        rows = await self.data.Task.table.select_where().select(
-            userid="DISTINCT(userid)"
-        ).with_no_adapter()
-
-        # Fetch or create discord user profiles for them
-        profile_map = {}
-        for row in rows:
-            userid = row['userid']
-            if userid > 100000:
-                # Assume a Discord snowflake
-                profile = await UserProfile.fetch_from_discordid(self.bot, userid)
-
-                if not profile:
-                    try:
-                        user = self.bot.get_user(userid)
-                        if user is None:
-                            user = await self.bot.fetch_user(userid)
-                    except discord.HTTPException:
-                        logger.info(f"Skipping user {userid}")
-                        continue
-                    profile = await UserProfile.create_from_discord(self.bot, user)
-                profile_map[userid] = profile
-
-        # Now iterate through
-        for userid, profile in profile_map.items():
-            logger.info(f"Migrating userid {userid} to profile {profile}")
-            await self.data.Task.table.update_where(userid=userid).set(userid=profile.profileid)
-
-    # Temporarily disabling integration with userid driven Economy
-    # @LionCog.listener('on_tasks_completed')
+    @LionCog.listener('on_tasks_completed')
     @log_wrap(action="reward tasks completed")
     async def reward_tasks_completed(self, member: discord.Member, *taskids: int):
         async with self.bot.db.connection() as conn:
@@ -248,9 +170,6 @@ class TasklistCog(LionCog):
                         )
 
     async def is_tasklist_channel(self, channel) -> bool:
-        """
-        Check whether a given Discord channel is a tasklist channel
-        """
         if not channel.guild:
             return True
         channels = (await self.settings.tasklist_channels.get(channel.guild.id)).value
@@ -267,16 +186,12 @@ class TasklistCog(LionCog):
         return (channel in channels) or (channel.id in private_channels) or (channel.category in channels)
 
     async def call_tasklist(self, interaction: discord.Interaction):
-        """
-        Given a Discord channel interaction, summon the interacting user's tasklist.
-        """
         await interaction.response.defer(thinking=True, ephemeral=True)
         channel = interaction.channel
         guild = channel.guild
-        profile = await self.bot.profiles.fetch_profile_discord(interaction.user)
-        profileid = profile.profileid
+        userid = interaction.user.id
 
-        tasklist = await Tasklist.fetch(self.bot, self.data, profileid)
+        tasklist = await Tasklist.fetch(self.bot, self.data, userid)
 
         if await self.is_tasklist_channel(channel):
             # Check we have permissions to send a regular message here
@@ -298,7 +213,7 @@ class TasklistCog(LionCog):
                 )
                 await interaction.edit_original_response(embed=error)
             else:
-                tasklistui = TasklistUI.fetch(tasklist, channel, guild, caller=interaction.user, timeout=None)
+                tasklistui = TasklistUI.fetch(tasklist, channel, guild, timeout=None)
                 await tasklistui.summon(force=True)
                 await interaction.delete_original_response()
         else:
@@ -307,14 +222,14 @@ class TasklistCog(LionCog):
             await tasklistui.run(interaction)
 
     @LionCog.listener('on_tasklist_update')
-    async def update_listening_tasklists(self, profileid, channel=None, summon=True):
+    async def update_listening_tasklists(self, userid, channel=None, summon=True):
         """
         Propagate a tasklist update to all persistent tasklist UIs for this user.
 
         If channel is given, also summons the UI if the channel is a tasklist channel.
         """
         # Do the given channel first, and summon if requested
-        if channel and (tui := TasklistUI._live_[profileid].get(channel.id, None)) is not None:
+        if channel and (tui := TasklistUI._live_[userid].get(channel.id, None)) is not None:
             try:
                 if summon and await self.is_tasklist_channel(channel):
                     await tui.summon()
@@ -325,7 +240,7 @@ class TasklistCog(LionCog):
                 await tui.close()
 
         # Now do the rest of the listening channels
-        listening = TasklistUI._live_[profileid]
+        listening = TasklistUI._live_[userid]
         for cid, ui in list(listening.items()):
             if channel and channel.id == cid:
                 # We already did this channel
@@ -360,7 +275,7 @@ class TasklistCog(LionCog):
     async def tasklist_group(self, ctx: LionContext):
         raise NotImplementedError
 
-    async def _task_acmpl(self, profileid: int, partial: str, multi=False) -> list[appcmds.Choice]:
+    async def _task_acmpl(self, userid: int, partial: str, multi=False) -> list[appcmds.Choice]:
         """
         Generate a list of task Choices matching a given partial string.
 
@@ -369,7 +284,7 @@ class TasklistCog(LionCog):
         t = self.bot.translator.t
 
         # Should usually be cached, so this won't trigger repetitive db access
-        tasklist = await Tasklist.fetch(self.bot, self.data, profileid)
+        tasklist = await Tasklist.fetch(self.bot, self.data, userid)
 
         # Special case for an empty tasklist
         if not tasklist.tasklist:
@@ -477,17 +392,13 @@ class TasklistCog(LionCog):
         """
         Shared autocomplete for single task parameters.
         """
-        profile = await self.bot.profiles.fetch_profile_discord(interaction.user)
-        profileid = profile.profileid
-        return await self._task_acmpl(profileid, partial, multi=False)
+        return await self._task_acmpl(interaction.user.id, partial, multi=False)
 
     async def tasks_acmpl(self, interaction: discord.Interaction, partial: str) -> list[appcmds.Choice]:
         """
         Shared autocomplete for multiple task parameters.
         """
-        profile = await self.bot.profiles.fetch_profile_discord(interaction.user)
-        profileid = profile.profileid
-        return await self._task_acmpl(profileid, partial, multi=True)
+        return await self._task_acmpl(interaction.user.id, partial, multi=True)
 
     @tasklist_group.command(
         name=_p('cmd:tasks_new', "new"),
@@ -511,7 +422,7 @@ class TasklistCog(LionCog):
         if not ctx.interaction:
             return
 
-        tasklist = await Tasklist.fetch(self.bot, self.data, ctx.profile.profileid)
+        tasklist = await Tasklist.fetch(self.bot, self.data, ctx.author.id)
         await ctx.interaction.response.defer(thinking=True, ephemeral=True)
 
         # Fetch parent task if required
@@ -542,9 +453,9 @@ class TasklistCog(LionCog):
         )
         await ctx.interaction.edit_original_response(
             embed=embed,
-            view=None if ctx.channel.id in TasklistUI._live_[ctx.profile.profileid] else TasklistCaller(self.bot)
+            view=None if ctx.channel.id in TasklistUI._live_[ctx.author.id] else TasklistCaller(self.bot)
         )
-        self.bot.dispatch('tasklist_update', profileid=ctx.profile.profileid, channel=ctx.channel)
+        self.bot.dispatch('tasklist_update', userid=ctx.author.id, channel=ctx.channel)
 
     tasklist_new_cmd.autocomplete('parent')(task_acmpl)
 
@@ -612,7 +523,7 @@ class TasklistCog(LionCog):
             raise UserInputError(error)
 
         # Contents successfully parsed, update the tasklist.
-        tasklist = await Tasklist.fetch(self.bot, self.data, ctx.profile.profileid)
+        tasklist = await Tasklist.fetch(self.bot, self.data, ctx.author.id)
 
         taskinfo = tasklist.parse_tasklist(lines)
 
@@ -661,9 +572,9 @@ class TasklistCog(LionCog):
         )
         await ctx.interaction.edit_original_response(
             embed=embed,
-            view=None if ctx.channel.id in TasklistUI._live_[ctx.profile.profileid] else TasklistCaller(self.bot)
+            view=None if ctx.channel.id in TasklistUI._live_[ctx.author.id] else TasklistCaller(self.bot)
         )
-        self.bot.dispatch('tasklist_update', profileid=ctx.profile.profileid, channel=ctx.channel)
+        self.bot.dispatch('tasklist_update', userid=ctx.author.id, channel=ctx.channel)
 
     @tasklist_group.command(
         name=_p('cmd:tasks_edit', "edit"),
@@ -689,7 +600,7 @@ class TasklistCog(LionCog):
         t = self.bot.translator.t
         if not ctx.interaction:
             return
-        tasklist = await Tasklist.fetch(self.bot, self.data, ctx.profile.profileid)
+        tasklist = await Tasklist.fetch(self.bot, self.data, ctx.author.id)
 
         # Fetch task to edit
         tid = tasklist.parse_label(taskstr) if taskstr else None
@@ -740,12 +651,12 @@ class TasklistCog(LionCog):
             await interaction.response.send_message(
                 embed=embed,
                 view=(
-                    discord.utils.MISSING if ctx.channel.id in TasklistUI._live_[ctx.profile.profileid]
+                    discord.utils.MISSING if ctx.channel.id in TasklistUI._live_[ctx.author.id]
                     else TasklistCaller(self.bot)
                 ),
                 ephemeral=True
             )
-            self.bot.dispatch('tasklist_update', profileid=ctx.profile.profileid, channel=ctx.channel)
+            self.bot.dispatch('tasklist_update', userid=ctx.author.id, channel=ctx.channel)
 
         if new_content or new_parent:
             # Manual edit route
@@ -777,17 +688,17 @@ class TasklistCog(LionCog):
     async def tasklist_clear_cmd(self, ctx: LionContext):
         t = ctx.bot.translator.t
 
-        tasklist = await Tasklist.fetch(self.bot, self.data, ctx.profile.profileid)
+        tasklist = await Tasklist.fetch(self.bot, self.data, ctx.author.id)
         await tasklist.update_tasklist(deleted_at=utc_now())
         await ctx.reply(
             t(_p(
                 'cmd:tasks_clear|resp:success',
                 "Your tasklist has been cleared."
             )),
-            view=None if ctx.channel.id in TasklistUI._live_[ctx.profile.profileid] else TasklistCaller(self.bot),
+            view=None if ctx.channel.id in TasklistUI._live_[ctx.author.id] else TasklistCaller(self.bot),
             ephemeral=True
         )
-        self.bot.dispatch('tasklist_update', profileid=ctx.profile.profileid, channel=ctx.channel)
+        self.bot.dispatch('tasklist_update', userid=ctx.author.id, channel=ctx.channel)
 
     @tasklist_group.command(
         name=_p('cmd:tasks_remove', "remove"),
@@ -837,7 +748,7 @@ class TasklistCog(LionCog):
 
         await ctx.interaction.response.defer(thinking=True, ephemeral=True)
 
-        tasklist = await Tasklist.fetch(self.bot, self.data, ctx.profile.profileid)
+        tasklist = await Tasklist.fetch(self.bot, self.data, ctx.author.id)
 
         conditions = []
         if taskidstr:
@@ -873,7 +784,7 @@ class TasklistCog(LionCog):
         elif completed is False:
             conditions.append(self.data.Task.completed_at == NULL)
 
-        tasks = await self.data.Task.fetch_where(*conditions, userid=ctx.profile.profileid)
+        tasks = await self.data.Task.fetch_where(*conditions, userid=ctx.author.id)
         if not tasks:
             await ctx.interaction.edit_original_response(
                 embed=error_embed(t(_p(
@@ -902,9 +813,9 @@ class TasklistCog(LionCog):
         )
         await ctx.interaction.edit_original_response(
             embed=embed,
-            view=None if ctx.channel.id in TasklistUI._live_[ctx.profile.profileid] else TasklistCaller(self.bot)
+            view=None if ctx.channel.id in TasklistUI._live_[ctx.author.id] else TasklistCaller(self.bot)
         )
-        self.bot.dispatch('tasklist_update', profileid=ctx.profile.profileid, channel=ctx.channel)
+        self.bot.dispatch('tasklist_update', userid=ctx.author.id, channel=ctx.channel)
 
     tasklist_remove_cmd.autocomplete('taskidstr')(tasks_acmpl)
 
@@ -933,7 +844,7 @@ class TasklistCog(LionCog):
 
         await ctx.interaction.response.defer(thinking=True, ephemeral=True)
 
-        tasklist = await Tasklist.fetch(self.bot, self.data, ctx.profile.profileid)
+        tasklist = await Tasklist.fetch(self.bot, self.data, ctx.author.id)
 
         try:
             taskids = tasklist.parse_labels(taskidstr)
@@ -978,9 +889,9 @@ class TasklistCog(LionCog):
         )
         await ctx.interaction.edit_original_response(
             embed=embed,
-            view=None if ctx.channel.id in TasklistUI._live_[ctx.profile.profileid] else TasklistCaller(self.bot)
+            view=None if ctx.channel.id in TasklistUI._live_[ctx.author.id] else TasklistCaller(self.bot)
         )
-        self.bot.dispatch('tasklist_update', profileid=ctx.profile.profileid, channel=ctx.channel)
+        self.bot.dispatch('tasklist_update', userid=ctx.author.id, channel=ctx.channel)
 
     tasklist_tick_cmd.autocomplete('taskidstr')(tasks_acmpl)
 
@@ -1009,7 +920,7 @@ class TasklistCog(LionCog):
 
         await ctx.interaction.response.defer(thinking=True, ephemeral=True)
 
-        tasklist = await Tasklist.fetch(self.bot, self.data, ctx.profile.profileid)
+        tasklist = await Tasklist.fetch(self.bot, self.data, ctx.author.id)
 
         try:
             taskids = tasklist.parse_labels(taskidstr)
@@ -1051,9 +962,9 @@ class TasklistCog(LionCog):
         )
         await ctx.interaction.edit_original_response(
             embed=embed,
-            view=None if ctx.channel.id in TasklistUI._live_[ctx.profile.profileid] else TasklistCaller(self.bot)
+            view=None if ctx.channel.id in TasklistUI._live_[ctx.author.id] else TasklistCaller(self.bot)
         )
-        self.bot.dispatch('tasklist_update', profileid=ctx.profile.profileid, channel=ctx.channel)
+        self.bot.dispatch('tasklist_update', userid=ctx.author.id, channel=ctx.channel)
 
     tasklist_untick_cmd.autocomplete('taskidstr')(tasks_acmpl)
 

src/modules/tasklist/data.py

@@ -5,7 +5,6 @@ from data.columns import Integer, String, Timestamp, Bool
 
 
 class TasklistData(Registry):
-
     class Task(RowModel):
         """
         Row model describing a single task in a tasklist.
@@ -15,17 +14,21 @@ class TasklistData(Registry):
         CREATE TABLE tasklist(
           taskid SERIAL PRIMARY KEY,
           userid BIGINT NOT NULL REFERENCES user_config ON DELETE CASCADE,
-          profileid INTEGER NOT NULL REFERENCES user_profiles ON DELETE CASCADE ON UPDATE CASCADE,
           parentid INTEGER REFERENCES tasklist (taskid) ON DELETE SET NULL,
           content TEXT NOT NULL,
           rewarded BOOL DEFAULT FALSE,
           deleted_at TIMESTAMPTZ,
           completed_at TIMESTAMPTZ,
           created_at TIMESTAMPTZ,
-          duration INTEGER,
           last_updated_at TIMESTAMPTZ
         );
         CREATE INDEX tasklist_users ON tasklist (userid);
+
+        CREATE TABLE tasklist_channels(
+          guildid BIGINT NOT NULL REFERENCES guild_config (guildid) ON DELETE CASCADE,
+          channelid BIGINT NOT NULL
+        );
+        CREATE INDEX tasklist_channels_guilds ON tasklist_channels (guildid);
         """
         _tablename_ = "tasklist"
 
@@ -38,26 +41,5 @@ class TasklistData(Registry):
         created_at = Timestamp()
         deleted_at = Timestamp()
         last_updated_at = Timestamp()
-        duration = Integer()
 
-    """
-    Schema
-    ------
-
-    CREATE TABLE tasklist_channels(
-            guildid BIGINT NOT NULL REFERENCES guild_config (guildid) ON DELETE CASCADE,
-            channelid BIGINT NOT NULL
-            );
-    CREATE INDEX tasklist_channels_guilds ON tasklist_channels (guildid);
-    """
     channels = Table('tasklist_channels')
-
-    """
-    Schema
-    ------
-    CREATE TABLE current_tasks(
-        taskid PRIMARY KEY REFERENCES tasklist (taskid) ON DELETE CASCADE ON UPDATE CASCADE,
-        last_started_at TIMESTAMPTZ NOT NULL
-    );
-    """
-    current_tasks = Table('current_tasks')

src/modules/tasklist/migration.sql

@@ -1,23 +0,0 @@
-ALTER TABLE tasklist
-    DROP CONSTRAINT fk_tasklist_users;
-
-ALTER TABLE tasklist
-    ADD CONSTRAINT fk_tasklist_users
-    FOREIGN KEY (userid)
-    REFERENCES user_profiles (profileid)
-    ON DELETE CASCADE
-    ON UPDATE CASCADE
-NOT VALID;
-ALTER TABLE tasklist
-    ADD COLUMN duration INTEGER;
-
-    
-CREATE TABLE tasklist_current(
-  taskid INTEGER PRIMARY KEY REFERENCES tasklist (taskid) ON DELETE CASCADE ON UPDATE CASCADE,
-  started_at TIMESTAMPTZ NOT NULL
-);
-
-CREATE TABLE tasklist_planner(
-  taskid INTEGER PRIMARY KEY REFERENCES tasklist (taskid) ON DELETE CASCADE ON UPDATE CASCADE,
-  sortkey INTEGER
-);

src/modules/tasklist/ui.py

@@ -232,18 +232,13 @@ class TasklistUI(BasePager):
 
     def __init__(self,
                  tasklist: Tasklist,
-                 channel: discord.abc.Messageable,
-                 guild: Optional[discord.Guild] = None,
-                 caller: Optional[discord.User | discord.Member] = None,
-                 **kwargs):
+                 channel: discord.abc.Messageable, guild: Optional[discord.Guild] = None, **kwargs):
         kwargs.setdefault('timeout', 600)
         super().__init__(**kwargs)
 
         self.bot = tasklist.bot
         self.tasklist = tasklist
         self.labelled = tasklist.labelled
-        self.caller = caller
-        # NOTE: This is now a profiled
         self.userid = tasklist.userid
         self.channel = channel
         self.guild = guild
@@ -454,10 +449,9 @@ class TasklistUI(BasePager):
                 cascade=True,
                 completed_at=utc_now()
             )
-            # TODO: Removed economy integration
-            # if self.guild:
-            #     if (member := self.guild.get_member(self.userid)):
-            #         self.bot.dispatch('tasks_completed', member, *(t.taskid for t in to_complete))
+            if self.guild:
+                if (member := self.guild.get_member(self.userid)):
+                    self.bot.dispatch('tasks_completed', member, *(t.taskid for t in to_complete))
         if to_uncomplete:
             await self.tasklist.update_tasks(
                 *(t.taskid for t in to_uncomplete),
@@ -481,7 +475,7 @@ class TasklistUI(BasePager):
             if shared_root:
                 self._subtree_root = labelled[shared_root].taskid
 
-        self.bot.dispatch('tasklist_update', profileid=self.userid, channel=self.channel, summon=False)
+        self.bot.dispatch('tasklist_update', userid=self.userid, channel=self.channel, summon=False)
 
     async def _delete_menu(self, interaction: discord.Interaction, selected: Select, subtree: bool):
         await interaction.response.defer()
@@ -492,7 +486,7 @@ class TasklistUI(BasePager):
                 cascade=True,
                 deleted_at=utc_now()
             )
-            self.bot.dispatch('tasklist_update', profileid=self.userid, channel=self.channel, summon=False)
+            self.bot.dispatch('tasklist_update', userid=self.userid, channel=self.channel, summon=False)
 
     async def _edit_menu(self, interaction: discord.Interaction, selected: Select, subtree: bool):
         if not selected.values:
@@ -519,7 +513,7 @@ class TasklistUI(BasePager):
                     self._last_parentid = new_parentid
                     if not subtree:
                         self._subtree_root = new_parentid
-                    self.bot.dispatch('tasklist_update', profileid=self.userid, channel=self.channel, summon=False)
+                    self.bot.dispatch('tasklist_update', userid=self.userid, channel=self.channel, summon=False)
 
             await interaction.response.send_modal(editor)
 
@@ -612,7 +606,7 @@ class TasklistUI(BasePager):
             self._subtree_root = pid
             await interaction.response.defer()
             await self.tasklist.create_task(new_task, parentid=pid)
-            self.bot.dispatch('tasklist_update', profileid=self.userid, channel=self.channel, summon=False)
+            self.bot.dispatch('tasklist_update', userid=self.userid, channel=self.channel, summon=False)
 
         await press.response.send_modal(editor)
 
@@ -673,7 +667,7 @@ class TasklistUI(BasePager):
 
         @editor.add_callback
         async def editor_callback(interaction: discord.Interaction):
-            self.bot.dispatch('tasklist_update', profileid=self.userid, channel=self.channel, summon=False)
+            self.bot.dispatch('tasklist_update', userid=self.userid, channel=self.channel, summon=False)
 
         if sum(len(line) for line in editor.lines.values()) + len(editor.lines) >= 4000:
             await press.response.send_message(
@@ -704,7 +698,7 @@ class TasklistUI(BasePager):
         await self.tasklist.update_tasklist(
             deleted_at=utc_now(),
         )
-        self.bot.dispatch('tasklist_update', profileid=self.userid, channel=self.channel, summon=False)
+        self.bot.dispatch('tasklist_update', userid=self.userid, channel=self.channel, summon=False)
 
     async def clear_button_refresh(self):
         self.clear_button.label = self.bot.translator.t(_p(
@@ -777,12 +771,11 @@ class TasklistUI(BasePager):
 
     # ----- UI Flow -----
     def access_check(self, userid):
-        return userid in (self.userid, self.caller.id if self.caller else None)
+        return userid == self.userid
 
     async def interaction_check(self, interaction: discord.Interaction):
         t = self.bot.translator.t
-        interaction_profile = await self.bot.profiles.fetch_profile_discord(interaction.user)
-        if not self.access_check(interaction_profile.profileid):
+        if not self.access_check(interaction.user.id):
             embed = discord.Embed(
                 description=t(_p(
                     'ui:tasklist|error:wrong_user',
@@ -819,7 +812,10 @@ class TasklistUI(BasePager):
         total = len(tasks)
         completed = sum(t.completed_at is not None for t in tasks)
 
-        user = self.caller
+        if self.guild:
+            user = self.guild.get_member(self.userid)
+        else:
+            user = self.bot.get_user(self.userid)
         user_name = user.name if user else str(self.userid)
         user_colour = user.colour if user else discord.Color.orange()