|
|
@@ -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 |