From 13dad6bf796a6009db4ff768795a3d45d044ff0e Mon Sep 17 00:00:00 2001
From: Shivansh-007 <Shivansh-007@users.noreply.github.com>
Date: Tue, 23 Feb 2021 16:46:08 +0530
Subject: Fix pipfile conflicts, and add/use emojis from constants.py

---
 bot/constants.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'bot/constants.py')

diff --git a/bot/constants.py b/bot/constants.py
index bb538487..682ccf6f 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -165,6 +165,7 @@ class Emojis:
     envelope = "\U0001F4E8"
     trashcan = "<:trashcan:637136429717389331>"
     ok_hand = ":ok_hand:"
+    hand_raised = "\U0001f64b"
 
     dice_1 = "<:dice_1:755891608859443290>"
     dice_2 = "<:dice_2:755891608741740635>"
@@ -179,7 +180,6 @@ class Emojis:
     pull_request_closed = "<:PRClosed:629695470519713818>"
     merge = "<:PRMerged:629695470570176522>"
 
-    # TicTacToe Emojis
     number_emojis = {
         1: "\u0031\ufe0f\u20e3",
         2: "\u0032\ufe0f\u20e3",
@@ -191,8 +191,11 @@ class Emojis:
         8: "\u0038\ufe0f\u20e3",
         9: "\u0039\ufe0f\u20e3"
     }
+
     confirmation = "\u2705"
     decline = "\u274c"
+    incident_unactioned = "<:incident_unactioned:719645583245180960>"
+
     x = "\U0001f1fd"
     o = "\U0001f1f4"
 
-- 
cgit v1.2.3


From f429ce6aaa57d680893be0cbd5a7760de947aac6 Mon Sep 17 00:00:00 2001
From: Chris <chris.lovering.95@gmail.com>
Date: Sun, 28 Feb 2021 19:48:13 +0000
Subject: Add issue cog to staff channels.

---
 bot/constants.py             | 2 ++
 bot/exts/evergreen/issues.py | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'bot/constants.py')

diff --git a/bot/constants.py b/bot/constants.py
index 682ccf6f..9b7e37f8 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -124,6 +124,7 @@ class Channels(NamedTuple):
     hacktoberfest_2020 = 760857070781071431
     voice_chat_0 = 412357430186344448
     voice_chat_1 = 799647045886541885
+    staff_voice = 541638762007101470
 
 
 class Categories(NamedTuple):
@@ -131,6 +132,7 @@ class Categories(NamedTuple):
     development = 411199786025484308
     devprojects = 787641585624940544
     media = 799054581991997460
+    staff = 364918151625965579
 
 
 class Client(NamedTuple):
diff --git a/bot/exts/evergreen/issues.py b/bot/exts/evergreen/issues.py
index 73ebe547..03d0a86b 100644
--- a/bot/exts/evergreen/issues.py
+++ b/bot/exts/evergreen/issues.py
@@ -24,9 +24,11 @@ if GITHUB_TOKEN := Tokens.github:
     REQUEST_HEADERS["Authorization"] = f"token {GITHUB_TOKEN}"
 
 WHITELISTED_CATEGORIES = (
-    Categories.devprojects, Categories.media, Categories.development
+    Categories.devprojects, Categories.media, Categories.development, Categories.staff
+)
+WHITELISTED_CHANNELS_ON_MESSAGE = (
+    Channels.organisation, Channels.mod_meta, Channels.mod_tools, Channels.staff_voice
 )
-WHITELISTED_CHANNELS_ON_MESSAGE = (Channels.organisation, Channels.mod_meta, Channels.mod_tools)
 
 CODE_BLOCK_RE = re.compile(
     r"^`([^`\n]+)`"  # Inline codeblock
-- 
cgit v1.2.3