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

2024-09-18 08:31:34 +09:00 · 2024-09-18 08:31:34 +09:00 · 4ce35dd837
commit 4ce35dd837
parent fe051aa32d 3e91c101b3
188 changed files with 1994 additions and 980 deletions
--- a/app/models/account.rb
+++ b/app/models/account.rb
@ -287,6 +287,10 @@ class Account < ApplicationRecord
    suspended_at.present? && !instance_actor?
  end

+  def suspended_locally?
+    suspended? && suspension_origin_local?
+  end
+
  def suspended_permanently?
    suspended? && deletion_request.nil?
  end