eightball/PluralKit
1
0
Fork 0
mirror of https://github.com/PluralKit/PluralKit.git synced 2026-02-17 03:00:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: don't try to append query params when there are none present

Browse source
This commit is contained in:
Jake Fulmine 2024-02-07 21:17:36 +01:00
parent a6a7961358
commit 3cbc40c3fc
No known key found for this signature in database
GPG key ID: 177E8DB7BF4C60B2
1 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

24
PluralKit.Bot/Utils/AvatarUtils.cs
View file

@ -26,6 +26,7 @@ public static class AvatarUtils
throw new PKError("Due to server issues, PluralKit is unable to read images hosted on toyhou.se."); throw new PKError("Due to server issues, PluralKit is unable to read images hosted on toyhou.se.");
url = TryRewriteCdnUrl(url); url = TryRewriteCdnUrl(url);
Console.WriteLine(url);
var response = await client.GetAsync(url); var response = await client.GetAsync(url);
if (!response.IsSuccessStatusCode) // Check status code if (!response.IsSuccessStatusCode) // Check status code
@ -63,11 +64,24 @@ public static class AvatarUtils
// This lets us add resizing parameters to "borrow" their media proxy server to downsize the image // This lets us add resizing parameters to "borrow" their media proxy server to downsize the image
// which in turn makes it more likely to be underneath the size limit! // which in turn makes it more likely to be underneath the size limit!
private static readonly Regex DiscordCdnUrl = private static readonly Regex DiscordCdnUrl =
new(@"^https?://(?:cdn\.discordapp\.com|media\.discordapp\.net)/attachments/(\d{17,19})/(\d{17,19})/([^/\\&\?]+)\.(png|jpg|jpeg|webp)(\?.*)?$"); new(@"^https?://(?:cdn\.discordapp\.com|media\.discordapp\.net)/attachments/(\d{17,19})/(\d{17,19})/([^/\\&\?]+)\.(png|jpg|jpeg|webp)(?<query>\?.*)?$");
private static readonly string DiscordMediaUrlReplacement = private static string DiscordMediaUrlReplacement(bool query = false)
"https://media.discordapp.net/attachments/$1/$2/$3.$4$5width=256&height=256"; {
var regexp = "https://media.discordapp.net/attachments/$1/$2/$3.$4";
regexp += query ? "$5" : "?";
regexp += "width=256&height=256";
return regexp;
}
public static string? TryRewriteCdnUrl(string? url) => public static string? TryRewriteCdnUrl(string? url)
url == null ? null : DiscordCdnUrl.Replace(url, DiscordMediaUrlReplacement); {
if (url == null)
return null;
var match = DiscordCdnUrl.Match(url);
var query = match.Groups["query"].Success;
return DiscordCdnUrl.Replace(url, DiscordMediaUrlReplacement(query));
}
} }