Merge branch 'main' into teapot-support

3 files changed, 8 insertions, 8 deletions

diff --git a/bot/exts/easter/bunny_name_generator.py b/bot/exts/easter/bunny_name_generator.py
index 3e97373f..4c3137de 100644
--- a/bot/exts/easter/bunny_name_generator.py
+++ b/bot/exts/easter/bunny_name_generator.py
@@ -3,7 +3,7 @@ import logging
 import random
 import re
 from pathlib import Path
-from typing import List, Union
+from typing import Optional
 
 from discord.ext import commands
 
@@ -18,7 +18,7 @@ class BunnyNameGenerator(commands.Cog):
     """Generate a random bunny name, or bunnify your Discord username!"""
 
     @staticmethod
-    def find_separators(displayname: str) -> Union[List[str], None]:
+    def find_separators(displayname: str) -> Optional[list[str]]:
         """Check if Discord name contains spaces so we can bunnify an individual word in the name."""
         new_name = re.split(r"[_.\s]", displayname)
         if displayname not in new_name:
@@ -26,7 +26,7 @@ class BunnyNameGenerator(commands.Cog):
         return None
 
     @staticmethod
-    def find_vowels(displayname: str) -> str:
+    def find_vowels(displayname: str) -> Optional[str]:
         """
         Finds vowels in the user's display name.
 
diff --git a/bot/exts/easter/egg_decorating.py b/bot/exts/easter/egg_decorating.py
index fd7620d4..fb5701c4 100644
--- a/bot/exts/easter/egg_decorating.py
+++ b/bot/exts/easter/egg_decorating.py
@@ -4,7 +4,7 @@ import random
 from contextlib import suppress
 from io import BytesIO
 from pathlib import Path
-from typing import Union
+from typing import Optional, Union
 
 import discord
 from PIL import Image
@@ -33,7 +33,7 @@ class EggDecorating(commands.Cog):
     """Decorate some easter eggs!"""
 
     @staticmethod
-    def replace_invalid(colour: str) -> Union[int, None]:
+    def replace_invalid(colour: str) -> Optional[int]:
         """Attempts to match with HTML or XKCD colour names, returning the int value."""
         with suppress(KeyError):
             return int(HTML_COLOURS[colour], 16)
@@ -44,7 +44,7 @@ class EggDecorating(commands.Cog):
     @commands.command(aliases=("decorateegg",))
     async def eggdecorate(
         self, ctx: commands.Context, *colours: Union[discord.Colour, str]
-    ) -> Union[Image.Image, None]:
+    ) -> Optional[Image.Image]:
         """
         Picks a random egg design and decorates it using the given colours.
 
@@ -108,7 +108,7 @@ class EggDecorating(commands.Cog):
                 description="Here is your pretty little egg. Hope you like it!"
             )
             embed.set_image(url="attachment://egg.png")
-            embed.set_footer(text=f"Made by {ctx.author.display_name}", icon_url=ctx.author.avatar_url)
+            embed.set_footer(text=f"Made by {ctx.author.display_name}", icon_url=ctx.author.display_avatar.url)
 
         await ctx.send(file=file, embed=embed)
         return new_im
diff --git a/bot/exts/easter/egghead_quiz.py b/bot/exts/easter/egghead_quiz.py
index 7c4960cd..ad550567 100644
--- a/bot/exts/easter/egghead_quiz.py
+++ b/bot/exts/easter/egghead_quiz.py
@@ -31,7 +31,7 @@ TIMELIMIT = 30
 class EggheadQuiz(commands.Cog):
     """This cog contains the command for the Easter quiz!"""
 
-    def __init__(self) -> None:
+    def __init__(self):
         self.quiz_messages = {}
 
     @commands.command(aliases=("eggheadquiz", "easterquiz"))