post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Remove statuses from antenna timeline when blocked

Browse source
This commit is contained in:
KMY 2023-08-20 11:43:19 +09:00
parent e336542063
commit 21e590c02b
4 changed files with 53 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/lib/feed_manager.rb
View file

@ -265,6 +265,28 @@ class FeedManager
end
end
def clear_from_antenna(antenna, target_account)
timeline_key = key(:antenna, antenna.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.filter_map(&:reblog_of_id), 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_antenna(antenna, status)
end
end
def clear_from_antennas(account, target_account)
Antenna.where(account: account).each do |antenna|
clear_from_antenna(antenna, target_account)
end
end
# Populate home feed of account from scratch
# @param [Account] account
# @return [void]

5
app/services/after_block_service.rb
View file

@ -7,6 +7,7 @@ class AfterBlockService < BaseService
clear_home_feed!
clear_list_feeds!
clear_antenna_feeds!
clear_notifications!
clear_conversations!
end
@ -21,6 +22,10 @@ class AfterBlockService < BaseService
FeedManager.instance.clear_from_lists(@account, @target_account)
end
def clear_antenna_feeds!
FeedManager.instance.clear_from_antennas(@account, @target_account)
end
def clear_conversations!
AccountConversation.where(account: @account).where('? = ANY(participant_account_ids)', @target_account.id).in_batches.destroy_all
end