diff options
| author | ThibG <thib@sitedethib.com> | 2020-10-26 16:11:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-26 16:11:58 +0100 |
| commit | 9c88792f0a60f2b383f0d3919475403e1e244faf (patch) | |
| tree | 709a22b7a9922c6dac4916542b95611afaf4a25b /app/services/activitypub/process_account_service.rb | |
| parent | 36e5c9d45be0e94216b5b92ea8749a00bb68e0e3 (diff) | |
| parent | ddbb9f0ec40df452d7061d4c7765e5e6694ba89f (diff) | |
Merge pull request #1442 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services/activitypub/process_account_service.rb')
| -rw-r--r-- | app/services/activitypub/process_account_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb index 85b915ec6..9f95f1950 100644 --- a/app/services/activitypub/process_account_service.rb +++ b/app/services/activitypub/process_account_service.rb @@ -196,7 +196,7 @@ class ActivityPub::ProcessAccountService < BaseService total_items = collection.is_a?(Hash) && collection['totalItems'].present? && collection['totalItems'].is_a?(Numeric) ? collection['totalItems'] : nil has_first_page = collection.is_a?(Hash) && collection['first'].present? @collections[type] = [total_items, has_first_page] - rescue HTTP::Error, OpenSSL::SSL::SSLError + rescue HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::LengthValidationError @collections[type] = [nil, nil] end |