From: Matt Jankowski <mjankowski@thoughtbot.com>
Date: Sun, 16 Apr 2017 14:38:29 +0000 (-0400)
Subject: Clean up check that account needs a webfinger update (#1932)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=e0b5a94a4b98aa99369428af42216b308377c618;p=mastodon.git

Clean up check that account needs a webfinger update (#1932)
---

diff --git a/app/services/follow_remote_account_service.rb b/app/services/follow_remote_account_service.rb
index dce712b40..14bc064d5 100644
--- a/app/services/follow_remote_account_service.rb
+++ b/app/services/follow_remote_account_service.rb
@@ -16,7 +16,7 @@ class FollowRemoteAccountService < BaseService
     return Account.find_local(username) if TagManager.instance.local_domain?(domain)
 
     account = Account.find_remote(username, domain)
-    return account unless account&.last_webfingered_at.nil? || 1.day.from_now(account.last_webfingered_at) < Time.now.utc
+    return account unless account_needs_webfinger_update?(account)
 
     Rails.logger.debug "Looking up webfinger for #{uri}"
 
@@ -62,6 +62,10 @@ class FollowRemoteAccountService < BaseService
 
   private
 
+  def account_needs_webfinger_update?(account)
+    account&.last_webfingered_at.nil? || account.last_webfingered_at <= 1.day.ago
+  end
+
   def get_feed(url)
     response = http_client.get(Addressable::URI.parse(url))
     [response.to_s, Nokogiri::XML(response)]