diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-05-12 11:39:55 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-12 11:39:55 +0200 |
commit | db2f6fa49b1a704c66be3f0ea04a440cde80cf50 (patch) | |
tree | 705571dd7a856c57f23dfd02917c115a887ca525 /app/services/activitypub | |
parent | ffc3f8eebe134ca9b18af73aa29eaa1627082e40 (diff) | |
parent | 671a95c545bf7b47d74e1021b76d17bbf44cc5cc (diff) |
Merge pull request #1535 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services/activitypub')
-rw-r--r-- | app/services/activitypub/process_account_service.rb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb index bb2e8f665..7e268f4d4 100644 --- a/app/services/activitypub/process_account_service.rb +++ b/app/services/activitypub/process_account_service.rb @@ -106,8 +106,16 @@ class ActivityPub::ProcessAccountService < BaseService end def set_fetchable_attributes! - @account.avatar_remote_url = image_url('icon') || '' unless skip_download? - @account.header_remote_url = image_url('image') || '' unless skip_download? + begin + @account.avatar_remote_url = image_url('icon') || '' unless skip_download? + rescue Mastodon::UnexpectedResponseError, HTTP::TimeoutError, HTTP::ConnectionError, OpenSSL::SSL::SSLError + RedownloadAvatarWorker.perform_in(rand(30..600).seconds, @account.id) + end + begin + @account.header_remote_url = image_url('image') || '' unless skip_download? + rescue Mastodon::UnexpectedResponseError, HTTP::TimeoutError, HTTP::ConnectionError, OpenSSL::SSL::SSLError + RedownloadHeaderWorker.perform_in(rand(30..600).seconds, @account.id) + end @account.statuses_count = outbox_total_items if outbox_total_items.present? @account.following_count = following_total_items if following_total_items.present? @account.followers_count = followers_total_items if followers_total_items.present? |