From 83d9173cdcd8671dedf5400dde81caac21e37634 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Tue, 7 Apr 2020 11:57:13 +0300
Subject: (Constants, TicTacToe): Added number emojis that will be shown in
 board and in reactions.

---
 bot/constants.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'bot/constants.py')

diff --git a/bot/constants.py b/bot/constants.py
index ca9bb94a..0135124b 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -118,6 +118,19 @@ class Emojis:
     pull_request_closed = "<:PRClosed:629695470519713818>"
     merge = "<:PRMerged:629695470570176522>"
 
+    # TicTacToe Emojis
+    number_emojis = {
+        1: "\u0031",
+        2: "\u0032",
+        3: "\u0033",
+        4: "\u0034",
+        5: "\u0035",
+        6: "\u0036",
+        7: "\u0037",
+        8: "\u0038",
+        9: "\u0039"
+    }
+
 
 class Hacktoberfest(NamedTuple):
     voice_id = 514420006474219521
-- 
cgit v1.2.3


From 1abec1772f140f886b84fb43c394527553cb271a Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Tue, 7 Apr 2020 11:59:12 +0300
Subject: (Constants, TicTacToe): Added confirmation and declining emojis.

---
 bot/constants.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'bot/constants.py')

diff --git a/bot/constants.py b/bot/constants.py
index 0135124b..a23c6bcc 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -130,6 +130,8 @@ class Emojis:
         8: "\u0038",
         9: "\u0039"
     }
+    confirmation = "\u2705"
+    decline = "\u274c"
 
 
 class Hacktoberfest(NamedTuple):
-- 
cgit v1.2.3


From fb9523b9c5e93ff30cdc58ac451e807da323c8b4 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Tue, 7 Apr 2020 12:01:26 +0300
Subject: (Constants, TicTacToe): Added X and O emojis.

---
 bot/constants.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'bot/constants.py')

diff --git a/bot/constants.py b/bot/constants.py
index a23c6bcc..d43cf4d3 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -132,6 +132,8 @@ class Emojis:
     }
     confirmation = "\u2705"
     decline = "\u274c"
+    x = "\U0001f1fd"
+    o = "\U0001f1f4"
 
 
 class Hacktoberfest(NamedTuple):
-- 
cgit v1.2.3


From 7a7385bf222c24f78356ea46331ae5d4abddb65a Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Tue, 7 Apr 2020 19:33:05 +0300
Subject: (Constants, TicTacToe): Fixed number emojis contants, created helper
 function `send_board` to `Game` class.

---
 bot/constants.py                  | 18 +++++++++---------
 bot/exts/evergreen/tic_tac_toe.py | 23 +++++++++++++++++++++--
 2 files changed, 30 insertions(+), 11 deletions(-)

(limited to 'bot/constants.py')

diff --git a/bot/constants.py b/bot/constants.py
index d43cf4d3..a8dd03e6 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -120,15 +120,15 @@ class Emojis:
 
     # TicTacToe Emojis
     number_emojis = {
-        1: "\u0031",
-        2: "\u0032",
-        3: "\u0033",
-        4: "\u0034",
-        5: "\u0035",
-        6: "\u0036",
-        7: "\u0037",
-        8: "\u0038",
-        9: "\u0039"
+        1: "\u0031\ufe0f\u20e3",
+        2: "\u0032\ufe0f\u20e3",
+        3: "\u0033\ufe0f\u20e3",
+        4: "\u0034\ufe0f\u20e3",
+        5: "\u0035\ufe0f\u20e3",
+        6: "\u0036\ufe0f\u20e3",
+        7: "\u0037\ufe0f\u20e3",
+        8: "\u0038\ufe0f\u20e3",
+        9: "\u0039\ufe0f\u20e3"
     }
     confirmation = "\u2705"
     decline = "\u274c"
diff --git a/bot/exts/evergreen/tic_tac_toe.py b/bot/exts/evergreen/tic_tac_toe.py
index 1a906535..55bbb7be 100644
--- a/bot/exts/evergreen/tic_tac_toe.py
+++ b/bot/exts/evergreen/tic_tac_toe.py
@@ -28,6 +28,11 @@ class Game:
         self.channel = channel
         self.players = players
         self.ctx = ctx
+        self.board = [
+            [Emojis.number_emojis[1], Emojis.number_emojis[2], Emojis.number_emojis[3]],
+            [Emojis.number_emojis[4], Emojis.number_emojis[5], Emojis.number_emojis[6]],
+            [Emojis.number_emojis[7], Emojis.number_emojis[8], Emojis.number_emojis[9]]
+        ]
 
         self.current = self.players[0]
         self.next = self.players[1]
@@ -74,9 +79,18 @@ class Game:
 
     async def add_reactions(self, msg: discord.Message) -> None:
         """Add number emojis to message."""
-        for nr in Emojis.number_emojis:
+        for nr in Emojis.number_emojis.values():
             await msg.add_reaction(nr)
 
+    async def send_board(self) -> discord.Message:
+        """Send board and return it's message."""
+        msg = ""
+        for line in self.board:
+            msg += " ".join(line)
+            msg += "\n"
+        message = await self.ctx.send(msg)
+        return message
+
 
 def is_channel_free() -> t.Callable:
     """Check is channel where command will be invoked free."""
@@ -113,7 +127,12 @@ class TicTacToe(Cog):
             ctx
         )
         self.games.append(game)
-        await game.get_confirmation()
+        confirmed, msg = await game.get_confirmation()
+
+        if not confirmed:
+            if msg:
+                await ctx.send(msg)
+            return
 
 
 def setup(bot: SeasonalBot) -> None:
-- 
cgit v1.2.3


From 8e54fab377c7f798259bbf217afc8c3f68c9fb0f Mon Sep 17 00:00:00 2001
From: Chris <chris.lovering.95@gmail.com>
Date: Fri, 8 Jan 2021 00:04:44 +0000
Subject: Get and renew V4 OAuth token

---
 bot/constants.py           |  5 +++--
 bot/exts/evergreen/game.py | 53 ++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 50 insertions(+), 8 deletions(-)

(limited to 'bot/constants.py')

diff --git a/bot/constants.py b/bot/constants.py
index f6da272e..e638dfa1 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -174,7 +174,7 @@ class Emojis:
     christmas_tree = "\U0001F384"
     check = "\u2611"
     envelope = "\U0001F4E8"
-    trashcan = "<:trashcan:637136429717389331>"
+    trashcan = "<:trashcan:796854840293589003>"
     ok_hand = ":ok_hand:"
 
     dice_1 = "<:dice_1:755891608859443290>"
@@ -257,7 +257,8 @@ class Tokens(NamedTuple):
     youtube = environ.get("YOUTUBE_API_KEY")
     tmdb = environ.get("TMDB_API_KEY")
     nasa = environ.get("NASA_API_KEY")
-    igdb = environ.get("IGDB_API_KEY")
+    igdb_client_id = environ.get("IGDB_CLIENT_ID")
+    igdb_client_secret = environ.get("IGDB_CLIENT_SECRET")
     github = environ.get("GITHUB_TOKEN")
 
 
diff --git a/bot/exts/evergreen/game.py b/bot/exts/evergreen/game.py
index d0fd7a40..f5707a22 100644
--- a/bot/exts/evergreen/game.py
+++ b/bot/exts/evergreen/game.py
@@ -2,7 +2,8 @@ import difflib
 import logging
 import random
 import re
-from datetime import datetime as dt
+from asyncio import sleep
+from datetime import datetime as dt, timedelta
 from enum import IntEnum
 from typing import Any, Dict, List, Optional, Tuple
 
@@ -17,10 +18,22 @@ from bot.utils.decorators import with_role
 from bot.utils.pagination import ImagePaginator, LinePaginator
 
 # Base URL of IGDB API
-BASE_URL = "https://api-v3.igdb.com"
+BASE_URL = "https://api.igdb.com/v4"
+
+CLIENT_ID = Tokens.igdb_client_id
+CLIENT_SECRET = Tokens.igdb_client_secret
+
+# URL to request API access token
+OAUTH_URL = "https://id.twitch.tv/oauth2/token"
+
+OAUTH_PARAMS = {
+    "client_id": CLIENT_ID,
+    "client_secret": CLIENT_SECRET,
+    "grant_type": "client_credentials"
+}
 
 HEADERS = {
-    "user-key": Tokens.igdb,
+    "Client-ID": CLIENT_ID,
     "Accept": "application/json"
 }
 
@@ -136,7 +149,32 @@ class Games(Cog):
 
         self.genres: Dict[str, int] = {}
 
