Merge pull request #80 from scragly/season_improvements

Season Improvements

1 files changed, 29 insertions, 23 deletions

diff --git a/bot/constants.py b/bot/constants.py
index 1294912a..71bdbf5f 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -4,14 +4,27 @@ from typing import NamedTuple
 
 from bot.bot import SeasonalBot
 
-__all__ = ('Client', 'Roles', 'bot')
+__all__ = (
+    "AdventOfCode", "Channels", "Client", "Colours", "Emojis", "Hacktoberfest", "Roles",
+    "Tokens", "bot"
+)
 
 log = logging.getLogger(__name__)
 
 
+class AdventOfCode:
+    leaderboard_cache_age_threshold_seconds = 3600
+    leaderboard_id = 363275
+    leaderboard_join_code = "363275-442b6939"
+    leaderboard_max_displayed_members = 10
+    year = 2018
+    channel_id = int(environ.get("AOC_CHANNEL_ID", 517745814039166986))
+    role_id = int(environ.get("AOC_ROLE_ID", 518565788744024082))
+
+
 class Channels(NamedTuple):
     admins = 365960823622991872
-    announcements = 354619224620138496
+    announcements = int(environ.get('CHANNEL_ANNOUNCEMENTS', 354619224620138496))
     big_brother_logs = 468507907357409333
     bot = 267659945086812160
     checkpoint_test = 422077681434099723
@@ -45,13 +58,26 @@ class Client(NamedTuple):
     season_override = environ.get('SEASON_OVERRIDE')
 
 
+class Colours:
+    soft_red = 0xcd6d6d
+    soft_green = 0x68c290
+    dark_green = 0x1f8b4c
+    orange = 0xe67e22
+
+
+class Emojis:
+    star = "\u2B50"
+    christmas_tree = "\U0001F384"
+    check = "\u2611"
+
+
 class Hacktoberfest(NamedTuple):
     channel_id = 498804484324196362
     voice_id = 514420006474219521
 
 
 class Roles(NamedTuple):
-    admin = 267628507062992896
+    admin = int(environ.get('SEASONALBOT_ADMIN_ROLE_ID', 267628507062992896))
     announcements = 463658397560995840
     champion = 430492892331769857
     contributor = 295488872404484098
@@ -66,29 +92,9 @@ class Roles(NamedTuple):
     rockstars = 458226413825294336
 
 
-class Colours:
-    soft_red = 0xcd6d6d
-    soft_green = 0x68c290
-
-
-class Emojis:
-    star = "\u2B50"
-    christmas_tree = u"\U0001F384"
-
-
 class Tokens(NamedTuple):
     giphy = environ.get("GIPHY_TOKEN")
     aoc_session_cookie = environ.get("AOC_SESSION_COOKIE")
 
 
-class AdventOfCode:
-    leaderboard_cache_age_threshold_seconds = 3600
-    leaderboard_id = 363275
-    leaderboard_join_code = "363275-442b6939"
-    leaderboard_max_displayed_members = 10
-    year = 2018
-    channel_id = int(environ.get("AOC_CHANNEL_ID", 517745814039166986))
-    role_id = int(environ.get("AOC_ROLE_ID", 518565788744024082))
-
-
 bot = SeasonalBot(command_prefix=Client.prefix)