From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 18 Oct 2016 10:23:38 +0000 (+0200)
Subject: Only run mastodon:push:clear on accounts that are still subscribed to
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=6f7c9774c776afeea0d98cbbd30483f4f0c6b938;p=mastodon.git

Only run mastodon:push:clear on accounts that are still subscribed to
---

diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index aa07c0738..78def7b51 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -13,7 +13,7 @@ namespace :mastodon do
     task clear: :environment do
       include RoutingHelper
 
-      Account.remote.without_followers.find_each do |a|
+      Account.remote.without_followers.where.not(subscription_expires_at: nil).find_each do |a|
         Rails.logger.debug "PuSH unsubscribing from #{a.acct}"
 
         begin