-        self.refresh_genres_task.start()
+        self.bot.loop.create_task(self.renew_access_token())
+
+        # self.refresh_genres_task.start()
+
+    async def renew_access_token(self) -> None:
+        """Refeshes V4 access token 2 days before expiry."""
+        while True:
+            async with self.http_session.post(OAUTH_URL, params=OAUTH_PARAMS) as resp:
+                result = await resp.json()
+                if resp.status != 200:
+                    logger.error(
+                        "Failed to renew IGDB access token, unloading Games cog."
+                        f"OAuth response message: {result['message']}"
+                    )
+                    self.bot.remove_cog('Games')
+                    return
+
+            self.access_token = result["access_token"]
+
+            # Set next renewal to 2 days before expire time
+            next_renewal = result["expires_in"] - 60*60*24*2
+
+            time_delta = timedelta(seconds=next_renewal)
+            logger.info(f"Successfully renewed access token. Refreshing again in {time_delta}")
+
+            await sleep(next_renewal)
 
     @tasks.loop(hours=24.0)
     async def refresh_genres_task(self) -> None:
@@ -418,7 +456,10 @@ class Games(Cog):
 def setup(bot: Bot) -> None:
     """Add/Load Games cog."""
     # Check does IGDB API key exist, if not, log warning and don't load cog
-    if not Tokens.igdb:
-        logger.warning("No IGDB API key. Not loading Games cog.")
+    if not Tokens.igdb_client_id:
+        logger.warning("No IGDB client ID. Not loading Games cog.")
+        return
+    if not Tokens.igdb_client_secret:
+        logger.warning("No IGDB client secret. Not loading Games cog.")
         return
     bot.add_cog(Games(bot))
-- 
cgit v1.2.3


From 4505ba3b07c75f531bb6aea0f16737f92330f37e Mon Sep 17 00:00:00 2001
From: Chris <chris.lovering.95@gmail.com>
Date: Fri, 8 Jan 2021 00:07:31 +0000
Subject: Revert change to trashcan emoji

---
 bot/constants.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bot/constants.py')

diff --git a/bot/constants.py b/bot/constants.py
index e638dfa1..cc342f3d 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -174,7 +174,7 @@ class Emojis:
     christmas_tree = "\U0001F384"
     check = "\u2611"
     envelope = "\U0001F4E8"
-    trashcan = "<:trashcan:796854840293589003>"
+    trashcan = "<:trashcan:637136429717389331>"
     ok_hand = ":ok_hand:"
 
     dice_1 = "<:dice_1:755891608859443290>"
-- 
cgit v1.2.3


From a6013bd678ed0b79684a707560ce052b18799052 Mon Sep 17 00:00:00 2001
From: Matteo Bertucci <matteobertucci2004@gmail.com>
Date: Fri, 15 Jan 2021 12:48:12 +0100
Subject: Remove sprint channels from the configuration.

Now that the core dev sprint has ended, we can safely remove those. It caused the wrong channel message to be huge because of all the deleted channels.
---
 bot/constants.py | 34 ----------------------------------
 1 file changed, 34 deletions(-)

(limited to 'bot/constants.py')

diff --git a/bot/constants.py b/bot/constants.py
index f6da272e..90e302d0 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -126,23 +126,6 @@ class Channels(NamedTuple):
     hacktoberfest_2020 = 760857070781071431
     voice_chat = 412357430186344448
 
-    # Core Dev Sprint channels
-    sprint_announcements = 755958119963557958
-    sprint_information = 753338352136224798
-    sprint_organisers = 753340132639375420
-    sprint_general = 753340631538991305
-    sprint_social1_cheese_shop = 758779754789863514
-    sprint_social2_pet_shop = 758780951978573824
-    sprint_escape_room = 761031075942105109
-    sprint_stdlib = 758553316732698634
-    sprint_asyncio = 762904152438472714
-    sprint_typing = 762904690341838888
-    sprint_discussion_capi = 758553358587527218
-    sprint_discussion_triage = 758553458365300746
-    sprint_discussion_design = 758553492662255616
-    sprint_discussion_mentor = 758553536623280159
-    sprint_documentation = 761038271127093278
-
 
 class Client(NamedTuple):
     name = "Sir Lancebot"
@@ -295,23 +278,6 @@ WHITELISTED_CHANNELS = (
     Channels.off_topic_1,
     Channels.off_topic_2,
     Channels.voice_chat,
-
-    # Core Dev Sprint Channels
-    Channels.sprint_announcements,
-    Channels.sprint_information,
-    Channels.sprint_organisers,
-    Channels.sprint_general,
-    Channels.sprint_social1_cheese_shop,
-    Channels.sprint_social2_pet_shop,
-    Channels.sprint_escape_room,
-    Channels.sprint_stdlib,
-    Channels.sprint_asyncio,
-    Channels.sprint_typing,
-    Channels.sprint_discussion_capi,
-    Channels.sprint_discussion_triage,
-    Channels.sprint_discussion_design,
-    Channels.sprint_discussion_mentor,
-    Channels.sprint_documentation,
 )
 
 GIT_SHA = environ.get("GIT_SHA", "foobar")
