Merge branch 'main' into fixing_uwu

Author: wookie184

bot/constants.py

@@ -301,6 +301,7 @@ class _Reddit(EnvConfig, env_prefix="reddit_"):
     client_id: SecretStr = ""
     secret: SecretStr = ""
     webhook: int = 635408384794951680
+    send_top_daily_posts: bool = True
 
 
 Reddit = _Reddit()

bot/exts/utilities/colour.py

@@ -163,7 +163,7 @@ async def hex(self, ctx: commands.Context, hex_code: str) -> None:
     @colour.command()
     async def name(self, ctx: commands.Context, *, user_colour_name: str) -> None:
         """Create an embed from a name input."""
-        hex_colour = self.match_colour_name(ctx, user_colour_name)
+        hex_colour = self.match_colour_name(ctx, user_colour_name.title())
         if hex_colour is None:
             name_error_embed = discord.Embed(
                 title="No colour match found.",

bot/exts/utilities/reddit.py

@@ -36,7 +36,8 @@ def __init__(self, bot: Bot):
         self.access_token = None
         self.client_auth = BasicAuth(RedditConfig.client_id.get_secret_value(), RedditConfig.secret.get_secret_value())
 
-        self.auto_poster_loop.start()
+        if RedditConfig.send_top_daily_posts:
+            self.auto_poster_loop.start()
 
     async def cog_unload(self) -> None:
         """Stop the loop task and revoke the access token when the cog is unloaded."""
@@ -201,6 +202,13 @@ async def fetch_posts(self, route: str, *, amount: int = 25, params: dict | None
             await asyncio.sleep(3)
 
         log.debug(f"Invalid response from: {url} - status code {response.status}, mimetype {response.content_type}")
+        if response.status == 429:
+            log.warning(
+                "Hit reddit ratelimit. Used: %s Remaining: %s Reset: %s",
+                response.headers.get("X-Ratelimit-Used", "Missing"),
+                response.headers.get("X-Ratelimit-Remaining", "Missing"),
+                response.headers.get("X-Ratelimit-Approximate ", "Missing"),
+            )
         return []  # Failed to get appropriate response within allowed number of retries.
 
     async def get_top_posts(
@@ -301,6 +309,11 @@ async def top_command(self, ctx: Context, subreddit: Subreddit = "r/Python") ->
         async with ctx.typing():
             pages = await self.get_top_posts(subreddit=subreddit, time="all", paginate=True)
 
+        if isinstance(pages, Embed):
+            # If get_top_posts hits an error, then an error embed is returned, not actual posts.
+            await ctx.send(embed=pages)
+            return
+
         await ctx.send(f"Here are the top {subreddit} posts of all time!")
         embed = Embed(
             color=Colour.og_blurple()