Merge branch 'master' into glitch-soc/merge-upstream

2018-08-22 20:56:32 +02:00
parent 628fca50e2 56f882aed6
commit e70fc059a9
103 changed files with 757 additions and 167 deletions
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -196,6 +196,13 @@ class Account < ApplicationRecord
    ResolveAccountService.new.call(acct)
  end

+  def suspend!
+    transaction do
+      user&.disable! if local?
+      update!(suspended: true)
+    end
+  end
+
  def unsuspend!
    transaction do
      user&.enable! if local?