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

prerun output

Browse Source
This commit is contained in:
deathbybandaid 2019-09-17 19:47:31 -04:00
parent 600de15689
commit e5363c6c3e
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sopel_modules/SpiceBot/Prerun.py
View File

@ -38,11 +38,6 @@ def prerun(t_command_type='module', t_command_subtype=None):
verify_channel(trigger)
verify_user(bot, trigger)
# Stop here if not registered
if bot.config.SpiceBot_regnick.regnick:
if str(trigger.nick).lower() not in [x.lower() for x in botusers.dict["registered"]]:
return
botcom = class_create('botcom')
if t_command_type == "nickname":
@ -137,11 +132,6 @@ def prerun_query(t_command_type='module', t_command_subtype=None):
verify_channel(trigger)
verify_user(bot, trigger)
# Stop here if not registered
if bot.config.SpiceBot_regnick.regnick:
if str(trigger.nick).lower() not in [x.lower() for x in botusers.dict["registered"]]:
return
botcom = class_create('botcom')
if t_command_type == "nickname":
@ -295,6 +285,12 @@ def trigger_runstatus_query(bot, trigger, botcom):
botmessagelog.messagelog_error(botcom.dict["log_id"], "The admin switch (-a) is for use by authorized nicks ONLY.")
return False
# Stop here if not registered
if bot.config.SpiceBot_regnick.regnick:
if str(trigger.nick).lower() not in [x.lower() for x in botusers.dict["registered"]]:
message = "The query command requires you to be registerd with IRC services."
return trigger_cant_run(bot, trigger, botcom, message)
# don't run commands that are disabled in channels
if not trigger.is_privmsg:
channel_disabled_list = botcommands.get_commands_disabled(str(trigger.sender))
@ -346,6 +342,12 @@ def trigger_runstatus(bot, trigger, botcom):
botmessagelog.messagelog_error(botcom.dict["log_id"], "The admin switch (-a) is for use by authorized nicks ONLY.")
return False
# Stop here if not registered
if bot.config.SpiceBot_regnick.regnick:
if str(trigger.nick).lower() not in [x.lower() for x in botusers.dict["registered"]]:
message = "The " + str(botcom.dict["comtext"]) + " command requires you to be registerd with IRC services."
return trigger_cant_run(bot, trigger, botcom, message)
# if botcom.dict["hyphen_arg"]:
# return False