From: blackle <isabelle@blackle-mori.com>
Date: Thu, 6 Apr 2017 00:04:13 +0000 (-0400)
Subject: Catch more errors in process_follows so it doesn't fail
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=540d6efe88717b0da4a23b5069a3caaff5b3241a;p=mastodon.git

Catch more errors in process_follows so it doesn't fail
---

diff --git a/app/workers/import_worker.rb b/app/workers/import_worker.rb
index 7cf29fb53..d5a33cada 100644
--- a/app/workers/import_worker.rb
+++ b/app/workers/import_worker.rb
@@ -46,7 +46,7 @@ class ImportWorker
 
       begin
         FollowService.new.call(from_account, row[0])
-      rescue Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError
+      rescue Mastodon::NotPermittedError, ActiveRecord::RecordNotFound, Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError
         next
       end
     end