diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-10-26 15:47:21 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-10-26 15:48:16 +0100 |
commit | 9c34090db84fc28bf6c40da700095f025f1887ea (patch) | |
tree | 960afb18131d57f7120c0d584915f0c2c29902bb /app/services | |
parent | 36e5c9d45be0e94216b5b92ea8749a00bb68e0e3 (diff) | |
parent | 3678b10823a691256ad63c1c4df8dc659dfc3bc0 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/services/process_mentions_service.rb`: glitch-soc local-only handling, ported upstream changes
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/activitypub/process_account_service.rb | 2 | ||||
-rw-r--r-- | app/services/process_mentions_service.rb | 2 |
2 files changed, 2 insertions, 2 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 diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb index d5ea69da1..570cd8272 100644 --- a/app/services/process_mentions_service.rb +++ b/app/services/process_mentions_service.rb @@ -60,7 +60,7 @@ class ProcessMentionsService < BaseService if mentioned_account.local? LocalNotificationWorker.perform_async(mentioned_account.id, mention.id, mention.class.name, :mention) elsif mentioned_account.activitypub? && !@status.local_only? - ActivityPub::DeliveryWorker.perform_async(activitypub_json, mention.status.account_id, mentioned_account.inbox_url) + ActivityPub::DeliveryWorker.perform_async(activitypub_json, mention.status.account_id, mentioned_account.inbox_url, { synchronize_followers: !mention.status.distributable? }) end end |