-- 
cgit v1.2.3


From a17445129a66907e210844d3edaf2871a001b4a8 Mon Sep 17 00:00:00 2001
From: Hassan Abouelela <47495861+HassanAbouelela@users.noreply.github.com>
Date: Fri, 15 Jan 2021 18:19:40 +0300
Subject: Updates Constants

Updates the constants file with the new channel ID, and renames both
channels to match the new names.
---
 bot/constants.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'bot/constants.py')

diff --git a/bot/constants.py b/bot/constants.py
index 90e302d0..24765c2a 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -124,7 +124,8 @@ class Channels(NamedTuple):
     verification = 352442727016693763
     python_discussion = 267624335836053506
     hacktoberfest_2020 = 760857070781071431
-    voice_chat = 412357430186344448
+    voice_chat_0 = 412357430186344448
+    voice_chat_1 = 799647045886541885
 
 
 class Client(NamedTuple):
@@ -277,7 +278,8 @@ WHITELISTED_CHANNELS = (
     Channels.off_topic_0,
     Channels.off_topic_1,
     Channels.off_topic_2,
-    Channels.voice_chat,
+    Channels.voice_chat_0,
+    Channels.voice_chat_1,
 )
 
 GIT_SHA = environ.get("GIT_SHA", "foobar")
-- 
cgit v1.2.3


From a7ffa0926b47bf40cd034eeb2b5e9d5dcd04798f Mon Sep 17 00:00:00 2001
From: Shivansh-007 <Shivansh-007@users.noreply.github.com>
Date: Wed, 27 Jan 2021 10:43:19 +0530
Subject: Add check for in category and in remove overide_channel check and do
 it without decorator

---
 bot/constants.py             |  8 ++++++++
 bot/exts/evergreen/issues.py | 19 ++++++++++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)

(limited to 'bot/constants.py')

