tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade Paperclip to 5, AWS-SDK to 2, do not generate medium/small versions of avatars

Browse Source
This commit is contained in:
Eugen Rochko
2016-11-29 14:20:15 +01:00
parent cc70f28f19
commit 5973ca3d11
6 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/helpers/atom_builder_helper.rb
View File

@ -116,9 +116,9 @@ module AtomBuilderHelper
end
def link_avatar(xml, account)
single_link_avatar(xml, account, :large, 300)
single_link_avatar(xml, account, :medium, 96)
single_link_avatar(xml, account, :small, 48)
single_link_avatar(xml, account, :large, 300)
# single_link_avatar(xml, account, :medium, 96)
# single_link_avatar(xml, account, :small, 48)
end
def logo(xml, url)

4
app/models/account.rb
View File

@ -13,12 +13,12 @@ class Account < ApplicationRecord
validates :username, presence: true, uniqueness: { scope: :domain, case_sensitive: true }, unless: 'local?'
# Avatar upload
has_attached_file :avatar, styles: { large: '300x300#', medium: '96x96#', small: '48x48#' }
has_attached_file :avatar, styles: { large: '300x300#' }, convert_options: { all: '-strip' }
validates_attachment_content_type :avatar, content_type: IMAGE_MIME_TYPES
validates_attachment_size :avatar, less_than: 2.megabytes
# Header upload
has_attached_file :header, styles: { medium: '700x335#' }
has_attached_file :header, styles: { medium: '700x335#' }, convert_options: { all: '-strip' }
validates_attachment_content_type :header, content_type: IMAGE_MIME_TYPES
validates_attachment_size :header, less_than: 2.megabytes