rewrite: Complete rolemenu system.

src/utils/lib.py

@@ -6,6 +6,7 @@ import re
 from contextvars import Context
 
 import discord
+from discord.partial_emoji import _EmojiTag
 from discord import Embed, File, GuildSticker, StickerItem, AllowedMentions, Message, MessageReference, PartialMessage
 from discord.ui import View
 
@@ -770,3 +771,20 @@ def replace_multiple(format_string, mapping):
     pattern = '|'.join(f"({key})" for key in keys)
     string = re.sub(pattern, lambda match: str(mapping[keys[match.lastindex - 1]]), format_string)
     return string
+
+
+def emojikey(emoji: discord.Emoji | discord.PartialEmoji | str):
+    """
+    Produces a distinguishing key for an Emoji or PartialEmoji.
+
+    Equality checks using this key should act as expected.
+    """
+    if isinstance(emoji, _EmojiTag):
+        if emoji.id:
+            key = str(emoji.id)
+        else:
+            key = str(emoji.name)
+    else:
+        key = str(emoji)
+
+    return key

src/utils/monitor.py

@@ -47,7 +47,7 @@ class TaskMonitor(Generic[Taskid]):
         Similar to `schedule_tasks`, but wipe and reset the tasklist.
         """
         self._taskmap = {tid: time for tid, time in tasks}
-        self._tasklist = sorted(self._taskmap.keys(), key=lambda tid: -1 * tid * self._taskmap[tid])
+        self._tasklist = list(sorted(self._taskmap.keys(), key=lambda tid: -1 * self._taskmap[tid]))
         self._wakeup.set()
 
     def schedule_tasks(self, *tasks: tuple[Taskid, int]) -> None:
@@ -59,7 +59,7 @@ class TaskMonitor(Generic[Taskid]):
         we build an entirely new list, and always wake up the loop.
         """
         self._taskmap |= {tid: time for tid, time in tasks}
-        self._tasklist = sorted(self._taskmap.keys(), key=lambda tid: -1 * self._taskmap[tid])
+        self._tasklist = list(sorted(self._taskmap.keys(), key=lambda tid: -1 * self._taskmap[tid]))
         self._wakeup.set()
 
     def schedule_task(self, taskid: Taskid, timestamp: int) -> None:

src/utils/ui/leo.py

@@ -248,6 +248,13 @@ class MessageUI(LeoUI):
         # Refresh lock, to avoid cache collisions on refresh
         self._refresh_lock = asyncio.Lock()
 
+    @property
+    def channel(self):
+        if self._original is not None:
+            return self._original.channel
+        else:
+            return self._message.channel
+
     # ----- UI API -----
     async def run(self, interaction: discord.Interaction, **kwargs):
         """
@@ -366,6 +373,15 @@ class MessageUI(LeoUI):
         args = await self.make_message()
         self._message = await channel.send(**args.send_args, view=self)
 
+    async def _redraw(self, args):
+        if self._original and not self._original.is_expired():
+            await self._original.edit_original_response(**args.edit_args, view=self)
+        elif self._message:
+            await self._message.edit(**args.edit_args, view=self)
+        else:
+            # Interaction expired or already closed. Quietly cleanup.
+            await self.close()
+
     async def redraw(self, thinking: Optional[discord.Interaction] = None):
         """
         Update the output message for this UI.
@@ -379,13 +395,7 @@ class MessageUI(LeoUI):
             asyncio.create_task(thinking.delete_original_response())
 
         try:
-            if self._original and not self._original.is_expired():
-                await self._original.edit_original_response(**args.edit_args, view=self)
-            elif self._message:
-                await self._message.edit(**args.edit_args, view=self)
-            else:
-                # Interaction expired or already closed. Quietly cleanup.
-                await self.close()
+            await self._redraw(args)
         except discord.HTTPException:
             # Unknown communication erorr, nothing we can reliably do. Exit quietly.
             await self.close()

src/utils/ui/micros.py

@@ -167,7 +167,10 @@ class ModalRetryUI(LeoUI):
 
     async def respond_to(self, interaction):
         self._interaction = interaction
-        await interaction.response.send_message(embed=self.embed, ephemeral=True, view=self)
+        if interaction.response.is_done():
+            await interaction.followup.send(embed=self.embed, ephemeral=True, view=self)
+        else:
+            await interaction.response.send_message(embed=self.embed, ephemeral=True, view=self)
 
     @button(label="Retry")
     async def retry_button(self, interaction, butt):