Skip to content
Snippets Groups Projects
Unverified Commit de57efd0 authored by ThibG's avatar ThibG Committed by GitHub
Browse files

Fix mentions not being deleted efficiently (#15416)


As a regression from the recent optimizations, mentions were left untouched
until `account.destroy`, which would then delete them individually,
and executing queries to find and delete associated notifications, resulting
in a massive slowdown.

Co-authored-by: default avatarClaire <claire.github-309c@sitedethib.com>
parent 473abc35
No related branches found
No related tags found
No related merge requests found
......@@ -142,6 +142,7 @@ class DeleteAccountService < BaseService
purge_user!
purge_profile!
purge_statuses!
purge_mentions!
purge_media_attachments!
purge_polls!
purge_generated_notifications!
......@@ -159,6 +160,10 @@ class DeleteAccountService < BaseService
end
end
def purge_mentions!
@account.mentions.reorder(nil).where.not(status_id: reported_status_ids).in_batches.delete_all
end
def purge_media_attachments!
@account.media_attachments.reorder(nil).find_each do |media_attachment|
next if keep_account_record? && reported_status_ids.include?(media_attachment.status_id)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment