fix help position in arguments

This commit is contained in:
Klemek
2021-04-22 15:20:49 +02:00
parent 5f8dfce640
commit e77e46b361
3 changed files with 5 additions and 4 deletions
+2 -1
View File
@@ -67,7 +67,7 @@ class Scanner(ABC):
try: try:
with GuildLogs(guild) as logs: with GuildLogs(guild) as logs:
# If "%cmd help" redirect to "%help cmd" # If "%cmd help" redirect to "%help cmd"
if "help" in args: if len(args) > 1 and args[1] == "help":
await client.bot.help(client, message, "help", args[0]) await client.bot.help(client, message, "help", args[0])
return return
@@ -98,6 +98,7 @@ class Scanner(ABC):
and arg not in str_mentions and arg not in str_mentions
and arg not in other_mentions and arg not in other_mentions
and not skip_check and not skip_check
and len(arg) > 0
): ):
if self.all_args: if self.all_args:
self.other_args += [arg] self.other_args += [arg]
+1 -1
View File
@@ -23,7 +23,7 @@ async def repeat(
*args: str, *args: str,
add_args: List[str] = [], add_args: List[str] = [],
): ):
if "help" in args: if len(args) > 1 and args[1] == "help":
await client.bot.help(client, message, "help", args[0]) await client.bot.help(client, message, "help", args[0])
return return
id = message.channel.id id = message.channel.id
+2 -2
View File
@@ -49,10 +49,10 @@ async def process(client: discord.client, message: discord.Message, *args: str):
args = list(args) args = list(args)
if len(args) == 1: if len(args) == 1:
await message.channel.send(TEXT) await message.channel.send(TEXT)
elif len(args) > 2:
await message.channel.send(f"Too many arguments", reference=message)
elif args[1] == "help": elif args[1] == "help":
await client.bot.help(client, message, "help", args[0]) await client.bot.help(client, message, "help", args[0])
elif len(args) > 2:
await message.channel.send(f"Too many arguments", reference=message)
elif args[1] in ["agree", "accept"]: elif args[1] in ["agree", "accept"]:
GuildLogs.init_log(message.channel.guild) GuildLogs.init_log(message.channel.guild)
await message.channel.send(AGREE_TEXT, reference=message) await message.channel.send(AGREE_TEXT, reference=message)