deathbybandaid/SpiceBot-migrated
1
0
Fork 0
mirror of https://github.com/SpiceBot/SpiceBot.git synced 2026-11-13 15:09:54 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Attempt hardcoded values for events

Browse Source
This commit is contained in:
deathbybandaid 2019-05-14 11:27:56 -04:00
parent b6f095b8b2
commit a48d3df444
9 changed files with 49 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sopel_modules/SpiceBot_AI/AI.py
View File

@ -7,7 +7,7 @@ import sopel.module
import spicemanip import spicemanip
from sopel_modules.SpiceBot_SBTools import sopel_triggerargs, googlesearch, bot_privs, inlist, inlist_match, similar_list 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 from sopel_modules.SpiceBot_Events.System import bot_events_check, botevents
@sopel.module.nickname_commands('(.*)') @sopel.module.nickname_commands('(.*)')
@ -17,7 +17,7 @@ def bot_command_nick(bot, trigger):
if str(trigger.args[1])[0] == "?": if str(trigger.args[1])[0] == "?":
return return
while not bot_events_check(bot, ['1004', '2002']): while not bot_events_check(bot, [botevents.BOT_LOADED, '2002']):
pass pass
triggerargs, triggercommand = sopel_triggerargs(bot, trigger, 'nickname_command') triggerargs, triggercommand = sopel_triggerargs(bot, trigger, 'nickname_command')

4
sopel_modules/SpiceBot_Channels/Channels.py
View File

