Merge remote-tracking branch 'parent/main' into upstream-20241009
This commit is contained in:
commit
d021659cb7
130 changed files with 1120 additions and 917 deletions
|
@ -120,7 +120,7 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
|
|||
media_attachment.download_file! if media_attachment.remote_url_previously_changed?
|
||||
media_attachment.download_thumbnail! if media_attachment.thumbnail_remote_url_previously_changed?
|
||||
media_attachment.save
|
||||
rescue Mastodon::UnexpectedResponseError, HTTP::TimeoutError, HTTP::ConnectionError, OpenSSL::SSL::SSLError
|
||||
rescue Mastodon::UnexpectedResponseError, *Mastodon::HTTP_CONNECTION_ERRORS
|
||||
RedownloadMediaWorker.perform_in(rand(30..600).seconds, media_attachment.id)
|
||||
rescue Seahorse::Client::NetworkingError => e
|
||||
Rails.logger.warn "Error storing media attachment: #{e}"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue