From ff70e5019910c309f8ab38d729c4eb5819512698 Mon Sep 17 00:00:00 2001
From: David Freedman <lcreg-github@convergence.cx>
Date: Fri, 13 Jan 2023 15:40:06 +0000
Subject: [PATCH] Don't crash on unobtainable avatars (#22462)
---
app/models/concerns/omniauthable.rb | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/app/models/concerns/omniauthable.rb b/app/models/concerns/omniauthable.rb
index a90d5d888a..feac0a1f5e 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