deathbybandaid/SpiceBot-migrated
1
0
Fork 0
mirror of https://github.com/SpiceBot/SpiceBot.git synced 2026-11-12 22:49:53 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

another test

Browse Source
This commit is contained in:
deathbybandaid 2019-05-23 09:20:09 -04:00
parent a0b81518d8
commit a56f9b3ab9
13 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sopel_modules/SpiceBot/Prerun.py
View File

@ -16,7 +16,7 @@ class BotPrerun():
def actual_decorator(function): def actual_decorator(function):
@functools.wraps(function) @functools.wraps(function)
def argsbuilder(bot, trigger, *args, **kwargs): def argsbuilder(bot, trigger, *args, **kwargs):
trigger.argcommand, trigger.arglist = self.sopel_triggerargs(bot, trigger, command_type) trigger.argcommand, trigger.arglist, trigger.command_type = self.sopel_triggerargs(bot, trigger, command_type)
return function(bot, trigger, *args, **kwargs) return function(bot, trigger, *args, **kwargs)
return argsbuilder return argsbuilder
return actual_decorator return actual_decorator
@ -29,7 +29,7 @@ class BotPrerun():
else: else:
command = spicemanip.main(triggerargs, 1).lower()[1:] command = spicemanip.main(triggerargs, 1).lower()[1:]
triggerargs = spicemanip.main(triggerargs, '2+', 'list') triggerargs = spicemanip.main(triggerargs, '2+', 'list')
return triggerargs, command return triggerargs, command, command_type
prerun = BotPrerun() prerun = BotPrerun()

2
sopel_modules/SpiceBot/Tools.py
View File

@ -52,7 +52,7 @@ def sopel_triggerargs(bot, trigger, command_type='module_command'):
command = spicemanip.main(triggerargs, 1).lower()[1:] command = spicemanip.main(triggerargs, 1).lower()[1:]
triggerargs = spicemanip.main(triggerargs, '2+', 'list') triggerargs = spicemanip.main(triggerargs, '2+', 'list')
return triggerargs, command return triggerargs, command, command_type
def bot_privs(bot, privtype): def bot_privs(bot, privtype):

2
sopel_modules/SpiceBot_AI/AI.py
View File

@ -13,7 +13,7 @@ import sopel_modules.SpiceBot as SpiceBot
@sopel.module.nickname_commands('(.*)') @sopel.module.nickname_commands('(.*)')
def bot_command_nick(bot, trigger): def bot_command_nick(bot, trigger):
triggerargs, triggercommand = SpiceBot.sopel_triggerargs(bot, trigger, 'nickname_command') triggerargs, triggercommand, command_type = SpiceBot.sopel_triggerargs(bot, trigger, 'nickname_command')
if not triggercommand: if not triggercommand:
return return

2
sopel_modules/SpiceBot_BotPrivs/BotPrivs.py
View File

@ -20,7 +20,7 @@ def bot_command_admins(bot, trigger):
def bot_command_process(bot, trigger): def bot_command_process(bot, trigger):
triggerargs, triggercommand = SpiceBot.sopel_triggerargs(bot, trigger, 'nickname_command') triggerargs, triggercommand, command_type = SpiceBot.sopel_triggerargs(bot, trigger, 'nickname_command')
if triggercommand == 'owner': if triggercommand == 'owner':
triggercommand = 'owners' triggercommand = 'owners'

2
sopel_modules/SpiceBot_Channels_Command/Channels_Command.py
View File

@ -13,7 +13,7 @@ import sopel_modules.SpiceBot as SpiceBot
@sopel.module.nickname_commands('channels', 'channel') @sopel.module.nickname_commands('channels', 'channel')
def nickname_comand_channels(bot, trigger): def nickname_comand_channels(bot, trigger):
triggerargs, triggercommand = SpiceBot.sopel_triggerargs(bot, trigger, 'nickname_command') triggerargs, triggercommand, command_type = SpiceBot.sopel_triggerargs(bot, trigger, 'nickname_command')
if not len(triggerargs): if not len(triggerargs):
commandused = 'list' commandused = 'list'

2
sopel_modules/SpiceBot_CommandsQuery/NickQueryCommand.py
View File

@ -14,7 +14,7 @@ import spicemanip
@sopel.module.nickname_commands('(.*)') @sopel.module.nickname_commands('(.*)')
def query_detection_nick(bot, trigger): def query_detection_nick(bot, trigger):
triggerargs, triggercommand = SpiceBot.sopel_triggerargs(bot, trigger, 'nickname_command') triggerargs, triggercommand, command_type = SpiceBot.sopel_triggerargs(bot, trigger, 'nickname_command')
# command issued, check if valid # command issued, check if valid
if not triggercommand or not len(triggercommand): if not triggercommand or not len(triggercommand):

2
sopel_modules/SpiceBot_CommandsQuery/QueryCommand.py
View File

