mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bookmark import stopping at the first failure (#19669) 

Fixes #19389
pull/1892/head
Claire 2022-11-02 16:38:23 +01:00 committed by GitHub
parent e91418436a
commit e0eb39d41b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/services/import_service.rb
View File

@ -112,6 +112,11 @@ class ImportService < BaseService
next if status.nil? && ActivityPub::TagManager.instance.local_uri?(uri) next if status.nil? && ActivityPub::TagManager.instance.local_uri?(uri)
status || ActivityPub::FetchRemoteStatusService.new.call(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 end
account_ids = statuses.map(&:account_id) account_ids = statuses.map(&:account_id)