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

2022-03-30 13:40:10 +02:00
parent eaea849035 2cc7ba2671
commit 51a297e128
70 changed files with 900 additions and 623 deletions
--- a/app/models/account_filter.rb
+++ b/app/models/account_filter.rb
@@ -80,6 +80,10 @@ class AccountFilter
      accounts_with_users.merge(User.pending)
    when 'suspended'
      Account.suspended
+    when 'disabled'
+      accounts_with_users.merge(User.disabled)
+    when 'silenced'
+      Account.silenced
    else
      raise "Unknown status: #{value}"
    end