github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-01 02:34:28 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: pull twitter's avatar & profile when signing up

Browse Source
This commit is contained in:
Régis Hanol
2016-10-17 15:43:40 +02:00
parent 3949c24f80
commit 0862ad406d
2 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/user_avatar.rb
View File

@ -68,9 +68,7 @@ class UserAvatar < ActiveRecord::Base
upload = Upload.create_for(user.id, tempfile, "external-avatar." + ext, File.size(tempfile.path), origin: avatar_url, image_type: "avatar")
unless user.user_avatar
user.create_user_avatar
end
user.create_user_avatar unless user.user_avatar
if !user.user_avatar.contains_upload?(upload.id)
user.user_avatar.update_columns(custom_upload_id: upload.id)
@ -84,7 +82,6 @@ class UserAvatar < ActiveRecord::Base
end
end
rescue => e
# skip saving, we are not connected to the net
Rails.logger.warn "#{e}: Failed to download external avatar: #{avatar_url}, user id #{ user.id }"