mirror/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon synced 2024-11-24 23:26:22 +09:00
Code

Merge pull request #87 from vayan/feature/strip-exif-data-from-images

Browse Source 
Strip exif data from uploaded images
This commit is contained in:
Eugen 2016-10-09 12:45:22 +02:00 committed by GitHub
commit 52d7f862d3
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/models/media_attachment.rb
View File

@ -5,7 +5,10 @@ class MediaAttachment < ApplicationRecord
belongs_to :account, inverse_of: :media_attachments belongs_to :account, inverse_of: :media_attachments
belongs_to :status, inverse_of: :media_attachments belongs_to :status, inverse_of: :media_attachments
has_attached_file :file, styles: -> (f) { f.instance.image? ? { small: '510x680>' } : { small: { convert_options: { output: { vf: 'scale="min(510\, iw):min(680\, ih)":force_original_aspect_ratio=decrease' } }, format: 'png', time: 1 } } }, processors: -> (f) { f.video? ? [:transcoder] : [:thumbnail] } has_attached_file :file,
styles: -> (f) { file_styles f },
processors: -> (f) { f.video? ? [:transcoder] : [:thumbnail] },
convert_options: { all: "-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: 4.megabytes validates_attachment_size :file, less_than: 4.megabytes
@ -30,4 +33,26 @@ class MediaAttachment < ApplicationRecord
def type def type
image? ? 'image' : 'video' image? ? 'image' : 'video'
end end
private
def self.file_styles(f)
if f.instance.image?
{
original: '100%',
small: '510x680>'
}
else
{
small: {
convert_options: {
output: {
vf: 'scale="min(510\, iw):min(680\, ih)":force_original_aspect_ratio=decrease'
}
},
format: 'png',
time: 1
}
}
end
end
end end