mirror of
https://github.com/SpiceBot/SpiceBot.git
synced 2026-11-10 21:50:59 -05:00
First hardcore test of new class system
This commit is contained in:
parent
805e075e6c
commit
39a246d9e7
@ -7,13 +7,13 @@ import sopel.module
|
||||
import spicemanip
|
||||
|
||||
from sopel_modules.SpiceBot_SBTools import sopel_triggerargs, googlesearch, bot_privs, inlist, inlist_match, similar_list
|
||||
from sopel_modules.SpiceBot_Events.System import bot_events_check, botevents
|
||||
from sopel_modules.SpiceBot_Events.System import botevents
|
||||
|
||||
|
||||
@sopel.module.nickname_commands('(.*)')
|
||||
def bot_command_nick(bot, trigger):
|
||||
|
||||
while not bot_events_check(bot, [botevents.BOT_LOADED, botevents.BOT_COMMANDSQUERY]):
|
||||
while not botevents.check([botevents.BOT_LOADED, botevents.BOT_COMMANDSQUERY]):
|
||||
pass
|
||||
|
||||
triggerargs, triggercommand = sopel_triggerargs(bot, trigger, 'nickname_command')
|
||||
|
||||
@ -6,7 +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_Events.System import bot_events_startup_register, bot_events_recieved, bot_events_trigger, botevents
|
||||
from sopel_modules.SpiceBot_Events.System import botevents
|
||||
from sopel_modules.SpiceBot_SBTools import (
|
||||
join_all_channels, chanadmin_all_channels, channel_list_current,
|
||||
bot_logging
|
||||
@ -34,7 +34,7 @@ def configure(config):
|
||||
|
||||
def setup(bot):
|
||||
bot_logging(bot, 'SpiceBot_Channels', "Starting setup procedure")
|
||||
bot_events_startup_register(bot, [botevents.BOT_CHANNELS])
|
||||
botevents.startup_add([botevents.BOT_CHANNELS])
|
||||
|
||||
bot.config.define_section("SpiceBot_Channels", SpiceBot_Channels_MainSection, validate=False)
|
||||
|
||||
@ -50,7 +50,7 @@ def shutdown(bot):
|
||||
@sopel.module.event(botevents.BOT_CONNECTED)
|
||||
@sopel.module.rule('.*')
|
||||
def trigger_channel_list_initial(bot, trigger):
|
||||
bot_events_recieved(bot, trigger.event)
|
||||
botevents.recieved(trigger)
|
||||
|
||||
# Unkickable
|
||||
bot.write(('SAMODE', bot.nick, '+q'))
|
||||
@ -74,7 +74,7 @@ def trigger_channel_list_initial(bot, trigger):
|
||||
channel_list_current(bot)
|
||||
foundchannelcount = len(bot.memory['SpiceBot_Channels']['channels'].keys())
|
||||
bot_logging(bot, 'SpiceBot_Channels', "Channel listing finished! " + str(foundchannelcount) + " channel(s) found.")
|
||||
bot_events_trigger(bot, botevents.BOT_CHANNELS, "SpiceBot_Channels")
|
||||
botevents.trigger(botevents.BOT_CHANNELS, "SpiceBot_Channels")
|
||||
|
||||
join_all_channels(bot)
|
||||
chanadmin_all_channels(bot)
|
||||
@ -126,4 +126,4 @@ def bot_part_empty(bot):
|
||||
@sopel.module.event(botevents.BOT_CHANNELS)
|
||||
@sopel.module.rule('.*')
|
||||
def bot_events_setup(bot, trigger):
|
||||
bot_events_recieved(bot, trigger.event)
|
||||
botevents.recieved(trigger)
|
||||
|
||||
@ -6,7 +6,7 @@ import sopel.module
|
||||
|
||||
import spicemanip
|
||||
|
||||
from sopel_modules.SpiceBot_Events.System import bot_events_check, botevents
|
||||
from sopel_modules.SpiceBot_Events.System import botevents
|
||||
from sopel_modules.SpiceBot_SBTools import (
|
||||
sopel_triggerargs, inlist, channel_privs,
|
||||
join_all_channels, channel_list_current,
|
||||
@ -17,7 +17,7 @@ from .Channels import bot_part_empty
|
||||
@sopel.module.nickname_commands('channels', 'channel')
|
||||
def nickname_comand_channels(bot, trigger):
|
||||
|
||||
while not bot_events_check(bot, botevents.BOT_LOADED):
|
||||
while not botevents.check(botevents.BOT_LOADED):
|
||||
pass
|
||||
|
||||
triggerargs, triggercommand = sopel_triggerargs(bot, trigger, 'nickname_command')
|
||||
|
||||
@ -7,7 +7,7 @@ import sopel.module
|
||||
|
||||
import os
|
||||
|
||||
from sopel_modules.SpiceBot_Events.System import bot_events_startup_register, bot_events_recieved, bot_events_trigger, botevents
|
||||
from sopel_modules.SpiceBot_Events.System import botevents
|
||||
from sopel_modules.SpiceBot_SBTools import bot_logging
|
||||
|
||||
import spicemanip
|
||||
@ -15,7 +15,7 @@ import spicemanip
|
||||
|
||||
def setup(bot):
|
||||
bot_logging(bot, 'SpiceBot_CommandsQuery', "Starting setup procedure")
|
||||
bot_events_startup_register(bot, [botevents.BOT_COMMANDSQUERY])
|
||||
botevents.startup_add([botevents.BOT_COMMANDSQUERY])
|
||||
|
||||
if 'SpiceBot_CommandsQuery' not in bot.memory:
|
||||
bot.memory['SpiceBot_CommandsQuery'] = {"counts": 0, "commands": {}, "nickrules": []}
|
||||
@ -162,7 +162,7 @@ def setup(bot):
|
||||
if command not in bot.memory['SpiceBot_CommandsQuery']['nickrules']:
|
||||
bot.memory['SpiceBot_CommandsQuery']['nickrules'].append(command)
|
||||
|
||||
bot_events_trigger(bot, botevents.BOT_COMMANDSQUERY, "SpiceBot_CommandsQuery")
|
||||
botevents.trigger(botevents.BOT_COMMANDSQUERY, "SpiceBot_CommandsQuery")
|
||||
|
||||
|
||||
def shutdown(bot):
|
||||
@ -173,7 +173,7 @@ def shutdown(bot):
|
||||
@sopel.module.event(botevents.BOT_LOADED)
|
||||
@sopel.module.rule('.*')
|
||||
def bot_events_complete(bot, trigger):
|
||||
bot_events_recieved(bot, trigger.event)
|
||||
botevents.recieved(trigger)
|
||||
|
||||
for comtype in bot.memory['SpiceBot_CommandsQuery']['commands'].keys():
|
||||
if comtype not in ['module', 'nickname', 'rule']:
|
||||
@ -217,4 +217,4 @@ def commandsquery_register(bot, command_type, validcoms, aliasfor=None):
|
||||
@sopel.module.event(botevents.BOT_COMMANDSQUERY)
|
||||
@sopel.module.rule('.*')
|
||||
def bot_events_setup(bot, trigger):
|
||||
bot_events_recieved(bot, trigger.event)
|
||||
botevents.recieved(trigger)
|
||||
|
||||
@ -5,7 +5,7 @@ from __future__ import unicode_literals, absolute_import, division, print_functi
|
||||
import sopel
|
||||
import sopel.module
|
||||
|
||||
from sopel_modules.SpiceBot_Events.System import bot_events_check, botevents
|
||||
from sopel_modules.SpiceBot_Events.System import botevents
|
||||
from sopel_modules.SpiceBot_SBTools import sopel_triggerargs, similar_list, letters_in_string
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@ import spicemanip
|
||||
@sopel.module.nickname_commands('(.*)')
|
||||
def query_detection_nick(bot, trigger):
|
||||
|
||||
while not bot_events_check(bot, botevents.BOT_COMMANDSQUERY):
|
||||
while not botevents.check(botevents.BOT_COMMANDSQUERY):
|
||||
pass
|
||||
|
||||
triggerargs, triggercommand = sopel_triggerargs(bot, trigger, 'nickname_command')
|
||||
|
||||
@ -5,7 +5,7 @@ from __future__ import unicode_literals, absolute_import, division, print_functi
|
||||
import sopel
|
||||
import sopel.module
|
||||
|
||||
from sopel_modules.SpiceBot_Events.System import bot_events_check, botevents
|
||||
from sopel_modules.SpiceBot_Events.System import botevents
|
||||
from sopel_modules.SpiceBot_SBTools import sopel_triggerargs, similar_list, letters_in_string
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@ import spicemanip
|
||||
@sopel.module.rule('^\?(.*)')
|
||||
def query_detection(bot, trigger):
|
||||
|
||||
while not bot_events_check(bot, botevents.BOT_COMMANDSQUERY):
|
||||
while not botevents.check(botevents.BOT_COMMANDSQUERY):
|
||||
pass
|
||||
|
||||
triggerargs, triggercommand = sopel_triggerargs(bot, trigger, 'query_command')
|
||||
|
||||
@ -5,7 +5,7 @@ from __future__ import unicode_literals, absolute_import, division, print_functi
|
||||
import sopel.module
|
||||
from sopel.trigger import PreTrigger
|
||||
|
||||
from .System import bot_events_trigger, bot_events_recieved, bot_events_startup_check, bot_events_setup_check, botevents
|
||||
from .System import botevents
|
||||
from sopel_modules.SpiceBot_SBTools import bot_logging
|
||||
|
||||
import time
|
||||
@ -14,59 +14,53 @@ import time
|
||||
@sopel.module.event('001')
|
||||
@sopel.module.rule('.*')
|
||||
def bot_startup_connection(bot, trigger):
|
||||
bot_events_trigger(bot, botevents.BOT_WELCOME, "Welcome to the SpiceBot Events System")
|
||||
botevents.trigger(botevents.BOT_WELCOME, "Welcome to the SpiceBot Events System")
|
||||
|
||||
while not len(bot.channels.keys()) > 0:
|
||||
pass
|
||||
time.sleep(1)
|
||||
bot_events_trigger(bot, botevents.BOT_CONNECTED, "Bot Connected to IRC")
|
||||
botevents.trigger(botevents.BOT_CONNECTED, "Bot Connected to IRC")
|
||||
|
||||
|
||||
@sopel.module.event(botevents.BOT_WELCOME)
|
||||
@sopel.module.rule('.*')
|
||||
def bot_events_start(bot, trigger):
|
||||
bot_logging(bot, 'SpiceBot_Events', trigger.args[1], True)
|
||||
bot_events_recieved(bot, trigger.event)
|
||||
botevents.recieved(trigger)
|
||||
|
||||
bot_events_trigger(bot, botevents.BOT_READY, "Ready To Process module setup procedures")
|
||||
botevents.trigger(botevents.BOT_READY, "Ready To Process module setup procedures")
|
||||
|
||||
while not bot_events_startup_check(bot):
|
||||
while not botevents.startup_check():
|
||||
pass
|
||||
bot_events_trigger(bot, botevents.BOT_LOADED, "All registered modules setup procedures have completed")
|
||||
botevents.trigger(botevents.BOT_LOADED, "All registered modules setup procedures have completed")
|
||||
|
||||
|
||||
@sopel.module.event(botevents.BOT_READY)
|
||||
@sopel.module.rule('.*')
|
||||
def bot_events_ready(bot, trigger):
|
||||
bot_logging(bot, 'SpiceBot_Events', trigger.args[1], True)
|
||||
bot_events_recieved(bot, trigger.event)
|
||||
botevents.recieved(trigger)
|
||||
|
||||
|
||||
@sopel.module.event(botevents.BOT_CONNECTED)
|
||||
@sopel.module.rule('.*')
|
||||
def bot_events_connected(bot, trigger):
|
||||
bot_logging(bot, 'SpiceBot_Events', trigger.args[1], True)
|
||||
bot_events_recieved(bot, trigger.event)
|
||||
|
||||
bot_events_setup_check(bot)
|
||||
|
||||
botevents.recieved(trigger)
|
||||
while True:
|
||||
try:
|
||||
if len(bot.memory['SpiceBot_Events']["queue"]):
|
||||
number = bot.memory['SpiceBot_Events']["queue"][0]["number"]
|
||||
message = bot.memory['SpiceBot_Events']["queue"][0]["message"]
|
||||
pretrigger = PreTrigger(
|
||||
bot.nick,
|
||||
":SpiceBot_Events " + str(number) + " " + str(bot.nick) + " :" + message
|
||||
)
|
||||
bot.dispatch(pretrigger)
|
||||
del bot.memory['SpiceBot_Events']["queue"][0]
|
||||
except KeyError:
|
||||
return
|
||||
if len(botevents.SpiceBot_Events["trigger_queue"]):
|
||||
number = botevents.SpiceBot_Events["trigger_queue"][0]["number"]
|
||||
message = botevents.SpiceBot_Events["trigger_queue"][0]["message"]
|
||||
pretrigger = PreTrigger(
|
||||
bot.nick,
|
||||
":SpiceBot_Events " + str(number) + " " + str(bot.nick) + " :" + message
|
||||
)
|
||||
bot.dispatch(pretrigger)
|
||||
del botevents.SpiceBot_Events["trigger_queue"][0]
|
||||
|
||||
|
||||
@sopel.module.event(botevents.BOT_LOADED)
|
||||
@sopel.module.rule('.*')
|
||||
def bot_events_complete(bot, trigger):
|
||||
bot_logging(bot, 'SpiceBot_Events', trigger.args[1], True)
|
||||
bot_events_recieved(bot, trigger.event)
|
||||
botevents.recieved(trigger)
|
||||
|
||||
@ -92,7 +92,7 @@ def register_trigger(number, message):
|
||||
|
||||
ideas:
|
||||
|
||||
while not bot_events_check(bot, [botevents.BOT_LOADED, botevents.BOT_COMMANDSQUERY]):
|
||||
while not botevents.check([botevents.BOT_LOADED, botevents.BOT_COMMANDSQUERY]):
|
||||
pass
|
||||
|
||||
"""
|
||||
@ -100,79 +100,4 @@ ideas:
|
||||
|
||||
def setup(bot):
|
||||
bot_logging(bot, 'SpiceBot_Events', "Starting setup procedure")
|
||||
bot_events_setup_check(bot)
|
||||
bot_events_startup_register(bot, [botevents.BOT_WELCOME, botevents.BOT_READY, botevents.BOT_CONNECTED])
|
||||
|
||||
|
||||
def shutdown(bot):
|
||||
if "SpiceBot_Events" in bot.memory:
|
||||
del bot.memory["SpiceBot_Events"]
|
||||
|
||||
|
||||
def bot_events_trigger(bot, number, message):
|
||||
|
||||
bot_events_setup_check(bot)
|
||||
|
||||
bot.memory["SpiceBot_Events"]["triggers"][str(number)] = message
|
||||
if str(number) in [botevents.BOT_WELCOME, botevents.BOT_READY, botevents.BOT_CONNECTED]:
|
||||
pretrigger = PreTrigger(
|
||||
bot.nick,
|
||||
":SpiceBot_Events " + str(number) + " " + str(bot.nick) + " :" + message
|
||||
)
|
||||
bot.dispatch(pretrigger)
|
||||
else:
|
||||
pretriggerdict = {"number": number, "message": message}
|
||||
bot.memory['SpiceBot_Events']["queue"].append(pretriggerdict)
|
||||
|
||||
|
||||
def bot_events_setup_check(bot):
|
||||
if "SpiceBot_Events" not in bot.memory:
|
||||
bot.memory["SpiceBot_Events"] = {"triggers": {}, "startup": [], "loaded": [], "queue": []}
|
||||
|
||||
|
||||
def bot_events_check(bot, listreq):
|
||||
|
||||
bot_events_setup_check(bot)
|
||||
|
||||
if not isinstance(listreq, list):
|
||||
listreq = [str(listreq)]
|
||||
|
||||
for requirement in listreq:
|
||||
if requirement not in bot.memory["SpiceBot_Events"]["loaded"]:
|
||||
return False
|
||||
|
||||
return True
|
||||
|
||||
|
||||
def bot_events_startup_register(bot, addonreq):
|
||||
|
||||
bot_events_setup_check(bot)
|
||||
|
||||
if not isinstance(addonreq, list):
|
||||
addonreq = [str(addonreq)]
|
||||
|
||||
bot.memory["SpiceBot_Events"]["startup"].extend(addonreq)
|
||||
|
||||
|
||||
def bot_events_recieved(bot, number):
|
||||
|
||||
bot_events_setup_check(bot)
|
||||
|
||||
if str(number) not in bot.memory["SpiceBot_Events"]["loaded"]:
|
||||
bot.memory["SpiceBot_Events"]["loaded"].append(str(number))
|
||||
|
||||
|
||||
def bot_events_startup_check(bot):
|
||||
|
||||
bot_events_setup_check(bot)
|
||||
|
||||
notcomplete = []
|
||||
|
||||
for startupitem in bot.memory["SpiceBot_Events"]["startup"]:
|
||||
if str(startupitem) not in bot.memory["SpiceBot_Events"]["loaded"]:
|
||||
notcomplete.append(str(startupitem))
|
||||
|
||||
if len(notcomplete):
|
||||
return False
|
||||
else:
|
||||
return True
|
||||
botevents.startup_add([botevents.BOT_WELCOME, botevents.BOT_READY, botevents.BOT_CONNECTED])
|
||||
|
||||
@ -7,7 +7,7 @@ from sopel import module
|
||||
from .gifsearch import getGif
|
||||
|
||||
from sopel_modules.SpiceBot_SBTools import sopel_triggerargs
|
||||
from sopel_modules.SpiceBot_Events.System import bot_events_check, botevents
|
||||
from sopel_modules.SpiceBot_Events.System import botevents
|
||||
|
||||
import spicemanip
|
||||
|
||||
@ -15,7 +15,7 @@ import spicemanip
|
||||
@module.commands('gif')
|
||||
def gif_trigger(bot, trigger):
|
||||
|
||||
while not bot_events_check(bot, botevents.BOT_GIFSEARCH):
|
||||
while not botevents.check(botevents.BOT_GIFSEARCH):
|
||||
pass
|
||||
|
||||
triggerargs, triggercommand = sopel_triggerargs(bot, trigger)
|
||||
|
||||
@ -9,13 +9,13 @@ import sopel.module
|
||||
import spicemanip
|
||||
|
||||
from sopel_modules.SpiceBot_SBTools import sopel_triggerargs
|
||||
from sopel_modules.SpiceBot_Events.System import bot_events_check, botevents
|
||||
from sopel_modules.SpiceBot_Events.System import botevents
|
||||
|
||||
|
||||
@sopel.module.commands('(.*)')
|
||||
def gifapi_triggers(bot, trigger):
|
||||
|
||||
while not bot_events_check(bot, botevents.BOT_GIFSEARCH):
|
||||
while not botevents.check(botevents.BOT_GIFSEARCH):
|
||||
pass
|
||||
|
||||
triggerargs, triggercommand = sopel_triggerargs(bot, trigger, 'prefix_command')
|
||||
|
||||
@ -5,7 +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_Events.System import bot_events_startup_register, bot_events_recieved, bot_events_trigger, botevents
|
||||
from sopel_modules.SpiceBot_Events.System import botevents
|
||||
|
||||
from sopel_modules.SpiceBot_CommandsQuery.CommandsQuery import commandsquery_register
|
||||
|
||||
@ -47,7 +47,7 @@ def configure(config):
|
||||
|
||||
def setup(bot):
|
||||
bot_logging(bot, 'SpiceBot_GifSearch', "Starting Setup Procedure")
|
||||
bot_events_startup_register(bot, [botevents.BOT_GIFSEARCH])
|
||||
botevents.startup_add([botevents.BOT_GIFSEARCH])
|
||||
|
||||
if 'SpiceBot_GifSearch' not in bot.memory:
|
||||
bot.memory["SpiceBot_GifSearch"] = {"cache": {}, "badgiflinks": [], 'valid_gif_api_dict': {}}
|
||||
@ -79,7 +79,7 @@ def setup(bot):
|
||||
if validgifapi not in bot.memory["SpiceBot_GifSearch"]['cache'].keys():
|
||||
bot.memory["SpiceBot_GifSearch"]['cache'][validgifapi] = dict()
|
||||
|
||||
bot_events_trigger(bot, botevents.BOT_GIFSEARCH, "SpiceBot_GifSearch")
|
||||
botevents.trigger(botevents.BOT_GIFSEARCH, "SpiceBot_GifSearch")
|
||||
|
||||
|
||||
def shutdown(bot):
|
||||
@ -254,4 +254,4 @@ def getGif(bot, searchdict):
|
||||
@sopel.module.event(botevents.BOT_GIFSEARCH)
|
||||
@sopel.module.rule('.*')
|
||||
def bot_events_setup(bot, trigger):
|
||||
bot_events_recieved(bot, trigger.event)
|
||||
botevents.recieved(trigger)
|
||||
|
||||
@ -5,7 +5,7 @@ from __future__ import unicode_literals, absolute_import, division, print_functi
|
||||
import sopel.module
|
||||
|
||||
from sopel_modules.SpiceBot_SBTools import sopel_triggerargs
|
||||
from sopel_modules.SpiceBot_Events.System import bot_events_check, bot_events_recieved, botevents
|
||||
from sopel_modules.SpiceBot_Events.System import botevents
|
||||
|
||||
|
||||
def setup(bot):
|
||||
@ -21,7 +21,7 @@ def shutdown(bot):
|
||||
@sopel.module.event(botevents.BOT_LOADED)
|
||||
@sopel.module.rule('.*')
|
||||
def bot_events_complete(bot, trigger):
|
||||
bot_events_recieved(bot, trigger.event)
|
||||
botevents.recieved(trigger)
|
||||
|
||||
for comtype in bot.memory['SpiceBot_CommandsQuery']['commands'].keys():
|
||||
bot.memory["SpiceBot_InvalidCommand"]["valid"].extend(bot.memory['SpiceBot_CommandsQuery']['commands'][comtype].keys())
|
||||
@ -31,7 +31,7 @@ def bot_events_complete(bot, trigger):
|
||||
def InvalidCommand_triggers(bot, trigger):
|
||||
return
|
||||
|
||||
while not bot_events_check(bot, [botevents.BOT_LOADED, botevents.BOT_COMMANDSQUERY]):
|
||||
while not botevents.check([botevents.BOT_LOADED, botevents.BOT_COMMANDSQUERY]):
|
||||
pass
|
||||
|
||||
triggerargs, triggercommand = sopel_triggerargs(bot, trigger, 'prefix_command')
|
||||
|
||||
@ -4,7 +4,7 @@ from __future__ import unicode_literals, absolute_import, division, print_functi
|
||||
|
||||
import sopel.module
|
||||
|
||||
from sopel_modules.SpiceBot_Events.System import bot_events_recieved, botevents
|
||||
from sopel_modules.SpiceBot_Events.System import botevents
|
||||
from sopel_modules.SpiceBot_SBTools import bot_logging
|
||||
from .Logs import stdio_logs_fetch
|
||||
|
||||
@ -12,7 +12,7 @@ from .Logs import stdio_logs_fetch
|
||||
@sopel.module.event(botevents.BOT_STARTUPMONOLOGUE)
|
||||
@sopel.module.rule('.*')
|
||||
def bot_startup_monologue_start(bot, trigger):
|
||||
bot_events_recieved(bot, trigger.event)
|
||||
botevents.recieved(trigger)
|
||||
|
||||
debuglines = stdio_logs_fetch(bot)
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@ import sopel.module
|
||||
from sopel.config.types import StaticSection, ValidatedAttribute
|
||||
|
||||
from sopel_modules.SpiceBot_SBTools import bot_logging
|
||||
from sopel_modules.SpiceBot_Events.System import bot_events_startup_register, bot_events_recieved, bot_events_trigger, botevents
|
||||
from sopel_modules.SpiceBot_Events.System import botevents
|
||||
|
||||
import os
|
||||
|
||||
@ -26,11 +26,11 @@ def setup(bot):
|
||||
bot_logging(bot, 'SpiceBot_Logs', "Starting Setup Procedure")
|
||||
bot.config.define_section("SpiceBot_Logs", SpiceBot_Logs_MainSection, validate=False)
|
||||
|
||||
bot_events_startup_register(bot, [botevents.BOT_LOGS])
|
||||
botevents.startup_add([botevents.BOT_LOGS])
|
||||
|
||||
bot_logs_setup_check(bot)
|
||||
|
||||
bot_events_trigger(bot, botevents.BOT_LOGS, "SpiceBot_Logs")
|
||||
botevents.trigger(botevents.BOT_LOGS, "SpiceBot_Logs")
|
||||
|
||||
|
||||
def bot_logs_setup_check(bot):
|
||||
@ -46,7 +46,7 @@ def shutdown(bot):
|
||||
@sopel.module.event(botevents.BOT_CONNECTED)
|
||||
@sopel.module.rule('.*')
|
||||
def join_log_channel(bot, trigger):
|
||||
bot_events_recieved(bot, trigger.event)
|
||||
botevents.recieved(trigger)
|
||||
|
||||
if bot.config.SpiceBot_Logs.logging_channel:
|
||||
channel = bot.config.SpiceBot_Logs.logging_channel
|
||||
@ -134,4 +134,4 @@ def get_running_pid(bot):
|
||||
@sopel.module.event(botevents.BOT_LOGS)
|
||||
@sopel.module.rule('.*')
|
||||
def bot_events_setup(bot, trigger):
|
||||
bot_events_recieved(bot, trigger.event)
|
||||
botevents.recieved(trigger)
|
||||
|
||||
@ -7,14 +7,14 @@ import sopel.module
|
||||
import spicemanip
|
||||
|
||||
from sopel_modules.SpiceBot_SBTools import sopel_triggerargs, command_permissions_check, inlist, inlist_match, similar_list
|
||||
from sopel_modules.SpiceBot_Events.System import bot_events_check, botevents
|
||||
from sopel_modules.SpiceBot_Events.System import botevents
|
||||
from .Logs import systemd_logs_fetch, stdio_logs_fetch
|
||||
|
||||
|
||||
@sopel.module.nickname_commands('logs', 'debug')
|
||||
def bot_command_logs(bot, trigger):
|
||||
|
||||
while not bot_events_check(bot, botevents.BOT_LOGS):
|
||||
while not botevents.check(botevents.BOT_LOGS):
|
||||
pass
|
||||
|
||||
if not command_permissions_check(bot, trigger, ['admins', 'owner', 'OP', 'ADMIN', 'OWNER']):
|
||||
|
||||
@ -4,13 +4,13 @@ from __future__ import unicode_literals, absolute_import, division, print_functi
|
||||
|
||||
import sopel.module
|
||||
|
||||
from sopel_modules.SpiceBot_Events.System import bot_events_recieved, bot_events_startup_register, botevents
|
||||
from sopel_modules.SpiceBot_Events.System import botevents
|
||||
from sopel_modules.SpiceBot_SBTools import bot_logging
|
||||
|
||||
|
||||
def setup(bot):
|
||||
bot_logging(bot, 'SpiceBot_StartupMonologue', "Starting setup procedure")
|
||||
bot_events_startup_register(bot, [botevents.BOT_STARTUPMONOLOGUE_CHANNELS, botevents.BOT_STARTUPMONOLOGUE_COMMANDSQUERY, botevents.BOT_STARTUPMONOLOGUE_CONNECTED])
|
||||
botevents.startup_add([botevents.BOT_STARTUPMONOLOGUE_CHANNELS, botevents.BOT_STARTUPMONOLOGUE_COMMANDSQUERY, botevents.BOT_STARTUPMONOLOGUE_CONNECTED])
|
||||
|
||||
if 'SpiceBot_StartupMonologue' not in bot.memory:
|
||||
bot.memory['SpiceBot_StartupMonologue'] = []
|
||||
@ -19,4 +19,4 @@ def setup(bot):
|
||||
@sopel.module.event(botevents.BOT_STARTUPMONOLOGUE, botevents.BOT_STARTUPMONOLOGUE_CHANNELS, botevents.BOT_STARTUPMONOLOGUE_COMMANDSQUERY, botevents.BOT_STARTUPMONOLOGUE_CONNECTED)
|
||||
@sopel.module.rule('.*')
|
||||
def bot_events_setup(bot, trigger):
|
||||
bot_events_recieved(bot, trigger.event)
|
||||
botevents.recieved(trigger)
|
||||
|
||||
@ -4,7 +4,7 @@ from __future__ import unicode_literals, absolute_import, division, print_functi
|
||||
|
||||
import sopel.module
|
||||
|
||||
from sopel_modules.SpiceBot_Events.System import bot_events_recieved, bot_events_trigger, botevents
|
||||
from sopel_modules.SpiceBot_Events.System import botevents
|
||||
from sopel_modules.SpiceBot_SBTools import humanized_time, bot_logging
|
||||
|
||||
import time
|
||||
@ -13,19 +13,19 @@ import time
|
||||
@sopel.module.event(botevents.BOT_CONNECTED)
|
||||
@sopel.module.rule('.*')
|
||||
def bot_startup_monologue_start(bot, trigger):
|
||||
bot_events_recieved(bot, trigger.event)
|
||||
botevents.recieved(trigger)
|
||||
|
||||
# Startup
|
||||
bot_logging(bot, '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')
|
||||
|
||||
bot_events_trigger(bot, botevents.BOT_STARTUPMONOLOGUE_CONNECTED, "SpiceBot_StartupMonologue")
|
||||
botevents.trigger(botevents.BOT_STARTUPMONOLOGUE_CONNECTED, "SpiceBot_StartupMonologue")
|
||||
|
||||
|
||||
@sopel.module.event(botevents.BOT_COMMANDSQUERY)
|
||||
@sopel.module.rule('.*')
|
||||
def bot_startup_monologue_commands(bot, trigger):
|
||||
bot_events_recieved(bot, trigger.event)
|
||||
botevents.recieved(trigger)
|
||||
|
||||
availablecomsnum, availablecomsfiles = 0, 0
|
||||
for commandstype in bot.memory['SpiceBot_CommandsQuery']['commands'].keys():
|
||||
@ -35,25 +35,25 @@ def bot_startup_monologue_commands(bot, trigger):
|
||||
bot.memory['SpiceBot_StartupMonologue'].append("There are " + str(availablecomsnum) + " commands available in " + str(availablecomsfiles) + " files.")
|
||||
bot_logging(bot, 'SpiceBot_StartupMonologue', "There are " + str(availablecomsnum) + " commands available in " + str(availablecomsfiles) + " files.")
|
||||
|
||||
bot_events_trigger(bot, botevents.BOT_STARTUPMONOLOGUE_COMMANDSQUERY, "SpiceBot_StartupMonologue")
|
||||
botevents.trigger(botevents.BOT_STARTUPMONOLOGUE_COMMANDSQUERY, "SpiceBot_StartupMonologue")
|
||||
|
||||
|
||||
@sopel.module.event(botevents.BOT_CHANNELS)
|
||||
@sopel.module.rule('.*')
|
||||
def bot_startup_monologue_channels(bot, trigger):
|
||||
bot_events_recieved(bot, trigger.event)
|
||||
botevents.recieved(trigger)
|
||||
|
||||
botcount = len(bot.channels.keys())
|
||||
servercount = len(bot.memory['SpiceBot_Channels']['channels'].keys())
|
||||
bot.memory['SpiceBot_StartupMonologue'].append("I am in " + str(botcount) + " of " + str(servercount) + " channel(s) available on this server.")
|
||||
|
||||
bot_events_trigger(bot, botevents.BOT_STARTUPMONOLOGUE_CHANNELS, "SpiceBot_StartupMonologue")
|
||||
botevents.trigger(botevents.BOT_STARTUPMONOLOGUE_CHANNELS, "SpiceBot_StartupMonologue")
|
||||
|
||||
|
||||
@sopel.module.event(botevents.BOT_LOADED)
|
||||
@sopel.module.rule('.*')
|
||||
def bot_startup_monologue_display(bot, trigger):
|
||||
bot_events_recieved(bot, trigger.event)
|
||||
botevents.recieved(trigger)
|
||||
|
||||
timesince = humanized_time(time.time() - bot.memory["SpiceBot_Uptime"])
|
||||
bot.memory['SpiceBot_StartupMonologue'].append("Startup took " + timesince)
|
||||
@ -64,5 +64,5 @@ def bot_startup_monologue_display(bot, trigger):
|
||||
|
||||
bot.osd(bot.memory['SpiceBot_StartupMonologue'], bot.channels.keys(), 'ACTION')
|
||||
|
||||
bot_events_trigger(bot, botevents.BOT_STARTUPMONOLOGUE, "SpiceBot_StartupMonologue")
|
||||
botevents.trigger(botevents.BOT_STARTUPMONOLOGUE, "SpiceBot_StartupMonologue")
|
||||
bot_logging(bot, 'SpiceBot_StartupMonologue', "Startup Monologue has been issued to all channels.", True)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user