about summary refs log tree commit diff
path: root/app/services/delete_account_service.rb
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-12-21 18:22:17 +0100
committerGitHub <noreply@github.com>2020-12-21 18:22:17 +0100
commit43961035a906cd8bccdf4c1ac023980b37823bb3 (patch)
tree9327e444230f7ee3eef18b2109aac371b807ba31 /app/services/delete_account_service.rb
parent6f51fd743590c8fd8dd95e48dc24e4472d46480b (diff)
Fix some notifications not being deleted on poll/status deletion (#15402)
* Fix deleting polls not deleting notifications

* Fix fav notification deletion when deleting a toot

* Refactor DeleteAccountService spec

* Add DeleteAccountService tests for other associations and notifications

* Add favourite handling spec in status removal

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Diffstat (limited to 'app/services/delete_account_service.rb')
-rw-r--r--app/services/delete_account_service.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/services/delete_account_service.rb b/app/services/delete_account_service.rb
index fe9b30b17..fa834e775 100644
--- a/app/services/delete_account_service.rb
+++ b/app/services/delete_account_service.rb
@@ -123,7 +123,9 @@ class DeleteAccountService < BaseService
       next if @options[:reserve_username] && reported_status_ids.include?(poll.status_id)
 
       # We can safely delete the poll rather than destroy it, as any non-reported
-      # status should have been deleted already
+      # status should have been deleted already, as long as we take care of
+      # notifications.
+      Notification.where(poll: poll).delete_all
       poll.delete
     end