Merge branch 'main' into feature/command-suggestions

4 files changed, 44 insertions, 7 deletions

diff --git a/bot/resources/easter/april_fools_vids.json b/bot/resources/easter/april_fools_vids.json
index 5f0ba06e..b2cbd07b 100644
--- a/bot/resources/easter/april_fools_vids.json
+++ b/bot/resources/easter/april_fools_vids.json
@@ -17,10 +17,6 @@
       "link": "https://youtu.be/3MA6_21nka8"
     },
     {
-      "title": "Introducing Google Gnome",
-      "link": "https://youtu.be/vNOllWX-2aE"
-    },
-    {
       "title": "Introducing Google Wind",
       "link": "https://youtu.be/QAwL0O5nXe0"
     },
@@ -119,6 +115,18 @@
     {
       "title": "Introducing Gmail Motion",
       "link": "https://youtu.be/Bu927_ul_X0"
+    },
+    {
+      "title": "Introducing GeForce GTX G-Assist",
+      "link": "https://youtu.be/smM-Wdk2RLQ"
+    },
+    {
+      "title": "The Hovering Mouse - Project McFly | Razer",
+      "link": "https://youtu.be/IlCx5gjAmqI"
+    },
+    {
+      "title": "Be the Machine | Project Venom v2",
+      "link": "https://youtu.be/j8UJE7DoyJ8"
     }
   ]
 
diff --git a/bot/resources/evergreen/py_topics.yaml b/bot/resources/evergreen/py_topics.yaml
index f3b2eaa3..6b7e0206 100644
--- a/bot/resources/evergreen/py_topics.yaml
+++ b/bot/resources/evergreen/py_topics.yaml
@@ -69,7 +69,11 @@
 
 # game-development
 660625198390837248:
-    -
+    - What is your favorite game mechanic?
+    - What is your favorite framework and why?
+    - What games do you know that were written in Python?
+    - What books or tutorials would you recommend for game-development beginners?
+    - What made you start developing games?
 
 # microcontrollers
 545603026732318730:
diff --git a/bot/resources/evergreen/starter.yaml b/bot/resources/evergreen/starter.yaml
index 949220f9..4fec6a10 100644
--- a/bot/resources/evergreen/starter.yaml
+++ b/bot/resources/evergreen/starter.yaml
@@ -31,3 +31,22 @@
 - What is your favorite TV show?
 - What is your favorite media genre?
 - How many years have you spent coding?
+- What book do you highly recommend everyone to read?
+- What websites do you use daily to keep yourself up to date with the industry?
+- What made you want to join this Discord server?
+- How are you?
+- What is the best advice you have ever gotten in regards to programming/software?
+- What is the most satisfying thing you've done in your life?
+- Who is your favorite music composer/producer/singer?
+- What is your favorite song?
+- What is your favorite video game?
+- What are your hobbies other than programming?
+- Who is your favorite Writer?
+- What is your favorite movie?
+- What is your favorite sport?
+- What is your favorite fruit?
+- What is your favorite juice?
+- What is the best scenery you've ever seen?
+- What artistic talents do you have?
+- What is the tallest building you've entered?
+- What is the oldest computer you've ever used?
diff --git a/bot/utils/decorators.py b/bot/utils/decorators.py
index c12a15ff..60066dc4 100644
--- a/bot/utils/decorators.py
+++ b/bot/utils/decorators.py
@@ -11,7 +11,7 @@ from discord import Colour, Embed
 from discord.ext import commands
 from discord.ext.commands import CheckFailure, Command, Context
 
-from bot.constants import ERROR_REPLIES, Month
+from bot.constants import Channels, ERROR_REPLIES, Month, WHITELISTED_CHANNELS
 from bot.utils import human_months, resolve_current_month
 from bot.utils.checks import in_whitelist_check
 
@@ -253,6 +253,12 @@ def whitelist_check(**default_kwargs: t.Container[int]) -> t.Callable[[Context],
         channels = set(kwargs.get("channels") or {})
         categories = kwargs.get("categories")
 
+        # Only output override channels + community_bot_commands
+        if channels:
+            default_whitelist_channels = set(WHITELISTED_CHANNELS)
+            default_whitelist_channels.discard(Channels.community_bot_commands)
+            channels.difference_update(default_whitelist_channels)
+
         # Add all whitelisted category channels
         if categories:
             for category_id in categories:
@@ -260,7 +266,7 @@ def whitelist_check(**default_kwargs: t.Container[int]) -> t.Callable[[Context],
                 if category is None:
                     continue
 
-                [channels.add(channel.id) for channel in category.text_channels]
+                channels.update(channel.id for channel in category.text_channels)
 
         if channels:
             channels_str = ', '.join(f"<#{c_id}>" for c_id in channels)