attempt && usage

This commit is contained in:
deathbybandaid 2019-05-23 10:22:25 -04:00
parent 2d8992c993
commit cfa6f07e7d
12 changed files with 38 additions and 23 deletions

View File

@ -12,25 +12,40 @@ class BotPrerun():
def __init__(self):
self.dict = {}
def args(self, trigger_command_type='module_command'):
def prerun(self, trigger_command_type='module_command'):
def actual_decorator(function):
@functools.wraps(function)
def argsbuilder(bot, trigger, *args, **kwargs):
trigger.sb = self.sopel_trigger_args(bot, trigger, trigger_command_type)
return function(bot, trigger, *args, **kwargs)
return argsbuilder
def internal_prerun(bot, trigger, *args, **kwargs):
prerun_split = self.sopel_trigger_args(bot, trigger, trigger_command_type)
for prerun in prerun_split:
trigger.sb = prerun
function(bot, trigger, *args, **kwargs)
return
return internal_prerun
return actual_decorator
def sopel_trigger_args(self, bot, trigger, trigger_command_type='module_command'):
trigger_args = spicemanip.main(trigger.args[1], 'create')
if trigger_command_type in ['nickname', 'nickname_command', 'nickname_commands']:
trigger_command = spicemanip.main(trigger_args, 2).lower()
trigger_args = spicemanip.main(trigger_args, '3+', 'list')
trigger_args = spicemanip.main(trigger_args, '2+', 'list')
else:
trigger_command = spicemanip.main(trigger_args, 1).lower()[1:]
trigger_args = spicemanip.main(trigger_args, '2+', 'list')
argsdict = {"com": trigger_command, "args": trigger_args, "type": trigger_command_type}
return argsdict
trigger_args = spicemanip.main(trigger_args, '1+', 'list')
# Handle && splittings
trigger_args_list_split = spicemanip.main(trigger_args, "split_&&")
if not len(trigger_args_list_split):
trigger_args_list_split.append([])
prerun_split = []
for trigger_args_list in trigger_args_list_split:
trigger_args_part = spicemanip.main(trigger_args, 'create')
argsdict = {"com": trigger_command, "args": trigger_args_part, "type": trigger_command_type}
prerun_split.append(argsdict)
return prerun_split
prerun = BotPrerun()

View File

@ -10,7 +10,7 @@ import sopel_modules.SpiceBot as SpiceBot
@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED, SpiceBot.events.BOT_COMMANDSQUERY])
@SpiceBot.prerun.args('nickname_command')
@SpiceBot.prerun.prerun('nickname_command')
@sopel.module.nickname_commands('(.*)')
def bot_command_nick(bot, trigger):

View File

@ -9,13 +9,13 @@ import spicemanip
import sopel_modules.SpiceBot as SpiceBot
@SpiceBot.prerun.args('nickname_command')
@SpiceBot.prerun.prerun('nickname_command')
@sopel.module.nickname_commands('owners', 'owner')
def bot_command_owners(bot, trigger):
bot_command_process(bot, trigger)
@SpiceBot.prerun.args('nickname_command')
@SpiceBot.prerun.prerun('nickname_command')
@sopel.module.nickname_commands('admins')
def bot_command_admins(bot, trigger):
bot_command_process(bot, trigger)

View File

@ -10,7 +10,7 @@ import sopel_modules.SpiceBot as SpiceBot
@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED])
@SpiceBot.prerun.args('nickname_command')
@SpiceBot.prerun.prerun('nickname_command')
@sopel.module.nickname_commands('channels', 'channel')
def nickname_comand_channels(bot, trigger):

View File

@ -11,7 +11,7 @@ import spicemanip
@SpiceBot.events.check_ready([SpiceBot.events.BOT_COMMANDSQUERY])
@SpiceBot.prerun.args('nickname_command')
@SpiceBot.prerun.prerun('nickname_command')
@sopel.module.nickname_commands('(.*)')
def query_detection_nick(bot, trigger):

View File

@ -11,7 +11,7 @@ import spicemanip
@SpiceBot.events.check_ready([SpiceBot.events.BOT_COMMANDSQUERY])
@SpiceBot.prerun.args('query_command')
@SpiceBot.prerun.prerun('query_command')
@sopel.module.rule('^\?(.*)')
def query_detection(bot, trigger):

View File

@ -12,7 +12,7 @@ import sopel_modules.SpiceBot as SpiceBot
@SpiceBot.events.check_ready([SpiceBot.events.BOT_GIFSEARCH])
@SpiceBot.prerun.args('prefix_command')
@SpiceBot.prerun.prerun('prefix_command')
@sopel.module.commands('(.*)')
def gifapi_triggers(bot, trigger):

View File

@ -12,7 +12,7 @@ import spicemanip
@SpiceBot.events.check_ready([SpiceBot.events.BOT_GIFSEARCH])
@SpiceBot.prerun.args('prefix_command')
@SpiceBot.prerun.prerun('prefix_command')
@module.commands('gif')
def gif_trigger(bot, trigger):

View File

@ -12,7 +12,7 @@ import sopel_modules.SpiceBot as SpiceBot
@SpiceBot.events.check_ready([SpiceBot.events.BOT_GIFSEARCH])
@SpiceBot.prerun.args('prefix_command')
@SpiceBot.prerun.prerun('prefix_command')
@sopel.module.commands('(.*)')
def gifapi_triggers(bot, trigger):

View File

@ -9,7 +9,7 @@ import sopel_modules.SpiceBot as SpiceBot
@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOGS])
@SpiceBot.prerun.args('nickname_command')
@SpiceBot.prerun.prerun('nickname_command')
@sopel.module.nickname_commands('logs', 'debug')
def bot_command_logs(bot, trigger):

View File

@ -9,19 +9,19 @@ import spicemanip
import sopel_modules.SpiceBot as SpiceBot
@SpiceBot.prerun.args('nickname_command')
@SpiceBot.prerun.prerun('nickname_command')
@sopel.module.nickname_commands('action')
def bot_command_action(bot, trigger):
bot_command_process(bot, trigger)
@SpiceBot.prerun.args('nickname_command')
@SpiceBot.prerun.prerun('nickname_command')
@sopel.module.nickname_commands('notice')
def bot_command_notice(bot, trigger):
bot_command_process(bot, trigger)
@SpiceBot.prerun.args('nickname_command')
@SpiceBot.prerun.prerun('nickname_command')
@sopel.module.nickname_commands('privmsg', 'say', 'msg')
def bot_command_privmsg(bot, trigger):
bot_command_process(bot, trigger)

View File

@ -27,7 +27,7 @@ def setup(bot):
bot.config.define_section("SpiceBot_Update", SpiceBot_Update_MainSection, validate=False)
@SpiceBot.prerun.args('nickname_command')
@SpiceBot.prerun.prerun('nickname_command')
@sopel.module.nickname_commands('update')
def nickname_comand_update(bot, trigger):