@ -6,7 +6,7 @@ from __future__ import unicode_literals, absolute_import, print_function, divisi
import sopel.module import sopel.module
from sopel.config.types import StaticSection, ValidatedAttribute, ListAttribute 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 from sopel_modules.SpiceBot_Events.System import bot_events_startup_register, bot_events_recieved, bot_events_trigger, botevents
from sopel_modules.SpiceBot_SBTools import ( from sopel_modules.SpiceBot_SBTools import (
join_all_channels, chanadmin_all_channels, channel_list_current, join_all_channels, chanadmin_all_channels, channel_list_current,
@ -48,7 +48,7 @@ def shutdown(bot):
del bot.memory["SpiceBot_Channels"] del bot.memory["SpiceBot_Channels"]
@sopel.module.event('1003') @sopel.module.event(botevents.BOT_CONNECTED)
@sopel.module.rule('.*') @sopel.module.rule('.*')
def trigger_channel_list_initial(bot, trigger): def trigger_channel_list_initial(bot, trigger):
bot_events_recieved(bot, trigger.event) bot_events_recieved(bot, trigger.event)

4
sopel_modules/SpiceBot_Channels/Channels_Command.py
View File

@ -6,7 +6,7 @@ import sopel.module
import spicemanip import spicemanip
from sopel_modules.SpiceBot_Events.System import bot_events_check from sopel_modules.SpiceBot_Events.System import bot_events_check, botevents
from sopel_modules.SpiceBot_SBTools import ( from sopel_modules.SpiceBot_SBTools import (
sopel_triggerargs, inlist, channel_privs, sopel_triggerargs, inlist, channel_privs,
join_all_channels, channel_list_current, join_all_channels, channel_list_current,
@ -17,7 +17,7 @@ from .Channels import bot_part_empty
@sopel.module.nickname_commands('channels', 'channel') @sopel.module.nickname_commands('channels', 'channel')
def nickname_comand_channels(bot, trigger): def nickname_comand_channels(bot, trigger):
while not bot_events_check(bot, '1004'): while not bot_events_check(bot, botevents.BOT_LOADED):
pass pass
triggerargs, triggercommand = sopel_triggerargs(bot, trigger, 'nickname_command') triggerargs, triggercommand = sopel_triggerargs(bot, trigger, 'nickname_command')

4
sopel_modules/SpiceBot_CommandsQuery/CommandsQuery.py
View File

@ -7,7 +7,7 @@ import sopel.module
import os import os
from sopel_modules.SpiceBot_Events.System import bot_events_startup_register, bot_events_recieved, bot_events_trigger from sopel_modules.SpiceBot_Events.System import bot_events_startup_register, bot_events_recieved, bot_events_trigger, botevents
from sopel_modules.SpiceBot_SBTools import bot_logging from sopel_modules.SpiceBot_SBTools import bot_logging
import spicemanip import spicemanip
@ -170,7 +170,7 @@ def shutdown(bot):
del bot.memory["SpiceBot_CommandsQuery"] del bot.memory["SpiceBot_CommandsQuery"]
@sopel.module.event('1004') @sopel.module.event(botevents.BOT_LOADED)
@sopel.module.rule('.*') @sopel.module.rule('.*')
def bot_events_complete(bot, trigger): def bot_events_complete(bot, trigger):
bot_events_recieved(bot, trigger.event) bot_events_recieved(bot, trigger.event)

18
sopel_modules/SpiceBot_Events/Events.py
View File

@ -5,7 +5,7 @@ from __future__ import unicode_literals, absolute_import, division, print_functi
import sopel.module import sopel.module
from sopel.trigger import PreTrigger from sopel.trigger import PreTrigger
from .System import bot_events_trigger, bot_events_recieved, bot_events_startup_check, bot_events_setup_check from .System import bot_events_trigger, bot_events_recieved, bot_events_startup_check, bot_events_setup_check, botevents
from sopel_modules.SpiceBot_SBTools import bot_logging from sopel_modules.SpiceBot_SBTools import bot_logging
import time import time
@ -14,35 +14,35 @@ import time
@sopel.module.event('001') @sopel.module.event('001')
@sopel.module.rule('.*') @sopel.module.rule('.*')
def bot_startup_connection(bot, trigger): def bot_startup_connection(bot, trigger):
bot_events_trigger(bot, 1001, "Welcome to the SpiceBot Events System") bot_events_trigger(bot, botevents.BOT_WELCOME, "Welcome to the SpiceBot Events System")
while not len(bot.channels.keys()) > 0: while not len(bot.channels.keys()) > 0:
pass pass
time.sleep(1) time.sleep(1)
bot_events_trigger(bot, 1003, "Bot Connected to IRC") bot_events_trigger(bot, botevents.BOT_CONNECTED, "Bot Connected to IRC")
@sopel.module.event('1001') @sopel.module.event(botevents.BOT_WELCOME)
@sopel.module.rule('.*') @sopel.module.rule('.*')
def bot_events_start(bot, trigger): def bot_events_start(bot, trigger):
bot_logging(bot, 'SpiceBot_Events', trigger.args[1], True) bot_logging(bot, 'SpiceBot_Events', trigger.args[1], True)
bot_events_recieved(bot, trigger.event) bot_events_recieved(bot, trigger.event)
bot_events_trigger(bot, 1002, "Ready To Process module setup procedures") bot_events_trigger(bot, botevents.BOT_READY, "Ready To Process module setup procedures")
while not bot_events_startup_check(bot): while not bot_events_startup_check(bot):
pass pass
bot_events_trigger(bot, 1004, "All registered modules setup procedures have completed") bot_events_trigger(bot, botevents.BOT_LOADED, "All registered modules setup procedures have completed")
@sopel.module.event('1002') @sopel.module.event(botevents.BOT_READY)
@sopel.module.rule('.*') @sopel.module.rule('.*')
def bot_events_ready(bot, trigger): def bot_events_ready(bot, trigger):
bot_logging(bot, 'SpiceBot_Events', trigger.args[1], True) bot_logging(bot, 'SpiceBot_Events', trigger.args[1], True)
bot_events_recieved(bot, trigger.event) bot_events_recieved(bot, trigger.event)
@sopel.module.event('1003') @sopel.module.event(botevents.BOT_CONNECTED)
@sopel.module.rule('.*') @sopel.module.rule('.*')
def bot_events_connected(bot, trigger): def bot_events_connected(bot, trigger):
bot_logging(bot, 'SpiceBot_Events', trigger.args[1], True) bot_logging(bot, 'SpiceBot_Events', trigger.args[1], True)
@ -65,7 +65,7 @@ def bot_events_connected(bot, trigger):
return return
@sopel.module.event('1004') @sopel.module.event(botevents.BOT_LOADED)
@sopel.module.rule('.*') @sopel.module.rule('.*')
def bot_events_complete(bot, trigger): def bot_events_complete(bot, trigger):
bot_logging(bot, 'SpiceBot_Events', trigger.args[1], True) bot_logging(bot, 'SpiceBot_Events', trigger.args[1], True)

26
sopel_modules/SpiceBot_Events/System.py
View File

@ -12,7 +12,7 @@ from sopel_modules.SpiceBot_SBTools import bot_logging
def setup(bot): def setup(bot):
bot_logging(bot, 'SpiceBot_Events', "Starting setup procedure") bot_logging(bot, 'SpiceBot_Events', "Starting setup procedure")
bot_events_setup_check(bot) bot_events_setup_check(bot)
bot_events_startup_register(bot, ['1001', '1002', '1003']) bot_events_startup_register(bot, [botevents.BOT_WELCOME, botevents.BOT_READY, botevents.BOT_CONNECTED])
def shutdown(bot): def shutdown(bot):
@ -25,7 +25,7 @@ def bot_events_trigger(bot, number, message):
bot_events_setup_check(bot) bot_events_setup_check(bot)
bot.memory["SpiceBot_Events"]["triggers"][str(number)] = message bot.memory["SpiceBot_Events"]["triggers"][str(number)] = message
if str(number) in ['1001', '1002', '1003']: if str(number) in [botevents.BOT_WELCOME, botevents.BOT_READY, botevents.BOT_CONNECTED]:
pretrigger = PreTrigger( pretrigger = PreTrigger(
bot.nick, bot.nick,
":SpiceBot_Events " + str(number) + " " + str(bot.nick) + " :" + message ":SpiceBot_Events " + str(number) + " " + str(bot.nick) + " :" + message
@ -88,3 +88,25 @@ def bot_events_startup_check(bot):
return False return False
else: else:
return True return True
def assign_event_number():
return 5
class botevents(object):
"""An dynamic listing of all the notable Bot numeric events.
Events contained in this module will utilize the 1000-range
All Other events will be tagged with a randomly generated
4-digit number above 2000.
This allows you to do, for example, ``@module.event(botevents.BOT_WELCOME)``
rather than ``@module.event('1000')``
"""
BOT_WELCOME = '1001'
BOT_READY = '1002'
BOT_CONNECTED = '1003'
BOT_LOADED = '1004'

6
sopel_modules/SpiceBot_InvalidCommand/InvalidCommand.py
View File

@ -5,7 +5,7 @@ from __future__ import unicode_literals, absolute_import, division, print_functi
import sopel.module import sopel.module
from sopel_modules.SpiceBot_SBTools import sopel_triggerargs from sopel_modules.SpiceBot_SBTools import sopel_triggerargs
from sopel_modules.SpiceBot_Events.System import bot_events_check, bot_events_recieved from sopel_modules.SpiceBot_Events.System import bot_events_check, bot_events_recieved, botevents
def setup(bot): def setup(bot):
@ -18,7 +18,7 @@ def shutdown(bot):
del bot.memory["SpiceBot_InvalidCommand"] del bot.memory["SpiceBot_InvalidCommand"]
@sopel.module.event('1004') @sopel.module.event(botevents.BOT_LOADED)
@sopel.module.rule('.*') @sopel.module.rule('.*')
def bot_events_complete(bot, trigger): def bot_events_complete(bot, trigger):
bot_events_recieved(bot, trigger.event) bot_events_recieved(bot, trigger.event)
@ -31,7 +31,7 @@ def bot_events_complete(bot, trigger):
def InvalidCommand_triggers(bot, trigger): def InvalidCommand_triggers(bot, trigger):
return return
while not bot_events_check(bot, ['1004', '2002']): while not bot_events_check(bot, [botevents.BOT_LOADED, '2002']):
pass pass
triggerargs, triggercommand = sopel_triggerargs(bot, trigger, 'prefix_command') triggerargs, triggercommand = sopel_triggerargs(bot, trigger, 'prefix_command')

4
sopel_modules/SpiceBot_Logs/Logs.py
View File

@ -5,7 +5,7 @@ from __future__ import unicode_literals, absolute_import, division, print_functi
import sopel.module import sopel.module
from sopel.config.types import StaticSection, ValidatedAttribute from sopel.config.types import StaticSection, ValidatedAttribute
from sopel_modules.SpiceBot_SBTools import bot_logging from sopel_modules.SpiceBot_SBTools import bot_logging, botevents
from sopel_modules.SpiceBot_Events.System import bot_events_startup_register, bot_events_recieved, bot_events_trigger from sopel_modules.SpiceBot_Events.System import bot_events_startup_register, bot_events_recieved, bot_events_trigger
import os import os
@ -43,7 +43,7 @@ def shutdown(bot):
del bot.memory["SpiceBot_Logs"] del bot.memory["SpiceBot_Logs"]
@sopel.module.event('1003') @sopel.module.event(botevents.BOT_CONNECTED)
@sopel.module.rule('.*') @sopel.module.rule('.*')
def join_log_channel(bot, trigger): def join_log_channel(bot, trigger):
bot_events_recieved(bot, trigger.event) bot_events_recieved(bot, trigger.event)

6
sopel_modules/SpiceBot_StartupMonologue/StartupMonologue_Display.py
View File

@ -4,12 +4,12 @@ from __future__ import unicode_literals, absolute_import, division, print_functi
import sopel.module import sopel.module
from sopel_modules.SpiceBot_Events.System import bot_events_recieved, bot_events_trigger from sopel_modules.SpiceBot_Events.System import bot_events_recieved, bot_events_trigger, botevents
from sopel_modules.SpiceBot_SBTools import humanized_time, bot_logging from sopel_modules.SpiceBot_SBTools import humanized_time, bot_logging
import time import time
@sopel.module.event('1003') @sopel.module.event(botevents.BOT_CONNECTED)
@sopel.module.rule('.*') @sopel.module.rule('.*')
def bot_startup_monologue_start(bot, trigger): def bot_startup_monologue_start(bot, trigger):
bot_events_recieved(bot, trigger.event) bot_events_recieved(bot, trigger.event)
@ -49,7 +49,7 @@ def bot_startup_monologue_channels(bot, trigger):
bot_events_trigger(bot, 2010, "SpiceBot_StartupMonologue") bot_events_trigger(bot, 2010, "SpiceBot_StartupMonologue")
@sopel.module.event('1004') @sopel.module.event(botevents.BOT_LOADED)
@sopel.module.rule('.*') @sopel.module.rule('.*')
def bot_startup_monologue_display(bot, trigger): def bot_startup_monologue_display(bot, trigger):
bot_events_recieved(bot, trigger.event) bot_events_recieved(bot, trigger.event)