significant progress on help channels at least

Author: Silabear

index.py

@@ -17,62 +17,62 @@
 )
 
 # Logs
-# from modules.logs.listeners import LogsListeners
-# bot.add_cog(LogsListeners(bot))
+from modules.logs.listeners import LogsListeners
+bot.add_cog(LogsListeners(bot))
 
 # Moderation
-# from modules.moderation.listeners import ModerationListeners
-# bot.add_cog(ModerationListeners(bot))
-# from modules.moderation.commands.mod import ModCommand
-# bot.add_cog(ModCommand(bot))
-# from modules.moderation.message_commands.moderate import ModerateCommand
-# bot.add_cog(ModerateCommand(bot))
-# from modules.moderation.message_commands.report import ReportCommand
-# bot.add_cog(ReportCommand(bot))
+from modules.moderation.listeners import ModerationListeners
+bot.add_cog(ModerationListeners(bot))
+from modules.moderation.commands.mod import ModCommand
+bot.add_cog(ModCommand(bot))
+from modules.moderation.message_commands.moderate import ModerateCommand
+bot.add_cog(ModerateCommand(bot))
+from modules.moderation.message_commands.report import ReportCommand
+bot.add_cog(ReportCommand(bot))
 
 # Help Channels
-# from modules.help_channels.listeners import HelpChannelListeners
-# bot.add_cog(HelpChannelListeners(bot))
-# from modules.help_channels.commands.resolve import ResolveCommand
-# bot.add_cog(ResolveCommand(bot))
-# from modules.help_channels.commands.summon import SummonCommand
-# bot.add_cog(SummonCommand(bot))
-# from modules.help_channels.commands.top import TopCommand
-# bot.add_cog(TopCommand(bot))
-# from modules.help_channels.message_commands.redirect import RedirectCommand
-# bot.add_cog(RedirectCommand(bot))
-# from modules.help_channels.message_commands.remind import RemindCommand
-# bot.add_cog(RemindCommand(bot))
+from modules.help_channels.listeners import HelpChannelListeners
+bot.add_cog(HelpChannelListeners(bot))
+from modules.help_channels.commands.resolve import ResolveCommand
+bot.add_cog(ResolveCommand(bot))
+from modules.help_channels.commands.summon import SummonCommand
+bot.add_cog(SummonCommand(bot))
+from modules.help_channels.commands.top import TopCommand
+bot.add_cog(TopCommand(bot))
+from modules.help_channels.message_commands.redirect import RedirectCommand
+bot.add_cog(RedirectCommand(bot))
+from modules.help_channels.message_commands.remind import RemindCommand
+bot.add_cog(RemindCommand(bot))
 
 # Utilities
-# from modules.utilities.commands.members import MembersCommand
-# 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))
+from modules.utilities.commands.members import MembersCommand
+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))
 
 # Fun
-# from modules.fun.listeners import FunListeners
-# bot.add_cog(FunListeners(bot))
-# from modules.fun.commands.suspension import SuspensionRailwayCommand
-# bot.add_cog(SuspensionRailwayCommand(bot))
-# from modules.fun.commands.uwu import UwuCommand
-# bot.add_cog(UwuCommand(bot))
+from modules.fun.listeners import FunListeners
+bot.add_cog(FunListeners(bot))
+from modules.fun.commands.suspension import SuspensionRailwayCommand
+bot.add_cog(SuspensionRailwayCommand(bot))
+from modules.fun.commands.uwu import UwuCommand
+bot.add_cog(UwuCommand(bot))
 
 # Welcome
-# from modules.welcome.listeners import WelcomeListeners
-# bot.add_cog(WelcomeListeners(bot))
+from modules.welcome.listeners import WelcomeListeners
+bot.add_cog(WelcomeListeners(bot))
 
 # Events
-# from modules.events.button_click import OnButtonClick
-# bot.add_cog(OnButtonClick(bot))
+from modules.events.button_click import OnButtonClick
+bot.add_cog(OnButtonClick(bot))
 
 # Stats
-from modules.stats.commands.stats import StatsCommand
-bot.add_cog(StatsCommand(bot))
+# from modules.stats.commands.stats import StatsCommand
+# bot.add_cog(StatsCommand(bot))
 # from modules.stats.commands.stats_admin import StatsAdminCommand
 # bot.add_cog(StatsAdminCommand(bot))
 
@@ -138,7 +138,7 @@ async def on_ready():
     Log.info("Bot has started!")
 
     await autoclose_loop.start()
