Merge remote-tracking branch 'parent/main' into upstream-20240906

2024-09-09 08:47:15 +09:00 · 2024-09-09 08:47:15 +09:00 · 218cb37fe3
commit 218cb37fe3
parent e5a02ba667 82161d8ae5
176 changed files with 750 additions and 603 deletions
--- a/app/models/admin/account_action.rb
+++ b/app/models/admin/account_action.rb
@ -73,6 +73,14 @@ class Admin::AccountAction
      end
    end

+    def disabled_types_for_account(account)
+      if account.suspended?
+        %w(silence suspend)
+      elsif account.silenced?
+        %w(silence)
+      end
+    end
+
    def i18n_scope
      :activerecord
    end