adding interaction check to config embed, making channel optional, and some logic changes

ballsdex/packages/config/cog.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, cast
+from typing import TYPE_CHECKING, Optional, cast
 
 import discord
 from discord import app_commands
@@ -36,53 +36,52 @@ def __init__(self, bot: "BallsDexBot"):
         self.bot = bot
 
     @app_commands.command()
-    @app_commands.describe(channel="The new text channel to set.")
+    @app_commands.checks.has_permissions(manage_guild=True)
+    @app_commands.checks.bot_has_permissions(
+        read_messages=True,
+        send_messages=True,
+        embed_links=True,
+    )
     async def channel(
         self,
         interaction: discord.Interaction,
-        channel: discord.TextChannel,
+        channel: Optional[discord.TextChannel] = None,
     ):
         """
         Set or change the channel where countryballs will spawn.
+
+        Parameters
+        ----------
+        channel: discord.TextChannel
+            The channel you want to set, current one if not specified.
         """
-        guild = cast(discord.Guild, interaction.guild)  # guild-only command
         user = cast(discord.Member, interaction.user)
-        if not user.guild_permissions.manage_guild:
-            await interaction.response.send_message(
-                "You need the permission to manage the server to use this."
-            )
-            return
-        if not channel.permissions_for(guild.me).read_messages:
-            await interaction.response.send_message(
-                f"I need the permission to read messages in {channel.mention}."
-            )
-            return
-        if not channel.permissions_for(guild.me).send_messages:
-            await interaction.response.send_message(
-                f"I need the permission to send messages in {channel.mention}."
-            )
-            return
-        if not channel.permissions_for(guild.me).embed_links:
-            await interaction.response.send_message(
-                f"I need the permission to send embed links in {channel.mention}."
-            )
-            return
+
+        if channel is None:
+            if isinstance(interaction.channel, discord.TextChannel):
+                channel = interaction.channel
+            else:
+                await interaction.response.send_message(
+                    "The current channel is not a valid text channel.", ephemeral=True
+                )
+                return
+
+        view = AcceptTOSView(interaction, channel, user)
+        message = await channel.send(embed=activation_embed, view=view)
+        view.message = message
+
         await interaction.response.send_message(
-            embed=activation_embed, view=AcceptTOSView(interaction, channel)
+            f"The activation embed has been sent in {channel.mention}.", ephemeral=True
         )
 
     @app_commands.command()
+    @app_commands.checks.has_permissions(manage_guild=True)
+    @app_commands.checks.bot_has_permissions(send_messages=True)
     async def disable(self, interaction: discord.Interaction):
         """
         Disable or enable countryballs spawning.
         """
         guild = cast(discord.Guild, interaction.guild)  # guild-only command
-        user = cast(discord.Member, interaction.user)
-        if not user.guild_permissions.manage_guild:
-            await interaction.response.send_message(
-                "You need the permission to manage the server to use this."
-            )
-            return
         config, created = await GuildConfig.get_or_create(guild_id=interaction.guild_id)
         if config.enabled:
             config.enabled = False  # type: ignore
@@ -98,10 +97,17 @@ async def disable(self, interaction: discord.Interaction):
             await config.save()
             self.bot.dispatch("ballsdex_settings_change", guild, enabled=True)
             if config.spawn_channel and (channel := guild.get_channel(config.spawn_channel)):
-                await interaction.response.send_message(
-                    f"{settings.bot_name} is now enabled in this server, "
-                    f"{settings.collectible_name}s will start spawning soon in {channel.mention}."
-                )
+                if channel:
+                    await interaction.response.send_message(
+                        f"{settings.bot_name} is now enabled in this server, "
+                        f"{settings.collectible_name}s will start spawning "
+                        f"soon in {channel.mention}."
+                    )
+                else:
+                    await interaction.response.send_message(
+                        "The spawning channel specified in the configuration is not available.",
+                        ephemeral=True,
+                    )
             else:
                 await interaction.response.send_message(
                     f"{settings.bot_name} is now enabled in this server, however there is no "

ballsdex/packages/config/components.py

@@ -1,3 +1,5 @@
+from typing import Optional
+
 import discord
 from discord.ui import Button, View, button
 
@@ -10,10 +12,18 @@ class AcceptTOSView(View):
     Button prompting the admin setting up the bot to accept the terms of service.
     """
 
-    def __init__(self, interaction: discord.Interaction, channel: discord.TextChannel):
+    def __init__(
+        self,
+        interaction: discord.Interaction,
+        channel: discord.TextChannel,
+        new_player: discord.Member,
+    ):
         super().__init__()
         self.original_interaction = interaction
         self.channel = channel
+        self.new_player = new_player
+        self.message: Optional[discord.Message] = None
+
         self.add_item(
             Button(
                 style=discord.ButtonStyle.link,
@@ -29,40 +39,45 @@ def __init__(self, interaction: discord.Interaction, channel: discord.TextChanne
             )
         )
 
+    async def interaction_check(self, interaction: discord.Interaction) -> bool:
+        if interaction.user.id != self.new_player.id:
+            await interaction.response.send_message(
+                "You are not allowed to interact with this menu.", ephemeral=True
+            )
+            return False
+        return True
+
     @button(
         label="Accept",
         style=discord.ButtonStyle.success,
         emoji="\N{HEAVY CHECK MARK}\N{VARIATION SELECTOR-16}",
     )
-    async def accept_button(self, interaction: discord.Interaction, item: discord.ui.Button):
+    async def accept_button(self, interaction: discord.Interaction, button: discord.ui.Button):
         config, created = await GuildConfig.get_or_create(guild_id=interaction.guild_id)
         config.spawn_channel = self.channel.id  # type: ignore
         await config.save()
         interaction.client.dispatch(
             "ballsdex_settings_change", interaction.guild, channel=self.channel
         )
         self.stop()
+        if self.message:
+            button.disabled = True
+            try:
+                await self.message.edit(view=self)
+            except discord.HTTPException:
+                pass
         await interaction.response.send_message(
             f"The new spawn channel was successfully set to {self.channel.mention}.\n"
             f"{settings.collectible_name.title()}s will start spawning as"
             " users talk unless the bot is disabled."
         )
 
-        self.accept_button.disabled = True
-        try:
-            await self.original_interaction.followup.edit_message(
-                "@original", view=self  # type: ignore
-            )
-        except discord.HTTPException:
-            pass
-
     async def on_timeout(self) -> None:
-        self.stop()
-        for item in self.children:
-            item.disabled = True  # type: ignore
-        try:
-            await self.original_interaction.followup.edit_message(
-                "@original", view=self  # type: ignore
-            )
-        except discord.HTTPException:
-            pass
+        if self.message:
+            for item in self.children:
+                if isinstance(item, discord.ui.Button):
+                    item.disabled = True
+            try:
+                await self.message.edit(view=self)
+            except discord.HTTPException:
+                pass