about summary refs log tree commit diff
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-11-02 16:38:23 +0100
committerGitHub <noreply@github.com>2022-11-02 16:38:23 +0100
commite0eb39d41b05115df973d5a9676b67a9309d4ff9 (patch)
tree2cd30c8347a0dc407da78421eb942dac94925c0c
parente91418436a17e13e09c2ad2a9eff13ce7e80946e (diff)
Fix bookmark import stopping at the first failure (#19669)
Fixes #19389
-rw-r--r--app/services/import_service.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/services/import_service.rb b/app/services/import_service.rb
index 676c37bde..ece5b9ef0 100644
--- a/app/services/import_service.rb
+++ b/app/services/import_service.rb
@@ -112,6 +112,11 @@ class ImportService < BaseService
       next if status.nil? && ActivityPub::TagManager.instance.local_uri?(uri)
 
       status || ActivityPub::FetchRemoteStatusService.new.call(uri)
+    rescue HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::UnexpectedResponseError
+      nil
+    rescue StandardError => e
+      Rails.logger.warn "Unexpected error when importing bookmark: #{e}"
+      nil
     end
 
     account_ids         = statuses.map(&:account_id)