X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a2ddcda9111894d11c297bd61da2c599060baf9c..1fd5d7f4fece70dfae87ce27644ad31cf972e688:/app/controllers/users_controller.rb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 6aa98f7ee..e4dd1b2dc 100644 --- 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? - 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 - user.image_use_gravatar = response.success? + user.image_use_gravatar = available oldsetting != user.image_use_gravatar end