-    await schedule_qotd(bot)
+    # await schedule_qotd(bot)
 
 # Run bot
 bot.run(TOKEN)

modules/events/button_click.py

@@ -1,18 +1,15 @@
 import discord
 from discord.ext import commands
 import variables
-import datetime
 import utils.log as Log
-from utils.stats import update
 from utils.res_thread import resolve_thread
 
-
 class OnButtonClick(commands.Cog):
     def __init__(self, bot: commands.Bot):
         self.bot = bot
 
-    @commands.Cog.listener()
-    async def on_button_click(self, inter: discord.MessageInteraction):
+    @discord.Cog.listener("on_button_click")
+    async def on_button_click(self, inter: discord.ApplicationContext):
         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):
@@ -29,73 +26,6 @@ async def on_button_click(self, inter: discord.MessageInteraction):
 
                 Log.info(f"{inter.author.name} tried to close a help thread, but did not have permissions.")
 
-        if inter.component.custom_id == "summon_helpers_button":
-            # Get time
-            creation_time = inter.channel.create_timestamp
-            current_time = datetime.datetime.now(creation_time.tzinfo)
-            time_difference = current_time - creation_time
-            time_difference_seconds = time_difference.total_seconds()
-            time_difference_minutes = time_difference_seconds / 60
-
-            # Get helper role
-            role = inter.guild.get_role(variables.helper)
-            channel = inter.channel.parent.id
-            if (inter.channel.owner_id == inter.author.id) or (
-                role in inter.author.roles
-            ):
-                if time_difference_minutes >= 30 or role in inter.author.roles:
-                    await inter.response.send_message(
-                        f"<@&{variables.helper!s}> <@&{variables.comm_helper_B!s}>",
-                        embed=discord.Embed(
-                            colour=discord.Colour.blue(),
-                            title=("🙇 Helpers Arise!"),
-                            description=(
-                                "Please note that you still might not immediately get a response since all helpers are human beings and volunteers (and also might be sleeping right now)"
-                            ),
-                        ).set_footer(
-                            text=("Requested by " + inter.user.name),
-                            icon_url=inter.user.avatar,
-                        ),
-                        allowed_mentions=discord.AllowedMentions(roles=True),
-                    )
-
-                    embed = discord.Embed(
-                        colour=discord.Colour.orange(),
-                        title="Someone will come and help soon!",
-                        description="💬 While you wait, take this time to provide more context and details.\n\n✅ Once your question has been resolved (or you no longer need it), please click Resolve Question or run `/resolve`"
-                    )
-                    resolve_question_button = discord.ui.Button(
-                        label="Resolve Question",
-                        custom_id="resolve_question_button",
-                        style=discord.ButtonStyle.green,
-                        emoji="✅",
-                    )
-
-                    await inter.message.edit(
-                        embed=embed, components=[resolve_question_button]
-                    )
-
-                    Log.info(f"{inter.author.name} summoned helpers")
-
-                else:
-                    embed = discord.Embed(
-                        colour=discord.Colour.red(),
-                        title="🕑 Be patient!",
-                        description=(
-                            f"Typically, you should get a response within 10 minutes, but our helpers are volunteers. We therefore need you to wait until <t:{int((datetime.datetime.now() + datetime.timedelta(minutes=30 - time_difference_minutes)).timestamp())}:t> before you use this button.\n\nIf nobody has helped you yet, try rephrasing your question, giving more details, or just being patient."
-                        ),
-                    )
-                    await inter.response.send_message(embed=embed, ephemeral=True)
-                    
-                    Log.info(f"{inter.author.name} tried to summon helpers, but still has {str(30 - int(time_difference_minutes))} minutes left.")
-            else:
-                embed = discord.Embed(
-                    colour=discord.Colour.red(),
-                    title="❌ Summon Helpers",
-                    description="You can't do this since you are neither a helper nor the owner of this channel!",
-                )
-                await inter.response.send_message(embed=embed, ephemeral=True)
-
         if inter.component.custom_id == "del_this_button":
             await inter.message.delete()
         if inter.component.custom_id == "close_report":

modules/fun/commands/suspension.py

@@ -46,25 +46,31 @@ class SuspensionRailwayCommand(commands.Cog, name="suspension_railway"):
     def __init__(self, bot):
         self.bot = bot
 
-    @commands.slash_command(name="susprail")
-    async def susprail(self, inter: discord.ApplicationContext):
-        return
+    susprail = discord.SlashCommandGroup(name="susprail")
 
