From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 22 Oct 2018 14:58:08 +0000 (+0200)
Subject: Fix cull tripping on nil in last_webfingered_at (#9051)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f5b8bd4392d7955c84de187e56def191dcf7de51;p=mastodon.git

Fix cull tripping on nil in last_webfingered_at (#9051)

Fix #8741
---

diff --git a/lib/mastodon/accounts_cli.rb b/lib/mastodon/accounts_cli.rb
index 829fab19e..a32bc9533 100644
--- a/lib/mastodon/accounts_cli.rb
+++ b/lib/mastodon/accounts_cli.rb
@@ -223,7 +223,7 @@ module Mastodon
       dry_run           = options[:dry_run] ? ' (DRY RUN)' : ''
 
       Account.remote.where(protocol: :activitypub).partitioned.find_each do |account|
-        next if account.updated_at >= skip_threshold || account.last_webfingered_at >= skip_threshold
+        next if account.updated_at >= skip_threshold || (account.last_webfingered_at.present? && account.last_webfingered_at >= skip_threshold)
 
         unless dead_servers.include?(account.domain)
           begin