Adaptions for ppp event.

Fix several typos in event handler
Rewrite sub and resub event handlers to expect resub events
Add ppp alias to campaign command.
Add ppp test command for testing last sub calculator

data/pluscampaign-v1.sql

@@ -2,8 +2,10 @@ BEGIN;
 
 -- Version dependency checks
 DO $$
+  BEGIN
     ASSERT current_module_version('PROFILES') = 1, 'Dependency version mismatch: PROFILES';
     ASSERT current_module_version('EVENT_TRACKER') = 2, 'Dependency version mismatch: EVENT_TRACKER';
+  END;
 $$ LANGUAGE plpgsql;
 
 -- Plugin version history
@@ -36,9 +38,9 @@ CREATE TABLE campaign_rewards_earned(
   fulfilled_note TEXT,
   modnote TEXT,
   reference TEXT,
-  logged_messageid BIGINT,
+  log_messageid BIGINT,
   earned_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-  earned_reason TEXT NOT NULL,
+  earned_from TEXT NOT NULL,
   _timestamp TIMESTAMPTZ NOT NULL DEFAULT NOW()
 );
 

plugin/campaign.py

@@ -2,6 +2,8 @@ from typing import Any, Optional
 import datetime as dt
 from datetime import datetime, timedelta
 
+import aiohttp
+
 from data import ORDER, Condition
 from data.conditions import NULL, condition
 from utils.lib import utc_now
@@ -16,8 +18,9 @@ from . import logger
 
 
 class RewardCampaign:
-    def __init__(self, row: Campaign):
+    def __init__(self, row: Campaign, session: aiohttp.ClientSession | None = None):
         self.row = row
+        self._session = session
 
         self._webhook: ThreadedWebhook | None = None
         self._cached_webhookurl: str | None = None
@@ -33,7 +36,7 @@ class RewardCampaign:
             if url is not None:
                 # TODO: I don't know if these needs a client
                 # Might be hard if so given we need to run this from Twitch client as well
-                self._webhook = ThreadedWebhook.from_url(url)
+                self._webhook = ThreadedWebhook.from_url(url, session=self._session)
             else:
                 self._webhook = None
         return self._webhook
@@ -54,20 +57,22 @@ class RewardCampaign:
     async def add_reward(
         self,
         profileid: int,
-        earned_reason: str,
+        earned_from: str,
         event_id: Optional[int] = None,
         twitch_user_id: Optional[str] = None,
         twitch_user_name: Optional[str] = None,
         earned_at: Optional[datetime] = None,
+        **kwargs,
     ) -> EarnedReward:
         row = await EarnedReward.create(
             campaign_id=self.row.campaign_id,
             profileid=profileid,
-            earned_reason=earned_reason,
+            earned_from=earned_from,
             event_id=event_id,
             twitch_user_id=twitch_user_id,
             twitch_user_name=twitch_user_name,
             earned_at=earned_at or utc_now(),
+            **kwargs,
         )
         await self.try_to_log_reward(row)
 
@@ -82,14 +87,31 @@ class RewardCampaign:
             await reward.update(**kwargs)
             await self.try_to_log_reward(reward)
 
+    async def delete_reward(self, rewardid: int):
+        reward = await EarnedReward.fetch(rewardid)
+        if reward is None:
+            raise ValueError("Reward doesn't exist")
+        await self.try_to_unlog_reward(reward)
+        await reward.delete()
+
     async def get_rewards(self) -> list[EarnedReward]:
         rows = await EarnedReward.fetch_where(
             campaign_id=self.row.campaign_id
         ).order_by("earned_at", direction=ORDER.ASC)
         return rows
 
+    async def try_to_unlog_reward(self, reward: EarnedReward):
+        import discord
+
+        try:
+            if self.webhook and reward.log_messageid:
+                await self.webhook.delete_message(reward.log_messageid)
+        except discord.HTTPException:
+            pass
+
     async def try_to_log_reward(self, reward: EarnedReward):
         import discord
+
         if self.webhook:
             embed = await self._log_format_reward(reward)
             if reward.log_messageid:
@@ -104,7 +126,9 @@ class RewardCampaign:
                     await reward.update(log_messageid=message.id)
                 except discord.HTTPException:
                     # Couldn't send, give up.
