From 981eb37f22ba716a3effe0fae4f3334be6ce6643 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Thu, 10 Feb 2022 13:53:45 -0500 Subject: [PATCH] test --- sopel_SpiceBot_Core_1/SBCore/__init__.py | 20 +++++++++++++------ .../SBCore/commands/__init__.py | 19 ++++++++++++++++++ .../SBCore/{interface => }/comms/__init__.py | 0 .../SBCore/{interface => }/config/__init__.py | 0 .../{interface => }/database/__init__.py | 0 .../SBCore/{interface => }/events/__init__.py | 0 .../SBCore/{interface => }/logger/__init__.py | 0 .../{interface => }/versions/__init__.py | 0 sopel_SpiceBot_Core_Prerun/__init__.py | 3 --- sopel_SpiceBot_Runtime_Commands/__init__.py | 9 +-------- 10 files changed, 34 insertions(+), 17 deletions(-) create mode 100644 sopel_SpiceBot_Core_1/SBCore/commands/__init__.py rename sopel_SpiceBot_Core_1/SBCore/{interface => }/comms/__init__.py (100%) rename sopel_SpiceBot_Core_1/SBCore/{interface => }/config/__init__.py (100%) rename sopel_SpiceBot_Core_1/SBCore/{interface => }/database/__init__.py (100%) rename sopel_SpiceBot_Core_1/SBCore/{interface => }/events/__init__.py (100%) rename sopel_SpiceBot_Core_1/SBCore/{interface => }/logger/__init__.py (100%) rename sopel_SpiceBot_Core_1/SBCore/{interface => }/versions/__init__.py (100%) diff --git a/sopel_SpiceBot_Core_1/SBCore/__init__.py b/sopel_SpiceBot_Core_1/SBCore/__init__.py index e3e45c8..2f15060 100644 --- a/sopel_SpiceBot_Core_1/SBCore/__init__.py +++ b/sopel_SpiceBot_Core_1/SBCore/__init__.py @@ -1,10 +1,11 @@ -from .interface.config import Config -from .interface.versions import Versions -from .interface.logger import Logger -from .interface.database import Database -from .interface.comms import Comms -from .interface.events import Events +from .config import Config +from .versions import Versions +from .logger import Logger +from .database import Database +from .comms import Comms +from .events import Events +from .commands import Commands class SpiceBotCore_OBJ(): @@ -38,6 +39,10 @@ class SpiceBotCore_OBJ(): self.comms = Comms(self.config) self.logger.info("SpiceBot Comms Interface Setup Complete.") + # SpiceBots access to Sopel Command listing + self.commands = Commands(self.logger) + self.logger.info("SpiceBot Commands Interface Setup Complete.") + def setup(self, bot): """This runs with the plugin setup routine""" @@ -47,6 +52,9 @@ class SpiceBotCore_OBJ(): # Re-initialize the bot config properly during plugin setup routine self.config.config = bot.config + # Give Spicebot access to bot commands + self.commands.bot = bot + # OSD shortcut def osd(self, messages, recipients=None, text_method='PRIVMSG', max_messages=-1): return self.comms.osd(messages, recipients, text_method, max_messages) diff --git a/sopel_SpiceBot_Core_1/SBCore/commands/__init__.py b/sopel_SpiceBot_Core_1/SBCore/commands/__init__.py new file mode 100644 index 0000000..4ca9a5e --- /dev/null +++ b/sopel_SpiceBot_Core_1/SBCore/commands/__init__.py @@ -0,0 +1,19 @@ +import bot + + +class Commands(): + + def __init__(self): + self.bot = None + + @property + def sopel_commands(self): + return bot.rules.get_all_commands() + + @property + def sopel_nickname_commands(self): + return bot.rules.get_all_nick_commands() + + @property + def sopel_action_commands(self): + return bot.rules.get_all_action_commands() diff --git a/sopel_SpiceBot_Core_1/SBCore/interface/comms/__init__.py b/sopel_SpiceBot_Core_1/SBCore/comms/__init__.py similarity index 100% rename from sopel_SpiceBot_Core_1/SBCore/interface/comms/__init__.py rename to sopel_SpiceBot_Core_1/SBCore/comms/__init__.py diff --git a/sopel_SpiceBot_Core_1/SBCore/interface/config/__init__.py b/sopel_SpiceBot_Core_1/SBCore/config/__init__.py similarity index 100% rename from sopel_SpiceBot_Core_1/SBCore/interface/config/__init__.py rename to sopel_SpiceBot_Core_1/SBCore/config/__init__.py diff --git a/sopel_SpiceBot_Core_1/SBCore/interface/database/__init__.py b/sopel_SpiceBot_Core_1/SBCore/database/__init__.py similarity index 100% rename from sopel_SpiceBot_Core_1/SBCore/interface/database/__init__.py rename to sopel_SpiceBot_Core_1/SBCore/database/__init__.py diff --git a/sopel_SpiceBot_Core_1/SBCore/interface/events/__init__.py b/sopel_SpiceBot_Core_1/SBCore/events/__init__.py similarity index 100% rename from sopel_SpiceBot_Core_1/SBCore/interface/events/__init__.py rename to sopel_SpiceBot_Core_1/SBCore/events/__init__.py diff --git a/sopel_SpiceBot_Core_1/SBCore/interface/logger/__init__.py b/sopel_SpiceBot_Core_1/SBCore/logger/__init__.py similarity index 100% rename from sopel_SpiceBot_Core_1/SBCore/interface/logger/__init__.py rename to sopel_SpiceBot_Core_1/SBCore/logger/__init__.py diff --git a/sopel_SpiceBot_Core_1/SBCore/interface/versions/__init__.py b/sopel_SpiceBot_Core_1/SBCore/versions/__init__.py similarity index 100% rename from sopel_SpiceBot_Core_1/SBCore/interface/versions/__init__.py rename to sopel_SpiceBot_Core_1/SBCore/versions/__init__.py diff --git a/sopel_SpiceBot_Core_Prerun/__init__.py b/sopel_SpiceBot_Core_Prerun/__init__.py index fa74257..c560756 100644 --- a/sopel_SpiceBot_Core_Prerun/__init__.py +++ b/sopel_SpiceBot_Core_Prerun/__init__.py @@ -34,9 +34,6 @@ def prerun_nickname_command(): # Primary command used for trigger, and a list of all words trigger_args, trigger_command, trigger_prefix = make_trigger_args(trigger.args[1], trigger_command_type) - for x in [trigger_args, trigger_command, trigger_prefix]: - bot.say(str(x)) - function(bot, trigger, *args, **kwargs) return internal_prerun diff --git a/sopel_SpiceBot_Runtime_Commands/__init__.py b/sopel_SpiceBot_Runtime_Commands/__init__.py index 139d314..9e9eb60 100644 --- a/sopel_SpiceBot_Runtime_Commands/__init__.py +++ b/sopel_SpiceBot_Runtime_Commands/__init__.py @@ -20,12 +20,5 @@ def sb_nickname_command(bot, trigger): @prerun_nickname_command() @plugin.nickname_command('fart') def sb_fart_command(bot, trigger): - bot.say("Testing the bot") - bot.say("Attributes: %s" % [x for x in dir(sb) if not x.startswith("__")]) - bot.say("%s" % sb.versions.dict) - sb.osd("test", trigger.sender) - - bot.say(str(bot.rules.get_all_commands())) - bot.say(str(bot.rules.get_all_nick_commands())) - bot.say(str(bot.rules.get_all_action_commands())) + bot.say(str(sb.commands.sopel_commands))