aboutsummaryrefslogtreecommitdiff
path: root/src/IRCBot.py
diff options
context:
space:
mode:
authorGravatar jesopo2019-12-07 11:07:43 +0000
committerGravatar jesopo2019-12-07 11:07:43 +0000
commit3028759c865bc9f604addb55c4b3d8e65f4cc827 (patch)
tree977eb2a06bd33aedc7942c410f7d11c2ff66ddd5 /src/IRCBot.py
parentadded get_list() and set_list() to src/Config.py (diff)
signature
use get_list and set_list to move dynamic module en/disabling to bot.conf
Diffstat (limited to 'src/IRCBot.py')
-rw-r--r--src/IRCBot.py12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/IRCBot.py b/src/IRCBot.py
index 9d354245..40728096 100644
--- a/src/IRCBot.py
+++ b/src/IRCBot.py
@@ -147,16 +147,10 @@ class Bot(object):
sys.exit(20)
def _module_lists(self):
- db_whitelist = set(self.get_setting("module-whitelist", []))
- db_blacklist = set(self.get_setting("module-blacklist", []))
+ whitelist = self.config.get_list("module-whitelist")
+ blacklist = self.config.get_list("module-blacklist")
- conf_whitelist = self.config.get("module-whitelist", "").split(",")
- conf_blacklist = self.config.get("module-blacklist", "").split(",")
-
- conf_whitelist = set(filter(None, conf_whitelist))
- conf_blacklist = set(filter(None, conf_blacklist))
-
- return (db_whitelist|conf_whitelist, db_blacklist|conf_blacklist)
+ return whitelist, blacklist
def load_modules(self
) -> typing.Tuple[typing.List[str], typing.List[str]]: