feat: CV2

Author: lorenzo132

cogs/modmail.py

@@ -2415,7 +2415,7 @@ async def cog_load(self):
     async def snooze_auto_unsnooze_task(self):
         await self.bot.wait_until_ready()
         while True:
-            now = datetime.utcnow()
+            now = datetime.now(timezone.utc)
             snoozed = await self.bot.api.logs.find({"snoozed": True}).to_list(None)
             for entry in snoozed:
                 start = entry.get("snooze_start")

core/paginator.py

@@ -223,8 +223,7 @@ def __init__(self, handler: PaginatorSession, *args, **kwargs):
         self.clear_items()  # clear first so we can control the order
         self.fill_items()
 
-    @discord.ui.button(label="Stop", style=ButtonStyle.danger)
-    async def stop_button(self, interaction: Interaction, button: Button):
+    async def stop_callback(self, interaction: Interaction):
         await self.handler.close(interaction=interaction)
 
     def fill_items(self):
@@ -244,7 +243,10 @@ def fill_items(self):
 
             self.handler._buttons_map[label] = button
             self.add_item(button)
-        self.add_item(self.stop_button)
+
+        stop_button = Button(label="Stop", style=ButtonStyle.danger)
+        stop_button.callback = self.stop_callback
+        self.add_item(stop_button)
 
     async def interaction_check(self, interaction: Interaction):
         """Only allow the message author to interact"""

core/thread.py

@@ -1694,8 +1694,10 @@ async def create(
             else:
                 destination = message.channel
             view = ConfirmThreadCreationView()
-            view.add_item(AcceptButton(self.bot.config["confirm_thread_creation_accept"]))
-            view.add_item(DenyButton(self.bot.config["confirm_thread_creation_deny"]))
+            view.add_item(
+                AcceptButton("accept-thread-creation", self.bot.config["confirm_thread_creation_accept"])
+            )
+            view.add_item(DenyButton("deny-thread-creation", self.bot.config["confirm_thread_creation_deny"]))
             confirm = await destination.send(
                 embed=discord.Embed(
                     title=self.bot.config["confirm_thread_creation_title"],

core/utils.py

@@ -581,8 +581,9 @@ def return_or_truncate(text, max_length):
 
 
 class AcceptButton(discord.ui.Button):
-    def __init__(self, emoji):
-        super().__init__(style=discord.ButtonStyle.gray, emoji=emoji)
+    def __init__(self, custom_id: str, emoji: str):
+        super().__init__(style=discord.ButtonStyle.gray, emoji=emoji, custom_id=custom_id)
+        self.view: ConfirmThreadCreationView
 
     async def callback(self, interaction: discord.Interaction):
         self.view.value = True
@@ -591,8 +592,9 @@ async def callback(self, interaction: discord.Interaction):
 
 
 class DenyButton(discord.ui.Button):
-    def __init__(self, emoji):
-        super().__init__(style=discord.ButtonStyle.gray, emoji=emoji)
+    def __init__(self, custom_id: str, emoji: str):
+        super().__init__(style=discord.ButtonStyle.gray, emoji=emoji, custom_id=custom_id)
+        self.view: ConfirmThreadCreationView
 
     async def callback(self, interaction: discord.Interaction):
         self.view.value = False