diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-09-29 23:52:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-29 23:52:36 +0200 |
commit | fc3ae1343df5adb83a3733958a4436981feb380f (patch) | |
tree | f320fbf9dbe402b668d12815a6e20070813c6b30 /app/lib | |
parent | 0e4a4db141550843c4996880c7f6c00e54808d78 (diff) |
Switch from unmaintained paperclip to kt-paperclip (#16724)
* Switch from unmaintained paperclip to kt-paperclip * Drop some compatibility monkey-patches not required by kt-paperclip * Drop media spoof check monkey-patching It's broken with kt-paperclip and hopefully it won't be needed anymore * Fix regression introduced by paperclip 6.1.0 * Do not rely on pathname to call FastImage * Add test for ogg vorbis file with cover art * Add audio/vorbis to the accepted content-types This seems erroneous as this would be the content-type for a vorbis stream without an ogg container, but that's what the `marcel` gem outputs, so… * Restore missing for_as_default method * Refactor Attachmentable concern and delay Paperclip's content-type spoof check Check for content-type spoofing *after* setting the extension ourselves, this fixes a regression with kt-paperclip's validations being more strict than paperclip 6.0.0 and rejecting some Pleroma uploads because of unknown extensions. * Please CodeClimate * Add audio/vorbis to the unreliable set It doesn't correspond to a file format and thus has no extension associated.
Diffstat (limited to 'app/lib')
-rw-r--r-- | app/lib/fast_geometry_parser.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/fast_geometry_parser.rb b/app/lib/fast_geometry_parser.rb index 5209c2bc5..f3395a833 100644 --- a/app/lib/fast_geometry_parser.rb +++ b/app/lib/fast_geometry_parser.rb @@ -2,7 +2,7 @@ class FastGeometryParser def self.from_file(file) - width, height = FastImage.size(file.path) + width, height = FastImage.size(file) raise Paperclip::Errors::NotIdentifiedByImageMagickError if width.nil? |