From b7f3cc086bdd27e7fb8a656ad66348b6bf489268 Mon Sep 17 00:00:00 2001
From: Leon Sandøy <leon.sandoy@conmodo.com>
Date: Sun, 29 Jul 2018 11:41:28 +0200
Subject: Addressing gdude comments

---
 pysite/constants.py               | 60 +++++++++++++++++++++++----------------
 pysite/views/api/bot/clean.py     |  2 +-
 pysite/views/main/bot/cleanlog.py |  4 +--
 tests/test_clean_logs.py          |  4 +--
 4 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/pysite/constants.py b/pysite/constants.py
index d7453871..7d8dbf6e 100644
--- a/pysite/constants.py
+++ b/pysite/constants.py
@@ -31,17 +31,27 @@ class BotEventTypes(Enum):
 DEBUG_MODE = "FLASK_DEBUG" in environ
 
 # All snowflakes should be strings as RethinkDB rounds them as ints
-OWNER_ROLE = "267627879762755584"
-ADMIN_ROLE = "267628507062992896"
-MODERATOR_ROLE = "267629731250176001"
+ADMIN_BOTS_ROLE = "270988689419665409"
+ADMINS_ROLE = "267628507062992896"
+ANNOUNCEMENTS_ROLE = "463658397560995840"
+BOTS_ROLE = "277546923144249364"
+CODE_JAM_CHAMPIONS_ROLE = "430492892331769857"
+CONTRIBS_ROLE = "295488872404484098"
 DEVOPS_ROLE = "409416496733880320"
-HELPER_ROLE = "267630620367257601"
-CONTRIB_ROLE = "295488872404484098"
+DEVELOPERS_ROLE = "352427296948486144"
+HELPERS_ROLE = "267630620367257601"
 JAMMERS_ROLE = "423054537079783434"
-
-ALL_STAFF_ROLES = (OWNER_ROLE, ADMIN_ROLE, MODERATOR_ROLE, DEVOPS_ROLE)
-TABLE_MANAGER_ROLES = (OWNER_ROLE, ADMIN_ROLE, DEVOPS_ROLE)
-EDITOR_ROLES = ALL_STAFF_ROLES + (HELPER_ROLE, CONTRIB_ROLE)
+MODERATORS_ROLE = "267629731250176001"
+MUTED_ROLE = "277914926603829249"
+OWNERS_ROLE = "267627879762755584"
+PARTNERS_ROLE = "323426753857191936"
+PYTHON_ROLE = "458226699344019457"
+STREAMERS_ROLE = "462650825978806274"
+SUBREDDIT_MOD_ROLE = "458226413825294336"
+
+ALL_STAFF_ROLES = (OWNERS_ROLE, ADMINS_ROLE, MODERATORS_ROLE, DEVOPS_ROLE)
+TABLE_MANAGER_ROLES = (OWNERS_ROLE, ADMINS_ROLE, DEVOPS_ROLE)
+EDITOR_ROLES = ALL_STAFF_ROLES + (HELPERS_ROLE, CONTRIBS_ROLE)
 
 SERVER_ID = 267624335836053506
 
@@ -103,22 +113,22 @@ JAM_QUESTION_TYPES = [
 
 # Server role colors
 ROLE_COLORS = {
-    "owners": "#ffa3a1",
-    "admins": "#e76e6c",
-    "moderators": "#ce3c42",
-    "python": "#6f9fed",
-    "bots": "#6f9fed",
-    "admin bots": "#6f9fed",
-    "devops": "#a1d1ff",
-    "helpers": "#e0b000",
-    "subreddit moderators": "#d897ed",
-    "partners": "#b66fed",
-    "streamers": "#833cba",
-    "developers": "#fcfcfc",
-    "muted": "#fcfcfc",
-    "code jam champions": "#b108b4",
-    "jammers": "#258639",
-    "contributors": "#55cc6c"
+    ADMIN_BOTS_ROLE: "#6f9fed",
+    ADMINS_ROLE: "#e76e6c",
+    BOTS_ROLE: "#6f9fed",
+    CODE_JAM_CHAMPIONS_ROLE: "#b108b4",
+    CONTRIBS_ROLE: "#55cc6c",
+    DEVOPS_ROLE: "#a1d1ff",
+    DEVELOPERS_ROLE: "#fcfcfc",
+    HELPERS_ROLE: "#e0b000",
+    JAMMERS_ROLE: "#258639",
+    MODERATORS_ROLE: "#ce3c42",
+    MUTED_ROLE: "#fcfcfc",
+    OWNERS_ROLE: "#ffa3a1",
+    PARTNERS_ROLE: "#b66fed",
+    PYTHON_ROLE: "#6f9fed",
+    STREAMERS_ROLE: "#833cba",
+    SUBREDDIT_MOD_ROLE: "#d897ed",
 }
 
 # CSRF
diff --git a/pysite/views/api/bot/clean.py b/pysite/views/api/bot/clean.py
index 2ee3f62d..82d1e735 100644
--- a/pysite/views/api/bot/clean.py
+++ b/pysite/views/api/bot/clean.py
@@ -12,7 +12,7 @@ POST_SCHEMA = Schema({
             "author": str,
             "user_id": str,
             "content": str,
-            "role": str,
+            "role_id": str,
             "timestamp": str,
             "embeds": object,
             "attachments": [str],
diff --git a/pysite/views/main/bot/cleanlog.py b/pysite/views/main/bot/cleanlog.py
index 1c90dc0b..9c719b3e 100644
--- a/pysite/views/main/bot/cleanlog.py
+++ b/pysite/views/main/bot/cleanlog.py
@@ -1,7 +1,7 @@
 import logging
 
 from pysite.base_route import RouteView
-from pysite.constants import ALL_STAFF_ROLES, ROLE_COLORS
+from pysite.constants import ALL_STAFF_ROLES, DEVELOPERS_ROLE, ROLE_COLORS
 from pysite.decorators import require_roles
 from pysite.mixins import DBMixin, OAuthMixin
 
@@ -30,6 +30,6 @@ class CleanLogView(RouteView, DBMixin, OAuthMixin):
         messages = data["log_data"]
 
         for message in messages:
-            message['color'] = ROLE_COLORS.get(message['role'], ROLE_COLORS['developers'])
+            message['color'] = ROLE_COLORS.get(message['role_id'], ROLE_COLORS[DEVELOPERS_ROLE])
 
         return self.render(self.template, messages=messages)
diff --git a/tests/test_clean_logs.py b/tests/test_clean_logs.py
index 886a4c3a..1c3449b4 100644
--- a/tests/test_clean_logs.py
+++ b/tests/test_clean_logs.py
@@ -9,7 +9,7 @@ class TestCleanLogAPI(SiteTest):
     Tests submitting a clean log and
     verifies that we get a UUID in return.
 
-    Then tests that
+    Also ensures that we get a 400 if we send in bad data.
     """
 
     def test_returns_400_on_bad_data(self):
@@ -31,7 +31,7 @@ class TestCleanLogAPI(SiteTest):
                 {
                     "author": "something",
                     "user_id": "12345151",
-                    "role": "awful",
+                    "role_id": "4818413",
                     "content": "testy",
                     "timestamp": "this way comes",
                     "embeds": [{"fire":"nanny"}],
-- 
cgit v1.2.3