From 1aa410e4f464f18b08b80f8358f0d8c4954e349c Mon Sep 17 00:00:00 2001
From: Iris System <iris@iris.ac.nz>
Date: Wed, 11 Oct 2023 15:17:09 +1300
Subject: [PATCH] fix(bot): remove query params from avatar attachment on
 member creation

see also commit 8cf50a7d9726d5a215280add59da3d859e9a0ad1
---
 PluralKit.Bot/Commands/Member.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/PluralKit.Bot/Commands/Member.cs b/PluralKit.Bot/Commands/Member.cs
index 9bc5dc47..41866ea7 100644
--- a/PluralKit.Bot/Commands/Member.cs
+++ b/PluralKit.Bot/Commands/Member.cs
@@ -70,8 +70,12 @@ public class Member
         if (avatarArg != null)
             try
             {
-                await AvatarUtils.VerifyAvatarOrThrow(_client, avatarArg.Url);
-                await ctx.Repository.UpdateMember(member.Id, new MemberPatch { AvatarUrl = avatarArg.Url }, conn);
+                // XXX: strip query params from attachment URLs because of new Discord CDN shenanigans
+                var uriBuilder = new UriBuilder(avatarArg.Url);
+                uriBuilder.Query = "";
+
+                await AvatarUtils.VerifyAvatarOrThrow(_client, uriBuilder.Uri.AbsoluteUri);
+                await ctx.Repository.UpdateMember(member.Id, new MemberPatch { AvatarUrl = uriBuilder.Uri.AbsoluteUri }, conn);
 
                 dispatchData.Add("avatar_url", avatarArg.Url);
             }