diff --git a/bot/constants.py b/bot/constants.py
index 1d41a53e..ce1ca29a 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -9,6 +9,7 @@ __all__ = (
     "AdventOfCode",
     "Branding",
     "Channels",
+    "Categories",
     "Client",
     "Colours",
     "Emojis",
@@ -100,6 +101,7 @@ class Channels(NamedTuple):
     big_brother_logs = 468507907357409333
     bot = 267659945086812160
     checkpoint_test = 422077681434099723
+    organisation = 551789653284356126
     devalerts = 460181980097675264
     devlog = int(environ.get("CHANNEL_DEVLOG", 622895325144940554))
     dev_contrib = 635950537262759947
@@ -128,6 +130,12 @@ class Channels(NamedTuple):
     voice_chat_1 = 799647045886541885
 
 
+class Categories(NamedTuple):
+    development = 411199786025484308
+    devprojects = 787641585624940544
+    media = 799054581991997460
+
+
 class Client(NamedTuple):
     name = "Sir Lancebot"
     guild = int(environ.get("BOT_GUILD", 267624335836053506))
diff --git a/bot/exts/evergreen/issues.py b/bot/exts/evergreen/issues.py
index d2c70d4b..4ab3df2c 100644
--- a/bot/exts/evergreen/issues.py
+++ b/bot/exts/evergreen/issues.py
@@ -7,8 +7,7 @@ from enum import Enum
 import discord
 from discord.ext import commands, tasks
 
-from bot.constants import Channels, Colours, ERROR_REPLIES, Emojis, Tokens, WHITELISTED_CHANNELS
-from bot.utils.decorators import override_in_channel
+from bot.constants import Categories, Channels, Colours, ERROR_REPLIES, Emojis, Tokens, WHITELISTED_CHANNELS
 
 log = logging.getLogger(__name__)
 
@@ -16,13 +15,19 @@ BAD_RESPONSE = {
     404: "Issue/pull request not located! Please enter a valid number!",
     403: "Rate limit has been hit! Please try again later!"
 }
+
 MAX_REQUESTS = 10
 REQUEST_HEADERS = dict()
-PYTHON_DISCORD_REPOS = "https://api.github.com/orgs/{repo}/repos"
 
+PYTHON_DISCORD_REPOS = "https://api.github.com/orgs/{repo}/repos"
 if GITHUB_TOKEN := Tokens.github:
     REQUEST_HEADERS["Authorization"] = f"token {GITHUB_TOKEN}"
 
+WHITELISTED_CATEGORIES = (
+    Categories.devprojects, Categories.media, Categories.development
+)
+WHITELISTED_CHANNELS += (Channels.organisation)
+
 CODE_BLOCK_RE = re.compile(
     r"^`([^`\n]+)`"  # Inline codeblock
     r"|```(.+?)```",  # Multiline codeblock
@@ -135,7 +140,6 @@ class Issues(commands.Cog):
         return resp
 
     @commands.command(aliases=("pr",))
-    @override_in_channel(WHITELISTED_CHANNELS + (Channels.dev_contrib, Channels.dev_branding))
     async def issue(
             self,
             ctx: commands.Context,
@@ -144,6 +148,9 @@ class Issues(commands.Cog):
             user: str = "python-discord"
     ) -> None:
         """Command to retrieve issue(s) from a GitHub repository."""
+        if ctx.channel.category not in WHITELISTED_CATEGORIES or ctx.channel.category in WHITELISTED_CHANNELS:
+            return
+
         result = await self.fetch_issues(set(numbers), repository, user)
 
         if result == FetchIssueErrors.value_error:
@@ -166,9 +173,11 @@ class Issues(commands.Cog):
             await ctx.send(result)
 
     @commands.Cog.listener()
-    @override_in_channel(WHITELISTED_CHANNELS + (Channels.dev_contrib, Channels.dev_branding))
     async def on_message(self, message: discord.Message) -> None:
         """Command to retrieve issue(s) from a GitHub repository using automatic linking if matching <repo>#<issue>."""
+        if message.channel.category not in WHITELISTED_CATEGORIES or message.channel.category in WHITELISTED_CHANNELS:
+            return
+
         message_repo_issue_map = re.findall(fr".+?({self.repo_regex})#(\d+)", message.content)
         links = []
 
-- 
cgit v1.2.3


From 45af7ff6803e75d70be8d78e232b3d30803ae65d Mon Sep 17 00:00:00 2001
From: Shivansh-007 <Shivansh-007@users.noreply.github.com>
Date: Sun, 31 Jan 2021 05:13:35 +0530
Subject: Add mod_meta and mod_tools channels to whitelisted

---
 bot/constants.py             | 2 ++
 bot/exts/evergreen/issues.py | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'bot/constants.py')

diff --git a/bot/constants.py b/bot/constants.py
index ce1ca29a..1234ef3b 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -116,6 +116,8 @@ class Channels(NamedTuple):
     message_log = 467752170159079424
     mod_alerts = 473092532147060736
     modlog = 282638479504965634
+    mod_meta = 775412552795947058
+    mod_tools = 775413915391098921
     off_topic_0 = 291284109232308226
     off_topic_1 = 463035241142026251
     off_topic_2 = 463035268514185226
diff --git a/bot/exts/evergreen/issues.py b/bot/exts/evergreen/issues.py
index 72d88d04..f24e0717 100644
--- a/bot/exts/evergreen/issues.py
+++ b/bot/exts/evergreen/issues.py
@@ -26,7 +26,7 @@ if GITHUB_TOKEN := Tokens.github:
 WHITELISTED_CATEGORIES = (
     Categories.devprojects, Categories.media, Categories.development
 )
-WHITELISTED_CHANNELS_ON_MESSAGE = (Channels.organisation,)
+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


From 3e884eaa43b78b433a470aaff39b03a0f6c2b3c2 Mon Sep 17 00:00:00 2001
From: Shivansh-007 <Shivansh-007@users.noreply.github.com>
Date: Tue, 2 Feb 2021 06:05:46 +0530
Subject: Allow cht.sh command to be used in occupied help channels

---
 bot/constants.py                 | 11 +++++------
 bot/exts/evergreen/cheatsheet.py | 13 +++++++++----
 2 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'bot/constants.py')

diff --git a/bot/constants.py b/bot/constants.py
index 1d41a53e..23865272 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -104,12 +104,6 @@ class Channels(NamedTuple):
     devlog = int(environ.get("CHANNEL_DEVLOG", 622895325144940554))
     dev_contrib = 635950537262759947
     dev_branding = 753252897059373066
-    help_0 = 303906576991780866
-    help_1 = 303906556754395136
-    help_2 = 303906514266226689
-    help_3 = 439702951246692352
-    help_4 = 451312046647148554
-    help_5 = 454941769734422538
     helpers = 385474242440986624
     message_log = 467752170159079424
     mod_alerts = 473092532147060736
