diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-10-06 18:02:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-06 18:02:18 +0200 |
| commit | 44fd66f0c6bff9cd94ba55345640c913cd733948 (patch) | |
| tree | 7691a7119bd79f459828943d26f13a234618c755 /app/models | |
| parent | b31748a496ac55e3f2763d74ea7e7a7ef5c4dfad (diff) | |
| parent | cef109e04661b1627acf9c98f6d00ea0629d41f4 (diff) | |
Merge pull request #1616 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/media_attachment.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb index b57600356..a80087fa3 100644 --- a/app/models/media_attachment.rb +++ b/app/models/media_attachment.rb @@ -167,12 +167,11 @@ class MediaAttachment < ApplicationRecord processors: ->(f) { file_processors f }, convert_options: GLOBAL_CONVERT_OPTIONS - before_file_post_process :set_type_and_extension - before_file_post_process :check_video_dimensions + before_file_validate :set_type_and_extension + before_file_validate :check_video_dimensions validates_attachment_content_type :file, content_type: IMAGE_MIME_TYPES + VIDEO_MIME_TYPES + AUDIO_MIME_TYPES - validates_attachment_size :file, less_than: IMAGE_LIMIT, unless: :larger_media_format? - validates_attachment_size :file, less_than: VIDEO_LIMIT, if: :larger_media_format? + validates_attachment_size :file, less_than: ->(m) { m.larger_media_format? ? VIDEO_LIMIT : IMAGE_LIMIT } remotable_attachment :file, VIDEO_LIMIT, suppress_errors: false, download_on_assign: false, attribute_name: :remote_url has_attached_file :thumbnail, |