diff options
| author | beatrix <beatrix.bitrot@gmail.com> | 2017-07-20 11:24:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-20 11:24:32 -0400 |
| commit | e7edb4d1eeba6c12a1c71271faa30d2bbf00d054 (patch) | |
| tree | f373d05c4ea43bd335910f3603fab3d866a2486e /app/workers/import_worker.rb | |
| parent | d2352246920800e491466d84b0146feb4d1d791f (diff) | |
| parent | 1fcdaafa6fbe6d746a096c33263d76e6819da46d (diff) | |
Merge pull request #87 from tootsuite/master
merge upstream
Diffstat (limited to 'app/workers/import_worker.rb')
| -rw-r--r-- | app/workers/import_worker.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/workers/import_worker.rb b/app/workers/import_worker.rb index 90a226206..27cc6b365 100644 --- a/app/workers/import_worker.rb +++ b/app/workers/import_worker.rb @@ -44,7 +44,7 @@ class ImportWorker target_account = ResolveRemoteAccountService.new.call(row.first) next if target_account.nil? MuteService.new.call(from_account, target_account) - rescue Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError + rescue Mastodon::UnexpectedResponseError, HTTP::Error, OpenSSL::SSL::SSLError next end end @@ -56,7 +56,7 @@ class ImportWorker target_account = ResolveRemoteAccountService.new.call(row.first) next if target_account.nil? BlockService.new.call(from_account, target_account) - rescue Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError + rescue Mastodon::UnexpectedResponseError, HTTP::Error, OpenSSL::SSL::SSLError next end end @@ -66,7 +66,7 @@ class ImportWorker import_rows.each do |row| begin FollowService.new.call(from_account, row.first) - rescue Mastodon::NotPermittedError, ActiveRecord::RecordNotFound, Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError + rescue Mastodon::NotPermittedError, ActiveRecord::RecordNotFound, Mastodon::UnexpectedResponseError, HTTP::Error, OpenSSL::SSL::SSLError next end end |