-                    logger.warning(f"Failed to log campaign reward {reward!r}", exc_info=True)
+                    logger.warning(
+                        f"Failed to log campaign reward {reward!r}", exc_info=True
+                    )
 
     async def _log_format_reward(self, reward: EarnedReward):
         """
@@ -115,51 +139,46 @@ class RewardCampaign:
         embed = discord.Embed(
             title=f"Reward #{reward.earned_id} in {self.row.campaign_name}",
         )
+        embed.description = f"> {reward.earned_from}"
         # User Field
         embed.add_field(
             name="User Information",
             value=(
-                f"Twitch user `{reward.twitch_user_name or 'Unknown'}` `(ID: {reward.twitch_user_id or 'Unknown'})`.\n"
+                f"`{reward.twitch_user_name or 'Unknown'}`\n"
+                f"`ID: {reward.twitch_user_id or 'Unknown'}`.\n"
                 f"Internal ID `{reward.profileid}`"
             ),
-            inline=True
+            inline=True,
         )
 
         # Earning field
         embed.add_field(
             name="Reward Earned",
-            value=(
-                f"Earned campaign reward at {discord.utils.format_dt(reward.earned_at, 'F')}.\n"
-                f"Earned reason: '{reward.earned_from}'"
-            ),
-            inline=True
+            value=(f"{discord.utils.format_dt(reward.earned_at, 'F')}."),
+            inline=True,
         )
 
         # Reference field
         embed.add_field(
             name="Reference",
             value=reward.reference or "No Reference information saved.",
-            inline=False
+            inline=False,
         )
         # Modnote field
         embed.add_field(
-            name="Notes",
-            value=reward.modnote or "No notes added",
-            inline=False
+            name="Notes", value=reward.modnote or "No notes added", inline=False
         )
 
         # Fulfilled field
+        fluffed_emoji = "✅" if reward.fulfilled_at else "🔳"
         if reward.fulfilled_at is not None:
-            fluffed = f"Fluffed at {discord.utils.format_dt(reward.fulfilled_at, 'F')}"
+            fluffed = f"{fluffed_emoji} Fluffed at {discord.utils.format_dt(reward.fulfilled_at, 'F')}"
             if reward.fulfilled_note:
-                fluffed += '\n' + "Fluff Note: " + reward.fulfilled_note
+                fluffed += "\n" + "Fluff Note: " + reward.fulfilled_note
         else:
-            fluffed = "Not yet fluffed"
+            fluffed = f"{fluffed_emoji} Not yet fluffed"
 
-        embed.add_field(
-            name="Fulfilled",
-            value=fluffed
-        )
+        embed.add_field(name="Fulfilled", value=fluffed)
 
         embed.set_footer(text="Last Updated")
         embed.timestamp = utc_now()
@@ -170,8 +189,12 @@ class RewardCampaign:
 class CampaignRegistry:
     VERSION = CampaignData.VERSION
 
-    def __init__(self, data: CampaignData):
+    def __init__(
+        self, data: CampaignData, session: aiohttp.ClientSession | None = None
+    ):
         self.data = data
+        # TODO: Actually pass in a session
+        self._session = aiohttp.ClientSession()
 
     async def init(self):
         await self.data.init()
@@ -183,7 +206,7 @@ class CampaignRegistry:
         row = await Campaign.fetch(campaign_id)
         if row is None:
             raise ValueError("Campign %s doesn't exist." % campaign_id)
-        camp = RewardCampaign(row)
+        camp = RewardCampaign(row, session=self._session)
         return camp
 
     async def fetch_campaigns(
@@ -198,16 +221,18 @@ class CampaignRegistry:
         condition = Campaign.communityid == cid
 
         if active is not None:
-            active_condition = (
-                Campaign.started_at != NULL and Campaign.completed_at == NULL
+            active_condition = (Campaign.started_at != NULL) & (
+                Campaign.completed_at == NULL
             )
             if active:
-                condition = condition and active_condition
+                condition = condition & active_condition
             else:
-                condition = condition and ~active_condition
+                condition = condition & ~active_condition
 
-        rows = await Campaign.fetch_where(condition)
-        campaigns = [RewardCampaign(row) for row in rows]
+        rows = await Campaign.fetch_where(
+            condition,
+        )
+        campaigns = [RewardCampaign(row, session=self._session) for row in rows]
 
         return campaigns
 
@@ -221,39 +246,30 @@ class CampaignRegistry:
         """
         results = await Campaign.fetch_where(
             Condition._expression_equality(
-                LOWER(Campaign.campaign_name.expr), LOWER(asexpr(name))
+                LOWER(Campaign.campaign_name), LOWER(asexpr(name))
             ),
-            campaignid=cid,
+            communityid=cid,
         )
         if results:
             row = results[0]
-            camp = RewardCampaign(row)
+            camp = RewardCampaign(row, session=self._session)
         else:
             camp = None
         return camp
 
     async def create_campaign(
-        self,
-        cid: int,
-        campaign_name: str,
-        **kwargs
+        self, cid: int, campaign_name: str, **kwargs
     ) -> RewardCampaign:
         """
         Create a new campaign.
         The name must be unique (ignoring case) to facilitate easy lookup.
         """
         row = await Campaign.create(
-            communityid=cid,
-            campaign_name=campaign_name,
-            **kwargs
+            communityid=cid, campaign_name=campaign_name, **kwargs
         )
-        return RewardCampaign(row)
+        return RewardCampaign(row, session=self._session)
 
-    async def update_campaign(
-        self,
-        campaign_id: int,
-        **kwargs
-    ) -> RewardCampaign:
+    async def update_campaign(self, campaign_id: int, **kwargs) -> RewardCampaign:
         """
         Update a campaign with the given data args.
 
@@ -261,4 +277,4 @@ class CampaignRegistry:
         """
         campaign = await Campaign.fetch(campaign_id)
         await campaign.update(**kwargs)
-        return RewardCampaign(campaign)
+        return RewardCampaign(campaign, session=self._session)

plugin/discord/cog.py

@@ -1,11 +1,13 @@
 from typing import Optional
 import asyncio
 
+from aiohttp import client
 import discord
 from discord.ext import commands as cmds
 from discord import Forbidden, User, app_commands as appcmds
 
 from meta import LionBot, LionCog, LionContext
+from meta import logger
 from meta.errors import SafeCancellation, UserInputError
 from meta.logger import log_wrap
 from utils.lib import utc_now
@@ -78,6 +80,7 @@ class CampaignCog(LionCog):
         sorted_campaigns = sorted(
             campaigns,
             key=lambda camp: (camp.is_active, camp.row.started_at, camp.row.created_at),
+            reverse=True,
         )
         names = [
             camp.row.campaign_name
@@ -122,7 +125,9 @@ class CampaignCog(LionCog):
             return
 
         # Open campaign UI
-        widget = CampaignDashboard(bot=self.bot, campaign=campaign, callerid=ctx.author.id)
+        widget = CampaignDashboard(
+            bot=self.bot, campaign=campaign, callerid=ctx.author.id
+        )
         await widget.run(ctx.interaction)
         await widget.wait()
 
@@ -178,7 +183,7 @@ class CampaignCog(LionCog):
 
         # If logging webhook is given, check that it works
         if logging_webhook is not None:
-            webhook = ThreadedWebhook.from_url(logging_webhook)
+            webhook = ThreadedWebhook.from_url(logging_webhook, client=self.bot)
             try:
                 await webhook.test_webhook()
             except (discord.HTTPException, discord.Forbidden):
@@ -193,6 +198,7 @@ class CampaignCog(LionCog):
             moderator_role_id=moderator_role.id if moderator_role else None,
             logging_webhook_url=logging_webhook,
         )
