diff options
author | David Yip <yipdw@member.fsf.org> | 2018-03-27 10:26:47 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-03-27 10:26:47 -0500 |
commit | f61aa8e0f7101b5b7510a3809c94b7083ba08329 (patch) | |
tree | 3677a21fdbd4174125495e3545c527e8aff47297 /app/models/preview_card.rb | |
parent | 6af17b79c57b95a39fb4ed325aeff3edf02162ea (diff) | |
parent | 40e5d2303ba1edc51beae66cc15263675980106a (diff) |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: app/javascript/styles/mastodon/components.scss app/models/media_attachment.rb
Diffstat (limited to 'app/models/preview_card.rb')
-rw-r--r-- | app/models/preview_card.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/preview_card.rb b/app/models/preview_card.rb index 86eecdfe5..0c82f06ce 100644 --- a/app/models/preview_card.rb +++ b/app/models/preview_card.rb @@ -26,6 +26,7 @@ class PreviewCard < ApplicationRecord IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif'].freeze + LIMIT = 1.megabytes self.inheritance_column = false @@ -36,11 +37,11 @@ class PreviewCard < ApplicationRecord has_attached_file :image, styles: { original: { geometry: '400x400>', file_geometry_parser: FastGeometryParser } }, convert_options: { all: '-quality 80 -strip' } include Attachmentable - include Remotable validates :url, presence: true, uniqueness: true validates_attachment_content_type :image, content_type: IMAGE_MIME_TYPES - validates_attachment_size :image, less_than: 1.megabytes + validates_attachment_size :image, less_than: LIMIT + remotable_attachment :image, LIMIT before_save :extract_dimensions, if: :link? |