From 827c50199936e839c6390d41281b10ac3b2eea48 Mon Sep 17 00:00:00 2001 From: Joey Hines Date: Tue, 14 Aug 2018 18:56:07 -0500 Subject: [PATCH] Added support for a list of bot_mod ranks --- BotConfig.py | 2 +- bot.py | 13 ++++++------- cogs/Admin_Commands.py | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/BotConfig.py b/BotConfig.py index b26d0c1..d1d7734 100644 --- a/BotConfig.py +++ b/BotConfig.py @@ -50,7 +50,7 @@ class Config: self.status = self.config['Discord']['Status'] self.prefix = self.config['Discord']['Prefix'] self.dynmap_url = self.config['Minecraft']['Dynmap_Url'] - self.bot_mod = self.config['Discord']['Bot_Mod'] + self.bot_mod = self.config['Discord']['Bot_Mod'].split(',') self.count = int(self.config['Logging']['Count']) self.rotation_duration = int(self.config['Logging']['Rotation_Duration']) self.special_name_list = dict(self.config.items('Special Names')) diff --git a/bot.py b/bot.py index 9204f27..c9170b6 100644 --- a/bot.py +++ b/bot.py @@ -122,14 +122,13 @@ async def username_update(): def start_bot(): - - for extension in extensions: - try: - bot.load_extension(extension) - except Exception as e: - logger.info('Failed to load extension {}, {}'.format(extension, e)) - try: + for extension in extensions: + try: + bot.load_extension(extension) + except Exception as e: + logger.info('Failed to load extension {}'.format(extension)) + raise e bot.loop.create_task(username_update()) logger.info('Logging into Discord...') bot.run(bot_config.token) diff --git a/cogs/Admin_Commands.py b/cogs/Admin_Commands.py index cd95f10..890b82a 100644 --- a/cogs/Admin_Commands.py +++ b/cogs/Admin_Commands.py @@ -9,7 +9,7 @@ from bot import bot_commands def check_mod(user): try: for role in user.roles: - if role.id == bot_config.bot_mod: + if role.id in bot_config.bot_mod: return True except AttributeError: raise NotOnServerError