+        await campaign.start()
 
         # Ack creation
         # TODO: Can also show dashboard
@@ -200,7 +206,9 @@ class CampaignCog(LionCog):
             f"Setup and started your reward campaign {campaign.row.campaign_name}! Good luck"
         )
         # Open campaign UI
-        widget = CampaignDashboard(bot=self.bot, campaign=campaign, callerid=ctx.author.id)
+        widget = CampaignDashboard(
+            bot=self.bot, campaign=campaign, callerid=ctx.author.id
+        )
         await widget.run(ctx.interaction)
         await widget.wait()
 
@@ -252,11 +260,11 @@ class CampaignCog(LionCog):
             update_args["campaign_name"] = new_name
 
         if new_cap is not None:
-            update_args["total_rewards"] = new_cap if new_cap > 0 else None
+            update_args["target_rewards"] = new_cap if new_cap > 0 else None
 
         # If logging webhook is given, check that it works
         if logging_webhook is not None:
-            webhook = ThreadedWebhook.from_url(logging_webhook)
+            webhook = ThreadedWebhook.from_url(logging_webhook, client=self.bot)
             try:
                 await webhook.test_webhook()
             except (discord.HTTPException, discord.Forbidden):
@@ -276,10 +284,7 @@ class CampaignCog(LionCog):
         )
 
         # Ack creation
-        # TODO: Can also show dashboard
-        await ctx.reply(
-            f"Setup and started your reward campaign {campaign.row.campaign_name}! Good luck"
-        )
+        await ctx.reply("Updated your campaign, good luck!", ephemeral=True)
 
     campaign_configure_cmd.autocomplete("campaign_name")(_campaign_acmpl)
 
@@ -315,14 +320,18 @@ class CampaignCog(LionCog):
     campaign_rewards_cmd.autocomplete("campaign_name")(_campaign_acmpl)
 
     @campaign_group.command(
-        name="editreward",
-        description="Add or edit details for a given reward in a campaign (see also /campaign rewards)",
+        name="delreward",
+        description="Remove a campaign reward",
     )
     @appcmds.describe(
-        rewardid="Earned reward to edit",
+        rewardid="Earned reward to delete",
     )
     @appcmds.rename(rewardid="reward")
-    async def campaign_editreward_cmd(self, ctx: LionContext, rewardid: str):
+    async def campaign_delreward_cmd(
+        self,
+        ctx: LionContext, 
+        rewardid: str,
+    ):
         # For this we'll just open the reward editor
         # Will need to identify the reward with autocomplete. Can use the reward id directly..
         if not rewardid.isdigit():
@@ -350,11 +359,84 @@ class CampaignCog(LionCog):
             )
             return
 
-        # Okay, this is our reward, and author has permission to modify it. Spin the modal.
-        modal = RewardEditor.from_reward(reward)
+        # Okay, they have permission, let's delete the reward.
+        await campaign.delete_reward(reward.earned_id)
 
+        # Ack
+        await ctx.reply(content="Campaign reward deleted!", ephemeral=True)
+
+
+    @campaign_group.command(
+        name="editreward",
+        description="Add or edit details for a given reward in a campaign (see also /campaign rewards)",
+    )
+    @appcmds.describe(
+        rewardid="Earned reward to edit",
+        fulfilled="Whether this reward has been completed or not.",
+        reference="Reference information for this reward, e.g. image or message URL",
+        notes="Any additional notes",
+    )
+    @appcmds.rename(rewardid="reward")
+    async def campaign_editreward_cmd(
+        self,
+        ctx: LionContext, 
+        rewardid: str,
+        fulfilled: Optional[bool] = None,
+        reference: Optional[str] = None, 
+        notes: Optional[str] = None
+    ):
+        # For this we'll just open the reward editor
+        # Will need to identify the reward with autocomplete. Can use the reward id directly..
+        if not rewardid.isdigit():
+            raise UserInputError(
+                "Please enter the reward number or select a reward from the argument menu"
+            )
+
+        reward = await EarnedReward.fetch(int(rewardid))
+        if not reward:
+            raise UserInputError(
+                "Reward not found. Please enter the reward number or select a reward from the argument menu"
+            )
+
+        # Fetch campaign and then do a perm check
+        campaign = await self.campaigns.fetch_campaign(reward.campaign_id)
+        if campaign is None:
+            raise SafeCancellation("Something went wrong.. please try again soon.")
+        if campaign.row.communityid != ctx.community.communityid:
+            raise UserInputError("This reward doesn't belong to this community!")
+
+        if not await self.campaign_modcheck(campaign, ctx.author):
+            await ctx.interaction.response.send_message(
+                "You need to be an administrator or have the configured modrole to use that!",
+                ephemeral=True,
+            )
+            return
+
+        # Okay, this is our reward, and author has permission to modify it.
         currently_fluffed = reward.fulfilled_at is not None
 
+        update_args = {}
+        if fulfilled is not None:
+            if fulfilled and not currently_fluffed:
+                # Reward has been fluffed
+                update_args["fulfilled_at"] = utc_now()
+            elif currently_fluffed and not fulfilled:
+                # Reward has been unfluffed
+                update_args["fulfilled_at"] = None
+        if reference is not None and reference != reward.reference:
+            update_args["reference"] = reference
+        if notes is not None and notes != reward.modnote:
+            update_args["modnote"] = notes
+
+        if update_args:
+            await ctx.interaction.response.defer(thinking=True, ephemeral=True)
+            await campaign.update_reward(reward.earned_id, **update_args)
+            await ctx.interaction.followup.send(
+                content="Reward updated!"
+            )
+        else:
+            modal = RewardEditor.from_reward(reward)
+
             @modal.submit_callback()
             async def on_editor_submit(interaction: discord.Interaction):
                 update_args = {}
