Merge remote-tracking branch 'upstream/pull/2504'

[rails.git] / script / gravatar

diff --git a/script/gravatar b/script/gravatar
index e14e7ea0e26afd4468727cb0d5f4640a1c04b753..2c2c2bd4b6d50e528a4154c4e9329c4255b6fcb4 100755 (executable)
--- a/script/gravatar
+++ b/script/gravatar
@@ -4,8 +4,9 @@
 
 start = 0
 User.where("image_use_gravatar AND id >=" + start.to_s).order("id").find_each do |user|
 
 start = 0
 User.where("image_use_gravatar AND id >=" + start.to_s).order("id").find_each do |user|

-  p "checked up to id " + user.id.to_s if user.id % 1000 == 0 # just give a rough indication where we are for restarting
-  next if user.image.present?
+  p "checked up to id " + user.id.to_s if (user.id % 1000).zero? # just give a rough indication where we are for restarting
+  next 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))
   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))