diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-08-21 15:42:50 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-21 15:42:50 +0200 |
commit | 5a3d09dc8e30198b4d8d921ef0b1ba0a35fe01d9 (patch) | |
tree | da884993bdb5476cd6df5028ecafcaf1a2ba2948 /app/services | |
parent | aba0032f540407d88144ac637a59fce69625546f (diff) | |
parent | 8a93dd3d83995a6821bfda88c28204dcee1461e8 (diff) |
Merge pull request #1826 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/activitypub/process_account_service.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb index 4449a5427..34750dba6 100644 --- a/app/services/activitypub/process_account_service.rb +++ b/app/services/activitypub/process_account_service.rb @@ -105,11 +105,13 @@ class ActivityPub::ProcessAccountService < BaseService def set_fetchable_attributes! begin @account.avatar_remote_url = image_url('icon') || '' unless skip_download? + @account.avatar = nil if @account.avatar_remote_url.blank? 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? + @account.header = nil if @account.header_remote_url.blank? rescue Mastodon::UnexpectedResponseError, HTTP::TimeoutError, HTTP::ConnectionError, OpenSSL::SSL::SSLError RedownloadHeaderWorker.perform_in(rand(30..600).seconds, @account.id) end |