Update paths to new resource links

Additionally, this commit fixes an error with the pridepfp command.
The avatar image now uses discord.py's v.20 avatar.url instead
of avatar_url

3 files changed, 5 insertions, 5 deletions

diff --git a/bot/exts/evergreen/avatar_modification/__init__.py b/bot/exts/avatar_modification/__init__.py
index e69de29b..e69de29b 100644
--- a/bot/exts/evergreen/avatar_modification/__init__.py
+++ b/bot/exts/avatar_modification/__init__.py
diff --git a/bot/exts/evergreen/avatar_modification/_effects.py b/bot/exts/avatar_modification/_effects.py
index df741973..f1c2e6d1 100644
--- a/bot/exts/evergreen/avatar_modification/_effects.py
+++ b/bot/exts/avatar_modification/_effects.py
@@ -77,7 +77,7 @@ class PfpEffects:
         """Applies the given pride effect to the given image."""
         image = PfpEffects.crop_avatar_circle(image)
 
-        ring = Image.open(Path(f"bot/resources/pride/flags/{flag}.png")).resize((1024, 1024))
+        ring = Image.open(Path(f"bot/resources/holidays/pride/flags/{flag}.png")).resize((1024, 1024))
         ring = ring.convert("RGBA")
         ring = PfpEffects.crop_ring(ring, pixels)
 
@@ -125,7 +125,7 @@ class PfpEffects:
             ))
             overlay_image = overlay_image.convert("RGBA")
         else:
-            overlay_image = Image.open(Path("bot/resources/easter/chocolate_bunny.png"))
+            overlay_image = Image.open(Path("bot/resources/holidays/easter/chocolate_bunny.png"))
 
         alpha = image.getchannel("A").getdata()
         image = image.convert("RGB")
diff --git a/bot/exts/evergreen/avatar_modification/avatar_modify.py b/bot/exts/avatar_modification/avatar_modify.py
index 18202902..87eb05e6 100644
--- a/bot/exts/evergreen/avatar_modification/avatar_modify.py
+++ b/bot/exts/avatar_modification/avatar_modify.py
@@ -13,7 +13,7 @@ from discord.ext import commands
 
 from bot.bot import Bot
 from bot.constants import Colours, Emojis
-from bot.exts.evergreen.avatar_modification._effects import PfpEffects
+from bot.exts.avatar_modification._effects import PfpEffects
 from bot.utils.extensions import invoke_help_command
 from bot.utils.halloween import spookifications
 
@@ -27,7 +27,7 @@ MAX_SQUARES = 10_000
 
 T = TypeVar("T")
 
-GENDER_OPTIONS = json.loads(Path("bot/resources/pride/gender_options.json").read_text("utf8"))
+GENDER_OPTIONS = json.loads(Path("bot/resources/holidays/pride/gender_options.json").read_text("utf8"))
 
 
 async def in_executor(func: Callable[..., T], *args) -> T:
@@ -239,7 +239,7 @@ class AvatarModify(commands.Cog):
                 description=f"Here is your lovely avatar, surrounded by\n a beautiful {option} flag. Enjoy :D"
             )
             embed.set_image(url=f"attachment://{file_name}")
-            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.avatar.url)
             await ctx.send(file=file, embed=embed)
 
     @avatar_modify.group(