diff options
author | Claire <claire.github-309c@sitedethib.com> | 2023-11-24 10:31:28 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2023-12-04 15:28:15 +0100 |
commit | 09115731d617c556135ac465421645ed54e92ca9 (patch) | |
tree | ec29eac30f7fd1e565e7bc43cc6dd150817ec30e | |
parent | e11100d7824258cafbd08b56945f340720a8029a (diff) |
Change GIF max matrix size error to explicitly mention GIF files (#27927)
-rw-r--r-- | app/models/concerns/attachmentable.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/models/concerns/attachmentable.rb b/app/models/concerns/attachmentable.rb index c0ee1bdce7c..4cdbdeb4738 100644 --- a/app/models/concerns/attachmentable.rb +++ b/app/models/concerns/attachmentable.rb @@ -52,9 +52,13 @@ module Attachmentable return if attachment.blank? || !/image.*/.match?(attachment.content_type) || attachment.queued_for_write[:original].blank? width, height = FastImage.size(attachment.queued_for_write[:original].path) - matrix_limit = attachment.content_type == 'image/gif' ? GIF_MATRIX_LIMIT : MAX_MATRIX_LIMIT + return unless width.present? && height.present? - raise Mastodon::DimensionsValidationError, "#{width}x#{height} images are not supported" if width.present? && height.present? && (width * height > matrix_limit) + if attachment.content_type == 'image/gif' && width * height > GIF_MATRIX_LIMIT + raise Mastodon::DimensionsValidationError, "#{width}x#{height} GIF files are not supported" + elsif width * height > MAX_MATRIX_LIMIT + raise Mastodon::DimensionsValidationError, "#{width}x#{height} images are not supported" + end end def appropriate_extension(attachment) |