diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-01-15 16:53:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-15 16:53:30 +0100 |
| commit | 13227e1dafd308dfe1a3effc3379b766274809b3 (patch) | |
| tree | c06274b2eaaf6fdb6d1ffb8c2d0ff6b94befdf6b /app/models/concerns | |
| parent | afd0d424da4928b9e20a3c7a943f970252ed3a29 (diff) | |
| parent | ab59743c131574076af7fa3640493a866c4528ad (diff) | |
Merge pull request #2081 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/concerns')
| -rw-r--r-- | app/models/concerns/omniauthable.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/app/models/concerns/omniauthable.rb b/app/models/concerns/omniauthable.rb index a90d5d888..feac0a1f5 100644 --- a/app/models/concerns/omniauthable.rb +++ b/app/models/concerns/omniauthable.rb @@ -55,7 +55,14 @@ module Omniauthable user = User.new(user_params_from_auth(email, auth)) - user.account.avatar_remote_url = auth.info.image if /\A#{URI::DEFAULT_PARSER.make_regexp(%w(http https))}\z/.match?(auth.info.image) + begin + if /\A#{URI::DEFAULT_PARSER.make_regexp(%w(http https))}\z/.match?(auth.info.image) + user.account.avatar_remote_url = auth.info.image + end + rescue Mastodon::UnexpectedResponseError + user.account.avatar_remote_url = nil + end + user.skip_confirmation! if email_is_verified user.save! user |