Don't crash on unobtainable avatars (#22462)

1 year ago · ff70e50199
parent 332a411fad
commit ff70e50199
1 changed files with 8 additions and 1 deletions
--- 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