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

2024-04-22 08:58:37 +09:00 · 2024-04-22 08:58:37 +09:00 · 44f4a93430
commit 44f4a93430
parent 389ae9d339 35b517c207
100 changed files with 770 additions and 441 deletions
--- a/app/models/announcement.rb
+++ b/app/models/announcement.rb
@ -59,11 +59,13 @@ class Announcement < ApplicationRecord
  end

  def statuses
-    @statuses ||= if status_ids.nil?
-                    []
-                  else
-                    Status.where(id: status_ids).distributable_visibility_for_anonymous
-                  end
+    @statuses ||= begin
+      if status_ids.nil?
+        []
+      else
+        Status.with_includes.distributable_visibility_for_anonymous.where(id: status_ids)
+      end
+    end
  end

  def tags