|
|
@ -87,8 +87,8 @@ class MediaAttachment < ApplicationRecord
|
|
|
|
convert_options: { all: '-quality 90 -strip' }
|
|
|
|
convert_options: { all: '-quality 90 -strip' }
|
|
|
|
|
|
|
|
|
|
|
|
validates_attachment_content_type :file, content_type: IMAGE_MIME_TYPES + VIDEO_MIME_TYPES
|
|
|
|
validates_attachment_content_type :file, content_type: IMAGE_MIME_TYPES + VIDEO_MIME_TYPES
|
|
|
|
validates_attachment_size :file, less_than: IMAGE_LIMIT, unless: :video?
|
|
|
|
validates_attachment_size :file, less_than: IMAGE_LIMIT, unless: :video_or_gifv?
|
|
|
|
validates_attachment_size :file, less_than: VIDEO_LIMIT, if: :video?
|
|
|
|
validates_attachment_size :file, less_than: VIDEO_LIMIT, if: :video_or_gifv?
|
|
|
|
remotable_attachment :file, VIDEO_LIMIT
|
|
|
|
remotable_attachment :file, VIDEO_LIMIT
|
|
|
|
|
|
|
|
|
|
|
|
include Attachmentable
|
|
|
|
include Attachmentable
|
|
|
@ -111,6 +111,10 @@ class MediaAttachment < ApplicationRecord
|
|
|
|
file.blank? && remote_url.present?
|
|
|
|
file.blank? && remote_url.present?
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def video_or_gifv?
|
|
|
|
|
|
|
|
video? || gifv?
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
def to_param
|
|
|
|
def to_param
|
|
|
|
shortcode
|
|
|
|
shortcode
|
|
|
|
end
|
|
|
|
end
|
|
|
|