mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary code from MediaAttachment#set_type_and_extension. 

Well, it seems unnecessary, anyway.
pull/456/head
David Yip 2018-05-04 02:38:04 -05:00
parent c816701550
commit 106a5d7b83
No known key found for this signature in database
GPG Key ID: 7DA0036508FCC0CC
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/media_attachment.rb
View File

@ -200,9 +200,6 @@ class MediaAttachment < ApplicationRecord
def set_type_and_extension def set_type_and_extension
self.type = VIDEO_MIME_TYPES.include?(file_content_type) ? :video : AUDIO_MIME_TYPES.include?(file_content_type) ? :audio : :image self.type = VIDEO_MIME_TYPES.include?(file_content_type) ? :video : AUDIO_MIME_TYPES.include?(file_content_type) ? :audio : :image
extension = AUDIO_MIME_TYPES.include?(file_content_type) ? '.mp4' : appropriate_extension
basename = Paperclip::Interpolations.basename(file, :original)
file.instance_write :file_name, [basename, extension].delete_if(&:blank?).join('.')
end end
def set_meta def set_meta