Handle errors checking for gravatars

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index cac193504b23fd2e5166998a8d07a81e50ac5cf7..cc90d168eca6d1ea37d02fdcb30da94c6c795899 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -68,7 +68,7 @@ Metrics/BlockNesting:
 # Offense count: 24
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
 # Offense count: 24
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:

-  Max: 582
+  Max: 587

 
 # Offense count: 52
 # Configuration parameters: IgnoredMethods.
 
 # Offense count: 52
 # Configuration parameters: IgnoredMethods.

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 6aa98f7ee508b1a083132b567b5305d07aedeaa3..e4dd1b2dc96247c30d612909f2d35502a65c311c 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -753,11 +753,17 @@ class UsersController < ApplicationController
     # code from example https://en.gravatar.com/site/implement/images/ruby/
     return false if user.avatar.attached?
 
     # code from example https://en.gravatar.com/site/implement/images/ruby/
     return false if user.avatar.attached?
 

-    hash = Digest::MD5.hexdigest(user.email.downcase)
-    url = "https://www.gravatar.com/avatar/#{hash}?d=404" # without d=404 we will always get an image back
-    response = OSM.http_client.get(URI.parse(url))
+    begin
+      hash = Digest::MD5.hexdigest(user.email.downcase)
+      url = "https://www.gravatar.com/avatar/#{hash}?d=404" # without d=404 we will always get an image back
+      response = OSM.http_client.get(URI.parse(url))
+      available = response.success?
+    rescue StandardError
+      available = false
+    end
+

     oldsetting = user.image_use_gravatar
     oldsetting = user.image_use_gravatar

-    user.image_use_gravatar = response.success?
+    user.image_use_gravatar = available

     oldsetting != user.image_use_gravatar
   end
 
     oldsetting != user.image_use_gravatar
   end