@ -14,7 +14,7 @@ import spicemanip
@sopel.module.rule('^\?(.*)') @sopel.module.rule('^\?(.*)')
def query_detection(bot, trigger): def query_detection(bot, trigger):
triggerargs, triggercommand = SpiceBot.sopel_triggerargs(bot, trigger, 'query_command') triggerargs, triggercommand, command_type = SpiceBot.sopel_triggerargs(bot, trigger, 'query_command')
# command issued, check if valid # command issued, check if valid
if not triggercommand or not len(triggercommand): if not triggercommand or not len(triggercommand):

2
sopel_modules/SpiceBot_GifSearch/Gif_API_Commands.py
View File

@ -15,7 +15,7 @@ import sopel_modules.SpiceBot as SpiceBot
@sopel.module.commands('(.*)') @sopel.module.commands('(.*)')
def gifapi_triggers(bot, trigger): def gifapi_triggers(bot, trigger):
triggerargs, triggercommand = SpiceBot.sopel_triggerargs(bot, trigger, 'prefix_command') triggerargs, triggercommand, command_type = SpiceBot.sopel_triggerargs(bot, trigger, 'prefix_command')
if triggercommand not in bot.memory["SpiceBot_GifSearch"]['valid_gif_api_dict'].keys(): if triggercommand not in bot.memory["SpiceBot_GifSearch"]['valid_gif_api_dict'].keys():
return return

2
sopel_modules/SpiceBot_GifSearch/Gif_Command.py
View File

@ -15,7 +15,7 @@ import spicemanip
@module.commands('gif') @module.commands('gif')
def gif_trigger(bot, trigger): def gif_trigger(bot, trigger):
triggerargs, triggercommand = SpiceBot.sopel_triggerargs(bot, trigger) triggerargs, triggercommand, command_type = SpiceBot.sopel_triggerargs(bot, trigger)
if not len(triggerargs): if not len(triggerargs):
return bot.osd("Please present a query to search.") return bot.osd("Please present a query to search.")

2
sopel_modules/SpiceBot_GifSearch/Gif_Search_Commands
View File

@ -15,7 +15,7 @@ import sopel_modules.SpiceBot as SpiceBot
@sopel.module.commands('(.*)') @sopel.module.commands('(.*)')
def gifapi_triggers(bot, trigger): def gifapi_triggers(bot, trigger):
triggerargs, triggercommand = SpiceBot.sopel_triggerargs(bot, trigger, 'prefix_command') triggerargs, triggercommand, command_type = SpiceBot.sopel_triggerargs(bot, trigger, 'prefix_command')
if triggercommand not in bot.memory["SpiceBot_GifSearch"]['valid_gif_api_dict'].keys(): if triggercommand not in bot.memory["SpiceBot_GifSearch"]['valid_gif_api_dict'].keys():
return return

2
sopel_modules/SpiceBot_Logs/Logs_Command.py
View File

@ -16,7 +16,7 @@ def bot_command_logs(bot, trigger):
bot.say("I was unable to process this Bot Nick command due to privilege issues.") bot.say("I was unable to process this Bot Nick command due to privilege issues.")
return return
triggerargs, triggercommand = SpiceBot.sopel_triggerargs(bot, trigger, 'nickname_command') triggerargs, triggercommand, command_type = SpiceBot.sopel_triggerargs(bot, trigger, 'nickname_command')
logtype = spicemanip.main(triggerargs, 1) or None logtype = spicemanip.main(triggerargs, 1) or None
if not logtype: if not logtype:

2
sopel_modules/SpiceBot_Messaging/Messaging.py
View File

@ -30,7 +30,7 @@ def bot_command_process(bot, trigger):
bot.say("I was unable to process this Bot Nick command due to privilege issues.") bot.say("I was unable to process this Bot Nick command due to privilege issues.")
return return
triggerargs, triggercommand = SpiceBot.sopel_triggerargs(bot, trigger, 'nickname_command') triggerargs, triggercommand, command_type = SpiceBot.sopel_triggerargs(bot, trigger, 'nickname_command')
if triggercommand in ['say', 'msg']: if triggercommand in ['say', 'msg']:
triggercommand = 'privmsg' triggercommand = 'privmsg'

2
sopel_modules/SpiceBot_Update/Update.py
View File

@ -34,7 +34,7 @@ def nickname_comand_update(bot, trigger):
bot.say("I was unable to process this Bot Nick command due to privilege issues.") bot.say("I was unable to process this Bot Nick command due to privilege issues.")
return return
triggerargs, triggercommand = SpiceBot.sopel_triggerargs(bot, trigger, 'nickname_command') triggerargs, triggercommand, command_type = SpiceBot.sopel_triggerargs(bot, trigger, 'nickname_command')
if not len(triggerargs): if not len(triggerargs):
commandused = 'nodeps' commandused = 'nodeps'