diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-03-16 23:09:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-16 23:09:53 +0100 |
| commit | f5daa20f2a90098c9d689c5ec9d95ce9887b3a33 (patch) | |
| tree | a225407cb43edf3fa9d9ac0100021a380e11ff91 /app/workers/activitypub | |
| parent | 6a0ed45aa3f11f0343a7be556b36b4d075ba08df (diff) | |
| parent | 32418f0ff3e7f25ca67334585d6d8442b34cb4af (diff) | |
Merge pull request #2134 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/workers/activitypub')
| -rw-r--r-- | app/workers/activitypub/distribute_poll_update_worker.rb | 2 | ||||
| -rw-r--r-- | app/workers/activitypub/move_distribution_worker.rb | 2 | ||||
| -rw-r--r-- | app/workers/activitypub/raw_distribution_worker.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/workers/activitypub/distribute_poll_update_worker.rb b/app/workers/activitypub/distribute_poll_update_worker.rb index 601075ea6..ebdb78bb3 100644 --- a/app/workers/activitypub/distribute_poll_update_worker.rb +++ b/app/workers/activitypub/distribute_poll_update_worker.rb @@ -12,7 +12,7 @@ class ActivityPub::DistributePollUpdateWorker return if @status.preloadable_poll.nil? || @status.local_only? - ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url| + ActivityPub::DeliveryWorker.push_bulk(inboxes, limit: 1_000) do |inbox_url| [payload, @account.id, inbox_url] end diff --git a/app/workers/activitypub/move_distribution_worker.rb b/app/workers/activitypub/move_distribution_worker.rb index 65c5c0d1c..1680fcc76 100644 --- a/app/workers/activitypub/move_distribution_worker.rb +++ b/app/workers/activitypub/move_distribution_worker.rb @@ -10,7 +10,7 @@ class ActivityPub::MoveDistributionWorker @migration = AccountMigration.find(migration_id) @account = @migration.account - ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url| + ActivityPub::DeliveryWorker.push_bulk(inboxes, limit: 1_000) do |inbox_url| [signed_payload, @account.id, inbox_url] end diff --git a/app/workers/activitypub/raw_distribution_worker.rb b/app/workers/activitypub/raw_distribution_worker.rb index 8ecc17db9..c77821e0f 100644 --- a/app/workers/activitypub/raw_distribution_worker.rb +++ b/app/workers/activitypub/raw_distribution_worker.rb @@ -25,7 +25,7 @@ class ActivityPub::RawDistributionWorker def distribute! return if inboxes.empty? - ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url| + ActivityPub::DeliveryWorker.push_bulk(inboxes, limit: 1_000) do |inbox_url| [payload, source_account_id, inbox_url, options] end end |