diff --git a/sopel_SpiceBot_Core_1/SBCore/commands/__init__.py b/sopel_SpiceBot_Core_1/SBCore/commands/__init__.py index 36f90e3..28a27e2 100644 --- a/sopel_SpiceBot_Core_1/SBCore/commands/__init__.py +++ b/sopel_SpiceBot_Core_1/SBCore/commands/__init__.py @@ -21,17 +21,21 @@ class Commands(): @property def multi_split_key(self): - return self.config.SpiceBot.multi_split_key + # TODO config + # return self.config.spiceBot.multi_split_key + return "&&" @property def pipe_split_key(self): # TODO config + # return self.config.spiceBot.pipe_split_key return "|" @property def query_command_key(self): # TODO config - return "|" + # return self.config.spiceBot.query_command_key + return "?" @property def valid_sopel_commands(self): diff --git a/sopel_SpiceBot_Core_1/SBCore/config/__init__.py b/sopel_SpiceBot_Core_1/SBCore/config/__init__.py index 9390cf1..d045d90 100644 --- a/sopel_SpiceBot_Core_1/SBCore/config/__init__.py +++ b/sopel_SpiceBot_Core_1/SBCore/config/__init__.py @@ -50,3 +50,5 @@ class Config(): class SpiceBot_Conf(StaticSection): multi_split_key = ValidatedAttribute('multi_split_key', default="&&") + pipe_split_key = ValidatedAttribute('pipe_split_key', default="|") + query_command_key = ValidatedAttribute('query_command_key', default="?") diff --git a/sopel_SpiceBot_Core_1/__init__.py b/sopel_SpiceBot_Core_1/__init__.py index 87e08d8..a79af7c 100644 --- a/sopel_SpiceBot_Core_1/__init__.py +++ b/sopel_SpiceBot_Core_1/__init__.py @@ -16,8 +16,10 @@ sb = SpiceBotCore_OBJ(SCRIPT_DIR) def configure(config): - config.define_section("SpiceBot", SpiceBot_Conf, validate=False) + config.define_section("spiceBot", SpiceBot_Conf, validate=False) config.SpiceBot_Conf.configure_setting('multi_split_key', 'key to split multi-commands') + config.SpiceBot_Conf.configure_setting('pipe_split_key', 'key to split multi-commands') + config.SpiceBot_Conf.configure_setting('query_command_key', 'key to split multi-commands') def setup(bot):