diff options
| author | Yamagishi Kazutoshi <ykzts@desire.sh> | 2017-05-01 23:20:57 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-01 16:20:57 +0200 |
| commit | 1899cf5f04400f8055e45ceda941a9580b93fa1e (patch) | |
| tree | 1e38818e9c7f8aee79c0111265b13aef34f29e1d /app/models/account.rb | |
| parent | 5259319cf5d01a23a0e9517b9dc91c0a1f7e2ae9 (diff) | |
Detect extension for preview card (#2679)
* Detect extension for preview card * next
Diffstat (limited to 'app/models/account.rb')
| -rw-r--r-- | app/models/account.rb | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index 19f8ca365..798042b3b 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -21,7 +21,7 @@ class Account < ApplicationRecord validates_attachment_content_type :header, content_type: IMAGE_MIME_TYPES validates_attachment_size :header, less_than: 2.megabytes - before_post_process :set_file_extensions + include Attachmentable # Local user profile validations validates :display_name, length: { maximum: 30 }, if: 'local?' @@ -363,18 +363,4 @@ class Account < ApplicationRecord self.domain = TagManager.instance.normalize_domain(domain) end - - def set_file_extensions - unless avatar.blank? - extension = Paperclip::Interpolations.content_type_extension(avatar, :original) - basename = Paperclip::Interpolations.basename(avatar, :original) - avatar.instance_write :file_name, [basename, extension].delete_if(&:empty?).join('.') - end - - unless header.blank? - extension = Paperclip::Interpolations.content_type_extension(header, :original) - basename = Paperclip::Interpolations.basename(header, :original) - header.instance_write :file_name, [basename, extension].delete_if(&:empty?).join('.') - end - end end |