Change account domain block to clear out notifications and follows (#11393)
This commit is contained in:
parent
94f5c714f1
commit
4eeff26533
7 changed files with 51 additions and 35 deletions
|
@ -2,43 +2,25 @@
|
|||
|
||||
class AfterBlockService < BaseService
|
||||
def call(account, target_account)
|
||||
clear_home_feed(account, target_account)
|
||||
clear_notifications(account, target_account)
|
||||
clear_conversations(account, target_account)
|
||||
@account = account
|
||||
@target_account = target_account
|
||||
|
||||
clear_home_feed!
|
||||
clear_notifications!
|
||||
clear_conversations!
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def clear_home_feed(account, target_account)
|
||||
FeedManager.instance.clear_from_timeline(account, target_account)
|
||||
def clear_home_feed!
|
||||
FeedManager.instance.clear_from_timeline(@account, @target_account)
|
||||
end
|
||||
|
||||
def clear_conversations(account, target_account)
|
||||
AccountConversation.where(account: account)
|
||||
.where('? = ANY(participant_account_ids)', target_account.id)
|
||||
.in_batches
|
||||
.destroy_all
|
||||
def clear_conversations!
|
||||
AccountConversation.where(account: @account).where('? = ANY(participant_account_ids)', @target_account.id).in_batches.destroy_all
|
||||
end
|
||||
|
||||
def clear_notifications(account, target_account)
|
||||
Notification.where(account: account)
|
||||
.joins(:follow)
|
||||
.where(activity_type: 'Follow', follows: { account_id: target_account.id })
|
||||
.delete_all
|
||||
|
||||
Notification.where(account: account)
|
||||
.joins(mention: :status)
|
||||
.where(activity_type: 'Mention', statuses: { account_id: target_account.id })
|
||||
.delete_all
|
||||
|
||||
Notification.where(account: account)
|
||||
.joins(:favourite)
|
||||
.where(activity_type: 'Favourite', favourites: { account_id: target_account.id })
|
||||
.delete_all
|
||||
|
||||
Notification.where(account: account)
|
||||
.joins(:status)
|
||||
.where(activity_type: 'Status', statuses: { account_id: target_account.id })
|
||||
.delete_all
|
||||
def clear_notifications!
|
||||
Notification.where(account: @account).where(from_account: @target_account).in_batches.delete_all
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue