Merge remote-tracking branch 'upstream/master' into merge-glitch

1 files changed, 3 insertions, 6 deletions

diff --git a/app/models/account.rb b/app/models/account.rb
index c7bf7bf80..228e36755 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -233,23 +233,20 @@ class Account < ApplicationRecord
 
   def suspend!(date = Time.now.utc)
     transaction do
-      user&.disable! if local?
+      create_deletion_request!
       update!(suspended_at: date)
     end
   end
 
   def unsuspend!
     transaction do
-      user&.enable! if local?
+      deletion_request&.destroy!
       update!(suspended_at: nil)
     end
   end
 
   def memorialize!
-    transaction do
-      user&.disable! if local?
-      update!(memorial: true)
-    end
+    update!(memorial: true)
   end
 
   def sign?