diff options
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/activitypub/process_status_update_service.rb | 8 | ||||
| -rw-r--r-- | app/services/delete_account_service.rb | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/app/services/activitypub/process_status_update_service.rb b/app/services/activitypub/process_status_update_service.rb index addd5fc27..a0605b1a3 100644 --- a/app/services/activitypub/process_status_update_service.rb +++ b/app/services/activitypub/process_status_update_service.rb @@ -92,7 +92,13 @@ class ActivityPub::ProcessStatusUpdateService < BaseService next if unsupported_media_type?(media_attachment_parser.file_content_type) || skip_download? - RedownloadMediaWorker.perform_async(media_attachment.id) if media_attachment.remote_url_previously_changed? || media_attachment.thumbnail_remote_url_previously_changed? + begin + 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 + RedownloadMediaWorker.perform_in(rand(30..600).seconds, media_attachment.id) + end rescue Addressable::URI::InvalidURIError => e Rails.logger.debug "Invalid URL in attachment: #{e}" end diff --git a/app/services/delete_account_service.rb b/app/services/delete_account_service.rb index a2d535d26..3a082c7c8 100644 --- a/app/services/delete_account_service.rb +++ b/app/services/delete_account_service.rb @@ -267,7 +267,7 @@ class DeleteAccountService < BaseService end def delete_actor_json - @delete_actor_json ||= Oj.dump(serialize_payload(@account, ActivityPub::DeleteActorSerializer, signer: @account, always_sign: true)) + @delete_actor_json ||= Oj.dump(serialize_payload(@account, ActivityPub::DeleteActorSerializer)) end def delivery_inboxes |