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

test

Browse Source
This commit is contained in:
deathbybandaid 2019-06-27 12:36:57 -04:00
parent 99122a819b
commit 363777987d
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sopel_modules/SpiceBot/Prerun.py
View File

@ -29,7 +29,10 @@ def prerun(t_command_type='module', t_command_subtype=None):
trigger_command_type = str(t_command_type) trigger_command_type = str(t_command_type)
# 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 = 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 == "?":
return
trigger_command_type = botcommands.find_command_type(trigger_command) trigger_command_type = botcommands.find_command_type(trigger_command)
if not trigger_command_type: if not trigger_command_type:
@ -101,7 +104,10 @@ def prerun_query(t_command_type='module', t_command_subtype=None):
trigger_command_type = str(t_command_type) trigger_command_type = str(t_command_type)
# 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 = 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 != "?":
return
# Argsdict Defaults # Argsdict Defaults
argsdict_default = {} argsdict_default = {}
@ -151,12 +157,16 @@ def prerun_query(t_command_type='module', t_command_subtype=None):
def make_trigger_args(triggerargs_one, trigger_command_type='module'): def make_trigger_args(triggerargs_one, trigger_command_type='module'):
trigger_args = spicemanip.main(triggerargs_one, 'create') trigger_args = spicemanip.main(triggerargs_one, 'create')
if trigger_command_type in ['nickname']: if trigger_command_type in ['nickname']:
trigger_prefix = spicemanip.main(trigger_args, 2).lower()[0]
if trigger_prefix.isupper() or trigger_prefix.islower():
trigger_prefix = None
trigger_command = spicemanip.main(trigger_args, 2).lower() trigger_command = spicemanip.main(trigger_args, 2).lower()
trigger_args = spicemanip.main(trigger_args, '3+', 'list') trigger_args = spicemanip.main(trigger_args, '3+', 'list')
else: else:
trigger_prefix = spicemanip.main(trigger_args, 1).lower()[0]
trigger_command = spicemanip.main(trigger_args, 1).lower()[1:] trigger_command = spicemanip.main(trigger_args, 1).lower()[1:]
trigger_args = spicemanip.main(trigger_args, '2+', 'list') trigger_args = spicemanip.main(trigger_args, '2+', 'list')
return trigger_args, trigger_command return trigger_args, trigger_command, trigger_prefix
def trigger_and_split(trigger_args): def trigger_and_split(trigger_args):

2
sopel_modules/SpiceBot_Core_Commands/CommandsQuery.py
View File

@ -20,7 +20,7 @@ def query_trigger(bot, trigger):
@SpiceBot.events.check_ready([SpiceBot.events.BOT_COMMANDS]) @SpiceBot.events.check_ready([SpiceBot.events.BOT_COMMANDS])
@SpiceBot.prerun_query('nickname', 'nickname') @SpiceBot.prerun_query('nickname', 'nickname')
@sopel.module.nickname_commands('^\?(.*)') @sopel.module.nickname_commands('(.*)')
def query_detection_nick(bot, trigger): def query_detection_nick(bot, trigger):
# command issued, check if valid # command issued, check if valid