test
This commit is contained in:
parent
7909c6b2c3
commit
8346a378c0
@ -20,11 +20,21 @@ def get_commands(bot, trigger):
|
||||
first_trigger = triggers[0]
|
||||
del triggers[0]
|
||||
|
||||
first_trigger_type = None
|
||||
if first_trigger.startswith(tuple(sb.config.prefix_list)):
|
||||
bot.say(str(sb.config.prefix_list))
|
||||
first_trigger_type = "command"
|
||||
first_trigger_prefix = first_trigger[0]
|
||||
first_trigger = first_trigger[1:]
|
||||
elif first_trigger.startswith(bot.nick):
|
||||
first_trigger_type = "nickname_command"
|
||||
first_trigger_prefix = first_trigger[0]
|
||||
first_trigger = first_trigger[1:]
|
||||
else:
|
||||
first_trigger_type = "action_command"
|
||||
first_trigger_prefix = "ACTION"
|
||||
|
||||
commands.append({
|
||||
"trigger_type": first_trigger_type,
|
||||
"trigger_prefix": first_trigger_prefix,
|
||||
"trigger_str": first_trigger
|
||||
})
|
||||
|
||||
@ -55,10 +65,7 @@ def prerun_nickname_command():
|
||||
@functools.wraps(function)
|
||||
def internal_prerun(bot, trigger, *args, **kwargs):
|
||||
|
||||
trigger_command_type = str("nickname_command")
|
||||
|
||||
# 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)
|
||||
get_commands(bot, trigger)
|
||||
|
||||
function(bot, trigger, *args, **kwargs)
|
||||
|
||||
@ -73,31 +80,9 @@ def prerun_action_command():
|
||||
@functools.wraps(function)
|
||||
def internal_prerun(bot, trigger, *args, **kwargs):
|
||||
|
||||
trigger_command_type = str("nickname_command")
|
||||
|
||||
# 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)
|
||||
get_commands(bot, trigger)
|
||||
|
||||
function(bot, trigger, *args, **kwargs)
|
||||
|
||||
return internal_prerun
|
||||
return actual_decorator
|
||||
|
||||
|
||||
def make_trigger_args(triggerargs_one, trigger_command_type='module'):
|
||||
trigger_args = spicemanip(triggerargs_one, 'create')
|
||||
if trigger_command_type in ['nickname_command']:
|
||||
trigger_prefix = None
|
||||
# if trigger_prefix.isupper() or trigger_prefix.islower():
|
||||
# trigger_prefix = None
|
||||
trigger_command = spicemanip(trigger_args, 2).lower()
|
||||
trigger_args = spicemanip(trigger_args, '3+', 'list')
|
||||
elif trigger_command_type in ['action_command']:
|
||||
trigger_prefix = None
|
||||
trigger_command = spicemanip(trigger_args, 1).lower()
|
||||
trigger_args = spicemanip(trigger_args, '2+', 'list')
|
||||
else:
|
||||
trigger_prefix = spicemanip(trigger_args, 1).lower()[0]
|
||||
trigger_command = spicemanip(trigger_args, 1).lower()[1:]
|
||||
trigger_args = spicemanip(trigger_args, '2+', 'list')
|
||||
return trigger_args, trigger_command, trigger_prefix
|
||||
|
||||
Loading…
Reference in New Issue
Block a user