From eb142a81fa80c1fd0fdb141cf5e259cbc516cec8 Mon Sep 17 00:00:00 2001 From: Ske Date: Mon, 2 Aug 2021 12:20:53 +0200 Subject: [PATCH] Handle null avatar URLs --- PluralKit.Bot/Utils/AvatarUtils.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/PluralKit.Bot/Utils/AvatarUtils.cs b/PluralKit.Bot/Utils/AvatarUtils.cs index 1881d8e4..6fc06c2b 100644 --- a/PluralKit.Bot/Utils/AvatarUtils.cs +++ b/PluralKit.Bot/Utils/AvatarUtils.cs @@ -55,7 +55,9 @@ namespace PluralKit.Bot { // which in turn makes it more likely to be underneath the size limit! private static readonly Regex DiscordCdnUrl = new Regex(@"^https?://(?:cdn\.discordapp\.com|media\.discordapp\.net)/attachments/(\d{17,19})/(\d{17,19})/([^/\\&\?]+)\.(png|jpg|jpeg|webp)(\?.*)?$"); private static readonly string DiscordMediaUrlReplacement = "https://media.discordapp.net/attachments/$1/$2/$3.$4?width=256&height=256"; - public static string TryRewriteCdnUrl(string url) => - DiscordCdnUrl.Replace(url, DiscordMediaUrlReplacement); + public static string? TryRewriteCdnUrl(string? url) + { + return url == null ? null : DiscordCdnUrl.Replace(url, DiscordMediaUrlReplacement); + } } } \ No newline at end of file