Merge branch 'master' into feat/version/3.24

suggestionsbot · Apr 20, 2024 · 1b0eb07 · 1b0eb07
2 parents c05e395 + bdeb22a
commit 1b0eb07
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 5 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -14,3 +14,5 @@
 - [ ] Guild config method names aren't duplicated
 - [ ] New localizations have been added
 - [ ] Documentation on ``docs.suggestions.gg`` has been updated
+- [ ] Do these changes make sure not to expose anonymous suggestion authors?
+- [ ] Do these changes have the correct default discord permissions setup?
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,4 @@
 aiodns==3.0.0
-aiohttp==3.8.1
 aiosignal==1.2.0
 alaric==1.2.0
 anyio==4.2.0

diff --git a/suggestions/cogs/blacklist_cog.py b/suggestions/cogs/blacklist_cog.py
@@ -20,7 +20,10 @@ def __init__(self, bot):
         self.bot: SuggestionsBot = bot
         self.state: State = self.bot.state
 
-    @commands.slash_command()
+    @commands.slash_command(
+        dm_permission=False,
+        default_member_permissions=disnake.Permissions(manage_guild=True),
+    )
     async def user(self, interaction: disnake.GuildCommandInteraction): ...
 
     @user.sub_command_group()

diff --git a/suggestions/cogs/suggestions_message_commands.py b/suggestions/cogs/suggestions_message_commands.py
@@ -27,7 +27,11 @@ def __init__(self, bot: SuggestionsBot):
         self.state: State = self.bot.state
         self.stats: Stats = self.bot.stats
 
-    @commands.message_command(name="Approve suggestion")
+    @commands.message_command(
+        name="Approve suggestion",
+        dm_permission=False,
+        default_member_permissions=disnake.Permissions(manage_guild=True),
+    )
     @cooldowns.cooldown(1, 3, bucket=InteractionBucket.author)
     @checks.ensure_guild_has_logs_channel_or_keep_logs()
     async def approve_suggestion(self, interaction: disnake.GuildCommandInteraction):
@@ -71,7 +75,11 @@ async def approve_suggestion(self, interaction: disnake.GuildCommandInteraction)
             self.stats.type.APPROVE_BY_MESSAGE_COMMAND,
         )
 
-    @commands.message_command(name="Reject suggestion")
+    @commands.message_command(
+        name="Reject suggestion",
+        dm_permission=False,
+        default_member_permissions=disnake.Permissions(manage_guild=True),
+    )
     @cooldowns.cooldown(1, 3, bucket=InteractionBucket.author)
     @checks.ensure_guild_has_logs_channel_or_keep_logs()
     async def reject_suggestion(self, interaction: disnake.GuildCommandInteraction):

diff --git a/suggestions/exceptions.py b/suggestions/exceptions.py
@@ -70,7 +70,7 @@ class ConflictingHandlerInformation(disnake.DiscordException):
 class InvalidFileType(disnake.DiscordException):
     """The file you attempted to upload is not allowed."""
 
-
+    
 class SuggestionSecurityViolation(disnake.DiscordException):
     """A security violation occurred."""
 

diff --git a/suggestions/objects/suggestion.py b/suggestions/objects/suggestion.py
@@ -698,6 +698,10 @@ async def create_thread(self, message: disnake.Message, *, ih: InteractionHandle
         thread = await message.create_thread(
             name=f"Thread for suggestion {self.suggestion_id}"
         )
+        if self.is_anonymous:
+            # Dont expose the anon author
+            return
+
         try:
             await thread.send(
                 ih.bot.get_localized_string(