Skip to content

Commit

Permalink
fix(git): garbage left after merging
Browse files Browse the repository at this point in the history
  • Loading branch information
ZRunner committed Feb 8, 2024
1 parent e7c4081 commit 53bb60b
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 17 deletions.
Empty file removed .scannerwork/.sonar_lock
Empty file.
6 changes: 0 additions & 6 deletions .scannerwork/report-task.txt

This file was deleted.

13 changes: 2 additions & 11 deletions fcts/help_cmd.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,18 +62,9 @@ async def help_cmd(self, ctx: MyContext, *, args: Optional[str]=None):
pass
except Exception as err:
self.bot.dispatch("error", err, ctx)
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')
await ctx.send_super_help(args or None)

async def help_command(self, ctx: MyContext, commands_arg: Optional[list[str]] = None):
async def help_command(self, ctx: MyContext, command_arg: list[str]):
"""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
Expand Down
1 change: 1 addition & 0 deletions fcts/rss.py
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,7 @@ 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)
Expand Down
1 change: 1 addition & 0 deletions fcts/tickets.py
Original file line number Diff line number Diff line change
Expand Up @@ -810,6 +810,7 @@ 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)
Expand Down

0 comments on commit 53bb60b

Please sign in to comment.