@@ -128,6 +122,10 @@ class Channels(NamedTuple):
     voice_chat_1 = 799647045886541885
 
 
+class Categories(NamedTuple):
+    help_in_use = 696958401460043776
+
+
 class Client(NamedTuple):
     name = "Sir Lancebot"
     guild = int(environ.get("BOT_GUILD", 267624335836053506))
@@ -249,6 +247,7 @@ class Roles(NamedTuple):
     rockstars = 458226413825294336
     core_developers = 587606783669829632
     events_lead = 778361735739998228
+    everyone = 267624335836053506
 
 
 class Tokens(NamedTuple):
diff --git a/bot/exts/evergreen/cheatsheet.py b/bot/exts/evergreen/cheatsheet.py
index c83af839..83098c76 100644
--- a/bot/exts/evergreen/cheatsheet.py
+++ b/bot/exts/evergreen/cheatsheet.py
@@ -3,13 +3,13 @@ import re
 import typing as t
 from urllib.parse import quote_plus
 
-from discord import Embed
+from discord import Embed, utils
 from discord.ext import commands
 from discord.ext.commands import BucketType, Context
 
 from bot import constants
-from bot.constants import Channels, Colours, ERROR_REPLIES, WHITELISTED_CHANNELS
-from bot.utils.decorators import override_in_channel
+from bot.constants import Categories, Channels, Colours, ERROR_REPLIES, Roles, WHITELISTED_CHANNELS
+from bot.utils.decorators import with_role
 
 ERROR_MESSAGE = f"""
 Unknown cheat sheet. Please try to reformulate your query.
@@ -72,8 +72,8 @@ class CheatSheet(commands.Cog):
         name="cheat",
         aliases=("cht.sh", "cheatsheet", "cheat-sheet", "cht"),
     )
-    @override_in_channel(WHITELISTED_CHANNELS)
     @commands.cooldown(1, 10, BucketType.user)
+    @with_role(Roles.everyone)
     async def cheat_sheet(self, ctx: Context, *search_terms: str) -> None:
         """
         Search cheat.sh.
@@ -82,6 +82,11 @@ class CheatSheet(commands.Cog):
         Usage:
         --> .cht read json
         """
+        category = utils.get(ctx.message.guild.categories, id=Categories.help_in_use)
+        all_allowed_channels = WHITELISTED_CHANNELS + tuple(category.channels)
+        if ctx.channel not in all_allowed_channels:
+            return
+
         async with self.bot.http_session.get(
                 URL.format(search=quote_plus(" ".join(search_terms)))
         ) as response:
-- 
cgit v1.2.3


From 5190f5b8576267807dd6a4920964d684f0d572a4 Mon Sep 17 00:00:00 2001
From: Shivansh-007 <Shivansh-007@users.noreply.github.com>
Date: Tue, 2 Feb 2021 06:17:58 +0530
Subject: everyone -> everyone_role  and remove developers role

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

(limited to 'bot/constants.py')

diff --git a/bot/constants.py b/bot/constants.py
index 23865272..8e210ad3 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -236,7 +236,6 @@ class Roles(NamedTuple):
     announcements = 463658397560995840
     champion = 430492892331769857
     contributor = 295488872404484098
-    developer = 352427296948486144
     devops = 409416496733880320
     jammer = 423054537079783434
     moderator = 267629731250176001
@@ -247,7 +246,7 @@ class Roles(NamedTuple):
     rockstars = 458226413825294336
     core_developers = 587606783669829632
     events_lead = 778361735739998228
-    everyone = 267624335836053506
+    everyone_role = 267624335836053506
 
 
 class Tokens(NamedTuple):
diff --git a/bot/exts/evergreen/cheatsheet.py b/bot/exts/evergreen/cheatsheet.py
index abc5306b..f650e3b0 100644
--- a/bot/exts/evergreen/cheatsheet.py
+++ b/bot/exts/evergreen/cheatsheet.py
@@ -73,7 +73,7 @@ class CheatSheet(commands.Cog):
         aliases=("cht.sh", "cheatsheet", "cheat-sheet", "cht"),
     )
     @commands.cooldown(1, 10, BucketType.user)
-    @with_role(Roles.everyone)
+    @with_role(Roles.everyone_role)
     async def cheat_sheet(self, ctx: Context, *search_terms: str) -> None:
         """
         Search cheat.sh.
-- 
cgit v1.2.3