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

2024-04-17 12:51:32 +09:00 · 2024-04-17 12:51:32 +09:00 · 51cf7b3eb4
commit 51cf7b3eb4
parent 1c054ed3a3 5915bd7f45
76 changed files with 835 additions and 307 deletions
--- a/app/models/concerns/status/threading_concern.rb
+++ b/app/models/concerns/status/threading_concern.rb
@ -21,7 +21,7 @@ module Status::ThreadingConcern
  end

  def self_replies(limit)
-    account.statuses.where(in_reply_to_id: id, visibility: [:public, :unlisted, :public_unlisted, :login]).reorder(id: :asc).limit(limit)
+    account.statuses.distributable_visibility.where(in_reply_to_id: id).reorder(id: :asc).limit(limit)
  end

  private