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

update prerun for action_commands

Browse Source
This commit is contained in:
deathbybandaid 2019-07-18 08:30:21 -04:00
parent a4d40e11df
commit 0362e13d7c
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sopel_modules/SpiceBot/Prerun.py
View File

@ -53,7 +53,7 @@ def prerun(t_command_type='module', t_command_subtype=None):
# Primary command used for trigger, and a list of all words # Primary command used for trigger, and a list of all words
trigger_args, trigger_command, trigger_prefix = make_trigger_args(trigger.args[1], trigger_command_type) trigger_args, trigger_command, trigger_prefix = make_trigger_args(trigger.args[1], trigger_command_type)
if trigger_prefix in [botconfig.SpiceBot_Commands.query_prefix]: if trigger_prefix and trigger_prefix in [botconfig.SpiceBot_Commands.query_prefix]:
return return
trigger_command_type = botcommands.find_command_type(trigger_command) trigger_command_type = botcommands.find_command_type(trigger_command)
@ -68,6 +68,7 @@ def prerun(t_command_type='module', t_command_subtype=None):
argsdict_default = {} argsdict_default = {}
argsdict_default["type"] = trigger_command_type argsdict_default["type"] = trigger_command_type
argsdict_default["com"] = trigger_command argsdict_default["com"] = trigger_command
argsdict_default["trigger_prefix"] = trigger_prefix
# messagelog ID # messagelog ID
argsdict_default["log_id"] = botmessagelog.messagelog_assign() argsdict_default["log_id"] = botmessagelog.messagelog_assign()
@ -144,7 +145,7 @@ def prerun_query(t_command_type='module', t_command_subtype=None):
# Primary command used for trigger, and a list of all words # Primary command used for trigger, and a list of all words
trigger_args, trigger_command, trigger_prefix = make_trigger_args(trigger.args[1], trigger_command_type) trigger_args, trigger_command, trigger_prefix = make_trigger_args(trigger.args[1], trigger_command_type)
if trigger_prefix != botconfig.SpiceBot_Commands.query_prefix: if trigger_prefix and trigger_prefix not in [botconfig.SpiceBot_Commands.query_prefix]:
return return
# Argsdict Defaults # Argsdict Defaults
@ -209,11 +210,15 @@ def verify_channel(trigger):
def make_trigger_args(triggerargs_one, trigger_command_type='module'): def make_trigger_args(triggerargs_one, trigger_command_type='module'):
trigger_args = spicemanip(triggerargs_one, 'create') trigger_args = spicemanip(triggerargs_one, 'create')
if trigger_command_type in ['nickname']: if trigger_command_type in ['nickname']:
trigger_prefix = spicemanip(trigger_args, 2).lower()[0] trigger_prefix = None
if trigger_prefix.isupper() or trigger_prefix.islower(): if trigger_prefix.isupper() or trigger_prefix.islower():
trigger_prefix = None trigger_prefix = None
trigger_command = spicemanip(trigger_args, 2).lower() trigger_command = spicemanip(trigger_args, 2).lower()
trigger_args = spicemanip(trigger_args, '3+', 'list') trigger_args = spicemanip(trigger_args, '3+', 'list')
elif trigger_command_type in ['action']:
trigger_prefix = None
trigger_command = spicemanip(trigger_args, 1).lower()
trigger_args = spicemanip(trigger_args, '2+', 'list')
else: else:
trigger_prefix = spicemanip(trigger_args, 1).lower()[0] trigger_prefix = spicemanip(trigger_args, 1).lower()[0]
trigger_command = spicemanip(trigger_args, 1).lower()[1:] trigger_command = spicemanip(trigger_args, 1).lower()[1:]