github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 02:51:14 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

GH#retrieve_avatar: simplify conditional and restructured testing

Browse Source
This commit is contained in:
Kyle Zhao
2017-08-22 23:46:50 -04:00
parent 49f0119c12
commit 5868508e98
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/auth/github_authenticator.rb
View File

@ -118,14 +118,11 @@ class Auth::GithubAuthenticator < Auth::Authenticator
scope: "user:email"
end
protected
private
def retrieve_avatar(user, data)
return unless user
return if user.user_avatar&.custom_upload_id.present?
return unless data[:image].present? && user && user.user_avatar&.custom_upload_id.blank?
if (avatar_url = data[:image]).present?
Jobs.enqueue(:download_avatar_from_url, url: avatar_url, user_id: user.id, override_gravatar: false)
end
Jobs.enqueue(:download_avatar_from_url, url: data[:image], user_id: user.id, override_gravatar: false)
end
end