From 6d2917c31b9a24b181a8aaa5741d08327667bf54 Mon Sep 17 00:00:00 2001 From: Phxntxm Date: Thu, 11 May 2017 19:50:57 -0500 Subject: [PATCH] Move extensions from config.yml to be hardcoded --- cogs/utils/config.py | 12 +++++------- config.yml.sample | 4 ---- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/cogs/utils/config.py b/cogs/utils/config.py index 7a6781a..81198f9 100644 --- a/cogs/utils/config.py +++ b/cogs/utils/config.py @@ -52,8 +52,6 @@ discord_bots_key = global_config.get('discord_bots_key', "") carbon_key = global_config.get('carbon_key', "") # The client ID for twitch requsets twitch_key = global_config.get('twitch_key', "") -# The steam API key -steam_key = global_config.get("steam_key", "") # The key for youtube API calls youtube_key = global_config.get("youtube_key", "") # The key for Osu API calls @@ -61,19 +59,19 @@ osu_key = global_config.get('osu_key', '') # The key for League of Legends API calls lol_key = global_config.get('lol_key', '') # The keys needed for deviant art calls -da_id = global_config.get("da_id", "") -da_secret = global_config.get("da_secret", "") # The invite link for the server made for the bot dev_server = global_config.get("dev_server", "") # The User-Agent that we'll use for most requests user_agent = global_config.get('user_agent', "") # The extensions to load -extensions = global_config.get('extensions', []) +extensions = ['cogs.interaction', 'cogs.misc', 'cogs.mod', 'cogs.admin', 'cogs.images', + 'cogs.owner', 'cogs.stats', 'cogs.picarto', 'cogs.overwatch', 'cogs.links', + 'cogs.roles', 'cogs.tictactoe', 'cogs.hangman', 'cogs.events', 'cogs.raffle', + 'cogs.twitch', 'cogs.blackjack', 'cogs.osu', 'cogs.tags', 'cogs.roulette', 'cogs.music'] + # The default status the bot will use default_status = global_config.get("default_status", None) -# The URL that will be used to link to for the help command -help_url = global_config.get("help_url", "") # The rethinkdb hostname db_host = global_config.get('db_host', 'localhost') # The rethinkdb database name diff --git a/config.yml.sample b/config.yml.sample index 897960d..623fc43 100644 --- a/config.yml.sample +++ b/config.yml.sample @@ -11,10 +11,6 @@ osu_key: 'key' dev_server: 'https://discord.gg/123456' user_agent: 'User-Agent/1.0.0 (Comment like link to site)' -extensions: [cogs.cog1, cogs.cog2] - -shard_count: 1 -shard_id: 0 db_host: 'localhost' db_name: 'Bot_Name'