deathbybandaid/SpiceBot-migrated
1
0
Fork 0
mirror of https://github.com/SpiceBot/SpiceBot.git synced 2026-11-13 06:59:53 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove double check

Browse Source
This commit is contained in:
deathbybandaid 2019-05-24 12:21:12 -04:00
parent 2968649e16
commit c679476c12
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sopel_modules/SpiceBot/Prerun.py
View File

@ -106,14 +106,12 @@ class BotPrerun():
reason = disabled_list[trigger.sb["realcom"]]["reason"] reason = disabled_list[trigger.sb["realcom"]]["reason"]
timestamp = disabled_list[trigger.sb["realcom"]]["timestamp"] timestamp = disabled_list[trigger.sb["realcom"]]["timestamp"]
bywhom = disabled_list[trigger.sb["realcom"]]["disabledby"] bywhom = disabled_list[trigger.sb["realcom"]]["disabledby"]
bot.notice("The " + str(trigger.sb["com"]) + " command was disabled by " + bywhom + " in " + str(trigger.sender) + " at " + str(timestamp) + " for the following reason: " + str(reason), trigger.nick) message = "The " + str(trigger.sb["com"]) + " command was disabled by " + bywhom + " in " + str(trigger.sender) + " at " + str(timestamp) + " for the following reason: " + str(reason)
if command_permissions_check(bot, trigger, ['admins', 'owner', 'OP', 'ADMIN', 'OWNER']): return self.trigger_cant_run(bot, trigger, message)
bot.notice("You however are authorized to bypass this warning with the (-a) admin switch.", trigger.nick)
return False
return True return True
def trigger_cant_run(bot, trigger, message=None): def trigger_cant_run(self, bot, trigger, message=None):
if message: if message:
bot.notice(message, trigger.nick) bot.notice(message, trigger.nick)
if command_permissions_check(bot, trigger, ['admins', 'owner', 'OP', 'ADMIN', 'OWNER']): if command_permissions_check(bot, trigger, ['admins', 'owner', 'OP', 'ADMIN', 'OWNER']):
@ -128,9 +126,7 @@ class BotPrerun():
def internal_prerun(bot, trigger, *args, **kwargs): def internal_prerun(bot, trigger, *args, **kwargs):
trigger.sb["args"], trigger.sb["hyphen_arg"] = self.trigger_hyphen_args(trigger.sb["args"]) trigger.sb["args"], trigger.sb["hyphen_arg"] = self.trigger_hyphen_args(trigger.sb["args"])
if not trigger.sb["hyphen_arg"]: if not trigger.sb["hyphen_arg"]:
# check if anything prohibits the nick from running the command return function(bot, trigger, *args, **kwargs)
if self.trigger_runstatus(bot, trigger):
return function(bot, trigger, *args, **kwargs)
else: else:
return self.trigger_hyphen_arg_handler(bot, trigger) return self.trigger_hyphen_arg_handler(bot, trigger)
return internal_prerun return internal_prerun