diff options
| author | Fire Demon <firedemon@creature.cafe> | 2020-10-28 19:11:21 -0500 |
|---|---|---|
| committer | Fire Demon <firedemon@creature.cafe> | 2020-10-28 19:11:21 -0500 |
| commit | 84a56390fda455e4bf42d0d9f44527bfbf207dfc (patch) | |
| tree | a951d84e093c2406eb9587e0559ca43cd827625c /app/services/activitypub | |
| parent | ecaf21464226b5cecc6d100165f7d1265afdffb9 (diff) | |
| parent | 5a41704f8926d9594c66028ca30dc1fc0f98da3d (diff) | |
Merge remote-tracking branch 'upstream/master' into dev
Diffstat (limited to 'app/services/activitypub')
| -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 7f17e460c..122850dd6 100644 --- a/app/services/activitypub/process_account_service.rb +++ b/app/services/activitypub/process_account_service.rb @@ -203,7 +203,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 |