Merge branch 'main' into develop

.scannerwork/report-task.txt

@@ -0,0 +1,6 @@
+projectKey=ZRunner_ZBot_AYcZirM5nIdtIeElAWF2
+serverUrl=https://sonarqube.zrunner.me
+serverVersion=9.9.0.65466
+dashboardUrl=https://sonarqube.zrunner.me/dashboard?id=ZRunner_ZBot_AYcZirM5nIdtIeElAWF2
+ceTaskId=AYgGZmhdv7TdYLyrmHUq
+ceTaskUrl=https://sonarqube.zrunner.me/api/ce/task?id=AYgGZmhdv7TdYLyrmHUq

fcts/help_cmd.py

@@ -62,9 +62,18 @@ async def help_cmd(self, ctx: MyContext, *, args: Optional[str]=None):
             pass
         except Exception as err:
             self.bot.dispatch("error", err, ctx)
-            await ctx.send_super_help(args or None)
+            if len(args) == 0:
+                await self._default_help_command(ctx)
+            else:
+                await self._default_help_command(ctx, args)
+
+    async def should_dm(self, context: MyContext) -> bool:
+        "Check if the answer should be sent in DM or in current channel"
+        if context.guild is None or not self.bot.database_online:
+            return False
+        return await self.bot.get_config(context.guild.id, 'help_in_dm')
 
-    async def help_command(self, ctx: MyContext, command_arg: list[str]):
+    async def help_command(self, ctx: MyContext, commands_arg: Optional[list[str]] = None):
         """Main command for the creation of the help message
 If the bot can't send the new command format, it will try to send the old one."""
         # if user entered a category name

fcts/rss.py

@@ -567,7 +567,6 @@ async def get_page_count(self) -> int:
                 if length == 0:
                     return 1
                 return ceil(length / feeds_per_page)
-
             async def get_page_content(self, interaction, page):
                 "Create one page"
                 embed = discord.Embed(title=title, color=rss_cog.embed_color, timestamp=ctx.message.created_at)

fcts/tickets.py

@@ -810,7 +810,6 @@ async def portal_review_config(self, ctx: MyContext, *, topic_id: Optional[int]=
     @portal_review_config.autocomplete("topic_id")
     async def portal_review_autocomplete(self, interaction: discord.Interaction, current: str):
         return await self.topic_id_autocompletion(interaction, current, allow_other=False)
-
     async def review_all(self, ctx: MyContext):
         "Send a global recap of a guild settings"
         topics = await self.db_get_topics(ctx.guild.id)