treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Don't crash on unobtainable avatars (#22462)

lolsob-rspec
David Freedman 2023-01-13 15:40:06 +00:00 committed by GitHub
parent e9516a38fe
commit 4d0985ce9c
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/concerns/omniauthable.rb
View File

@ -55,7 +55,14 @@ module Omniauthable
user = User.new(user_params_from_auth(email, auth)) 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.skip_confirmation! if email_is_verified
user.save! user.save!
user user