Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Adding avatars to profile page and statuses

Browse source
This commit is contained in:
Eugen Rochko 2016-02-28 00:51:05 +01:00
parent 2c70f0ecaa
commit 5ae54f9e36
7 changed files with 80 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/models/account.rb
View file

@ -3,7 +3,8 @@ class Account < ActiveRecord::Base
has_one :user, inverse_of: :account
# Avatar upload
has_attached_file :avatar, styles: { large: '300x300#', medium: '96x96#', small: '48x48#' }
attr_reader :avatar_remote_url
has_attached_file :avatar, styles: { large: '300x300#', medium: '96x96#', small: '48x48#' }, default_url: 'avatars/missing.png'
validates_attachment_content_type :avatar, content_type: /\Aimage\/.*\Z/
# Timelines
@ -64,6 +65,11 @@ class Account < ActiveRecord::Base
@subscription ||= OStatus2::Subscription.new(self.remote_url, secret: self.secret, token: self.verify_token, webhook: webhook_url, hub: self.hub_url)
end
def avatar_remote_url=(url)
self.avatar = URI.parse(url)
@avatar_remote_url = url
end
before_create do
if local?
keypair = OpenSSL::PKey::RSA.new(Rails.env.test? ? 48 : 2048)