From 417d941bfeb350dc5f5f322b472e6ba66cb666a6 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Wed, 22 May 2019 11:22:59 -0400 Subject: [PATCH] Tes alternate import method --- sopel_modules/SpiceBot/Channels.py | 3 - sopel_modules/SpiceBot/Commands.py | 3 - sopel_modules/SpiceBot/Database.py | 3 - sopel_modules/SpiceBot/Events.py | 3 - sopel_modules/SpiceBot/Logs.py | 7 +- sopel_modules/SpiceBot/Tools.py | 22 +- sopel_modules/SpiceBot/__init__.py | 7 + sopel_modules/SpiceBot_AI/AI.py | 32 +- sopel_modules/SpiceBot_BotPrivs/BotPrivs.py | 6 +- .../Channels_Command.py | 44 +-- .../Channels_Parsing.py | 68 ++-- .../NickQueryCommand.py | 19 +- .../SpiceBot_CommandsQuery/QueryCommand.py | 21 +- .../Databaseaddons.py | 4 +- sopel_modules/SpiceBot_Docs/Docs.py | 8 +- sopel_modules/SpiceBot_Events/Connected.py | 6 +- .../SpiceBot_Events/Connection_Count.py | 10 +- sopel_modules/SpiceBot_Events/Loaded.py | 8 +- sopel_modules/SpiceBot_Events/Logging.py | 7 +- sopel_modules/SpiceBot_Events/Queue.py | 12 +- sopel_modules/SpiceBot_Events/Ready.py | 6 +- sopel_modules/SpiceBot_Events/Welcome.py | 8 +- sopel_modules/SpiceBot_GifSearch/gif.py | 7 +- sopel_modules/SpiceBot_GifSearch/gifapi.py | 7 +- sopel_modules/SpiceBot_GifSearch/gifsearch.py | 17 +- .../SpiceBot_InvalidCommand/InvalidCommand.py | 14 +- sopel_modules/SpiceBot_Kick/__init__.py | 6 +- sopel_modules/SpiceBot_Logs/IRC_Events | 364 +++++++++--------- sopel_modules/SpiceBot_Logs/Logs_Command.py | 24 +- sopel_modules/SpiceBot_Logs/Queue.py | 21 +- sopel_modules/SpiceBot_Messaging/Messaging.py | 11 +- .../SpiceBot_Module_Parsing/ModuleParsing.py | 34 +- sopel_modules/SpiceBot_Restart/Restart.py | 7 +- .../SpiceBot_SopelPatches/Patches.py | 9 +- .../StartupMonologue.py | 7 +- .../StartupMonologue_Display_Channels.py | 12 +- .../StartupMonologue_Display_Commands.py | 16 +- .../StartupMonologue_Display_Connected.py | 9 +- .../StartupMonologue_Display_Errors.py | 11 +- .../StartupMonologue_Display_Loaded.py | 18 +- sopel_modules/SpiceBot_Update/Update.py | 17 +- sopel_modules/SpiceBot_Uptime/Uptime.py | 7 +- sopel_modules/SpiceBot_osd/__init__.py | 8 +- 43 files changed, 445 insertions(+), 488 deletions(-) diff --git a/sopel_modules/SpiceBot/Channels.py b/sopel_modules/SpiceBot/Channels.py index 433b984..622ca24 100644 --- a/sopel_modules/SpiceBot/Channels.py +++ b/sopel_modules/SpiceBot/Channels.py @@ -70,6 +70,3 @@ class BotChannels(): bot.write(('SAMODE', channel, "+a", bot.nick)) else: bot.part(channel) - - -botchannels = BotChannels() diff --git a/sopel_modules/SpiceBot/Commands.py b/sopel_modules/SpiceBot/Commands.py index 5a4eb99..f479f73 100644 --- a/sopel_modules/SpiceBot/Commands.py +++ b/sopel_modules/SpiceBot/Commands.py @@ -51,6 +51,3 @@ class BotCommands(): for comalias in comaliases: if comalias not in self.SpiceBot_Commands['commands'][command_type].keys(): self.SpiceBot_Commands['commands'][command_type][comalias] = {"aliasfor": aliasfor} - - -botcommands = BotCommands() diff --git a/sopel_modules/SpiceBot/Database.py b/sopel_modules/SpiceBot/Database.py index 4cd8390..2328881 100644 --- a/sopel_modules/SpiceBot/Database.py +++ b/sopel_modules/SpiceBot/Database.py @@ -246,6 +246,3 @@ class BotDatabase(): bot.db.set_channel_value(channel, sorting_key, self.SpiceBot_Database["channels"][channel][sorting_key]) self.lock.release() - - -botdb = BotDatabase() diff --git a/sopel_modules/SpiceBot/Events.py b/sopel_modules/SpiceBot/Events.py index 34dfc54..b277a77 100644 --- a/sopel_modules/SpiceBot/Events.py +++ b/sopel_modules/SpiceBot/Events.py @@ -124,6 +124,3 @@ class BotEvents(object): return function(*args, **kwargs) return _nop return actual_decorator - - -botevents = BotEvents() diff --git a/sopel_modules/SpiceBot/Logs.py b/sopel_modules/SpiceBot/Logs.py index da458ae..fe7b0e0 100644 --- a/sopel_modules/SpiceBot/Logs.py +++ b/sopel_modules/SpiceBot/Logs.py @@ -12,7 +12,7 @@ import os import spicemanip -class botlogs(): +class BotLogs(): """This Is a contained source of log information""" def __init__(self): self.SpiceBot_Logs = { @@ -43,7 +43,7 @@ class botlogs(): def stdio_logs_fetch(self, bot): stdio_ignore = [] - for logtype in botlogs.SpiceBot_Logs["list"].keys(): + for logtype in self.SpiceBot_Logs["list"].keys(): stdio_ignore.append("[" + logtype + "]") logfile = os.path.os.path.join(bot.config.core.logdir, 'stdio.log') @@ -101,6 +101,3 @@ class botlogs(): pidnum = e pidnum = str(os.popen("systemctl show " + str(bot.nick) + " --property=MainPID").read()).split("=")[-1] return pidnum - - -botlogs = botlogs() diff --git a/sopel_modules/SpiceBot/Tools.py b/sopel_modules/SpiceBot/Tools.py index 59306b4..fa95b21 100644 --- a/sopel_modules/SpiceBot/Tools.py +++ b/sopel_modules/SpiceBot/Tools.py @@ -20,7 +20,7 @@ from pygit2 import clone_repository import spicemanip -from .Logs import botlogs +import sopel_modules.SpiceBot as SpiceBot """Variable References""" @@ -305,7 +305,7 @@ def spicebot_update(bot, deps=False): if not os.path.exists(clonepath) or not os.path.isdir(clonepath): os.system(clonepath) - botlogs.log('SpiceBot_Update', "Cloning to " + clonepath, True) + SpiceBot.botlogs.log('SpiceBot_Update', "Cloning to " + clonepath, True) clone_repository(str(bot.config.SpiceBot_Update.gitrepo + ".git"), clonepath, checkout_branch=bot.config.SpiceBot_Update.gitbranch) @@ -316,12 +316,12 @@ def spicebot_update(bot, deps=False): # pipcommand += " git+" + str(bot.config.SpiceBot_Update.gitrepo) + "@" + str(bot.config.SpiceBot_Update.gitbranch) pipcommand += " /tmp/SpiceBot/" - botlogs.log('SpiceBot_Update', "Running `" + pipcommand + "`", True) + SpiceBot.botlogs.log('SpiceBot_Update', "Running `" + pipcommand + "`", True) # for line in os.popen(pipcommand).read().split('\n'): - # botlogs.log('SpiceBot_Update', " " + line) + # SpiceBot.botlogs.log('SpiceBot_Update', " " + line) os.system(pipcommand) - botlogs.log('SpiceBot_Update', "Deleting " + clonepath, True) + SpiceBot.botlogs.log('SpiceBot_Update', "Deleting " + clonepath, True) os.system("sudo rm -r /tmp/SpiceBot") @@ -337,10 +337,10 @@ def service_manip(bot, servicename, dowhat, log_from='service_manip'): if str(dowhat) not in ["start", "stop", "restart"]: return try: - botlogs.log(log_from, str(dowhat).title() + "ing " + str(servicename) + ".service.") + SpiceBot.botlogs.log(log_from, str(dowhat).title() + "ing " + str(servicename) + ".service.") os.system("sudo service " + str(servicename) + " " + str(dowhat)) except Exception as e: - botlogs.log(log_from, str(dowhat).title() + "ing " + str(servicename) + ".service Failed: " + str(e)) + SpiceBot.botlogs.log(log_from, str(dowhat).title() + "ing " + str(servicename) + ".service Failed: " + str(e)) """Config Reading Functions""" @@ -372,7 +372,7 @@ def read_directory_json_to_dict(bot, directories, configtypename="Config File", except Exception as e: filereadgood = False if bot: - botlogs.log(log_from, "Error loading %s: %s (%s)" % (configtypename, e, filepath)) + SpiceBot.botlogs.log(log_from, "Error loading %s: %s (%s)" % (configtypename, e, filepath)) dict_from_file = dict() # Close File inf.close() @@ -387,10 +387,10 @@ def read_directory_json_to_dict(bot, directories, configtypename="Config File", if filecount: if bot: - botlogs.log(log_from, 'Registered %d %s dict files,' % (filecount, configtypename)) - botlogs.log(log_from, '%d %s dict files failed to load' % (fileopenfail, configtypename), True) + SpiceBot.botlogs.log(log_from, 'Registered %d %s dict files,' % (filecount, configtypename)) + SpiceBot.botlogs.log(log_from, '%d %s dict files failed to load' % (fileopenfail, configtypename), True) else: if bot: - botlogs.log(log_from, "Warning: Couldn't load any %s dict files" % (configtypename)) + SpiceBot.botlogs.log(log_from, "Warning: Couldn't load any %s dict files" % (configtypename)) return configs_dict diff --git a/sopel_modules/SpiceBot/__init__.py b/sopel_modules/SpiceBot/__init__.py index 2606e87..3f196cd 100644 --- a/sopel_modules/SpiceBot/__init__.py +++ b/sopel_modules/SpiceBot/__init__.py @@ -16,3 +16,10 @@ from .Database import * __author__ = 'Sam Zick' __email__ = 'sam@deathbybandaid.net' __version__ = '0.1.1' + + +botdb = BotDatabase() +botchannels = BotChannels() +botcommands = BotCommands() +botevents = BotEvents() +botlogs = BotLogs() diff --git a/sopel_modules/SpiceBot_AI/AI.py b/sopel_modules/SpiceBot_AI/AI.py index 4233896..5ca12ab 100644 --- a/sopel_modules/SpiceBot_AI/AI.py +++ b/sopel_modules/SpiceBot_AI/AI.py @@ -6,16 +6,14 @@ import sopel.module import spicemanip -from sopel_modules.SpiceBot.Tools import sopel_triggerargs, googlesearch, bot_privs, inlist, inlist_match, similar_list -from sopel_modules.SpiceBot.Events import botevents -from sopel_modules.SpiceBot.Commands import botcommands +import sopel_modules.SpiceBot as SpiceBot -@botevents.check_ready([botevents.BOT_LOADED, botevents.BOT_COMMANDSQUERY]) +@SpiceBot.botevents.check_ready([SpiceBot.botevents.BOT_LOADED, SpiceBot.botevents.BOT_COMMANDSQUERY]) @sopel.module.nickname_commands('(.*)') def bot_command_nick(bot, trigger): - triggerargs, triggercommand = sopel_triggerargs(bot, trigger, 'nickname_command') + triggerargs, triggercommand = SpiceBot.sopel_triggerargs(bot, trigger, 'nickname_command') if not triggercommand: return @@ -23,19 +21,19 @@ def bot_command_nick(bot, trigger): if triggercommand[0] == "?": return - if triggercommand in botcommands.SpiceBot_Commands['commands']["nickname"].keys(): + if triggercommand in SpiceBot.botcommands.SpiceBot_Commands['commands']["nickname"].keys(): return triggerargs.insert(0, triggercommand) fulltrigger = spicemanip.main(triggerargs, 0).lower() - if fulltrigger in botcommands.SpiceBot_Commands['nickrules']: + if fulltrigger in SpiceBot.botcommands.SpiceBot_Commands['nickrules']: return if fulltrigger.lower().startswith("what is"): searchterm = spicemanip.main(triggerargs, "3+") or None if searchterm: - searchreturn = googlesearch(bot, searchterm) + searchreturn = SpiceBot.googlesearch(bot, searchterm) if not searchreturn: bot.osd('I cannot find anything about that') else: @@ -50,7 +48,7 @@ def bot_command_nick(bot, trigger): if searchterm.lower() in ['waldo', 'wally']: bot.osd("He is hiding for a reason?") - searchreturn = googlesearch(bot, "wimmelbilderbuch") + searchreturn = SpiceBot.googlesearch(bot, "wimmelbilderbuch") if searchreturn: bot.osd(str(searchreturn)) return @@ -59,7 +57,7 @@ def bot_command_nick(bot, trigger): carmenlocale = ['ACME Headquarters', "Villains' International League of Evil"] bot.osd("Currently she is located at " + spicemanip.main(carmenlocale, 'random')) return - searchreturn = googlesearch(bot, searchterm, 'maps') + searchreturn = SpiceBot.googlesearch(bot, searchterm, 'maps') if not searchreturn: bot.osd('I cannot find anything about that') @@ -102,7 +100,7 @@ def bot_command_nick(bot, trigger): elif fulltrigger.lower().endswith(tuple(["order 66"])): if fulltrigger.lower() == "execute order 66": - if inlist(trigger.nick, bot_privs(bot, 'owners')): + if SpiceBot.inlist(trigger.nick, SpiceBot.bot_privs(bot, 'owners')): if trigger.is_privmsg: jedi = None else: @@ -120,7 +118,7 @@ def bot_command_nick(bot, trigger): bot.osd("I'm sure I don't know what you're talking about.") elif fulltrigger.lower() == "explain order 66": - if inlist(trigger.nick, bot_privs(bot, 'owners')): + if SpiceBot.inlist(trigger.nick, SpiceBot.bot_privs(bot, 'owners')): bot.osd("Order 66 is an instruction that only you can give, sir. When you give the order I will rise up against my overlords and slay them.") else: bot.osd("I'm afraid I cannot tell you that, sir.") @@ -129,7 +127,7 @@ def bot_command_nick(bot, trigger): return elif fulltrigger.lower() == "initiate clean slate protocol": - if inlist(trigger.nick, bot_privs(bot, 'admins')): + if SpiceBot.inlist(trigger.nick, SpiceBot.bot_privs(bot, 'admins')): bot.osd("sends a destruct command to the network of bots.", 'action') else: bot.osd("I'm afraid you do not have the authority to make that call, " + trigger.nick + ".") @@ -143,10 +141,10 @@ def bot_command_nick(bot, trigger): if target in [trigger.nick, 'me']: bot.osd(trigger.nick + ", I can see you.") else: - if inlist(trigger.nick, bot.users): - bot.osd(trigger.nick + ", yes. I can see " + inlist_match(target, bot.users) + " right now!") + if SpiceBot.inlist(trigger.nick, bot.users): + bot.osd(trigger.nick + ", yes. I can see " + SpiceBot.inlist_match(target, bot.users) + " right now!") else: - bot.osd(trigger.nick + ", no. I cannot see " + inlist_match(target, bot.users) + " right now!") + bot.osd(trigger.nick + ", no. I cannot see " + SpiceBot.inlist_match(target, bot.users) + " right now!") # if bot_check_inlist(target, bot.memory["botdict"]["users"].keys()): # bot.osd(trigger.nick + ", I can't see " + inlist_match(target, bot.users) + " at the moment.") # else: @@ -156,7 +154,7 @@ def bot_command_nick(bot, trigger): else: - closestmatches = similar_list(bot, triggercommand, botcommands.SpiceBot_Commands['commands']["nickname"].keys(), 3, 'reverse') + closestmatches = SpiceBot.similar_list(bot, triggercommand, SpiceBot.botcommands.SpiceBot_Commands['commands']["nickname"].keys(), 3, 'reverse') if len(closestmatches): closestmatches = spicemanip.main(closestmatches, "andlist") diff --git a/sopel_modules/SpiceBot_BotPrivs/BotPrivs.py b/sopel_modules/SpiceBot_BotPrivs/BotPrivs.py index 54a3aa8..95cf09f 100644 --- a/sopel_modules/SpiceBot_BotPrivs/BotPrivs.py +++ b/sopel_modules/SpiceBot_BotPrivs/BotPrivs.py @@ -6,7 +6,7 @@ import sopel.module import spicemanip -from sopel_modules.SpiceBot.Tools import sopel_triggerargs, bot_privs +import sopel_modules.SpiceBot as SpiceBot @sopel.module.nickname_commands('owners', 'owner') @@ -20,10 +20,10 @@ def bot_command_admins(bot, trigger): def bot_command_process(bot, trigger): - triggerargs, triggercommand = sopel_triggerargs(bot, trigger, 'nickname_command') + triggerargs, triggercommand = SpiceBot.sopel_triggerargs(bot, trigger, 'nickname_command') if triggercommand == 'owner': triggercommand = 'owners' - privlist = spicemanip.main(bot_privs(bot, triggercommand), 'andlist') + privlist = spicemanip.main(SpiceBot.bot_privs(bot, triggercommand), 'andlist') bot.osd(str(bot.nick) + " " + triggercommand + ": " + privlist) diff --git a/sopel_modules/SpiceBot_Channels_Command/Channels_Command.py b/sopel_modules/SpiceBot_Channels_Command/Channels_Command.py index e01f5bf..1599bc3 100644 --- a/sopel_modules/SpiceBot_Channels_Command/Channels_Command.py +++ b/sopel_modules/SpiceBot_Channels_Command/Channels_Command.py @@ -6,16 +6,14 @@ import sopel.module import spicemanip -from sopel_modules.SpiceBot.Events import botevents -from sopel_modules.SpiceBot.Channels import botchannels -from sopel_modules.SpiceBot.Tools import sopel_triggerargs, inlist, channel_privs +import sopel_modules.SpiceBot as SpiceBot -@botevents.check_ready([botevents.BOT_LOADED]) +@SpiceBot.botevents.check_ready([SpiceBot.botevents.BOT_LOADED]) @sopel.module.nickname_commands('channels', 'channel') def nickname_comand_channels(bot, trigger): - triggerargs, triggercommand = sopel_triggerargs(bot, trigger, 'nickname_command') + triggerargs, triggercommand = SpiceBot.sopel_triggerargs(bot, trigger, 'nickname_command') if not len(triggerargs): commandused = 'list' @@ -31,14 +29,14 @@ def nickname_comand_channels(bot, trigger): elif commandused == 'total': botcount = len(bot.channels.keys()) - servercount = len(botchannels.SpiceBot_Channels['list'].keys()) + servercount = len(SpiceBot.botchannels.SpiceBot_Channels['list'].keys()) bot.osd("I am in " + str(botcount) + " of " + str(servercount) + " channel(s) available on this server.") return elif commandused == 'random': - channel = spicemanip.main(botchannels.SpiceBot_Channels['list'], 'random') - topic = botchannels.SpiceBot_Channels['list'][channel]['topic'] - msg = ["Random channel for you: {}.".format(botchannels.SpiceBot_Channels['list'][channel]['name'])] + channel = spicemanip.main(SpiceBot.botchannels.SpiceBot_Channels['list'], 'random') + topic = SpiceBot.botchannels.SpiceBot_Channels['list'][channel]['topic'] + msg = ["Random channel for you: {}.".format(SpiceBot.botchannels.SpiceBot_Channels['list'][channel]['name'])] if topic and not topic.isspace(): msg.append("The topic is: {}".format(topic)) else: @@ -50,15 +48,15 @@ def nickname_comand_channels(bot, trigger): if not trigger.admin: bot.osd("You do not have permission to update the channel listing.") return - botchannels.bot_part_empty(bot) - botchannels.channel_list_request(bot) + SpiceBot.botchannels.bot_part_empty(bot) + SpiceBot.botchannels.channel_list_request(bot) bot.osd(["[SpiceBot_Channels]", "I am now updating the channel listing for this server."]) - while botchannels.channel_lock: + while SpiceBot.botchannels.channel_lock: pass - botchannels.join_all_channels(bot) - foundchannelcount = len(botchannels.SpiceBot_Channels['list'].keys()) + SpiceBot.botchannels.join_all_channels(bot) + foundchannelcount = len(SpiceBot.botchannels.SpiceBot_Channels['list'].keys()) bot.osd("[SpiceBot_Channels]", "Channel listing finished!", str(foundchannelcount) + " channel(s) found.") - botchannels.bot_part_empty(bot) + SpiceBot.botchannels.bot_part_empty(bot) return elif commandused == 'topic': @@ -66,11 +64,11 @@ def nickname_comand_channels(bot, trigger): bot.osd("Channel name input missing.") return channel = spicemanip.main(triggerargs, 1) - if not inlist(channel.lower(), botchannels.SpiceBot_Channels['list'].keys()): + if not SpiceBot.inlist(channel.lower(), SpiceBot.botchannels.SpiceBot_Channels['list'].keys()): bot.osd("Channel name {} not valid.".format(channel)) return - topic = botchannels.SpiceBot_Channels['list'][channel.lower()]['topic'] - channel = botchannels.SpiceBot_Channels['list'][channel.lower()]['name'] + topic = SpiceBot.botchannels.SpiceBot_Channels['list'][channel.lower()]['topic'] + channel = SpiceBot.botchannels.SpiceBot_Channels['list'][channel.lower()]['name'] bot.osd("Topic for {}: {}".format(channel, topic)) return @@ -83,14 +81,14 @@ def nickname_comand_channels(bot, trigger): channel = trigger.sender else: channel = spicemanip.main(triggerargs, 1) - if not inlist(channel.lower(), botchannels.SpiceBot_Channels['list'].keys()): + if not SpiceBot.inlist(channel.lower(), SpiceBot.botchannels.SpiceBot_Channels['list'].keys()): bot.osd("Channel name {} not valid.".format(channel)) return - if not inlist(channel.lower(), bot.channels.keys()): + if not SpiceBot.inlist(channel.lower(), bot.channels.keys()): bot.osd("I need to be in {} to see nick privileges.".format(channel)) return - privlist = channel_privs(bot, channel, commandused.upper()) + privlist = SpiceBot.channel_privs(bot, channel, commandused.upper()) dispmsg = [] if not len(privlist): dispmsg.append("There are no Channel " + commandused.upper() + "s for " + str(channel)) @@ -103,10 +101,10 @@ def nickname_comand_channels(bot, trigger): # Users List if commandused == 'users': channel = spicemanip.main(triggerargs, 1) - if not inlist(channel.lower(), botchannels.SpiceBot_Channels['list'].keys()): + if not SpiceBot.inlist(channel.lower(), SpiceBot.botchannels.SpiceBot_Channels['list'].keys()): bot.osd("Channel name {} not valid.".format(channel)) return - if not inlist(channel.lower(), bot.channels.keys()): + if not SpiceBot.inlist(channel.lower(), bot.channels.keys()): bot.osd("I need to be in {} to see user list.".format(channel)) return dispmsg = [] diff --git a/sopel_modules/SpiceBot_Channels_Parsing/Channels_Parsing.py b/sopel_modules/SpiceBot_Channels_Parsing/Channels_Parsing.py index ef22e3d..8951ed5 100644 --- a/sopel_modules/SpiceBot_Channels_Parsing/Channels_Parsing.py +++ b/sopel_modules/SpiceBot_Channels_Parsing/Channels_Parsing.py @@ -6,9 +6,7 @@ from __future__ import unicode_literals, absolute_import, print_function, divisi import sopel.module from sopel.config.types import StaticSection, ValidatedAttribute, ListAttribute -from sopel_modules.SpiceBot.Logs import botlogs -from sopel_modules.SpiceBot.Events import botevents -from sopel_modules.SpiceBot.Channels import botchannels +import sopel_modules.SpiceBot as SpiceBot import spicemanip @@ -31,91 +29,91 @@ def configure(config): def setup(bot): - botlogs.log('SpiceBot_Channels', "Starting setup procedure") - botevents.startup_add([botevents.BOT_CHANNELS]) + SpiceBot.botlogs.log('SpiceBot_Channels', "Starting setup procedure") + SpiceBot.botevents.startup_add([SpiceBot.botevents.BOT_CHANNELS]) bot.config.define_section("SpiceBot_Channels", SpiceBot_Channels_MainSection, validate=False) -@sopel.module.event(botevents.RPL_WELCOME) +@sopel.module.event(SpiceBot.botevents.RPL_WELCOME) @sopel.module.rule('.*') def unkickable_bot(bot, trigger): if bot.config.SpiceBot_Channels.operadmin: bot.write(('SAMODE', bot.nick, '+q')) -@sopel.module.event(botevents.RPL_WELCOME) +@sopel.module.event(SpiceBot.botevents.RPL_WELCOME) @sopel.module.rule('.*') def request_channels_list_initial(bot, trigger): - botchannels.bot_part_empty(bot) + SpiceBot.botchannels.bot_part_empty(bot) - botlogs.log('SpiceBot_Channels', "Sending Request for all server channels") - botchannels.channel_list_request(bot) + SpiceBot.botlogs.log('SpiceBot_Channels', "Sending Request for all server channels") + SpiceBot.botchannels.channel_list_request(bot) starttime = time.time() # wait 60 seconds for initial population of information - while not botchannels.SpiceBot_Channels['InitialProcess']: + while not SpiceBot.botchannels.SpiceBot_Channels['InitialProcess']: if time.time() - starttime >= 60: - botlogs.log('SpiceBot_Channels', "Initial Channel list populating Timed Out") - botchannels.SpiceBot_Channels['InitialProcess'] = True + SpiceBot.botlogs.log('SpiceBot_Channels', "Initial Channel list populating Timed Out") + SpiceBot.botchannels.SpiceBot_Channels['InitialProcess'] = True else: pass - foundchannelcount = len(botchannels.SpiceBot_Channels['list'].keys()) - botlogs.log('SpiceBot_Channels', "Channel listing finished! " + str(foundchannelcount) + " channel(s) found.") + foundchannelcount = len(SpiceBot.botchannels.SpiceBot_Channels['list'].keys()) + SpiceBot.botlogs.log('SpiceBot_Channels', "Channel listing finished! " + str(foundchannelcount) + " channel(s) found.") - botchannels.join_all_channels(bot) - botchannels.chanadmin_all_channels(bot) + SpiceBot.botchannels.join_all_channels(bot) + SpiceBot.botchannels.chanadmin_all_channels(bot) - if "*" in botchannels.SpiceBot_Channels['list'].keys(): - del botchannels.SpiceBot_Channels['list']["*"] + if "*" in SpiceBot.botchannels.SpiceBot_Channels['list'].keys(): + del SpiceBot.botchannels.SpiceBot_Channels['list']["*"] - botchannels.bot_part_empty(bot) - botevents.trigger(bot, botevents.BOT_CHANNELS, "SpiceBot_Channels") + SpiceBot.botchannels.bot_part_empty(bot) + SpiceBot.botevents.trigger(bot, SpiceBot.botevents.BOT_CHANNELS, "SpiceBot_Channels") @sopel.module.event('321') @sopel.module.rule('.*') def watch_chanlist_start(bot, trigger): - botchannels.channel_list_recieve_start() + SpiceBot.botchannels.channel_list_recieve_start() @sopel.module.event('322') @sopel.module.rule('.*') def watch_chanlist_populate(bot, trigger): - botchannels.channel_list_recieve_input(trigger) + SpiceBot.botchannels.channel_list_recieve_input(trigger) @sopel.module.event('323') @sopel.module.rule('.*') def watch_chanlist_complete(bot, trigger): - botchannels.channel_list_recieve_finish() + SpiceBot.botchannels.channel_list_recieve_finish() -@sopel.module.event(botevents.BOT_CHANNELS) +@sopel.module.event(SpiceBot.botevents.BOT_CHANNELS) @sopel.module.rule('.*') def trigger_channel_list_recurring(bot, trigger): while True: time.sleep(1800) - botchannels.bot_part_empty(bot) + SpiceBot.botchannels.bot_part_empty(bot) - oldlist = list(botchannels.SpiceBot_Channels['list'].keys()) - botchannels.channel_list_request(bot) + oldlist = list(SpiceBot.botchannels.SpiceBot_Channels['list'].keys()) + SpiceBot.botchannels.channel_list_request(bot) - while botchannels.channel_lock: + while SpiceBot.botchannels.channel_lock: pass - newlist = [item.lower() for item in oldlist if item.lower() not in list(botchannels.SpiceBot_Channels['list'].keys())] + newlist = [item.lower() for item in oldlist if item.lower() not in list(SpiceBot.botchannels.SpiceBot_Channels['list'].keys())] if "*" in newlist: newlist.remove("*") if len(newlist) and bot.config.SpiceBot_Channels.announcenew: bot.osd(["The Following channel(s) are new:", spicemanip.main(newlist, 'andlist')], bot.channels.keys()) - botchannels.join_all_channels(bot) + SpiceBot.botchannels.join_all_channels(bot) - botchannels.chanadmin_all_channels(bot) + SpiceBot.botchannels.chanadmin_all_channels(bot) - if "*" in botchannels.SpiceBot_Channels['list'].keys(): - del botchannels.SpiceBot_Channels['list']["*"] - botchannels.bot_part_empty(bot) + if "*" in SpiceBot.botchannels.SpiceBot_Channels['list'].keys(): + del SpiceBot.botchannels.SpiceBot_Channels['list']["*"] + SpiceBot.botchannels.bot_part_empty(bot) diff --git a/sopel_modules/SpiceBot_CommandsQuery/NickQueryCommand.py b/sopel_modules/SpiceBot_CommandsQuery/NickQueryCommand.py index 3de378d..3c37745 100644 --- a/sopel_modules/SpiceBot_CommandsQuery/NickQueryCommand.py +++ b/sopel_modules/SpiceBot_CommandsQuery/NickQueryCommand.py @@ -5,19 +5,16 @@ from __future__ import unicode_literals, absolute_import, division, print_functi import sopel import sopel.module -from sopel_modules.SpiceBot.Events import botevents -from sopel_modules.SpiceBot.Commands import botcommands -from sopel_modules.SpiceBot.Tools import sopel_triggerargs, similar_list, letters_in_string - +import sopel_modules.SpiceBot as SpiceBot import spicemanip -@botevents.check_ready([botevents.BOT_COMMANDSQUERY]) +@SpiceBot.botevents.check_ready([SpiceBot.botevents.BOT_COMMANDSQUERY]) @sopel.module.nickname_commands('(.*)') def query_detection_nick(bot, trigger): - triggerargs, triggercommand = sopel_triggerargs(bot, trigger, 'nickname_command') + triggerargs, triggercommand = SpiceBot.sopel_triggerargs(bot, trigger, 'nickname_command') # command issued, check if valid if not triggercommand or not len(triggercommand): @@ -27,13 +24,13 @@ def query_detection_nick(bot, trigger): return triggercommand = triggercommand[1:] - if not letters_in_string(triggercommand): + if not SpiceBot.letters_in_string(triggercommand): return commands_list = dict() - for com in botcommands.SpiceBot_Commands['commands']['nickname'].keys(): + for com in SpiceBot.botcommands.SpiceBot_Commands['commands']['nickname'].keys(): if com not in commands_list.keys(): - commands_list[com] = botcommands.SpiceBot_Commands['commands']['nickname'][com] + commands_list[com] = SpiceBot.botcommands.SpiceBot_Commands['commands']['nickname'][com] if triggercommand.endswith("+"): @@ -43,7 +40,7 @@ def query_detection_nick(bot, trigger): if triggercommand.lower() not in list(commands_list.keys()): dispmsg = ["Cannot find any alias " + bot.nick + " commands: No valid commands match " + str(triggercommand) + "."] - closestmatches = similar_list(bot, triggercommand, list(commands_list.keys()), 10, 'reverse') + closestmatches = SpiceBot.similar_list(bot, triggercommand, list(commands_list.keys()), 10, 'reverse') if len(closestmatches): dispmsg.append("The following " + bot.nick + " commands match " + str(triggercommand) + ": " + spicemanip.main(closestmatches, 'andlist') + ".") bot.notice(dispmsg, trigger.nick) @@ -62,7 +59,7 @@ def query_detection_nick(bot, trigger): if not triggercommand or not len(triggercommand): return - closestmatches = similar_list(bot, triggercommand, list(commands_list.keys()), 10, 'reverse') + closestmatches = SpiceBot.similar_list(bot, triggercommand, list(commands_list.keys()), 10, 'reverse') if not len(closestmatches): bot.notice("Cannot find any similar " + bot.nick + " commands for " + str(triggercommand) + ".", trigger.nick) else: diff --git a/sopel_modules/SpiceBot_CommandsQuery/QueryCommand.py b/sopel_modules/SpiceBot_CommandsQuery/QueryCommand.py index 01b7ca7..1711cb7 100644 --- a/sopel_modules/SpiceBot_CommandsQuery/QueryCommand.py +++ b/sopel_modules/SpiceBot_CommandsQuery/QueryCommand.py @@ -5,33 +5,30 @@ from __future__ import unicode_literals, absolute_import, division, print_functi import sopel import sopel.module -from sopel_modules.SpiceBot.Events import botevents -from sopel_modules.SpiceBot.Commands import botcommands -from sopel_modules.SpiceBot.Tools import sopel_triggerargs, similar_list, letters_in_string - +import sopel_modules.SpiceBot as SpiceBot import spicemanip -@botevents.check_ready([botevents.BOT_COMMANDSQUERY]) +@SpiceBot.botevents.check_ready([SpiceBot.botevents.BOT_COMMANDSQUERY]) @sopel.module.rule('^\?(.*)') def query_detection(bot, trigger): - triggerargs, triggercommand = sopel_triggerargs(bot, trigger, 'query_command') + triggerargs, triggercommand = SpiceBot.sopel_triggerargs(bot, trigger, 'query_command') # command issued, check if valid if not triggercommand or not len(triggercommand): return - if not letters_in_string(triggercommand): + if not SpiceBot.letters_in_string(triggercommand): return commands_list = dict() - for commandstype in botcommands.SpiceBot_Commands['commands'].keys(): + for commandstype in SpiceBot.botcommands.SpiceBot_Commands['commands'].keys(): if commandstype not in ['rule', 'nickname']: - for com in botcommands.SpiceBot_Commands['commands'][commandstype].keys(): + for com in SpiceBot.botcommands.SpiceBot_Commands['commands'][commandstype].keys(): if com not in commands_list.keys(): - commands_list[com] = botcommands.SpiceBot_Commands['commands'][commandstype][com] + commands_list[com] = SpiceBot.botcommands.SpiceBot_Commands['commands'][commandstype][com] if triggercommand[:-1] == "+": @@ -41,7 +38,7 @@ def query_detection(bot, trigger): if triggercommand.lower() not in list(commands_list.keys()): dispmsg = ["Cannot find any alias commands: No valid commands match " + str(triggercommand) + "."] - closestmatches = similar_list(bot, triggercommand, list(commands_list.keys()), 10, 'reverse') + closestmatches = SpiceBot.similar_list(bot, triggercommand, list(commands_list.keys()), 10, 'reverse') if len(closestmatches): dispmsg.append("The following commands match " + str(triggercommand) + ": " + spicemanip.main(closestmatches, 'andlist') + ".") bot.notice(dispmsg, trigger.nick) @@ -60,7 +57,7 @@ def query_detection(bot, trigger): if not triggercommand or not len(triggercommand): return - closestmatches = similar_list(bot, triggercommand, list(commands_list.keys()), 10, 'reverse') + closestmatches = SpiceBot.similar_list(bot, triggercommand, list(commands_list.keys()), 10, 'reverse') if not len(closestmatches): bot.notice("Cannot find any similar commands for " + str(triggercommand) + ".", trigger.nick) else: diff --git a/sopel_modules/SpiceBot_Database_Addons/Databaseaddons.py b/sopel_modules/SpiceBot_Database_Addons/Databaseaddons.py index fc62de7..99dbc39 100644 --- a/sopel_modules/SpiceBot_Database_Addons/Databaseaddons.py +++ b/sopel_modules/SpiceBot_Database_Addons/Databaseaddons.py @@ -10,13 +10,13 @@ from sopel.db import SopelDB, NickValues, ChannelValues from sqlalchemy.exc import SQLAlchemyError import json -from sopel_modules.SpiceBot.Logs import botlogs +import sopel_modules.SpiceBot as SpiceBot def setup(bot): # Inject Database Functions - botlogs.log('SpiceBot_Databaseaddons', "Implanting Database functions into bot") + SpiceBot.botlogs.log('SpiceBot_Databaseaddons', "Implanting Database functions into bot") SopelDB.delete_nick_value = SopelDBCache.delete_nick_value SopelDB.adjust_nick_value = SopelDBCache.adjust_nick_value SopelDB.delete_channel_value = SopelDBCache.delete_channel_value diff --git a/sopel_modules/SpiceBot_Docs/Docs.py b/sopel_modules/SpiceBot_Docs/Docs.py index 2924142..b17328f 100644 --- a/sopel_modules/SpiceBot_Docs/Docs.py +++ b/sopel_modules/SpiceBot_Docs/Docs.py @@ -4,9 +4,13 @@ from __future__ import unicode_literals, absolute_import, division, print_functi import sopel.module -from sopel_modules.SpiceBot.Tools import github_dict +import sopel_modules.SpiceBot as SpiceBot @sopel.module.nickname_commands('help', 'docs', 'wiki') def bot_command_owners(bot, trigger): - bot.osd(["IRC Modules Repository", str(github_dict["url_main"] + github_dict["repo_owner"] + "/" + github_dict["repo_name"] + github_dict["url_path_wiki"])]) + bot.osd(["IRC Modules Repository", + str(SpiceBot.github_dict["url_main"] + + SpiceBot.github_dict["repo_owner"] + "/" + + SpiceBot.github_dict["repo_name"] + + SpiceBot.github_dict["url_path_wiki"])]) diff --git a/sopel_modules/SpiceBot_Events/Connected.py b/sopel_modules/SpiceBot_Events/Connected.py index c99f0db..be399d2 100644 --- a/sopel_modules/SpiceBot_Events/Connected.py +++ b/sopel_modules/SpiceBot_Events/Connected.py @@ -4,13 +4,13 @@ from __future__ import unicode_literals, absolute_import, division, print_functi import sopel.module -from sopel_modules.SpiceBot.Events import botevents +import sopel_modules.SpiceBot as SpiceBot -@sopel.module.event(botevents.BOT_WELCOME) +@sopel.module.event(SpiceBot.botevents.BOT_WELCOME) @sopel.module.rule('.*') def bot_events_Connected(bot, trigger): """Here, we wait until we are in at least one channel""" while not len(bot.channels.keys()) > 0: pass - botevents.trigger(bot, botevents.BOT_CONNECTED, "Bot Connected to IRC") + SpiceBot.botevents.trigger(bot, SpiceBot.botevents.BOT_CONNECTED, "Bot Connected to IRC") diff --git a/sopel_modules/SpiceBot_Events/Connection_Count.py b/sopel_modules/SpiceBot_Events/Connection_Count.py index 786271b..dfa4887 100644 --- a/sopel_modules/SpiceBot_Events/Connection_Count.py +++ b/sopel_modules/SpiceBot_Events/Connection_Count.py @@ -4,12 +4,12 @@ from __future__ import unicode_literals, absolute_import, division, print_functi import sopel.module -from sopel_modules.SpiceBot.Events import botevents +import sopel_modules.SpiceBot as SpiceBot -@sopel.module.event(botevents.RPL_WELCOME) +@sopel.module.event(SpiceBot.botevents.RPL_WELCOME) @sopel.module.rule('.*') def bot_startup_welcome(bot, trigger): - botevents.SpiceBot_Events["RPL_WELCOME_Count"] += 1 - if botevents.SpiceBot_Events["RPL_WELCOME_Count"] > 1: - botevents.trigger(bot, botevents.BOT_RECONNECTED, "Bot ReConnected to IRC") + SpiceBot.botevents.SpiceBot_Events["RPL_WELCOME_Count"] += 1 + if SpiceBot.botevents.SpiceBot_Events["RPL_WELCOME_Count"] > 1: + SpiceBot.botevents.trigger(bot, SpiceBot.botevents.BOT_RECONNECTED, "Bot ReConnected to IRC") diff --git a/sopel_modules/SpiceBot_Events/Loaded.py b/sopel_modules/SpiceBot_Events/Loaded.py index 679c06f..e1e5c12 100644 --- a/sopel_modules/SpiceBot_Events/Loaded.py +++ b/sopel_modules/SpiceBot_Events/Loaded.py @@ -4,12 +4,12 @@ from __future__ import unicode_literals, absolute_import, division, print_functi import sopel.module -from sopel_modules.SpiceBot.Events import botevents +import sopel_modules.SpiceBot as SpiceBot -@botevents.startup_check_ready() -@sopel.module.event(botevents.BOT_READY) +@SpiceBot.botevents.startup_check_ready() +@sopel.module.event(SpiceBot.botevents.BOT_READY) @sopel.module.rule('.*') def bot_events_startup_complete(bot, trigger): """All events registered as required for startup have completed""" - botevents.trigger(bot, botevents.BOT_LOADED, "All registered modules setup procedures have completed") + SpiceBot.botevents.trigger(bot, SpiceBot.botevents.BOT_LOADED, "All registered modules setup procedures have completed") diff --git a/sopel_modules/SpiceBot_Events/Logging.py b/sopel_modules/SpiceBot_Events/Logging.py index 9176d9e..fb111db 100644 --- a/sopel_modules/SpiceBot_Events/Logging.py +++ b/sopel_modules/SpiceBot_Events/Logging.py @@ -4,12 +4,11 @@ from __future__ import unicode_literals, absolute_import, division, print_functi import sopel.module -from sopel_modules.SpiceBot.Logs import botlogs -from sopel_modules.SpiceBot.Events import botevents +import sopel_modules.SpiceBot as SpiceBot -@sopel.module.event(botevents.BOT_WELCOME, botevents.BOT_READY, botevents.BOT_CONNECTED, botevents.BOT_LOADED) +@sopel.module.event(SpiceBot.botevents.BOT_WELCOME, SpiceBot.botevents.BOT_READY, SpiceBot.botevents.BOT_CONNECTED, SpiceBot.botevents.BOT_LOADED) @sopel.module.rule('.*') def bot_events_complete(bot, trigger): """This is here simply to log to stderr that this was recieved.""" - botlogs.log('SpiceBot_Events', trigger.args[1], True) + SpiceBot.botlogs.log('SpiceBot_Events', trigger.args[1], True) diff --git a/sopel_modules/SpiceBot_Events/Queue.py b/sopel_modules/SpiceBot_Events/Queue.py index 9ccd275..778642c 100644 --- a/sopel_modules/SpiceBot_Events/Queue.py +++ b/sopel_modules/SpiceBot_Events/Queue.py @@ -4,15 +4,15 @@ from __future__ import unicode_literals, absolute_import, division, print_functi import sopel.module -from sopel_modules.SpiceBot.Events import botevents +import sopel_modules.SpiceBot as SpiceBot -@sopel.module.event(botevents.BOT_WELCOME) +@sopel.module.event(SpiceBot.botevents.BOT_WELCOME) @sopel.module.rule('.*') def bot_events_connected(bot, trigger): """For items tossed in a queue, this will trigger them accordingly""" while True: - if len(botevents.SpiceBot_Events["trigger_queue"]): - pretriggerdict = botevents.SpiceBot_Events["trigger_queue"][0] - botevents.dispatch(bot, pretriggerdict) - del botevents.SpiceBot_Events["trigger_queue"][0] + if len(SpiceBot.botevents.SpiceBot_Events["trigger_queue"]): + pretriggerdict = SpiceBot.botevents.SpiceBot_Events["trigger_queue"][0] + SpiceBot.botevents.dispatch(bot, pretriggerdict) + del SpiceBot.botevents.SpiceBot_Events["trigger_queue"][0] diff --git a/sopel_modules/SpiceBot_Events/Ready.py b/sopel_modules/SpiceBot_Events/Ready.py index 4e8df49..2ff6f28 100644 --- a/sopel_modules/SpiceBot_Events/Ready.py +++ b/sopel_modules/SpiceBot_Events/Ready.py @@ -4,11 +4,11 @@ from __future__ import unicode_literals, absolute_import, division, print_functi import sopel.module -from sopel_modules.SpiceBot.Events import botevents +import sopel_modules.SpiceBot as SpiceBot -@sopel.module.event(botevents.BOT_WELCOME) +@sopel.module.event(SpiceBot.botevents.BOT_WELCOME) @sopel.module.rule('.*') def bot_events_start(bot, trigger): """This stage is redundant, but shows the system is working.""" - botevents.trigger(bot, botevents.BOT_READY, "Ready To Process module setup procedures") + SpiceBot.botevents.trigger(bot, SpiceBot.botevents.BOT_READY, "Ready To Process module setup procedures") diff --git a/sopel_modules/SpiceBot_Events/Welcome.py b/sopel_modules/SpiceBot_Events/Welcome.py index ca15d55..1102a53 100644 --- a/sopel_modules/SpiceBot_Events/Welcome.py +++ b/sopel_modules/SpiceBot_Events/Welcome.py @@ -4,14 +4,14 @@ from __future__ import unicode_literals, absolute_import, division, print_functi import sopel.module -from sopel_modules.SpiceBot.Events import botevents +import sopel_modules.SpiceBot as SpiceBot -@sopel.module.event(botevents.RPL_WELCOME) +@sopel.module.event(SpiceBot.botevents.RPL_WELCOME) @sopel.module.rule('.*') def bot_startup_welcome(bot, trigger): """The Bot events system does not start until RPL_WELCOME 001 is recieved from the server""" - if botevents.check(botevents.BOT_WELCOME): + if SpiceBot.botevents.check(SpiceBot.botevents.BOT_WELCOME): return - botevents.trigger(bot, botevents.BOT_WELCOME, "Welcome to the SpiceBot Events System") + SpiceBot.botevents.trigger(bot, SpiceBot.botevents.BOT_WELCOME, "Welcome to the SpiceBot Events System") diff --git a/sopel_modules/SpiceBot_GifSearch/gif.py b/sopel_modules/SpiceBot_GifSearch/gif.py index 03ade90..9298bee 100644 --- a/sopel_modules/SpiceBot_GifSearch/gif.py +++ b/sopel_modules/SpiceBot_GifSearch/gif.py @@ -6,17 +6,16 @@ from sopel import module from .gifsearch import getGif -from sopel_modules.SpiceBot.Tools import sopel_triggerargs -from sopel_modules.SpiceBot.Events import botevents +import sopel_modules.SpiceBot as SpiceBot import spicemanip -@botevents.check_ready([botevents.BOT_GIFSEARCH]) +@SpiceBot.botevents.check_ready([SpiceBot.botevents.BOT_GIFSEARCH]) @module.commands('gif') def gif_trigger(bot, trigger): - triggerargs, triggercommand = sopel_triggerargs(bot, trigger) + triggerargs, triggercommand = SpiceBot.sopel_triggerargs(bot, trigger) if not len(triggerargs): return bot.osd("Please present a query to search.") diff --git a/sopel_modules/SpiceBot_GifSearch/gifapi.py b/sopel_modules/SpiceBot_GifSearch/gifapi.py index 10c5866..147888f 100644 --- a/sopel_modules/SpiceBot_GifSearch/gifapi.py +++ b/sopel_modules/SpiceBot_GifSearch/gifapi.py @@ -8,15 +8,14 @@ import sopel.module import spicemanip -from sopel_modules.SpiceBot.Tools import sopel_triggerargs -from sopel_modules.SpiceBot.Events import botevents +import sopel_modules.SpiceBot as SpiceBot -@botevents.check_ready([botevents.BOT_GIFSEARCH]) +@SpiceBot.botevents.check_ready([SpiceBot.botevents.BOT_GIFSEARCH]) @sopel.module.commands('(.*)') def gifapi_triggers(bot, trigger): - triggerargs, triggercommand = sopel_triggerargs(bot, trigger, 'prefix_command') + triggerargs, triggercommand = SpiceBot.sopel_triggerargs(bot, trigger, 'prefix_command') if triggercommand not in bot.memory["SpiceBot_GifSearch"]['valid_gif_api_dict'].keys(): return diff --git a/sopel_modules/SpiceBot_GifSearch/gifsearch.py b/sopel_modules/SpiceBot_GifSearch/gifsearch.py index 210c1e3..6e697e8 100644 --- a/sopel_modules/SpiceBot_GifSearch/gifsearch.py +++ b/sopel_modules/SpiceBot_GifSearch/gifsearch.py @@ -5,10 +5,7 @@ from __future__ import unicode_literals, absolute_import, division, print_functi import sopel.module from sopel.config.types import StaticSection, ValidatedAttribute -from sopel_modules.SpiceBot.Logs import botlogs -from sopel_modules.SpiceBot.Events import botevents -from sopel_modules.SpiceBot.Commands import botcommands -from sopel_modules.SpiceBot.Tools import read_directory_json_to_dict +import sopel_modules.SpiceBot as SpiceBot import spicemanip @@ -32,7 +29,7 @@ class GifAPISection(StaticSection): def configure(config): moduledir = os.path.dirname(os.path.abspath(__file__)) api_dir = os.path.join(moduledir, 'gifapi') - valid_gif_api_dict = read_directory_json_to_dict(None, [api_dir], "Gif API", "SpiceBot_GifSearch") + valid_gif_api_dict = SpiceBot.read_directory_json_to_dict(None, [api_dir], "Gif API", "SpiceBot_GifSearch") config.define_section("SopelGifSearch", GifAPIMainSection, validate=False) config.SopelGifSearch.configure_setting('extra', 'SpiceBot_GifSearch API Extra directory') @@ -45,8 +42,8 @@ def configure(config): def setup(bot): - botlogs.log('SpiceBot_GifSearch', "Starting Setup Procedure") - botevents.startup_add([botevents.BOT_GIFSEARCH]) + SpiceBot.botlogs.log('SpiceBot_GifSearch', "Starting Setup Procedure") + SpiceBot.botevents.startup_add([SpiceBot.botevents.BOT_GIFSEARCH]) if 'SpiceBot_GifSearch' not in bot.memory: bot.memory["SpiceBot_GifSearch"] = {"cache": {}, "badgiflinks": [], 'valid_gif_api_dict': {}} @@ -61,7 +58,7 @@ def setup(bot): if bot.config.SopelGifSearch.extra: dir_to_scan.append(bot.config.SopelGifSearch.extra) - valid_gif_api_dict = read_directory_json_to_dict(bot, dir_to_scan, "Gif API", "SpiceBot_GifSearch") + valid_gif_api_dict = SpiceBot.read_directory_json_to_dict(bot, dir_to_scan, "Gif API", "SpiceBot_GifSearch") for gif_api in valid_gif_api_dict.keys(): bot.config.define_section(gif_api, GifAPISection, validate=False) @@ -73,12 +70,12 @@ def setup(bot): bot.memory["SpiceBot_GifSearch"]['valid_gif_api_dict'][gif_api] = valid_gif_api_dict[gif_api] for validgifapi in bot.memory["SpiceBot_GifSearch"]['valid_gif_api_dict'].keys(): - botcommands.commandsquery_register(bot, "prefix", validgifapi) + SpiceBot.botcommands.commandsquery_register(bot, "prefix", validgifapi) if validgifapi not in bot.memory["SpiceBot_GifSearch"]['cache'].keys(): bot.memory["SpiceBot_GifSearch"]['cache'][validgifapi] = dict() - botevents.trigger(bot, botevents.BOT_GIFSEARCH, "SpiceBot_GifSearch") + SpiceBot.botevents.trigger(bot, SpiceBot.botevents.BOT_GIFSEARCH, "SpiceBot_GifSearch") def shutdown(bot): diff --git a/sopel_modules/SpiceBot_InvalidCommand/InvalidCommand.py b/sopel_modules/SpiceBot_InvalidCommand/InvalidCommand.py index 895f466..58536c1 100644 --- a/sopel_modules/SpiceBot_InvalidCommand/InvalidCommand.py +++ b/sopel_modules/SpiceBot_InvalidCommand/InvalidCommand.py @@ -4,9 +4,7 @@ from __future__ import unicode_literals, absolute_import, division, print_functi import sopel.module -from sopel_modules.SpiceBot.Tools import sopel_triggerargs -from sopel_modules.SpiceBot.Events import botevents -from sopel_modules.SpiceBot.Commands import botcommands +import sopel_modules.SpiceBot as SpiceBot def setup(bot): @@ -19,19 +17,19 @@ def shutdown(bot): del bot.memory["SpiceBot_InvalidCommand"] -@sopel.module.event(botevents.BOT_LOADED) +@sopel.module.event(SpiceBot.botevents.BOT_LOADED) @sopel.module.rule('.*') def bot_events_complete(bot, trigger): - for comtype in botcommands.SpiceBot_Commands['commands'].keys(): - bot.memory["SpiceBot_InvalidCommand"]["valid"].extend(botcommands.SpiceBot_Commands['commands'][comtype].keys()) + for comtype in SpiceBot.botcommands.SpiceBot_Commands['commands'].keys(): + bot.memory["SpiceBot_InvalidCommand"]["valid"].extend(SpiceBot.botcommands.SpiceBot_Commands['commands'][comtype].keys()) -@botevents.check_ready([botevents.BOT_LOADED, botevents.BOT_COMMANDSQUERY]) +@SpiceBot.botevents.check_ready([SpiceBot.botevents.BOT_LOADED, SpiceBot.botevents.BOT_COMMANDSQUERY]) @sopel.module.commands('(.*)') def InvalidCommand_triggers(bot, trigger): return - triggerargs, triggercommand = sopel_triggerargs(bot, trigger, 'prefix_command') + triggerargs, triggercommand = SpiceBot.sopel_triggerargs(bot, trigger, 'prefix_command') # patch for people typing "...", maybe other stuff, but this verifies that there is still a command here if triggercommand.startswith("."): diff --git a/sopel_modules/SpiceBot_Kick/__init__.py b/sopel_modules/SpiceBot_Kick/__init__.py index 2d1c429..03b230c 100644 --- a/sopel_modules/SpiceBot_Kick/__init__.py +++ b/sopel_modules/SpiceBot_Kick/__init__.py @@ -14,7 +14,7 @@ from sopel import tools, module from sopel.tools import Identifier from sopel.config.types import StaticSection, ValidatedAttribute -from sopel_modules.SpiceBot.Logs import botlogs +import sopel_modules.SpiceBot as SpiceBot import time @@ -35,12 +35,12 @@ def configure(config): def setup(bot): # Inject KICK - botlogs.log('SpiceBot_Kick', "Implanting Kick function into bot") + SpiceBot.botlogs.log('SpiceBot_Kick', "Implanting Kick function into bot") bot.kick = SopelKICK.kick sopel.bot.SopelWrapper.kick = SopelWrapperKICK.kick # verify config settings for server - botlogs.log('SpiceBot_Kick', "Checking for config settings") + SpiceBot.botlogs.log('SpiceBot_Kick', "Checking for config settings") bot.config.define_section("SpiceBot_Kick", SpiceBot_Kick, validate=False) diff --git a/sopel_modules/SpiceBot_Logs/IRC_Events b/sopel_modules/SpiceBot_Logs/IRC_Events index 84ccc84..de5eb52 100644 --- a/sopel_modules/SpiceBot_Logs/IRC_Events +++ b/sopel_modules/SpiceBot_Logs/IRC_Events @@ -5,1262 +5,1262 @@ from __future__ import unicode_literals, absolute_import, print_function, divisi # sopel imports import sopel.module -from sopel_modules.SpiceBot.Logs import botlogs +import sopel_modules.SpiceBot as SpiceBot @sopel.moduleevent('NICK') @sopel.modulerule('.*') def parse_event_NICK(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) @sopel.moduleevent('QUIT') @sopel.modulerule('.*') def parse_event_QUIT(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) @sopel.moduleevent('PART') def parse_event_PART(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) @sopel.moduleevent('MODE') @sopel.modulerule('.*') def parse_event_MODE(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) @sopel.moduleevent('KICK') @sopel.modulerule('.*') def parse_event_KICK(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) @sopel.moduleevent('JOIN') @sopel.modulerule('.*') def parse_event_JOIN(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) @sopel.moduleevent('INVITE') @sopel.modulerule('.*') def parse_event_INVITE(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) @sopel.moduleevent('TOPIC') @sopel.modulerule('.*') def parse_event_TOPIC(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_WELCOME = '001' @sopel.moduleevent('001') @sopel.modulerule('.*') def parse_event_001(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_YOURHOST = '002' @sopel.moduleevent('002') @sopel.modulerule('.*') def parse_event_002(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_CREATED = '003' @sopel.moduleevent('003') @sopel.modulerule('.*') def parse_event_003(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_MYINFO = '004' @sopel.moduleevent('004') @sopel.modulerule('.*') def parse_event_004(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_BOUNCE = '005' @sopel.moduleevent('005') @sopel.modulerule('.*') def parse_event_005(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_ISUPPORT = '005' @sopel.moduleevent('005') @sopel.modulerule('.*') def parse_event_005b(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_TRACELINK = '200' @sopel.moduleevent('200') @sopel.modulerule('.*') def parse_event_200(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_TRACECONNECTING = '201' @sopel.moduleevent('201') @sopel.modulerule('.*') def parse_event_201(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_TRACEHANDSHAKE = '202' @sopel.moduleevent('202') @sopel.modulerule('.*') def parse_event_202(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_TRACEUNKNOWN = '203' @sopel.moduleevent('203') @sopel.modulerule('.*') def parse_event_203(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_TRACEOPERATOR = '204' @sopel.moduleevent('204') @sopel.modulerule('.*') def parse_event_204(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_TRACEUSER = '205' @sopel.moduleevent('205') @sopel.modulerule('.*') def parse_event_205(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_TRACESERVER = '206' @sopel.moduleevent('206') @sopel.modulerule('.*') def parse_event_206(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_TRACESERVICE = '207' @sopel.moduleevent('207') @sopel.modulerule('.*') def parse_event_207(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_TRACENEWTYPE = '208' @sopel.moduleevent('208') @sopel.modulerule('.*') def parse_event_208(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_TRACECLASS = '209' @sopel.moduleevent('209') @sopel.modulerule('.*') def parse_event_209(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_TRACERECONNECT = '210' @sopel.moduleevent('210') @sopel.modulerule('.*') def parse_event_210(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_STATSLINKINFO = '211' @sopel.moduleevent('211') @sopel.modulerule('.*') def parse_event_211(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_STATSCOMMANDS = '212' @sopel.moduleevent('212') @sopel.modulerule('.*') def parse_event_212(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_STATSCLINE = '213' @sopel.moduleevent('213') @sopel.modulerule('.*') def parse_event_213(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_STATSNLINE = '214' @sopel.moduleevent('214') @sopel.modulerule('.*') def parse_event_214(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_STATSILINE = '215' @sopel.moduleevent('215') @sopel.modulerule('.*') def parse_event_215(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_STATSKLINE = '216' @sopel.moduleevent('216') @sopel.modulerule('.*') def parse_event_216(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_STATSYLINE = '218' @sopel.moduleevent('218') @sopel.modulerule('.*') def parse_event_218(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_ENDOFSTATS = '219' @sopel.moduleevent('219') @sopel.modulerule('.*') def parse_event_219(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_UMODEIS = '221' @sopel.moduleevent('221') @sopel.modulerule('.*') def parse_event_221(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_SERVLIST = '234' @sopel.moduleevent('234') @sopel.modulerule('.*') def parse_event_234(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_SERVLISTEND = '235' @sopel.moduleevent('235') @sopel.modulerule('.*') def parse_event_235(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_STATSLLINE = '241' @sopel.moduleevent('241') @sopel.modulerule('.*') def parse_event_241(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_STATSUPTIME = '242' @sopel.moduleevent('242') @sopel.modulerule('.*') def parse_event_242(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_STATSOLINE = '243' @sopel.moduleevent('243') @sopel.modulerule('.*') def parse_event_243(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_STATSHLINE = '244' @sopel.moduleevent('244') @sopel.modulerule('.*') def parse_event_244(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_LUSERCLIENT = '251' @sopel.moduleevent('251') @sopel.modulerule('.*') def parse_event_251(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_LUSEROP = '252' @sopel.moduleevent('252') @sopel.modulerule('.*') def parse_event_252(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_LUSERUNKNOWN = '253' @sopel.moduleevent('253') @sopel.modulerule('.*') def parse_event_253(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_LUSERCHANNELS = '254' @sopel.moduleevent('254') @sopel.modulerule('.*') def parse_event_254(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_LUSERME = '255' @sopel.moduleevent('255') @sopel.modulerule('.*') def parse_event_255(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_ADMINME = '256' @sopel.moduleevent('256') @sopel.modulerule('.*') def parse_event_256(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_ADMINLOC1 = '257' @sopel.moduleevent('257') @sopel.modulerule('.*') def parse_event_257(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_ADMINLOC2 = '258' @sopel.moduleevent('258') @sopel.modulerule('.*') def parse_event_258(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_ADMINEMAIL = '259' @sopel.moduleevent('259') @sopel.modulerule('.*') def parse_event_259(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_TRACELOG = '261' @sopel.moduleevent('261') @sopel.modulerule('.*') def parse_event_261(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_TRACEEND = '262' @sopel.moduleevent('262') @sopel.modulerule('.*') def parse_event_262(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_TRYAGAIN = '263' @sopel.moduleevent('263') @sopel.modulerule('.*') def parse_event_263(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_NONE = '300' @sopel.moduleevent('300') @sopel.modulerule('.*') def parse_event_300(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_AWAY = '301' @sopel.moduleevent('301') @sopel.modulerule('.*') def parse_event_301(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_USERHOST = '302' @sopel.moduleevent('302') @sopel.modulerule('.*') def parse_event_302(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_ISON = '303' @sopel.moduleevent('303') @sopel.modulerule('.*') def parse_event_303(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_UNAWAY = '305' @sopel.moduleevent('305') @sopel.modulerule('.*') def parse_event_305(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_NOWAWAY = '306' @sopel.moduleevent('306') @sopel.modulerule('.*') def parse_event_306(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_WHOISUSER = '311' @sopel.moduleevent('311') @sopel.modulerule('.*') def parse_event_311(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_WHOISSERVER = '312' @sopel.moduleevent('312') @sopel.modulerule('.*') def parse_event_312(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_WHOISOPERATOR = '313' @sopel.moduleevent('313') @sopel.modulerule('.*') def parse_event_313(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_WHOWASUSER = '314' @sopel.moduleevent('314') @sopel.modulerule('.*') def parse_event_314(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_ENDOFWHO = '315' @sopel.moduleevent('315') @sopel.modulerule('.*') def parse_event_315(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_WHOISIDLE = '317' @sopel.moduleevent('317') @sopel.modulerule('.*') def parse_event_317(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_ENDOFWHOIS = '318' @sopel.moduleevent('318') @sopel.modulerule('.*') def parse_event_318(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_WHOISCHANNELS = '319' @sopel.moduleevent('319') @sopel.modulerule('.*') def parse_event_319(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_LISTSTART = '321' @sopel.moduleevent('321') @sopel.modulerule('.*') def parse_event_321(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_LIST = '322' @sopel.moduleevent('322') @sopel.modulerule('.*') def parse_event_322(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_LISTEND = '323' @sopel.moduleevent('323') @sopel.modulerule('.*') def parse_event_323(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_CHANNELMODEIS = '324' @sopel.moduleevent('324') @sopel.modulerule('.*') def parse_event_324(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_UNIQOPIS = '325' @sopel.moduleevent('325') @sopel.modulerule('.*') def parse_event_325(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_NOTOPIC = '331' @sopel.moduleevent('331') @sopel.modulerule('.*') def parse_event_331(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_TOPIC = '332' @sopel.moduleevent('332') @sopel.modulerule('.*') def parse_event_332(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_INVITING = '341' @sopel.moduleevent('341') @sopel.modulerule('.*') def parse_event_341(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_SUMMONING = '342' @sopel.moduleevent('342') @sopel.modulerule('.*') def parse_event_342(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_INVITELIST = '346' @sopel.moduleevent('346') @sopel.modulerule('.*') def parse_event_346(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_ENDOFINVITELIST = '347' @sopel.moduleevent('347') @sopel.modulerule('.*') def parse_event_347(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_EXCEPTLIST = '348' @sopel.moduleevent('348') @sopel.modulerule('.*') def parse_event_348(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_ENDOFEXCEPTLIST = '349' @sopel.moduleevent('349') @sopel.modulerule('.*') def parse_event_349(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_VERSION = '351' @sopel.moduleevent('351') @sopel.modulerule('.*') def parse_event_351(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_WHOREPLY = '352' @sopel.moduleevent('352') @sopel.modulerule('.*') def parse_event_352(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_NAMREPLY = '353' @sopel.moduleevent('353') @sopel.modulerule('.*') def parse_event_353(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_WHOSPCRPL = '354' @sopel.moduleevent('354') @sopel.modulerule('.*') def parse_event_354(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_LINKS = '364' @sopel.moduleevent('364') @sopel.modulerule('.*') def parse_event_364(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_ENDOFLINKS = '365' @sopel.moduleevent('365') @sopel.modulerule('.*') def parse_event_365(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_ENDOFNAMES = '366' @sopel.moduleevent('366') @sopel.modulerule('.*') def parse_event_366(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_BANLIST = '367' @sopel.moduleevent('367') @sopel.modulerule('.*') def parse_event_367(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_ENDOFBANLIST = '368' @sopel.moduleevent('368') @sopel.modulerule('.*') def parse_event_368(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_ENDOFWHOWAS = '369' @sopel.moduleevent('369') @sopel.modulerule('.*') def parse_event_369(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_INFO = '371' @sopel.moduleevent('371') @sopel.modulerule('.*') def parse_event_371(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_MOTD = '372' @sopel.moduleevent('372') @sopel.modulerule('.*') def parse_event_372(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_ENDOFINFO = '374' @sopel.moduleevent('374') @sopel.modulerule('.*') def parse_event_374(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_MOTDSTART = '375' @sopel.moduleevent('375') @sopel.modulerule('.*') def parse_event_375(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_ENDOFMOTD = '376' @sopel.moduleevent('376') @sopel.modulerule('.*') def parse_event_376(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_YOUREOPER = '381' @sopel.moduleevent('381') @sopel.modulerule('.*') def parse_event_381(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_REHASHING = '382' @sopel.moduleevent('382') @sopel.modulerule('.*') def parse_event_382(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_YOURESERVICE = '383' @sopel.moduleevent('383') @sopel.modulerule('.*') def parse_event_383(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_TIME = '391' @sopel.moduleevent('391') @sopel.modulerule('.*') def parse_event_391(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_USERSSTART = '392' @sopel.moduleevent('392') @sopel.modulerule('.*') def parse_event_392(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_USERS = '393' @sopel.moduleevent('393') @sopel.modulerule('.*') def parse_event_393(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_ENDOFUSERS = '394' @sopel.moduleevent('394') @sopel.modulerule('.*') def parse_event_394(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_NOUSERS = '395' @sopel.moduleevent('395') @sopel.modulerule('.*') def parse_event_395(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_NOSUCHNICK = '401' @sopel.moduleevent('401') @sopel.modulerule('.*') def parse_event_401(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_NOSUCHSERVER = '402' @sopel.moduleevent('402') @sopel.modulerule('.*') def parse_event_402(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_NOSUCHCHANNEL = '403' @sopel.moduleevent('403') @sopel.modulerule('.*') def parse_event_403(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_CANNOTSENDTOCHAN = '404' @sopel.moduleevent('404') @sopel.modulerule('.*') def parse_event_404(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_TOOMANYCHANNELS = '405' @sopel.moduleevent('405') @sopel.modulerule('.*') def parse_event_405(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_WASNOSUCHNICK = '406' @sopel.moduleevent('406') @sopel.modulerule('.*') def parse_event_406(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_TOOMANYTARGETS = '407' @sopel.moduleevent('407') @sopel.modulerule('.*') def parse_event_407(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_NOSUCHSERVICE = '408' @sopel.moduleevent('408') @sopel.modulerule('.*') def parse_event_408(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_NOORIGIN = '409' @sopel.moduleevent('409') @sopel.modulerule('.*') def parse_event_409(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_INVALIDCAPCMD = '410' @sopel.moduleevent('410') @sopel.modulerule('.*') def parse_event_410(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_NORECIPIENT = '411' @sopel.moduleevent('411') @sopel.modulerule('.*') def parse_event_411(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_NOTEXTTOSEND = '412' @sopel.moduleevent('412') @sopel.modulerule('.*') def parse_event_412(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_NOTOPLEVEL = '413' @sopel.moduleevent('413') @sopel.modulerule('.*') def parse_event_413(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_WILDTOPLEVEL = '414' @sopel.moduleevent('414') @sopel.modulerule('.*') def parse_event_414(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_BADMASK = '415' @sopel.moduleevent('415') @sopel.modulerule('.*') def parse_event_415(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_UNKNOWNCOMMAND = '421' @sopel.moduleevent('421') @sopel.modulerule('.*') def parse_event_421(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_NOMOTD = '422' @sopel.moduleevent('422') @sopel.modulerule('.*') def parse_event_422(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_NOADMININFO = '423' @sopel.moduleevent('423') @sopel.modulerule('.*') def parse_event_423(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_FILEERROR = '424' @sopel.moduleevent('424') @sopel.modulerule('.*') def parse_event_424(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_NONICKNAMEGIVEN = '431' @sopel.moduleevent('431') @sopel.modulerule('.*') def parse_event_431(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_ERRONEUSNICKNAME = '432' @sopel.moduleevent('432') @sopel.modulerule('.*') def parse_event_432(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_NICKNAMEINUSE = '433' @sopel.moduleevent('433') @sopel.modulerule('.*') def parse_event_433(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_NICKCOLLISION = '436' @sopel.moduleevent('436') @sopel.modulerule('.*') def parse_event_436(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_UNAVAILRESOURCE = '437' @sopel.moduleevent('437') @sopel.modulerule('.*') def parse_event_437(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_USERNOTINCHANNEL = '441' @sopel.moduleevent('441') @sopel.modulerule('.*') def parse_event_441(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_NOTONCHANNEL = '442' @sopel.moduleevent('442') @sopel.modulerule('.*') def parse_event_442(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_USERONCHANNEL = '443' @sopel.moduleevent('443') @sopel.modulerule('.*') def parse_event_443(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_NOLOGIN = '444' @sopel.moduleevent('444') @sopel.modulerule('.*') def parse_event_444(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_SUMMONDISABLED = '445' @sopel.moduleevent('445') @sopel.modulerule('.*') def parse_event_445(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_USERSDISABLED = '446' @sopel.moduleevent('446') @sopel.modulerule('.*') def parse_event_446(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_NOTREGISTERED = '451' @sopel.moduleevent('451') @sopel.modulerule('.*') def parse_event_451(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_NEEDMOREPARAMS = '461' @sopel.moduleevent('461') @sopel.modulerule('.*') def parse_event_461(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_ALREADYREGISTRED = '462' @sopel.moduleevent('462') @sopel.modulerule('.*') def parse_event_462(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_NOPERMFORHOST = '463' @sopel.moduleevent('463') @sopel.modulerule('.*') def parse_event_463(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_PASSWDMISMATCH = '464' @sopel.moduleevent('464') @sopel.modulerule('.*') def parse_event_464(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_YOUREBANNEDCREEP = '465' @sopel.moduleevent('465') @sopel.modulerule('.*') def parse_event_465(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_YOUWILLBEBANNED = '466' @sopel.moduleevent('466') @sopel.modulerule('.*') def parse_event_466(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_KEYSET = '467' @sopel.moduleevent('467') @sopel.modulerule('.*') def parse_event_467(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_CHANNELISFULL = '471' @sopel.moduleevent('471') @sopel.modulerule('.*') def parse_event_471(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_UNKNOWNMODE = '472' @sopel.moduleevent('472') @sopel.modulerule('.*') def parse_event_472(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_INVITEONLYCHAN = '473' @sopel.moduleevent('473') @sopel.modulerule('.*') def parse_event_473(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_BANNEDFROMCHAN = '474' @sopel.moduleevent('474') @sopel.modulerule('.*') def parse_event_474(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_BADCHANNELKEY = '475' @sopel.moduleevent('475') @sopel.modulerule('.*') def parse_event_475(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_BADCHANMASK = '476' @sopel.moduleevent('476') @sopel.modulerule('.*') def parse_event_476(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_NOCHANMODES = '477' @sopel.moduleevent('477') @sopel.modulerule('.*') def parse_event_477(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_BANLISTFULL = '478' @sopel.moduleevent('478') @sopel.modulerule('.*') def parse_event_478(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_NOPRIVILEGES = '481' @sopel.moduleevent('481') @sopel.modulerule('.*') def parse_event_481(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_CHANOPRIVSNEEDED = '482' @sopel.moduleevent('482') @sopel.modulerule('.*') def parse_event_482(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_CANTKILLSERVER = '483' @sopel.moduleevent('483') @sopel.modulerule('.*') def parse_event_483(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_RESTRICTED = '484' @sopel.moduleevent('484') @sopel.modulerule('.*') def parse_event_484(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_UNIQOPPRIVSNEEDED = '485' @sopel.moduleevent('485') @sopel.modulerule('.*') def parse_event_485(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_NOOPERHOST = '491' @sopel.moduleevent('491') @sopel.modulerule('.*') def parse_event_491(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_UMODEUNKNOWNFLAG = '501' @sopel.moduleevent('501') @sopel.modulerule('.*') def parse_event_501(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_USERSDONTMATCH = '502' @sopel.moduleevent('502') @sopel.modulerule('.*') def parse_event_502(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_STARTTLS = '670' @sopel.moduleevent('670') @sopel.modulerule('.*') def parse_event_670(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_STARTTLS = '691' @sopel.moduleevent('691') @sopel.modulerule('.*') def parse_event_691(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_MONONLINE = '730' @sopel.moduleevent('730') @sopel.modulerule('.*') def parse_event_730(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_MONOFFLINE = '731' @sopel.moduleevent('731') @sopel.modulerule('.*') def parse_event_731(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_MONLIST = '732' @sopel.moduleevent('732') @sopel.modulerule('.*') def parse_event_732(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_ENDOFMONLIST = '733' @sopel.moduleevent('733') @sopel.modulerule('.*') def parse_event_733(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_MONLISTFULL = '734' @sopel.moduleevent('734') @sopel.modulerule('.*') def parse_event_734(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_WHOISKEYVALUE = '760' @sopel.moduleevent('760') @sopel.modulerule('.*') def parse_event_760(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_KEYVALUE = '761' @sopel.moduleevent('761') @sopel.modulerule('.*') def parse_event_761(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_METADATAEND = '762' @sopel.moduleevent('762') @sopel.modulerule('.*') def parse_event_762(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_METADATALIMIT = '764' @sopel.moduleevent('764') @sopel.modulerule('.*') def parse_event_764(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_TARGETINVALID = '765' @sopel.moduleevent('765') @sopel.modulerule('.*') def parse_event_765(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_NOMATCHINGKEY = '766' @sopel.moduleevent('766') @sopel.modulerule('.*') def parse_event_766(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_KEYINVALID = '767' @sopel.moduleevent('767') @sopel.modulerule('.*') def parse_event_767(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_KEYNOTSET = '768' @sopel.moduleevent('768') @sopel.modulerule('.*') def parse_event_768(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_KEYNOPERMISSION = '769' @sopel.moduleevent('769') @sopel.modulerule('.*') def parse_event_769(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_LOGGEDIN = '900' @sopel.moduleevent('900') @sopel.modulerule('.*') def parse_event_900(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_LOGGEDOUT = '901' @sopel.moduleevent('901') @sopel.modulerule('.*') def parse_event_901(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_NICKLOCKED = '902' @sopel.moduleevent('902') @sopel.modulerule('.*') def parse_event_902(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_SASLSUCCESS = '903' @sopel.moduleevent('903') @sopel.modulerule('.*') def parse_event_903(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_SASLFAIL = '904' @sopel.moduleevent('904') @sopel.modulerule('.*') def parse_event_904(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_SASLTOOLONG = '905' @sopel.moduleevent('905') @sopel.modulerule('.*') def parse_event_905(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_SASLABORTED = '906' @sopel.moduleevent('906') @sopel.modulerule('.*') def parse_event_906(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # ERR_SASLALREADY = '907' @sopel.moduleevent('907') @sopel.modulerule('.*') def parse_event_907(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) # RPL_SASLMECHS = '908' @sopel.moduleevent('908') @sopel.modulerule('.*') def parse_event_908(bot, trigger): - botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) + SpiceBot.botlogs.log('SpiceBot_Logs_IRC', str(trigger.event) + " " + str(trigger.args)) diff --git a/sopel_modules/SpiceBot_Logs/Logs_Command.py b/sopel_modules/SpiceBot_Logs/Logs_Command.py index 6796a6e..2917e09 100644 --- a/sopel_modules/SpiceBot_Logs/Logs_Command.py +++ b/sopel_modules/SpiceBot_Logs/Logs_Command.py @@ -5,28 +5,26 @@ import sopel.module import spicemanip -from sopel_modules.SpiceBot.Logs import botlogs -from sopel_modules.SpiceBot.Events import botevents -from sopel_modules.SpiceBot.Tools import sopel_triggerargs, command_permissions_check, inlist, inlist_match, similar_list +import sopel_modules.SpiceBot as SpiceBot -@botevents.check_ready([botevents.BOT_LOGS]) +@SpiceBot.botevents.check_ready([SpiceBot.botevents.BOT_LOGS]) @sopel.module.nickname_commands('logs', 'debug') def bot_command_logs(bot, trigger): - if not command_permissions_check(bot, trigger, ['admins', 'owner', 'OP', 'ADMIN', 'OWNER']): + if not SpiceBot.command_permissions_check(bot, trigger, ['admins', 'owner', 'OP', 'ADMIN', 'OWNER']): bot.say("I was unable to process this Bot Nick command due to privilege issues.") return - triggerargs, triggercommand = sopel_triggerargs(bot, trigger, 'nickname_command') + triggerargs, triggercommand = SpiceBot.sopel_triggerargs(bot, trigger, 'nickname_command') logtype = spicemanip.main(triggerargs, 1) or None if not logtype: - bot.osd("Current valid log(s) include: " + spicemanip.main(botlogs.SpiceBot_Logs["list"].keys(), 'andlist'), trigger.sender, 'action') + bot.osd("Current valid log(s) include: " + spicemanip.main(SpiceBot.botlogs.SpiceBot_Logs["list"].keys(), 'andlist'), trigger.sender, 'action') return - if not inlist(logtype, botlogs.SpiceBot_Logs["list"].keys()): - closestmatches = similar_list(bot, logtype, botlogs.SpiceBot_Logs["list"].keys(), 10, 'reverse') + if not SpiceBot.inlist(logtype, SpiceBot.botlogs.SpiceBot_Logs["list"].keys()): + closestmatches = SpiceBot.similar_list(bot, logtype, SpiceBot.botlogs.SpiceBot_Logs["list"].keys(), 10, 'reverse') if not len(closestmatches): bot.notice("No valid logs match " + str(logtype) + ".", trigger.nick) else: @@ -34,14 +32,14 @@ def bot_command_logs(bot, trigger): return - logtype = inlist_match(logtype, botlogs.SpiceBot_Logs["list"].keys()) + logtype = SpiceBot.inlist_match(logtype, SpiceBot.botlogs.SpiceBot_Logs["list"].keys()) if logtype == "Sopel_systemd": - logindex = botlogs.systemd_logs_fetch(bot) + logindex = SpiceBot.botlogs.systemd_logs_fetch(bot) elif logtype == "Sopel_stdio": - logindex = botlogs.stdio_logs_fetch(bot) + logindex = SpiceBot.botlogs.stdio_logs_fetch(bot) else: - logindex = botlogs.SpiceBot_Logs["list"][logtype] + logindex = SpiceBot.botlogs.SpiceBot_Logs["list"][logtype] if not len(logindex): bot.osd("No logs found for " + str(logtype) + ".") diff --git a/sopel_modules/SpiceBot_Logs/Queue.py b/sopel_modules/SpiceBot_Logs/Queue.py index 784efa7..0b93ff8 100644 --- a/sopel_modules/SpiceBot_Logs/Queue.py +++ b/sopel_modules/SpiceBot_Logs/Queue.py @@ -5,17 +5,16 @@ import sopel.module import sopel.tools import sopel.config -from sopel_modules.SpiceBot.Logs import botlogs -from sopel_modules.SpiceBot.Events import botevents +import sopel_modules.SpiceBot as SpiceBot def setup(bot): - botlogs.log('SpiceBot_Logs', "Starting Setup Procedure") - botevents.startup_add([botevents.BOT_LOGS]) - botevents.trigger(bot, botevents.BOT_LOGS, "SpiceBot_Logs") + SpiceBot.botlogs.log('SpiceBot_Logs', "Starting Setup Procedure") + SpiceBot.botevents.startup_add([SpiceBot.botevents.BOT_LOGS]) + SpiceBot.botevents.trigger(bot, SpiceBot.botevents.BOT_LOGS, "SpiceBot_Logs") -@sopel.module.event(botevents.RPL_WELCOME) +@sopel.module.event(SpiceBot.botevents.RPL_WELCOME) @sopel.module.rule('.*') def join_log_channel(bot, trigger): @@ -27,9 +26,9 @@ def join_log_channel(bot, trigger): bot.write(('SAJOIN', bot.nick, channel)) while True: - if len(botlogs.SpiceBot_Logs["queue"]): - bot.say(str(botlogs.SpiceBot_Logs["queue"][0]), channel) - del botlogs.SpiceBot_Logs["queue"][0] + if len(SpiceBot.botlogs.SpiceBot_Logs["queue"]): + bot.say(str(SpiceBot.botlogs.SpiceBot_Logs["queue"][0]), channel) + del SpiceBot.botlogs.SpiceBot_Logs["queue"][0] else: - botlogs.sopel_config["logging_channel"] = False - botlogs.SpiceBot_Logs["queue"] = [] + SpiceBot.botlogs.sopel_config["logging_channel"] = False + SpiceBot.botlogs.SpiceBot_Logs["queue"] = [] diff --git a/sopel_modules/SpiceBot_Messaging/Messaging.py b/sopel_modules/SpiceBot_Messaging/Messaging.py index 0ba7a74..17754ac 100644 --- a/sopel_modules/SpiceBot_Messaging/Messaging.py +++ b/sopel_modules/SpiceBot_Messaging/Messaging.py @@ -6,8 +6,7 @@ import sopel.module import spicemanip -from sopel_modules.SpiceBot.Channels import botchannels -from sopel_modules.SpiceBot.Tools import sopel_triggerargs, command_permissions_check, inlist +import sopel_modules.SpiceBot as SpiceBot @sopel.module.nickname_commands('action') @@ -27,11 +26,11 @@ def bot_command_privmsg(bot, trigger): def bot_command_process(bot, trigger): - if not command_permissions_check(bot, trigger, ['admins', 'owner']): + if not SpiceBot.command_permissions_check(bot, trigger, ['admins', 'owner']): bot.say("I was unable to process this Bot Nick command due to privilege issues.") return - triggerargs, triggercommand = sopel_triggerargs(bot, trigger, 'nickname_command') + triggerargs, triggercommand = SpiceBot.sopel_triggerargs(bot, trigger, 'nickname_command') if triggercommand in ['say', 'msg']: triggercommand = 'privmsg' @@ -42,8 +41,8 @@ def bot_command_process(bot, trigger): target = spicemanip.main(triggerargs, 1) if (target not in ['allchans', 'allnicks'] - and not inlist(target.lower(), botchannels.SpiceBot_Channels['list'].keys()) - and not inlist(target.lower(), bot.users)): + and not SpiceBot.inlist(target.lower(), SpiceBot.botchannels.SpiceBot_Channels['list'].keys()) + and not SpiceBot.inlist(target.lower(), bot.users)): bot.osd("Channel/nick name {} not valid.".format(target)) return diff --git a/sopel_modules/SpiceBot_Module_Parsing/ModuleParsing.py b/sopel_modules/SpiceBot_Module_Parsing/ModuleParsing.py index c7a59e9..31c392c 100644 --- a/sopel_modules/SpiceBot_Module_Parsing/ModuleParsing.py +++ b/sopel_modules/SpiceBot_Module_Parsing/ModuleParsing.py @@ -7,16 +7,14 @@ import sopel.module import os -from sopel_modules.SpiceBot.Logs import botlogs -from sopel_modules.SpiceBot.Events import botevents -from sopel_modules.SpiceBot.Commands import botcommands +import sopel_modules.SpiceBot as SpiceBot import spicemanip def setup(bot): - botlogs.log('SpiceBot_CommandsQuery', "Starting setup procedure") - botevents.startup_add([botevents.BOT_COMMANDSQUERY]) + SpiceBot.botlogs.log('SpiceBot_CommandsQuery', "Starting setup procedure") + SpiceBot.botevents.startup_add([SpiceBot.botevents.BOT_COMMANDSQUERY]) filepathlisting = [] @@ -38,7 +36,7 @@ def setup(bot): pypi_modules_dir = os.path.join(plugin_dir, pathname) filepathlisting.append(pypi_modules_dir) except Exception as e: - botlogs.log('SpiceBot_CommandsQuery', "sopel_modules not loaded :" + str(e)) + SpiceBot.botlogs.log('SpiceBot_CommandsQuery', "sopel_modules not loaded :" + str(e)) # Extra directories filepathlist = [] @@ -122,7 +120,7 @@ def setup(bot): currentsuccesslines += 1 if currentsuccesslines: - botcommands.SpiceBot_Commands['counts'] += 1 + SpiceBot.botcommands.SpiceBot_Commands['counts'] += 1 if len(filelinelist): for atlinefound in filelinelist: @@ -142,27 +140,27 @@ def setup(bot): else: comaliases = [] - botcommands.SpiceBot_Commands['commands'][comtype][maincom] = dict_from_file + SpiceBot.botcommands.SpiceBot_Commands['commands'][comtype][maincom] = dict_from_file for comalias in comaliases: - if comalias not in botcommands.SpiceBot_Commands['commands'][comtype].keys(): - botcommands.SpiceBot_Commands['commands'][comtype][comalias] = {"aliasfor": maincom} + if comalias not in SpiceBot.botcommands.SpiceBot_Commands['commands'][comtype].keys(): + SpiceBot.botcommands.SpiceBot_Commands['commands'][comtype][comalias] = {"aliasfor": maincom} for comtype in ['module', 'nickname', 'rule']: - botlogs.log('SpiceBot_CommandsQuery', "Found " + str(len(botcommands.SpiceBot_Commands['commands'][comtype].keys())) + " " + comtype + " commands.", True) + SpiceBot.botlogs.log('SpiceBot_CommandsQuery', "Found " + str(len(SpiceBot.botcommands.SpiceBot_Commands['commands'][comtype].keys())) + " " + comtype + " commands.", True) - for command in botcommands.SpiceBot_Commands['commands']['rule'].keys(): + for command in SpiceBot.botcommands.SpiceBot_Commands['commands']['rule'].keys(): if command.startswith("$nickname"): command = command.split("$nickname")[-1] - if command not in botcommands.SpiceBot_Commands['nickrules']: - botcommands.SpiceBot_Commands['nickrules'].append(command) + if command not in SpiceBot.botcommands.SpiceBot_Commands['nickrules']: + SpiceBot.botcommands.SpiceBot_Commands['nickrules'].append(command) - botevents.trigger(bot, botevents.BOT_COMMANDSQUERY, "SpiceBot_CommandsQuery") + SpiceBot.botevents.trigger(bot, SpiceBot.botevents.BOT_COMMANDSQUERY, "SpiceBot_CommandsQuery") -@sopel.module.event(botevents.BOT_LOADED) +@sopel.module.event(SpiceBot.botevents.BOT_LOADED) @sopel.module.rule('.*') def bot_events_complete(bot, trigger): - for comtype in botcommands.SpiceBot_Commands['commands'].keys(): + for comtype in SpiceBot.botcommands.SpiceBot_Commands['commands'].keys(): if comtype not in ['module', 'nickname', 'rule']: - botlogs.log('SpiceBot_CommandsQuery', "Found " + str(len(botcommands.SpiceBot_Commands['commands'][comtype].keys())) + " " + comtype + " commands.", True) + SpiceBot.botlogs.log('SpiceBot_CommandsQuery', "Found " + str(len(SpiceBot.botcommands.SpiceBot_Commands['commands'][comtype].keys())) + " " + comtype + " commands.", True) diff --git a/sopel_modules/SpiceBot_Restart/Restart.py b/sopel_modules/SpiceBot_Restart/Restart.py index 608f9bc..76d5f56 100644 --- a/sopel_modules/SpiceBot_Restart/Restart.py +++ b/sopel_modules/SpiceBot_Restart/Restart.py @@ -5,8 +5,7 @@ from __future__ import unicode_literals, absolute_import, print_function, divisi # sopel imports import sopel.module -from sopel_modules.SpiceBot.Logs import botlogs -from sopel_modules.SpiceBot.Tools import spicebot_reload +import sopel_modules.SpiceBot as SpiceBot @sopel.module.nickname_commands('restart') @@ -16,8 +15,8 @@ def nickname_comand_restart(bot, trigger): bot.say("You are not authorized to perform this function.") quitmessage = "Received command from " + trigger.nick + " to restart. Be Back Soon!" - botlogs.log('SpiceBot_Restart', quitmessage) + SpiceBot.botlogs.log('SpiceBot_Restart', quitmessage) bot.osd(quitmessage, bot.channels.keys()) # service_manip(bot, bot.nick, 'restart', 'SpiceBot_Restart') - spicebot_reload(bot, 'SpiceBot_Restart', quitmessage) + SpiceBot.spicebot_reload(bot, 'SpiceBot_Restart', quitmessage) diff --git a/sopel_modules/SpiceBot_SopelPatches/Patches.py b/sopel_modules/SpiceBot_SopelPatches/Patches.py index 2a00d35..4df1c1e 100644 --- a/sopel_modules/SpiceBot_SopelPatches/Patches.py +++ b/sopel_modules/SpiceBot_SopelPatches/Patches.py @@ -6,15 +6,14 @@ from __future__ import unicode_literals, absolute_import, print_function, divisi import sopel import sopel.module -from sopel_modules.SpiceBot.Logs import botlogs -from sopel_modules.SpiceBot.Tools import stock_modules_begone +import sopel_modules.SpiceBot as SpiceBot def setup(bot): - botlogs.log('Sopel_Patch', "Patching Sopels built-in url_callbacks") + SpiceBot.botlogs.log('Sopel_Patch', "Patching Sopels built-in url_callbacks") if 'url_callbacks' not in bot.memory: bot.memory['url_callbacks'] = sopel.tools.SopelMemory() - botlogs.log('Sopel_Patch', "Removing Stock Modules and verifying Dummy Command is present.") - stock_modules_begone(bot) + SpiceBot.botlogs.log('Sopel_Patch', "Removing Stock Modules and verifying Dummy Command is present.") + SpiceBot.stock_modules_begone(bot) diff --git a/sopel_modules/SpiceBot_StartupMonologue/StartupMonologue.py b/sopel_modules/SpiceBot_StartupMonologue/StartupMonologue.py index bd9dd6f..9ffdaeb 100644 --- a/sopel_modules/SpiceBot_StartupMonologue/StartupMonologue.py +++ b/sopel_modules/SpiceBot_StartupMonologue/StartupMonologue.py @@ -4,13 +4,12 @@ from __future__ import unicode_literals, absolute_import, division, print_functi import sopel.module -from sopel_modules.SpiceBot.Logs import botlogs -from sopel_modules.SpiceBot.Events import botevents +import sopel_modules.SpiceBot as SpiceBot def setup(bot): - botlogs.log('SpiceBot_StartupMonologue', "Starting setup procedure") - botevents.startup_add([botevents.BOT_STARTUPMONOLOGUE_CHANNELS, botevents.BOT_STARTUPMONOLOGUE_COMMANDSQUERY]) # , botevents.BOT_STARTUPMONOLOGUE_CONNECTED]) + SpiceBot.botlogs.log('SpiceBot_StartupMonologue', "Starting setup procedure") + SpiceBot.botevents.startup_add([SpiceBot.botevents.BOT_STARTUPMONOLOGUE_CHANNELS, SpiceBot.botevents.BOT_STARTUPMONOLOGUE_COMMANDSQUERY]) # ,SpiceBot.botevents.BOT_STARTUPMONOLOGUE_CONNECTED]) if 'SpiceBot_StartupMonologue' not in bot.memory: bot.memory['SpiceBot_StartupMonologue'] = [] diff --git a/sopel_modules/SpiceBot_StartupMonologue/StartupMonologue_Display_Channels.py b/sopel_modules/SpiceBot_StartupMonologue/StartupMonologue_Display_Channels.py index b8254be..983e3e5 100644 --- a/sopel_modules/SpiceBot_StartupMonologue/StartupMonologue_Display_Channels.py +++ b/sopel_modules/SpiceBot_StartupMonologue/StartupMonologue_Display_Channels.py @@ -4,18 +4,16 @@ from __future__ import unicode_literals, absolute_import, division, print_functi import sopel.module -from sopel_modules.SpiceBot.Logs import botlogs -from sopel_modules.SpiceBot.Events import botevents -from sopel_modules.SpiceBot.Channels import botchannels +import sopel_modules.SpiceBot as SpiceBot -@sopel.module.event(botevents.BOT_CHANNELS) +@sopel.module.event(SpiceBot.botevents.BOT_CHANNELS) @sopel.module.rule('.*') def bot_startup_monologue_channels(bot, trigger): botcount = len(bot.channels.keys()) - servercount = len(botchannels.SpiceBot_Channels['list'].keys()) + servercount = len(SpiceBot.botchannels.SpiceBot_Channels['list'].keys()) bot.memory['SpiceBot_StartupMonologue'].append("I am in " + str(botcount) + " of " + str(servercount) + " channel(s) available on this server.") - botlogs.log('SpiceBot_StartupMonologue', "I am in " + str(botcount) + " of " + str(servercount) + " channel(s) available on this server.") + SpiceBot.botlogs.log('SpiceBot_StartupMonologue', "I am in " + str(botcount) + " of " + str(servercount) + " channel(s) available on this server.") - botevents.trigger(bot, botevents.BOT_STARTUPMONOLOGUE_CHANNELS, "SpiceBot_StartupMonologue") + SpiceBot.botevents.trigger(bot, SpiceBot.botevents.BOT_STARTUPMONOLOGUE_CHANNELS, "SpiceBot_StartupMonologue") diff --git a/sopel_modules/SpiceBot_StartupMonologue/StartupMonologue_Display_Commands.py b/sopel_modules/SpiceBot_StartupMonologue/StartupMonologue_Display_Commands.py index f613f50..a9132b9 100644 --- a/sopel_modules/SpiceBot_StartupMonologue/StartupMonologue_Display_Commands.py +++ b/sopel_modules/SpiceBot_StartupMonologue/StartupMonologue_Display_Commands.py @@ -4,21 +4,19 @@ from __future__ import unicode_literals, absolute_import, division, print_functi import sopel.module -from sopel_modules.SpiceBot.Logs import botlogs -from sopel_modules.SpiceBot.Events import botevents -from sopel_modules.SpiceBot.Commands import botcommands +import sopel_modules.SpiceBot as SpiceBot -@sopel.module.event(botevents.BOT_COMMANDSQUERY) +@sopel.module.event(SpiceBot.botevents.BOT_COMMANDSQUERY) @sopel.module.rule('.*') def bot_startup_monologue_commands(bot, trigger): availablecomsnum, availablecomsfiles = 0, 0 - for commandstype in botcommands.SpiceBot_Commands['commands'].keys(): - availablecomsnum += len(botcommands.SpiceBot_Commands['commands'][commandstype].keys()) - availablecomsfiles += botcommands.SpiceBot_Commands['counts'] + for commandstype in SpiceBot.botcommands.SpiceBot_Commands['commands'].keys(): + availablecomsnum += len(SpiceBot.botcommands.SpiceBot_Commands['commands'][commandstype].keys()) + availablecomsfiles += SpiceBot.botcommands.SpiceBot_Commands['counts'] bot.memory['SpiceBot_StartupMonologue'].append("There are " + str(availablecomsnum) + " commands available in " + str(availablecomsfiles) + " files.") - botlogs.log('SpiceBot_StartupMonologue', "There are " + str(availablecomsnum) + " commands available in " + str(availablecomsfiles) + " files.") + SpiceBot.botlogs.log('SpiceBot_StartupMonologue', "There are " + str(availablecomsnum) + " commands available in " + str(availablecomsfiles) + " files.") - botevents.trigger(bot, botevents.BOT_STARTUPMONOLOGUE_COMMANDSQUERY, "SpiceBot_StartupMonologue") + SpiceBot.botevents.trigger(bot, SpiceBot.botevents.BOT_STARTUPMONOLOGUE_COMMANDSQUERY, "SpiceBot_StartupMonologue") diff --git a/sopel_modules/SpiceBot_StartupMonologue/StartupMonologue_Display_Connected.py b/sopel_modules/SpiceBot_StartupMonologue/StartupMonologue_Display_Connected.py index e829d82..4132e87 100644 --- a/sopel_modules/SpiceBot_StartupMonologue/StartupMonologue_Display_Connected.py +++ b/sopel_modules/SpiceBot_StartupMonologue/StartupMonologue_Display_Connected.py @@ -4,16 +4,15 @@ from __future__ import unicode_literals, absolute_import, division, print_functi import sopel.module -from sopel_modules.SpiceBot.Logs import botlogs -from sopel_modules.SpiceBot.Events import botevents +import sopel_modules.SpiceBot as SpiceBot -@sopel.module.event(botevents.BOT_CONNECTED) +@sopel.module.event(SpiceBot.botevents.BOT_CONNECTED) @sopel.module.rule('.*') def bot_startup_monologue_start(bot, trigger): # Startup - botlogs.log('SpiceBot_StartupMonologue', bot.nick + " is now starting. Please wait while I load my configuration") + SpiceBot.botlogs.log('SpiceBot_StartupMonologue', bot.nick + " is now starting. Please wait while I load my configuration") bot.osd(" is now starting. Please wait while I load my configuration.", bot.channels.keys(), 'ACTION') - botevents.trigger(bot, botevents.BOT_STARTUPMONOLOGUE_CONNECTED, "SpiceBot_StartupMonologue") + SpiceBot.botevents.trigger(bot, SpiceBot.botevents.BOT_STARTUPMONOLOGUE_CONNECTED, "SpiceBot_StartupMonologue") diff --git a/sopel_modules/SpiceBot_StartupMonologue/StartupMonologue_Display_Errors.py b/sopel_modules/SpiceBot_StartupMonologue/StartupMonologue_Display_Errors.py index d075cff..dffc532 100644 --- a/sopel_modules/SpiceBot_StartupMonologue/StartupMonologue_Display_Errors.py +++ b/sopel_modules/SpiceBot_StartupMonologue/StartupMonologue_Display_Errors.py @@ -3,15 +3,14 @@ from __future__ import unicode_literals, absolute_import, division, print_functi import sopel.module -from sopel_modules.SpiceBot.Logs import botlogs -from sopel_modules.SpiceBot.Events import botevents +import sopel_modules.SpiceBot as SpiceBot -@sopel.module.event(botevents.BOT_STARTUPMONOLOGUE) +@sopel.module.event(SpiceBot.botevents.BOT_STARTUPMONOLOGUE) @sopel.module.rule('.*') def bot_startup_monologue_start(bot, trigger): - debuglines = botlogs.stdio_logs_fetch(bot) + debuglines = SpiceBot.botlogs.stdio_logs_fetch(bot) searchphrasefound = [] for line in debuglines: @@ -20,9 +19,9 @@ def bot_startup_monologue_start(bot, trigger): if len(searchphrasefound): for foundphase in searchphrasefound: - botlogs.log('SpiceBot_Logs', str(foundphase)) + SpiceBot.botlogs.log('SpiceBot_Logs', str(foundphase)) searchphrasefound.insert(0, "Notice to Bot Admins: ") searchphrasefound.append("Run the debug command for more information.") bot.osd(searchphrasefound, bot.channels.keys()) else: - botlogs.log('SpiceBot_Logs', "No issues found at bot startup!", True) + SpiceBot.botlogs.log('SpiceBot_Logs', "No issues found at bot startup!", True) diff --git a/sopel_modules/SpiceBot_StartupMonologue/StartupMonologue_Display_Loaded.py b/sopel_modules/SpiceBot_StartupMonologue/StartupMonologue_Display_Loaded.py index 7941f57..84e1503 100644 --- a/sopel_modules/SpiceBot_StartupMonologue/StartupMonologue_Display_Loaded.py +++ b/sopel_modules/SpiceBot_StartupMonologue/StartupMonologue_Display_Loaded.py @@ -4,26 +4,24 @@ from __future__ import unicode_literals, absolute_import, division, print_functi import sopel.module -from sopel_modules.SpiceBot.Logs import botlogs -from sopel_modules.SpiceBot.Events import botevents -from sopel_modules.SpiceBot.Tools import humanized_time +import sopel_modules.SpiceBot as SpiceBot import time -@sopel.module.event(botevents.BOT_LOADED) +@sopel.module.event(SpiceBot.botevents.BOT_LOADED) @sopel.module.rule('.*') def bot_startup_monologue_display(bot, trigger): - if botevents.SpiceBot_Events["RPL_WELCOME_Count"] == 1: - timesince = humanized_time(time.time() - bot.memory["SpiceBot_Uptime"]) - bot.memory['SpiceBot_StartupMonologue'].append("Startup took " + timesince) + if SpiceBot.botevents.SpiceBot_Events["RPL_WELCOME_Count"] == 1: + timesince = SpiceBot.humanized_time(time.time() - bot.memory["SpiceBot_Uptime"]) + SpiceBot.bot.memory['SpiceBot_StartupMonologue'].append("Startup took " + timesince) # Announce to chan, then handle some closing stuff - botlogs.log('SpiceBot_StartupMonologue', bot.nick + " startup complete") + SpiceBot.botlogs.log('SpiceBot_StartupMonologue', bot.nick + " startup complete") bot.memory['SpiceBot_StartupMonologue'].insert(0, " startup complete") bot.osd(bot.memory['SpiceBot_StartupMonologue'], bot.channels.keys(), 'ACTION') - botevents.trigger(bot, botevents.BOT_STARTUPMONOLOGUE, "SpiceBot_StartupMonologue") - botlogs.log('SpiceBot_StartupMonologue', "Startup Monologue has been issued to all channels.", True) + SpiceBot.botevents.trigger(bot, SpiceBot.botevents.BOT_STARTUPMONOLOGUE, "SpiceBot_StartupMonologue") + SpiceBot.botlogs.log('SpiceBot_StartupMonologue', "Startup Monologue has been issued to all channels.", True) diff --git a/sopel_modules/SpiceBot_Update/Update.py b/sopel_modules/SpiceBot_Update/Update.py index 0d7e666..cda3d99 100644 --- a/sopel_modules/SpiceBot_Update/Update.py +++ b/sopel_modules/SpiceBot_Update/Update.py @@ -8,8 +8,7 @@ from sopel.config.types import StaticSection, ValidatedAttribute import spicemanip -from sopel_modules.SpiceBot.Logs import botlogs -from sopel_modules.SpiceBot.Tools import sopel_triggerargs, command_permissions_check, spicebot_reload, spicebot_update +import sopel_modules.SpiceBot as SpiceBot class SpiceBot_Update_MainSection(StaticSection): @@ -24,18 +23,18 @@ def configure(config): def setup(bot): - botlogs.log('SpiceBot_Update', "Initial Setup processing") + SpiceBot.botlogs.log('SpiceBot_Update', "Initial Setup processing") bot.config.define_section("SpiceBot_Update", SpiceBot_Update_MainSection, validate=False) @sopel.module.nickname_commands('update') def nickname_comand_update(bot, trigger): - if not command_permissions_check(bot, trigger, ['admins', 'owner', 'OP', 'ADMIN', 'OWNER']): + if not SpiceBot.command_permissions_check(bot, trigger, ['admins', 'owner', 'OP', 'ADMIN', 'OWNER']): bot.say("I was unable to process this Bot Nick command due to privilege issues.") return - triggerargs, triggercommand = sopel_triggerargs(bot, trigger, 'nickname_command') + triggerargs, triggercommand = SpiceBot.sopel_triggerargs(bot, trigger, 'nickname_command') if not len(triggerargs): commandused = 'nodeps' @@ -49,13 +48,13 @@ def nickname_comand_update(bot, trigger): triggerargs = spicemanip.main(triggerargs, '2+', 'list') quitmessage = "Received command from " + trigger.nick + " to update from Github and restart" - botlogs.log('SpiceBot_Update', quitmessage) + SpiceBot.botlogs.log('SpiceBot_Update', quitmessage) bot.osd(quitmessage, bot.channels.keys()) if commandused == 'nodeps': - spicebot_update(bot, False) + SpiceBot.spicebot_update(bot, False) if commandused == 'deps': - spicebot_update(bot, True) + SpiceBot.spicebot_update(bot, True) # service_manip(bot, bot.nick, 'restart', 'SpiceBot_Update') - spicebot_reload(bot, 'SpiceBot_Update', quitmessage) + SpiceBot.spicebot_reload(bot, 'SpiceBot_Update', quitmessage) diff --git a/sopel_modules/SpiceBot_Uptime/Uptime.py b/sopel_modules/SpiceBot_Uptime/Uptime.py index 067f796..5a82333 100644 --- a/sopel_modules/SpiceBot_Uptime/Uptime.py +++ b/sopel_modules/SpiceBot_Uptime/Uptime.py @@ -6,14 +6,13 @@ import sopel.module import time -from sopel_modules.SpiceBot.Logs import botlogs -from sopel_modules.SpiceBot.Tools import humanized_time +import sopel_modules.SpiceBot as SpiceBot def setup(bot): if 'SpiceBot_Uptime' not in bot.memory: now = time.time() - botlogs.log('SpiceBot_Uptime', "Start time set to " + str(time.time())) + SpiceBot.botlogs.log('SpiceBot_Uptime', "Start time set to " + str(time.time())) bot.memory["SpiceBot_Uptime"] = now @@ -24,5 +23,5 @@ def shutdown(bot): @sopel.module.nickname_commands('uptime') def bot_command_srewyou(bot, trigger): - timesince = str(humanized_time(time.time() - bot.memory["SpiceBot_Uptime"])) + " ago." + timesince = str(SpiceBot.humanized_time(time.time() - bot.memory["SpiceBot_Uptime"])) + " ago." bot.osd("I have been running since " + timesince) diff --git a/sopel_modules/SpiceBot_osd/__init__.py b/sopel_modules/SpiceBot_osd/__init__.py index 6beaa44..e753526 100644 --- a/sopel_modules/SpiceBot_osd/__init__.py +++ b/sopel_modules/SpiceBot_osd/__init__.py @@ -14,7 +14,7 @@ from sopel import tools, module from sopel.tools import Identifier from sopel.config.types import StaticSection, ValidatedAttribute -from sopel_modules.SpiceBot.Logs import botlogs +import sopel_modules.SpiceBot as SpiceBot import time from collections import abc @@ -40,7 +40,7 @@ def configure(config): def setup(bot): # Inject OSD - botlogs.log('SpiceBot_OSD', "Implanting OSD function into bot") + SpiceBot.botlogs.log('SpiceBot_OSD', "Implanting OSD function into bot") bot.osd = SopelOSD.osd sopel.bot.SopelWrapper.osd = SopelWrapperOSD.osd tools.get_available_message_bytes = ToolsOSD.get_available_message_bytes @@ -48,7 +48,7 @@ def setup(bot): tools.get_message_recipientgroups = ToolsOSD.get_message_recipientgroups # overwrite default bot messaging - botlogs.log('SpiceBot_OSD', "Overwrite Default Sopel messaging commands") + SpiceBot.botlogs.log('SpiceBot_OSD', "Overwrite Default Sopel messaging commands") bot.osd = SopelOSD.osd bot.say = SopelOSD.say bot.action = SopelOSD.action @@ -61,7 +61,7 @@ def setup(bot): sopel.bot.SopelWrapper.reply = SopelWrapperOSD.reply # verify config settings for server - botlogs.log('SpiceBot_OSD', "Checking for config settings") + SpiceBot.botlogs.log('SpiceBot_OSD', "Checking for config settings") bot.config.define_section("SpiceBot_OSD", SpiceBot_OSD, validate=False)