Merge remote-tracking branch 'parent/main' into upstream-20250403

This commit is contained in:
KMY 2025-04-03 08:36:36 +09:00
commit 32f5604499
265 changed files with 6227 additions and 3383 deletions

View file

@ -12,6 +12,7 @@ module Mastodon
class RateLimitExceededError < Error; end
class SyntaxError < Error; end
class InvalidParameterError < Error; end
class SignatureVerificationError < Error; end
class UnexpectedResponseError < Error
attr_reader :response

View file

@ -123,7 +123,14 @@ module Paperclip
end
def needs_convert?
needs_different_geometry? || needs_different_format? || needs_metadata_stripping?
strip_animations? || needs_different_geometry? || needs_different_format? || needs_metadata_stripping?
end
def strip_animations?
# Detecting whether the source image is animated across all our supported
# input file formats is not trivial, and converting unconditionally is just
# as simple for now
options[:style] == :static
end
def needs_different_geometry?