Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

Check min_args before we check if a user has permission (commands.py)

Browse source
This commit is contained in:
jesopo 2019-01-30 11:37:29 +00:00
parent fc39f8f9fc
commit c822a1afd6
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
modules/commands.py
View file

@ -182,23 +182,6 @@ class Module(ModuleManager.BaseModule):
target=target, is_channel=is_channel, tags=event["tags"], target=target, is_channel=is_channel, tags=event["tags"],
args_split=args_split) args_split=args_split)
hard_fail = False
force_success = False
error = None
for returned in returns:
if returned == utils.consts.PERMISSION_HARD_FAIL:
hard_fail = True
elif returned == utils.consts.PERMISSION_FORCE_SUCCESS:
force_success = True
elif returned:
error = returned
if hard_fail or (not force_success and error):
if error:
stderr.write(error).send(command_method)
target.buffer.skip_next()
return
if hook.kwargs.get("remove_empty", True): if hook.kwargs.get("remove_empty", True):
args_split = list(filter(None, args_split)) args_split = list(filter(None, args_split))
@ -216,6 +199,23 @@ class Module(ModuleManager.BaseModule):
stderr.write("Not enough arguments (minimum: %d)" % stderr.write("Not enough arguments (minimum: %d)" %
min_args).send(command_method) min_args).send(command_method)
else: else:
hard_fail = False
force_success = False
error = None
for returned in returns:
if returned == utils.consts.PERMISSION_HARD_FAIL:
hard_fail = True
elif returned == utils.consts.PERMISSION_FORCE_SUCCESS:
force_success = True
elif returned:
error = returned
if hard_fail or (not force_success and error):
if error:
stderr.write(error).send(command_method)
target.buffer.skip_next()
return
args = " ".join(args_split) args = " ".join(args_split)
server = event["server"] server = event["server"]
user = event["user"] user = event["user"]