-    @susprail.sub_command("image","Generate a random image of a suspension railway")
+    @susprail.command(description="Generate a random image of a suspension railway")
     async def image(self, inter: discord.ApplicationContext):
         image = random.choice(IMAGES)
         embed = discord.Embed(
             title=image["title"],
             colour=discord.Colour.blue()
-        ).set_image(image["url"]).set_footer(text=image["credits"])
+        ).set_image(url=image["url"]).set_footer(text=image["credits"])
         await inter.response.send_message(embed=embed)
 
-    @susprail.sub_command("info","Learn about suspension railways")
+    @susprail.command(description="Learn about suspension railways")
     async def info(self, inter: discord.ApplicationContext):
         embed = discord.Embed(
             title="Learn about Suspension Railways",
             colour=discord.Colour.blue()
         )
-        embed.add_field("What are suspension railways?","A suspension railway is a type of elevated monorail. The suspension railway vehicles are suspended from a single, fixed track (not a cable). This makes them good for being built above streets or even other railway types.",inline=False)
-        embed.add_field("What suspension railways are there?","There are many suspension railways including the following:\n- **Schwebebahn** in Wuppertal, Germany\n- **Schwebebahn** in Dresden, Germany\n- **H-Bahn** in TU Dortmund, Germany\n- **Sky train** in Dusseldorf Airport, Germany\n- **Strela** in Glukhovo , Russia\n- **Shonan** in Kanagawa Prefecture, Japan\n- **Chiba Urban** in Chiba, Japan\n- **SkyTrain** in Chengdu, China\n- **Optics Valley** in Wuhan, China\n- **Red Rail** in Xingguo, China",inline=False)
+        embed.add_field(
+            name="What are suspension railways?",
+            value="A suspension railway is a type of elevated monorail. The suspension railway vehicles are suspended from a single, fixed track (not a cable). This makes them good for being built above streets or even other railway types.",
+            inline=False
+        )
+        embed.add_field(
+            name="What suspension railways are there?",
+            value="There are many suspension railways including the following:\n- **Schwebebahn** in Wuppertal, Germany\n- **Schwebebahn** in Dresden, Germany\n- **H-Bahn** in TU Dortmund, Germany\n- **Sky train** in Dusseldorf Airport, Germany\n- **Strela** in Glukhovo , Russia\n- **Shonan** in Kanagawa Prefecture, Japan\n- **Chiba Urban** in Chiba, Japan\n- **SkyTrain** in Chengdu, China\n- **Optics Valley** in Wuhan, China\n- **Red Rail** in Xingguo, China",
+            inline=False
+        )
         await inter.response.send_message(embed=embed)

modules/fun/commands/uwu.py

@@ -10,11 +10,9 @@ class UwuCommand(commands.Cog, name="uwu"):
     def __init__(self, bot):
         self.bot = bot
 
-    @commands.slash_command(name="uwu")
-    async def uwu(self, inter: discord.ApplicationContext):
-        return
+    uwu = discord.SlashCommandGroup(name="uwu")
 
-    @uwu.sub_command("message","Send an uwufied message")
+    @uwu.command(description="Send an uwufied message")
     async def message(self, inter: discord.ApplicationContext, text: str):
         hooks = await inter.channel.webhooks()
 
@@ -28,7 +26,7 @@ async def message(self, inter: discord.ApplicationContext, text: str):
         await inter.response.send_message("yes done",ephemeral=True)
         Log.info(f"Uwufied a message from {inter.author.name} in #{inter.channel.name}")
 
-    @uwu.sub_command("auto","Enable the auto uwufier")
+    @uwu.command(description="Enable the auto uwufier")
     async def auto(self, inter: discord.ApplicationContext):
         try:
             users = uwu_data["users"]
@@ -44,7 +42,7 @@ async def auto(self, inter: discord.ApplicationContext):
         except Exception as e:
             Log.error(f"Could not toggle uwufier for user {inter.author.name}: {e}")
 
-    @uwu.sub_command("channel","Enable the auto uwufier for the current channel")
+    @uwu.command(description="Enable the auto uwufier for the current channel")
     async def channel(self, inter: discord.ApplicationContext):
         try:
             if inter.channel.id in uwu_data["channels"]:
@@ -58,7 +56,7 @@ async def channel(self, inter: discord.ApplicationContext):
         except Exception as e:
             Log.error(f"Could not toggle uwufier for channel #{inter.channel.name}: {e}")
 
