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

Conflicts:
- config/routes.rb
  Upstream changed some admin routes, conflict was because of an added :show
  action for statuses on our side. Kept it.

1 files changed, 8 insertions, 0 deletions

diff --git a/app/models/account.rb b/app/models/account.rb
index 60ad0788e..99fcbf778 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -159,6 +159,14 @@ class Account < ApplicationRecord
     ResolveAccountService.new.call(acct)
   end
 
+  def silence!
+    update!(silenced: true)
+  end
+
+  def unsilence!
+    update!(silenced: false)
+  end
+
   def suspend!
     transaction do
       user&.disable! if local?