aboutsummaryrefslogtreecommitdiff
path: root/start.py
diff options
context:
space:
mode:
authorGravatar jesopo2018-09-13 13:35:05 +0100
committerGravatar jesopo2018-09-13 13:35:05 +0100
commit1eed727bc5a8efaded32035cd1922851d799156c (patch)
treeacc6efcca649bada764ec86781ca9d64d908d9c2 /start.py
parentOops, this isn't C#. (diff)
signature
Add !enablemodule and !disablemodule to modules.py
Diffstat (limited to 'start.py')
-rwxr-xr-xstart.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/start.py b/start.py
index 6dabd853..1ed9909f 100755
--- a/start.py
+++ b/start.py
@@ -25,10 +25,9 @@ bot.database = database
bot.config = config.load_config()
bot.args = args
-whitelist = bot.config.get("module_whitelist", None)
-if not whitelist == None:
- whitelist = whitelist.split(",")
-bot.modules.load_modules(whitelist=whitelist)
+whitelist = bot.get_setting("module-whitelist", [])
+blacklist = bot.get_setting("module-blacklist", [])
+bot.modules.load_modules(whitelist=whitelist, blacklist=blacklist)
server_details = database.servers.get_all()
servers = []