From a5a39cba0aceb9a74447540f21e8452d4fd2a51a Mon Sep 17 00:00:00 2001 From: spiral Date: Fri, 6 Aug 2021 21:41:27 -0400 Subject: [PATCH] fix: correctly check banner image size (don't) --- PluralKit.Bot/Utils/AvatarUtils.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/PluralKit.Bot/Utils/AvatarUtils.cs b/PluralKit.Bot/Utils/AvatarUtils.cs index 9f3f20a9..24dee2a4 100644 --- a/PluralKit.Bot/Utils/AvatarUtils.cs +++ b/PluralKit.Bot/Utils/AvatarUtils.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Linq; using System.Net.Http; using System.Text.RegularExpressions; @@ -41,11 +41,15 @@ namespace PluralKit.Bot { if (!acceptableMimeTypes.Contains(response.Content.Headers.ContentType.MediaType)) // Check MIME type throw Errors.AvatarNotAnImage(response.Content.Headers.ContentType.MediaType); + if (isFullSizeImage) + // no need to do size checking on banners + return; + // Parse the image header in a worker var stream = await response.Content.ReadAsStreamAsync(); var image = await Task.Run(() => Image.Identify(stream)); if (image == null) throw Errors.AvatarInvalid; - if (!isFullSizeImage && (image.Width > Limits.AvatarDimensionLimit || image.Height > Limits.AvatarDimensionLimit)) // Check image size + if (image.Width > Limits.AvatarDimensionLimit || image.Height > Limits.AvatarDimensionLimit) // Check image size throw Errors.AvatarDimensionsTooLarge(image.Width, image.Height); } }