@@ -366,11 +448,11 @@ class CampaignCog(LionCog):
                     # Reward has been unfluffed
                     update_args["fulfilled_at"] = None
 
-            new_ref_value = modal.reference.value or None
+                new_ref_value = modal.reference.component.value or None
                 if new_ref_value != reward.reference:
                     update_args["reference"] = new_ref_value
 
-            new_notes_value = modal.notes.value or None
+                new_notes_value = modal.notes.component.value or None
                 if new_notes_value != reward.modnote:
                     update_args["modnote"] = new_notes_value
 
@@ -383,6 +465,8 @@ class CampaignCog(LionCog):
                 else:
                     await interaction.response.defer(thinking=False)
 
+            await ctx.interaction.response.send_modal(modal)
+
     def _reward_acmpl_format(
         self, campaign: RewardCampaign, reward: EarnedReward
     ) -> str:
@@ -391,8 +475,13 @@ class CampaignCog(LionCog):
 
         #100: username in campaign
         """
-        ...
+        return "#{rewardid}: {username} in {cname}".format(
+            rewardid=reward.earned_id,
+            username=reward.twitch_user_name or reward.twitch_user_id or "Unknown",
+            cname=campaign.row.campaign_name,
+        )
 
+    @campaign_delreward_cmd.autocomplete("rewardid")
     @campaign_editreward_cmd.autocomplete("rewardid")
     async def _reward_acmpl(
         self, interaction: discord.Interaction, partial: str
@@ -418,6 +507,7 @@ class CampaignCog(LionCog):
         sorted_campaigns = sorted(
             campaigns,
             key=lambda camp: (camp.is_active, camp.row.started_at, camp.row.created_at),
+            reverse=True,
         )
         for campaign in sorted_campaigns:
             rewards = await campaign.get_rewards()

plugin/discord/ui/campaign.py

@@ -16,9 +16,8 @@ from meta import LionBot
 from meta.errors import UserInputError
 from meta.config import conf
 from utils.lib import tabulate, utc_now, MessageArgs, parse_duration
-from utils.ui import MessageUI, AButton, AsComponents, ConfigEditor
+from utils.ui import MessageUI
 from utils.ui.micros import FastModal
-from utils.ui.pagers import BasePager, Pager
 
 from ...campaign import RewardCampaign
 from ...data import EarnedReward
@@ -54,7 +53,7 @@ class CampaignDashboard(MessageUI):
         await widget.wait()
         self._slaves.remove(widget)
 
-    @button(emoji=conf.emojis.cancel, style=ButtonStyle.red)
+    @button(emoji=conf.emojis.cancel)
     async def quit_button(self, press: discord.Interaction, pressed: Button):
         """Close the UI and all children."""
         await press.response.defer(thinking=False)
@@ -101,31 +100,43 @@ class CampaignDashboard(MessageUI):
         table = {
             "Created at": discord.utils.format_dt(campaign.row.created_at, "F"),
             "Started at": started_at,
-            "Moderator Role": f"<&@{campaign.row.moderator_role_id}>" if campaign.row.moderator_role_id else "*Not Set*",
-            "Logging webhook": "*Set Up*" if campaign.row.logging_webhook_url else "*Not Set*",
+            "Moderator Role": f"<@&{campaign.row.moderator_role_id}>"
+            if campaign.row.moderator_role_id
+            else "*Not Set*",
+            "Logging webhook": "*Set Up*"
+            if campaign.row.logging_webhook_url
+            else "*Not Set*",
             "Rewards Earned": str(rewards_earned),
             "Rewards Cap": str(reward_cap),
         }
         if campaign.row.completed_at is not None:
-            table['Finished at'] = discord.utils.format_dt(campaign.row.completed_at, "F")
-        prop_table = '\n'.join(tabulate(*table.items())) 
+            table["Finished at"] = discord.utils.format_dt(
+                campaign.row.completed_at, "F"
+            )
+        prop_table = "\n".join(tabulate(*table.items()))
 
         embed.description = f"{description}\n\n{prop_table}"
 
         # Brief summary of rewards in columns. 12 per column. Empty titles?
         rewardrows = []
         for reward in all_rewards:
-            name = reward.twitch_user_name or str(reward.twitch_user_id) or str(reward.profileid)
+            name = (
+                reward.twitch_user_name
+                or str(reward.twitch_user_id)
+                or str(reward.profileid)
+            )
             fluffed = reward.fulfilled_at is not None
-            fluffed_emoji = '✅' if fluffed else '🔳'
+            fluffed_emoji = "✅" if fluffed else "🔳"
             rewardrows.append(f"{fluffed_emoji} {name}")
 
-        blocks = ['\n'.join(rewardrows[i:i+12]) for i in range(0, len(rewardrows), 12)]
+        blocks = [
+            "\n".join(rewardrows[i : i + 12]) for i in range(0, len(rewardrows), 12)
+        ]
 
         embed.add_field(
             name="Rewards Summary",
-            value=blocks[0] or 'No Rewards Earned',
-            inline=True
+            value=blocks[0] if blocks else "No Rewards Earned",
+            inline=True,
         )
         for block in blocks[1:]:
             embed.add_field(

plugin/discord/ui/rewards.py

@@ -29,15 +29,13 @@ class RewardEditor(FastModal):
     # Title is the reward we are editing
 
     # Block of text with dates and user info
-    blurb = discord.ui.TextDisplay(content='placeholder')
+    blurb = discord.ui.TextDisplay(content="placeholder")
 
     # Fulfilled is a checkbox, and supports a fulfilled note
     flufbox = discord.ui.Label(
         text="Fulfilled",
         description="Whether this reward has been completed",
-        component=discord.ui.Checkbox(
-            default=False
-        )
+        component=discord.ui.Checkbox(default=False),
     )
 
     # Reference and further notes need to be editable,
@@ -47,6 +45,7 @@ class RewardEditor(FastModal):
         description="Reference URL or other information",
         component=discord.ui.TextInput(
             style=discord.TextStyle.long,
+            required=False,
         ),
     )
     notes = discord.ui.Label(
@@ -54,6 +53,7 @@ class RewardEditor(FastModal):
         description="Further notes for this user/reward",
         component=discord.ui.TextInput(
             style=discord.TextStyle.long,
+            required=False,
         ),
     )
 
@@ -64,19 +64,18 @@ class RewardEditor(FastModal):
 
         # blurb
         table = {
-            'Earned At': discord.utils.format_dt(reward.earned_at, 'F'),
-            'Earned From': reward.earned_from,
+            "Earned At": discord.utils.format_dt(reward.earned_at, "F"),
+            "Earned From": reward.earned_from,
         }
-        prop_table = '\n'.join(tabulate(*table.items())) 
+        prop_table = "\n".join(tabulate(*table.items()))
         self.blurb.content = prop_table
 
-
         # Fulfilled
-        self.flufbox.component.default = (reward.fulfilled_at is not None)
+        self.flufbox.component.default = reward.fulfilled_at is not None
 
         # Notes
-        self.reference.component.default = reward.reference or ''
-        self.notes.component.default = reward.modnote or ''
+        self.reference.component.default = reward.reference or ""
+        self.notes.component.default = reward.modnote or ""
 
         return self
 
@@ -134,7 +133,7 @@ class RewardList(MessageUI):
             reward = next(r for r in self._rewards if r.earned_id == value)
             modal = RewardEditor.from_reward(reward)
 
-            currently_fluffed = (reward.fulfilled_at is not None)
+            currently_fluffed = reward.fulfilled_at is not None
 
             @modal.submit_callback()
             async def on_editor_submit(interaction: discord.Interaction):
@@ -142,18 +141,18 @@ class RewardList(MessageUI):
 
                 if modal.flufbox.component.value and not currently_fluffed:
                     # Reward has been fluffed
-                    update_args['fulfilled_at'] = utc_now()
+                    update_args["fulfilled_at"] = utc_now()
                 elif currently_fluffed and not modal.flufbox.component.value:
                     # Reward has been unfluffed
-                    update_args['fulfilled_at'] = None
+                    update_args["fulfilled_at"] = None
 
-                new_ref_value = modal.reference.value or None
+                new_ref_value = modal.reference.component.value or None
                 if new_ref_value != reward.reference:
-                    update_args['reference'] = new_ref_value
+                    update_args["reference"] = new_ref_value
 
-                new_notes_value = modal.notes.value or None
+                new_notes_value = modal.notes.component.value or None
                 if new_notes_value != reward.modnote:
-                    update_args['modnote'] = new_notes_value
+                    update_args["modnote"] = new_notes_value
 
                 if update_args:
                     await interaction.response.defer(thinking=True, ephemeral=True)
@@ -162,7 +161,6 @@ class RewardList(MessageUI):
                 else:
                     await interaction.response.defer(thinking=False)
 
-
             await selection.response.send_modal(modal)
 
             await self.refresh()
@@ -173,14 +171,10 @@ class RewardList(MessageUI):
         menu = self.reward_menu
         rewards = self.page
         if rewards:
-            menu.options = [
-                self._format_reward_option(r) for r in rewards
-            ]
+            menu.options = [self._format_reward_option(r) for r in rewards]
             menu.disabled = False
         else:
-            menu.options = [
-                SelectOption(label='DUMMY')
-            ]
+            menu.options = [SelectOption(label="DUMMY")]
             menu.disabled = True
 
     # Meta buttons
@@ -196,7 +190,7 @@ class RewardList(MessageUI):
         self.pagen -= 1
         await self.refresh()
 
-    @button(emoji=conf.emojis.cancel, style=ButtonStyle.red)
+    @button(emoji=conf.emojis.cancel)
     async def quit_button(self, press: discord.Interaction, pressed: Button):
         """Close the UI and all children."""
         await press.response.defer(thinking=False)
@@ -214,10 +208,9 @@ class RewardList(MessageUI):
         """
         # Title is Reward #n earned by twitch_username
         # Reward, Earned at, Earned by, Fulfilled at (not fulfilled/date), Ref, Added Notes
