Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mastodon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pierre Boudes
mastodon
Commits
99c4b5b7
Commit
99c4b5b7
authored
6 years ago
by
ThibG
Committed by
Eugen Rochko
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Move sending account Delete to anyone but the account's followers to the pull̀ queue (#10016)
parent
0e513ff8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/services/suspend_account_service.rb
+9
-1
9 additions, 1 deletion
app/services/suspend_account_service.rb
app/workers/activitypub/low_priority_delivery_worker.rb
+5
-0
5 additions, 0 deletions
app/workers/activitypub/low_priority_delivery_worker.rb
with
14 additions
and
1 deletion
app/services/suspend_account_service.rb
+
9
−
1
View file @
99c4b5b7
...
...
@@ -102,6 +102,10 @@ class SuspendAccountService < BaseService
ActivityPub
::
DeliveryWorker
.
push_bulk
(
delivery_inboxes
)
do
|
inbox_url
|
[
delete_actor_json
,
@account
.
id
,
inbox_url
]
end
ActivityPub
::
LowPriorityDeliveryWorker
.
push_bulk
(
low_priority_delivery_inboxes
)
do
|
inbox_url
|
[
delete_actor_json
,
@account
.
id
,
inbox_url
]
end
end
def
delete_actor_json
...
...
@@ -117,7 +121,11 @@ class SuspendAccountService < BaseService
end
def
delivery_inboxes
Account
.
inboxes
+
Relay
.
enabled
.
pluck
(
:inbox_url
)
@delivery_inboxes
||=
@account
.
followers
.
inboxes
+
Relay
.
enabled
.
pluck
(
:inbox_url
)
end
def
low_priority_delivery_inboxes
Account
.
inboxes
-
delivery_inboxes
end
def
associations_for_destruction
...
...
This diff is collapsed.
Click to expand it.
app/workers/activitypub/low_priority_delivery_worker.rb
0 → 100644
+
5
−
0
View file @
99c4b5b7
# frozen_string_literal: true
class
ActivityPub::LowPriorityDeliveryWorker
<
ActivityPub
::
DeliveryWorker
sidekiq_options
queue:
'pull'
,
retry:
8
,
dead:
false
end
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment