From 58b3f4fd674d29c444b236ad3936dbd04c6e175e Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 2 Dec 2016 14:14:49 +0100 Subject: Fix #329 - avatar errors no longer prevent remote accounts from being saved (without avatar). Also improved search position of exact matches --- lib/tasks/mastodon.rake | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'lib/tasks/mastodon.rake') diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake index 8730a64cd..a95a7258f 100644 --- a/lib/tasks/mastodon.rake +++ b/lib/tasks/mastodon.rake @@ -11,18 +11,9 @@ namespace :mastodon do namespace :push do desc 'Unsubscribes from PuSH updates of feeds nobody follows locally' task clear: :environment do - include RoutingHelper - Account.remote.without_followers.where.not(subscription_expires_at: nil).find_each do |a| Rails.logger.debug "PuSH unsubscribing from #{a.acct}" - - begin - a.subscription(api_subscription_url(a.id)).unsubscribe - rescue HTTP::Error, OpenSSL::SSL::SSLError - Rails.logger.debug "PuSH unsubscribing from #{a.acct} failed due to an HTTP or SSL error" - ensure - a.update!(secret: '', subscription_expires_at: nil) - end + UnsubscribeService.new.call(a) end end -- cgit