-        name = f"Reward #{reward.earned_id} earned by {reward.twitch_user_name or reward.twitch_user_id}"
 
         if reward.fulfilled_at is not None:
-            fat = discord.utils.format_dt(reward.fulfilled_at, 'F')
+            fat = discord.utils.format_dt(reward.fulfilled_at, "F")
             if reward.fulfilled_note is not None:
                 fluf = f"{fat} ({reward.fulfilled_note})"
             else:
@@ -225,17 +218,25 @@ class RewardList(MessageUI):
         else:
             fluf = "*Not Fulfilled*"
 
-        table = {
-            'Reward': "Plus Campaign Sketch",
-            'Earned At': discord.utils.format_dt(reward.earned_at, 'F'),
-            'Earned From': reward.earned_from,
-            'Fulfilled At': fluf,
-            'Reference': reward.reference or "*No reference set*",
-            'Further notes': reward.modnote or "*No notes*",
-        }
-        prop_table = '\n'.join(tabulate(*table.items())) 
+        fluffed_emoji = "✅" if reward.fulfilled_at else "🔳"
+        earned = discord.utils.format_dt(reward.earned_at, "d")
 
-        return (name, prop_table)
+        name = f"{fluffed_emoji} #{reward.earned_id} earned by {reward.twitch_user_name or reward.twitch_user_id} at {earned}"
+
+        table = {
+            # "Reward": "Plus Campaign Sketch",
+            # "Earned From": reward.earned_from,
+            # "Fulfilled At": fluf,
+            "Reference": reward.reference or "*No reference set*",
+            "Further notes": reward.modnote or "*No notes*",
+        }
+        prop_table = "\n".join(tabulate(*table.items()))
+
+        value = '\n'.join((
+            "> {reason}",
+            "{table}", 
+        )).format(reason=reward.earned_from, table=prop_table)
+        return (name, value)
 
     def _format_reward_option(self, reward: EarnedReward) -> SelectOption:
         """
@@ -246,17 +247,13 @@ class RewardList(MessageUI):
         name = f"Reward #{reward.earned_id} earned by {reward.twitch_user_name or reward.twitch_user_id}"
         value = reward.earned_id
 
-        return SelectOption(
-            label=name, value=value 
-        )
+        return SelectOption(label=name, value=str(value))
 
     async def refresh_layout(self):
-        to_refresh = (
-            self.reward_menu_refresh(),
-        )
+        to_refresh = (self.reward_menu_refresh(),)
         await asyncio.gather(*to_refresh)
 
-        if self.page_count > 1:
+        if self.page_count <= 1:
             self.prev_page_button.disabled = True
             self.next_page_button.disabled = True
         else:
@@ -264,13 +261,34 @@ class RewardList(MessageUI):
             self.next_page_button.disabled = False
 
         self.set_layout(
-            (self.prev_page_button, self.refresh_button, self.next_page_button, self.quit_button),
+            (
+                self.prev_page_button,
+                self.refresh_button,
+                self.next_page_button,
+                self.quit_button,
+            ),
             (self.reward_menu,),
         )
 
     async def make_message(self) -> MessageArgs:
         embed = discord.Embed(title=f"{self.campaign.row.campaign_name} Reward List")
-        # embed.set_footer with last update
+        embed.set_footer(text="Last Update")
+        embed.timestamp = utc_now()
+
+        campaign = self.campaign
+        all_rewards = await campaign.get_rewards()
+        rewards_earned = len(all_rewards)
+        reward_cap = campaign.row.target_rewards
+        if reward_cap is not None:
+            description = f"{rewards_earned} earned out of {reward_cap} available"
+        else:
+            description = f"{rewards_earned} earned so far"
+
+        embed.description = description
+
+        for reward in self.page:
+            name, value = self._format_reward_section(reward)
+            embed.add_field(name=name, value=value, inline=False)
 
         return MessageArgs(embed=embed)
 

plugin/lib.py

@@ -17,12 +17,14 @@ def LOWER(expression: Expression) -> RawExpr:
 
     return RawExpr(final_expr, final_values)
 
+
 def asexpr(value: Any) -> RawExpr:
     """
     Turn a value into an expression.
     """
     return RawExpr(sql.Placeholder(), (value,))
 
+
 async def fire_and_forget(awaitable, do_in=1, ignorable=(discord.HTTPException)):
     await asyncio.sleep(do_in)
     try:
@@ -33,6 +35,7 @@ async def fire_and_forget(awaitable, do_in=1, ignorable=(discord.HTTPException))
         # TODO: Log unexpected exceptions
         pass
 
+
 class ThreadedWebhook(discord.Webhook):
     __slots__ = ("thread_id",)
 
@@ -55,11 +58,25 @@ class ThreadedWebhook(discord.Webhook):
             kwargs.setdefault("thread", discord.Object(self.thread_id))
         return await super().send(*args, **kwargs)
 
+    async def edit_message(self, *args, **kwargs):
+        if self.thread_id is not None:
+            kwargs.setdefault("thread", discord.Object(self.thread_id))
+        return await super().edit_message(*args, **kwargs)
+
+    async def delete_message(self, *args, **kwargs):
+        if self.thread_id is not None:
+            kwargs.setdefault("thread", discord.Object(self.thread_id))
+        return await super().delete_message(*args, **kwargs)
+
+    async def fetch_message(self, *args, **kwargs):
+        if self.thread_id is not None:
+            kwargs.setdefault("thread", discord.Object(self.thread_id))
+        return await super().fetch_message(*args, **kwargs)
+
     async def test_webhook(self):
         embed = discord.Embed(
-            title="Testing",
-            description="Testing logging webhook, feel free to delete."
+            title="Testing", description="Testing logging webhook, feel free to delete."
         )
         result = await self.send(embed=embed, wait=True, silent=True)
         asyncio.create_task(fire_and_forget(result.delete()))
-        await result
+        return result

plugin/twitch/component.py

@@ -1,11 +1,16 @@
 from typing import Optional
 import asyncio
+import datetime as dt
+from datetime import datetime, timedelta
 
 import twitchio
 from twitchio.ext import commands as cmds
+from dateutil.relativedelta import relativedelta
 
+from data.queries import JOINTYPE, ORDER
 from meta import Bot
 from meta.logger import log_wrap
+from meta.sockets import Channel, register_channel
 from utils.lib import utc_now
 
 from . import logger
@@ -23,7 +28,7 @@ class CampaignComponent(cmds.Component):
         self.campaigns = CampaignRegistry(self.data)
         self.channel = CampaignChannel(self.bot.profiles.profiles, self.campaigns)
 
-        register_channel("Campaign", self.channel)
+        register_channel(self.channel.name, self.channel)
 
     # ----- API -----
     async def component_load(self):
@@ -41,7 +46,7 @@ class CampaignComponent(cmds.Component):
 
     # ------ Event Handlers -----
     @cmds.Component.listener()
-    async def event_safe_event_chat_notice_sub(self, payload):
+    async def event_safe_chat_notice_sub(self, payload):
         """
         This is our most important notice for this event.
 
