Merge pull request #22 from HeDeAnTheonlyone/main

added command to change guild icon, moved same resolve code to one place

Author: Silabear

index.py

@@ -9,6 +9,7 @@
 from utils.stats import update
 
 
+
 # Setup bot
 bot = commands.InteractionBot(
     test_guilds=[variables.guild],
@@ -48,6 +49,8 @@
 bot.add_cog(MembersCommand(bot))
 from modules.utilities.commands.help import HelpCommand
 bot.add_cog(HelpCommand(bot))
+from modules.utilities.commands.icon import IconCommand
+bot.add_cog(IconCommand(bot))
 from modules.utilities.message_commands.view import ViewFileCommand
 bot.add_cog(ViewFileCommand(bot))
 

modules/events/button_click.py

@@ -16,12 +16,7 @@ async def on_button_click(self, inter: disnake.MessageInteraction):
         if inter.component.custom_id == "resolve_question_button":
             role = inter.guild.get_role(variables.helper)
             if (inter.channel.owner_id == inter.user.id) or (role in inter.user.roles):
-                if len(inter.channel.applied_tags) == 5:
-                    await inter.response.send_message("This post has too many tags and the resolved tag cannot be applied. Please remove the least important one to properly resolve it.")
-                else:
-                    await inter.response.send_message("Done.")
-                    await inter.delete_original_message()   
-                    await resolve_thread(inter.channel,inter.author)
+                await resolve_thread(inter.channel, inter.response, inter.author)
             else:
                 await inter.response.send_message(
                     embed=disnake.Embed(

modules/help_channels/commands/resolve.py

@@ -21,12 +21,7 @@ async def resolve(self, inter: disnake.ApplicationCommandInteraction):
             return False
 
         if (inter.channel.owner_id == inter.author.id) or (role in inter.author.roles) and channel in variables.help_channels:
-            if len(inter.channel.applied_tags) == 5:
-                await inter.response.send_message("This post has too many tags and the resolved tag cannot be applied. Please remove the least important one to properly resolve it.")
-            else:
-                await inter.response.send_message("Done.")
-                await inter.delete_original_message()
-                await resolve_thread(inter.channel,inter.author)
+            await resolve_thread(inter.channel, inter.response, inter.author)
         else:
             await inter.response.send_message("You aren't allowed to do this here.", ephemeral=True)
             Log.info(f"{inter.author.name} tried to resolve a thread which wasn't theirs")

modules/utilities/commands/icon.py

@@ -0,0 +1,28 @@
+import os
+import disnake
+from disnake.ext import commands
+
+ICONS = list(map(lambda s:  s.removesuffix(".gif"),os.listdir(os.path.join(os.getcwd(), "static", "icons"))))
+
+class IconCommand(commands.Cog):
+    def __init__(self, bot):
+        self.bot = bot
+
+    @commands.slash_command(name="icon", description="Changes the icon of the server.")
+    async def icon(
+        self,
+        inter: disnake.ApplicationCommandInteraction,
+        icon_type: str = commands.Param(
+            default="Normal",
+            choices=ICONS
+        )
+    ):
+        try:
+            with open(os.path.join(os.getcwd(), "static", "icons", f"{icon_type}.gif"), "rb") as image_file:
+                icon_data = image_file.read()
+
+            await inter.guild.edit(icon=icon_data)
+            await inter.send("Guild icon updated.", ephemeral=True)
+        except Exception as e:
+            await inter.send(f"Updating guild icon failed: {e}", ephemeral=True)
+