-    @uwu.sub_command("ban","Ban a user from using the uwu features")
+    @uwu.command(description="Ban a user from using the uwu features")
     async def ban(self, inter: discord.ApplicationContext, user: discord.Member):
         try:
             if user.id in uwu_data["banned"]:
@@ -72,8 +70,8 @@ async def ban(self, inter: discord.ApplicationContext, user: discord.Member):
         except Exception as e:
             Log.error(f"Could not ban user {user.name} from the uwufier: {e}")
 
-    @uwu.sub_command("user","Enable the auto uwufier for another user")
-    async def auto(self, inter: discord.ApplicationContext, user: discord.Member):
+    @uwu.command(description="Enable the auto uwufier for another user")
+    async def user(self, inter: discord.ApplicationContext, user: discord.Member):
         try:
             users = uwu_data["users"]
             if user.id in users:
@@ -88,7 +86,7 @@ async def auto(self, inter: discord.ApplicationContext, user: discord.Member):
         except Exception as e:
             Log.error(f"Could not toggle uwufier for user {user.name}: {e}")
 
-    @uwu.sub_command("override","Toggle all uwu features")
+    @uwu.command(description="Toggle all uwu features")
     async def override(self, inter: discord.ApplicationContext):
         try:
             if uwu_data["enabled"]:

modules/help_channels/commands/resolve.py

@@ -21,7 +21,7 @@ async def resolve(self, inter: discord.ApplicationContext):
             return False
 
         if (inter.channel.owner_id == inter.author.id) or (role in inter.author.roles) and channel in variables.help_channels:
-            await resolve_thread(inter.channel, inter.response, inter.author)
+            await resolve_thread(inter.channel, inter.response)
         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/help_channels/components/buttons.py

@@ -0,0 +1,64 @@
+import discord
+import variables
+from utils.res_thread import resolve_thread
+
+class SummonHelpersButton(discord.ui.Button):
+    def __init__(self, enabled = True):
+        super().__init__(
+            label="Summon Helpers",
+            custom_id="summon_helpers_button",
+            style=discord.ButtonStyle.blurple,
+            emoji="🙇",
+            disabled=enabled
+        )
+        
+    async def callback(self, inter: discord.Interaction):
+        # Get helper role
+        role = inter.guild.get_role(variables.helper)
+        
+        # Check user has permission
+        if not (
+            inter.channel.owner_id == inter.user.id or 
+            role in inter.user.roles
+        ):
+            return await inter.respond("Only the original poster and staff members do this!",ephemeral=True)
+        
+        # Check that it has been half an hour
+        time_difference = discord.utils.utcnow() - inter.message.channel.created_at
+        time_difference_minutes = time_difference.total_seconds() / 60
+        
+        if time_difference_minutes < 2 and (not role in inter.user.roles):
+            return await inter.respond("**Please be patient!** It has not been long enough to summon helpers. Please wait a bit more before trying again.",ephemeral=True)
+        
+        # Ping helpers
+        await inter.response.send_message(
+            f"<@&{variables.helper!s}> <@&{variables.comm_helper_B!s}>",
+            embed=discord.Embed(
+                colour=discord.Colour.blue(),
+                title=("🙇 Helpers Arise!"),
+                description="I've pinged the staff members. Our staff are volunteers, so please be respectful, and mindful that we all have lives outside of Discord.",
+            ).set_footer(text="Requested by " + inter.user.name, icon_url=inter.user.avatar),
+            allowed_mentions=discord.AllowedMentions(roles=True)
+        )
+        
+        await inter.respond("Done!",ephemeral=True)
+        
+        # Edit the thing out
+        from modules.help_channels.components.views import HelpChannelMessageView
+        await inter.message.edit(view=HelpChannelMessageView(created_at=inter.message.created_at, summoned=True))
+        
+class ResolveQuestionButton(discord.ui.Button):
+    def __init__(self):
+        super().__init__(
+            label="Resolve Question",
+            custom_id="resolve_question_button",
+            style=discord.ButtonStyle.green,
+            emoji="✅"
+        )
+        
+    async def callback(self, inter: discord.Interaction):
+        role = inter.guild.get_role(variables.helper)
+        if (inter.channel.owner_id == inter.user.id) or (role in inter.user.roles):
+            await resolve_thread(inter.channel, inter.response)
+        else:
+            await inter.respond("Only the original poster and staff members do this!",ephemeral=True)