📦 Switch ConfirmView to components v2

This rly sucks to code ngl

Author: Kile

killua/cogs/cards.py

@@ -284,9 +284,12 @@ async def _sell_confirm_view(
         Asks the user if they want to sell the cards.
         Returns True if the user wants to sell the cards, False if they don't
         """
-        view = ConfirmButton(ctx.author.id, timeout=80)
-        msg = await ctx.send(
+        view = ConfirmButton(
+            ctx.author.id,
             f"You will receive {to_be_gained} Jenny for selling {selling_what} cards, do you want to proceed?",
+            timeout=80,
+        )
+        msg = await ctx.send(
             view=view,
         )
         await view.wait()
@@ -649,9 +652,12 @@ async def discard(self, ctx: commands.Context, card: str):
         if card.id == 0:
             return await ctx.send("You cannot discard this card!")
 
-        view = ConfirmButton(ctx.author.id, timeout=20)
-        msg = await ctx.send(
+        view = ConfirmButton(
+            ctx.author.id,
             f"Do you really want to throw this card away? (if you want to throw a fake aware, make sure it's in the free slots (unless it's the only copy you own. You can switch cards between free and restricted slots with `{(await self.client.command_prefix(self.client, ctx.message))[2]}swap <card_id>`)",
+            timeout=20,
+        )
+        msg = await ctx.send(
             view=view,
             allowed_mentions=discord.AllowedMentions.none(),
         )

killua/cogs/games.py

@@ -411,9 +411,11 @@ async def play_against(
             )
 
         if not replay:
-            view = ConfirmButton(other.id)
-            msg = await self.ctx.send(
+            view = ConfirmButton(
+                other.id,
                 f"{other.mention}, {self.ctx.author.mention} wants to play a trivia against you. They chose the category `{next((t for t, v in TRIVIA_TOPICS.items() if v == self.category)) if self.category else 'Random category'}` with a difficulty of `{self.difficulty}`, playing for {jenny} jenny. Do you accept?",
+            )
+            msg = await self.ctx.send(
                 view=view,
             )
             await view.wait()
@@ -646,9 +648,12 @@ async def multiplayer(self, replay: bool = False) -> Union[None, discord.Message
             if await blcheck(self.other.id) is True:
                 return await self.ctx.send("You can't play against someone blacklisted")
 
-            view = ConfirmButton(self.other.id, timeout=80)
-            msg = await self.ctx.send(
+            view = ConfirmButton(
+                self.other.id,
                 f"{self.ctx.author.mention} challenged {self.other.mention} to a game of Rock Paper Scissors! Will **{self.other}** accept the challange?",
+                timeout=80,
+            )
+            msg = await self.ctx.send(
                 view=view,
             )
             await view.wait()

killua/cogs/shop.py

@@ -528,9 +528,8 @@ async def _todo(
             if todo_list.spots >= 100:
                 return await ctx.send("You can't buy more than 100 spots")
 
-            view = ConfirmButton(ctx.author.id, timeout=10)
+            view = ConfirmButton(ctx.author.id, f"Do you want to buy 10 more to-do spots for this list? \nCurrent spots: {todo_list.spots} \nCost: {int(todo_list.spots*100*0.5)} points", timeout=10)
             msg = await ctx.send(
-                f"Do you want to buy 10 more to-do spots for this list? \nCurrent spots: {todo_list.spots} \nCost: {int(todo_list.spots*100*0.5)} points",
                 view=view,
             )
             await view.wait()

killua/cogs/todo.py

@@ -297,9 +297,7 @@ async def create(
     ):
         """Lets you create your todo list in an interactive menu"""
 
-        user_todo_lists = [
-            x async for x in DB.todo.find({"owner": ctx.author.id})
-        ]
+        user_todo_lists = [x async for x in DB.todo.find({"owner": ctx.author.id})]
 
         if len(user_todo_lists) == 5:
             return await ctx.send(
@@ -866,26 +864,31 @@ async def invite(
                 "The user you are trying to invite has their dms closed, they need to open them to accept the invitation"
             )
 
-        embed = discord.Embed.from_dict(
-            {
-                "title": f"You were invited to to-do list {todo_list.name} (ID: {todo_list.id})",
-                "description": f'{ctx.author} invited you to be {role} in their to-do list. To accept, click "confirm", to deny click "cancel". If this invitation was inappropriate, click "report"',
-                "color": todo_list.color or 0x3E4A78,
-                "footer": {
-                    "icon_url": str(ctx.author.avatar.url),
-                    "text": f"Requested by {ctx.author}",
-                },
-            }
-        )
+        # embed = discord.Embed.from_dict(
+        #     {
+        #         "title": f"You were invited to to-do list {todo_list.name} (ID: {todo_list.id})",
+        #         "description": f'{ctx.author} invited you to be {role} in their to-do list. To accept, click "confirm", to deny click "cancel". If this invitation was inappropriate, click "report"',
+        #         "color": todo_list.color or 0x3E4A78,
+        #         "footer": {
+        #             "icon_url": str(ctx.author.avatar.url),
+        #             "text": f"Requested by {ctx.author}",
+        #         },
+        #     }
+        # )
 
         try:
-            view = ConfirmButton(user.id, timeout=60 * 60 * 24)
-            view.add_item(
+            view = ConfirmButton(
+                user.id,
+                f"# You were invited to to-do list {todo_list.name} (ID: {todo_list.id})\n"
+                + f'{ctx.author} invited you to be {role} in their to-do list. To accept, click "confirm", to deny click "cancel". If this invitation was inappropriate, click "report"',
+                timeout=60 * 60 * 24,
+            )
+            view._children[0]._children[1].add_item(
                 Button(
-                    label="Report", custom_id="report", style=discord.ButtonStyle.red
+                    label="report", custom_id="report", style=discord.ButtonStyle.red
                 )
             )
-            msg = await user.send(embed=embed, view=view)
+            msg = await user.send(view=view)
             await ctx.send(
                 "Successfully send the invitation to the specified user! They have 24 hours to accept or deny"
             )

killua/static/cards.py

@@ -54,9 +54,7 @@ async def exec(self, member: discord.Member) -> None:
         self._has_cards_check(other.fs_cards, " in their free slots", uses_up=True)
 
         async def make_embed(page, *_):
-            return await Book(
-                cast(BaseBot, self.ctx.bot)
-            ).create(member, page,True)
+            return await Book(cast(BaseBot, self.ctx.bot)).create(member, page, True)
 
         await Paginator(
             self.ctx,
@@ -87,9 +85,7 @@ async def exec(self, member: discord.Member) -> None:
         await self._view_defense_check(self.ctx, other)
 
         async def make_embed(page, *_):
-            return await Book(
-                cast(BaseBot, self.ctx.bot)
-            ).create(member, page)
+            return await Book(cast(BaseBot, self.ctx.bot)).create(member, page)
 
         await Paginator(self.ctx, max_pages=6, func=make_embed, has_file=True).start()
 
@@ -203,9 +199,7 @@ async def exec(self, member: discord.Member) -> None:
         self._has_cards_check(other.all_cards)
 
         async def make_embed(page, embed, pages):
-            return await Book(
-                cast(BaseBot, self.ctx.bot)
-            ).create(member, page)
+            return await Book(cast(BaseBot, self.ctx.bot)).create(member, page)
 
         return await Paginator(
             self.ctx,
@@ -339,9 +333,11 @@ async def exec(self) -> None:
                 raise CheckFailure(
                     "You don't have another copy of this card to renew the effect"
                 )
-            view = ConfirmButton(user_id=self.ctx.author.id)
-            msg = await self.ctx.send(
+            view = ConfirmButton(
+                self.ctx.author.id,
                 f"You still have {author.has_effect(str(self.id))[1]} protections left. Do you really want to use this card now and overwrite the current protection?",
+            )
+            msg = await self.ctx.send(
                 view=view,
             )
             await view.wait()

killua/utils/interactions.py

@@ -42,7 +42,7 @@ async def disable(self, msg: discord.Message) -> Union[discord.Message, None]:
             try:
                 await msg.edit(view=self)
             except discord.HTTPException:
-                pass # Idk why but this can be Forbidden
+                pass  # Idk why but this can be Forbidden
 
 
 class Modal(discord.ui.Modal):  # lgtm [py/missing-call-to-init]
@@ -89,18 +89,46 @@ async def callback(self, _: discord.Interaction):
         self.view.value = self.custom_id
         self.view.stop()
 
+class ConfirmButtonRow(discord.ui.ActionRow):
+    def __init__(self, view: 'ConfirmButton') -> None:
+        self.__view = view
+        super().__init__()
 
-class ConfirmButton(discord.ui.View):
+    @discord.ui.button(
+        label="confirm", style=discord.ButtonStyle.green, custom_id="confirm"
+    )
+    async def confirm(self, *_):
+        print("Confirming")
+        self.__view.value = True
+        self.__view.timed_out = False
+        self.__view.stop()
+
+    @discord.ui.button(label="cancel", style=discord.ButtonStyle.red, custom_id="cancel")
+    async def cancel(self, *_):
+        self.__view.value = False
+        self.__view.timed_out = False
+        self.__view.stop()
+
+class ConfirmButton(discord.ui.LayoutView):
     """A button that is used to confirm a certain action or deny it"""
 
-    def __init__(self, user_id: int, **kwargs):
+    def __init__(self, user_id: int, text: str, **kwargs):
         super().__init__(**kwargs)
         self.user_id = user_id
         self.timed_out = (
             False  # helps subclasses using Button to have set this to False
         )
         self.interaction = None
         self.value = False
+        self.buttons = ConfirmButtonRow(self)
+        container = discord.ui.Container(
+            discord.ui.TextDisplay(
+                content=text,
+            ),
+            self.buttons,
+            accent_colour=discord.Colour.blurple(),
+        )
+        self.add_item(container)
 
     async def interaction_check(self, interaction: discord.Interaction) -> bool:
         if not (val := interaction.user.id == self.user_id):
@@ -109,37 +137,16 @@ async def interaction_check(self, interaction: discord.Interaction) -> bool:
         return val
 
     async def disable(self, msg: discord.Message) -> discord.Message:
-        if (
-            len([c for c in self.children if not c.disabled]) == 0
-        ):  # if every child is already disabled, we don't need to edit the message again
-            return
-
-        for child in self.children:
+        for child in self._children[0]._children[1]._children:
+            # I tried to do this more dynamically but it didn't work
             child.disabled = True
-
         if self.interaction and not self.interaction.response.is_done():
             await self.interaction.response.edit_message(view=self)
         else:
             try:
                 await msg.edit(view=self)
             except discord.HTTPException:
-                pass # Idk why but this can be Forbidden
+                pass  # Idk why but this can be Forbidden
 
     async def on_timeout(self):
         self.timed_out = True
-
-    @discord.ui.button(
-        label="confirm", style=discord.ButtonStyle.green, custom_id="confirm"
-    )
-    async def confirm(self, *_):
-        self.value = True
-        self.timed_out = False
-        self.stop()
-
-    @discord.ui.button(
-        label="cancel", style=discord.ButtonStyle.red, custom_id="cancel"
-    )
-    async def cancel(self, *_):
-        self.value = False
-        self.timed_out = False
-        self.stop()