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
afb78821
Unverified
Commit
afb78821
authored
3 years ago
by
Claire
Committed by
GitHub
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix blocking someone not clearing up list feeds (#16205)
parent
10cd2d1e
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
app/lib/feed_manager.rb
+30
-0
30 additions, 0 deletions
app/lib/feed_manager.rb
app/services/after_block_service.rb
+5
-0
5 additions, 0 deletions
app/services/after_block_service.rb
spec/services/after_block_service_spec.rb
+27
-5
27 additions, 5 deletions
spec/services/after_block_service_spec.rb
with
62 additions
and
5 deletions
app/lib/feed_manager.rb
+
30
−
0
View file @
afb78821
...
...
@@ -194,6 +194,36 @@ class FeedManager
end
end
# Clear all statuses from or mentioning target_account from a list feed
# @param [List] list
# @param [Account] target_account
# @return [void]
def
clear_from_list
(
list
,
target_account
)
timeline_key
=
key
(
:list
,
list
.
id
)
timeline_status_ids
=
redis
.
zrange
(
timeline_key
,
0
,
-
1
)
statuses
=
Status
.
where
(
id:
timeline_status_ids
).
select
(
:id
,
:reblog_of_id
,
:account_id
).
to_a
reblogged_ids
=
Status
.
where
(
id:
statuses
.
map
(
&
:reblog_of_id
).
compact
,
account:
target_account
).
pluck
(
:id
)
with_mentions_ids
=
Mention
.
active
.
where
(
status_id:
statuses
.
flat_map
{
|
s
|
[
s
.
id
,
s
.
reblog_of_id
]
}.
compact
,
account:
target_account
).
pluck
(
:status_id
)
target_statuses
=
statuses
.
select
do
|
status
|
status
.
account_id
==
target_account
.
id
||
reblogged_ids
.
include?
(
status
.
reblog_of_id
)
||
with_mentions_ids
.
include?
(
status
.
id
)
||
with_mentions_ids
.
include?
(
status
.
reblog_of_id
)
end
target_statuses
.
each
do
|
status
|
unpush_from_list
(
list
,
status
)
end
end
# Clear all statuses from or mentioning target_account from an account's lists
# @param [Account] account
# @param [Account] target_account
# @return [void]
def
clear_from_lists
(
account
,
target_account
)
List
.
where
(
account:
account
).
each
do
|
list
|
clear_from_list
(
list
,
target_account
)
end
end
# Populate home feed of account from scratch
# @param [Account] account
# @return [void]
...
...
This diff is collapsed.
Click to expand it.
app/services/after_block_service.rb
+
5
−
0
View file @
afb78821
...
...
@@ -6,6 +6,7 @@ class AfterBlockService < BaseService
@target_account
=
target_account
clear_home_feed!
clear_list_feeds!
clear_notifications!
clear_conversations!
end
...
...
@@ -16,6 +17,10 @@ class AfterBlockService < BaseService
FeedManager
.
instance
.
clear_from_home
(
@account
,
@target_account
)
end
def
clear_list_feeds!
FeedManager
.
instance
.
clear_from_lists
(
@account
,
@target_account
)
end
def
clear_conversations!
AccountConversation
.
where
(
account:
@account
).
where
(
'? = ANY(participant_account_ids)'
,
@target_account
.
id
).
in_batches
.
destroy_all
end
...
...
This diff is collapsed.
Click to expand it.
spec/services/after_block_service_spec.rb
+
27
−
5
View file @
afb78821
...
...
@@ -5,12 +5,14 @@ RSpec.describe AfterBlockService, type: :service do
->
{
described_class
.
new
.
call
(
account
,
target_account
)
}
end
let
(
:account
)
{
Fabricate
(
:account
)
}
let
(
:target_account
)
{
Fabricate
(
:account
)
}
let
(
:account
)
{
Fabricate
(
:account
)
}
let
(
:target_account
)
{
Fabricate
(
:account
)
}
let
(
:status
)
{
Fabricate
(
:status
,
account:
target_account
)
}
let
(
:other_status
)
{
Fabricate
(
:status
,
account:
target_account
)
}
let
(
:other_account_status
)
{
Fabricate
(
:status
)
}
let
(
:other_account_reblog
)
{
Fabricate
(
:status
,
reblog_of_id:
other_status
.
id
)
}
describe
'home timeline'
do
let
(
:status
)
{
Fabricate
(
:status
,
account:
target_account
)
}
let
(
:other_account_status
)
{
Fabricate
(
:status
)
}
let
(
:home_timeline_key
)
{
FeedManager
.
instance
.
key
(
:home
,
account
.
id
)
}
before
do
...
...
@@ -20,10 +22,30 @@ RSpec.describe AfterBlockService, type: :service do
it
"clears account's statuses"
do
FeedManager
.
instance
.
push_to_home
(
account
,
status
)
FeedManager
.
instance
.
push_to_home
(
account
,
other_account_status
)
FeedManager
.
instance
.
push_to_home
(
account
,
other_account_reblog
)
is_expected
.
to
change
{
Redis
.
current
.
zrange
(
home_timeline_key
,
0
,
-
1
)
}.
from
([
status
.
id
.
to_s
,
other_account_status
.
id
.
to_s
]).
to
([
other_account_status
.
id
.
to_s
])
}.
from
([
status
.
id
.
to_s
,
other_account_status
.
id
.
to_s
,
other_account_reblog
.
id
.
to_s
]).
to
([
other_account_status
.
id
.
to_s
])
end
end
describe
'lists'
do
let
(
:list
)
{
Fabricate
(
:list
,
account:
account
)
}
let
(
:list_timeline_key
)
{
FeedManager
.
instance
.
key
(
:list
,
list
.
id
)
}
before
do
Redis
.
current
.
del
(
list_timeline_key
)
end
it
"clears account's statuses"
do
FeedManager
.
instance
.
push_to_list
(
list
,
status
)
FeedManager
.
instance
.
push_to_list
(
list
,
other_account_status
)
FeedManager
.
instance
.
push_to_list
(
list
,
other_account_reblog
)
is_expected
.
to
change
{
Redis
.
current
.
zrange
(
list_timeline_key
,
0
,
-
1
)
}.
from
([
status
.
id
.
to_s
,
other_account_status
.
id
.
to_s
,
other_account_reblog
.
id
.
to_s
]).
to
([
other_account_status
.
id
.
to_s
])
end
end
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