diff --git a/lib/account_deleter.rb b/lib/account_deleter.rb index 356c5a54c..3158de873 100644 --- a/lib/account_deleter.rb +++ b/lib/account_deleter.rb @@ -26,7 +26,6 @@ class AccountDeleter def perform! # close person delete_standard_person_associations - remove_conversation_visibilities delete_contacts_of_me tombstone_person_and_profile @@ -84,10 +83,6 @@ class AccountDeleter ShareVisibility.for_a_user(user).find_each(batch_size: 20, &:destroy) end - def remove_conversation_visibilities - ConversationVisibility.where(:person_id => person.id).destroy_all - end - def tombstone_person_and_profile person.lock_access! person.clear_profile! @@ -102,12 +97,12 @@ class AccountDeleter end def normal_ar_person_associates_to_delete - %i[posts photos mentions participations roles blocks] + %i[posts photos mentions participations roles blocks conversation_visibilities] end def ignored_or_special_ar_person_associations %i[comments likes poll_participations contacts notification_actors notifications owner profile - conversation_visibilities pod conversations messages] + pod conversations messages] end def mark_account_deletion_complete diff --git a/spec/lib/account_deleter_spec.rb b/spec/lib/account_deleter_spec.rb index a6445a3b9..3752d91a6 100644 --- a/spec/lib/account_deleter_spec.rb +++ b/spec/lib/account_deleter_spec.rb @@ -20,7 +20,6 @@ describe AccountDeleter do delete_contacts_of_me delete_standard_person_associations tombstone_person_and_profile - remove_conversation_visibilities ] context "user deletion" do @@ -157,14 +156,6 @@ describe AccountDeleter do @account_deletion.tombstone_person_and_profile end end - describe "#remove_conversation_visibilities" do - it "removes the conversation visibility for the deleted user" do - vis = double - expect(ConversationVisibility).to receive(:where).with(hash_including(:person_id => bob.person.id)).and_return(vis) - expect(vis).to receive(:destroy_all) - @account_deletion.remove_conversation_visibilities - end - end end describe "#remove_share_visibilities_by_contacts_of_user" do