@@ -57,11 +62,51 @@ class CampaignComponent(cmds.Component):
 
         # Check the tier and duration of the subscription.
         # Continue if tier = 3000 and duration is at least 3 months
-        if (tier := detail_row["tier"]) == 3000 and (
-            duration := detail_row["duration_months"]
-        ) >= 3:
+        if detail_row["tier"] == 3000 and detail_row["duration_months"] >= 3:
             # Check if there is an ongoing campaign
             campaigns = await self.campaigns.fetch_campaigns(event_row["communityid"])
+            pid = event_row["profileid"]
+
+            for campaign in campaigns:
+                rewards = await campaign.get_rewards()
+                reward_progress = len(rewards)
+
+                existing = any(reward.profileid == pid for reward in rewards)
+                if existing:
+                    continue
+
+                if (
+                    campaign.row.target_rewards is None
+                    or reward_progress < campaign.row.target_rewards
+                ):
+                    # Add a reward to the database with the correct info.
+                    await campaign.add_reward(
+                        profileid=event_row["profileid"],
+                        earned_from=f"(SUB NOTICE) {data.system_message}",
+                        event_id=event_row["event_id"],
+                        twitch_user_id=data.chatter.id,
+                        twitch_user_name=data.chatter.name,
+                    )
+                    await self.dispatch_update(campaign)
+        else:
+            logger.info(f"Campaigns ignoring sub notice event: {event_row}")
+
+    # @cmds.Component.listener()
+    async def event_custom_redemption_add(self, payload):
+        if payload.reward.title not in (
+            "hi!",
+            "hydrate",
+            "stretch",
+            "save file",
+            "pet lilac",
+        ):
+            return
+
+        community = await self.bot.profiles.fetch_community(payload.broadcaster)
+        cid = community.communityid
+        profile = await self.bot.profiles.fetch_profile(payload.user)
+        pid = profile.profileid
+        campaigns = await self.campaigns.fetch_campaigns(cid)
 
         for campaign in campaigns:
             reward_progress = len(await campaign.get_rewards())
@@ -72,18 +117,45 @@ class CampaignComponent(cmds.Component):
             ):
                 # Add a reward to the database with the correct info.
                 await campaign.add_reward(
-                        profileid=event_row["profileid"],
-                        earned_reason=f"(SUB) User subscribed for {duration} months at tier {tier}",
-                        event_id=event_row["event_id"],
-                        twitch_user_id=data["chatter_user_id"],
-                        twitch_user_name=data["chatter_user_name"],
+                    profileid=pid,
+                    earned_from=f"(REDEEM) User redeemed {payload.reward.title}",
+                    event_id=None,
+                    twitch_user_id=payload.user.id,
+                    twitch_user_name=payload.user.name,
+                    reference=f"Redeem text: {payload.user_input}",
+                )
+                await self.dispatch_update(campaign)
+
+    # @cmds.Component.listener()
+    async def event_message(self, payload):
+        if not payload.text.startswith("%reward%"):
+            return
+
+        community = await self.bot.profiles.fetch_community(payload.broadcaster)
+        cid = community.communityid
+        profile = await self.bot.profiles.fetch_profile(payload.chatter)
+        pid = profile.profileid
+        campaigns = await self.campaigns.fetch_campaigns(cid)
+
+        for campaign in campaigns:
+            reward_progress = len(await campaign.get_rewards())
+
+            if (
+                campaign.row.target_rewards is None
+                or reward_progress < campaign.row.target_rewards
+            ):
+                # Add a reward to the database with the correct info.
+                await campaign.add_reward(
+                    profileid=pid,
+                    earned_from=f"(MSG) User messaged in chat: {payload.text}",
+                    event_id=None,
+                    twitch_user_id=payload.chatter.id,
+                    twitch_user_name=payload.chatter.name,
                 )
                 await self.dispatch_update(campaign)
-                    # TODO: Webhook logging maybe.. (do this in campaign)
-                    # Or just general logging. (also do this in campaign, but we can do again here)
 
     @cmds.Component.listener()
-    async def event_safe_event_chat_notice_resub(self, payload):
+    async def event_safe_chat_notice_resub(self, payload):
         # Check that the end of the sub is past the threshold by adding duration to the previous sub
         # Threshold being now + 3 months, by calendar date.
         # Or even if the sub ends on at least the month that is past the three month region.
@@ -92,7 +164,72 @@ class CampaignComponent(cmds.Component):
         # # TODO: This logic should be done for completeness, but will postpone for now
         # This could be done in subscription_message as well, but the
         # notice has slightly more self-contained metadata.
-        ...
+        event_row, detail_row, data = payload
+
+        # Check the tier and duration of the subscription.
+        # Continue if tier = 3000 and duration is at least 3 months
+        if detail_row["tier"] == 3000 and detail_row["duration_months"] >= 3:
+            # Check if there is an ongoing campaign
+            campaigns = await self.campaigns.fetch_campaigns(event_row["communityid"])
+            pid = event_row["profileid"]
+
+            # Get user's last sub date
+            last_sub_date = await self.get_sub_start(
+                channelid=event_row["channel_id"],
+                userid=event_row["user_id"],
+                tier=3000,
+            )
+            if last_sub_date is None:
+                logger.error(f"T3 rsub with no history: {event_row!r}")
+                return
+            forecast_end = last_sub_date + relativedelta(
+                months=detail_row["duration_months"]
+            )
+            if forecast_end < dt.datetime(2026, 11, 1, tzinfo=dt.UTC):
+                logger.warning(f"T3 sub with forecast end too short: {event_row!r}")
+                return
+
+            for campaign in campaigns:
+                rewards = await campaign.get_rewards()
+                reward_progress = len(rewards)
+
+                existing = any(reward.profileid == pid for reward in rewards)
+                if existing:
+                    continue
+
+                if (
+                    campaign.row.target_rewards is None
+                    or reward_progress < campaign.row.target_rewards
+                ):
+                    # Add a reward to the database with the correct info.
+                    await campaign.add_reward(
+                        profileid=event_row["profileid"],
+                        earned_from=f"(RESUB NOTICE) {data.system_message}",
+                        event_id=event_row["event_id"],
+                        twitch_user_id=data.chatter.id,
+                        twitch_user_name=data.chatter.name,
+                    )
+                    await self.dispatch_update(campaign)
+        else:
+            logger.info(f"Campaigns ignoring sub notice event: {event_row}")
+
+    async def get_sub_start(self, channelid, userid, tier=3000):
+        event_tracker = self.bot.get_component("TrackerComponent")
+        query = event_tracker.data.events.select_where(
+            channel_id=channelid,
+            user_id=userid,
+            tier=tier,
+        )
+        query.join("subscribe_events", using=("event_id",), join_type=JOINTYPE.INNER)
+        query.order_by("created_at", direction=ORDER.DESC)
+        query.select("created_at")
+        query.limit(1)
+        query.with_no_adapter()
+        rows = await query
+        if rows:
+            return rows[0]["created_at"]
+        else:
+            return None
 
     @cmds.Component.listener()
     async def event_safe_subscription(self, payload): ...
@@ -101,8 +238,7 @@ class CampaignComponent(cmds.Component):
     async def event_safe_subscription_message(self, payload): ...
 
     # ------ Commands -----
-    @cmds.group(name="campaign", invoke_fallback=True)
-    @cmds.is_moderator()
+    @cmds.group(name="campaign", aliases=["ppp"], invoke_fallback=True)
     async def group_campaign(self, ctx: cmds.Context, name: Optional[str] = None):
         """Status of the current or named campaign."""
         community = await self.bot.profiles.fetch_community(ctx.broadcaster)
@@ -135,16 +271,24 @@ class CampaignComponent(cmds.Component):
             rewards_earned = len(all_rewards)
             reward_cap = campaign.row.target_rewards
 
-            if reward_cap is not None:
-                response = f"{name}: {given} rewards earned out of {cap}!"
-            else:
-                response = f"{name}: {given} rewards earned so far!"
+            response = (
+                "event details can be found here: {event_link} "
+                "there are {remaining} sketch slots remaining! ♡♡ "
+            )
+
+            # if reward_cap is not None:
+            #     response = "{name}: {given} rewards earned out of {cap}!"
+            # else:
+            #     response = "{name}: {given} rewards earned so far!"
             formatted = response.format(
                 name=campaign.row.campaign_name,
+                event_link="https://lilac.thewisewolf.dev/provides/partner_plus_poster2.jpg",
+                remaining=reward_cap - rewards_earned,
                 given=rewards_earned,
                 cap=reward_cap,
             )
             await ctx.reply(formatted)
+            await self.dispatch_update(campaign)
 
     @group_campaign.command(name="setup", aliases=["start"])
     @cmds.is_moderator()
@@ -180,7 +324,9 @@ class CampaignComponent(cmds.Component):
             return
 
         # Now can create
-        campaign = await self.campaigns.create_campaign(cid, name, rewards)
+        campaign = await self.campaigns.create_campaign(
+            cid, name, target_rewards=rewards
+        )
 
         # Also start the campaign
         await campaign.start()
@@ -230,9 +376,9 @@ class CampaignComponent(cmds.Component):
             reward_cap = campaign.row.target_rewards
 
             if reward_cap is not None:
-                response = f"Completed {name}: {given} rewards earned out of {cap}!"
+                response = "Completed {name}: {given} rewards earned out of {cap}!"
             else:
-                response = f"Completed {name}: {given} rewards earned so far!"
+                response = "Completed {name}: {given} rewards earned so far!"
             formatted = response.format(
                 name=campaign.row.campaign_name,
                 given=rewards_earned,
@@ -246,7 +392,8 @@ class CampaignComponent(cmds.Component):
     async def cmd_campaign_reward(
         self,
         ctx: cmds.Context,
-        user: twitchio.PartialUser,
+        user: twitchio.User,
+        *,
         reward_reason: str,
     ):
         """Manually reward a target user, adjusting their points."""
@@ -279,3 +426,51 @@ class CampaignComponent(cmds.Component):
                 f"Successfully added campaign reward to {user.mention}'s account."
             )
             await self.dispatch_update(campaign)
+
+    @group_campaign.command(name="test")
+    @cmds.is_moderator()
+    async def cmd_campaign_test(
+        self,
+        ctx: cmds.Context,
+        user: twitchio.User,
+        channel: twitchio.User,
+        tier: int = 3000,
+    ):
+        community = await self.bot.profiles.fetch_community(ctx.broadcaster)
+        cid = community.communityid
+        profile = await self.bot.profiles.fetch_profile(user)
+        name = user.display_name or profile.nickname or "Unknown"
+        pid = profile.profileid
+        campaigns = await self.campaigns.fetch_campaigns(cid)
+        campaign = campaigns[0]
+
+        # Get user's last sub date
+        last_sub_date = await self.get_sub_start(
+            channelid=channel.id,
+            userid=user.id,
+            tier=tier,
+        )
+        lines = []
+        if last_sub_date is None:
+            subline = f"Last {tier} sub not found"
+            lines.append(subline)
+        else:
+            subline = f"Last {tier} sub at {last_sub_date}"
+            lines.append(subline)
+            forecast_end = last_sub_date + relativedelta(months=3)
+            lines.append(f"Three months after: {forecast_end}")
+
+            if forecast_end > dt.datetime(2026, 11, 1, tzinfo=dt.UTC):
+                lines.append("Which is after the end of the event")
+            else:
+                lines.append("Which is not after the end of the event")
+
+        rewards = await campaign.get_rewards()
+
+        existing = any(reward.profileid == pid for reward in rewards)
+        if existing:
+            lines.append(f"This user has already been rewarded.")
+        else:
+            lines.append(f"This user might yet earn a reward")
+
+        await ctx.reply("; ".join(lines))