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

2024-01-26 11:14:21 +09:00 · 2024-01-26 11:14:21 +09:00 · 3dd9591a4b
commit 3dd9591a4b
parent 32cd686080 881e8c113c
163 changed files with 3000 additions and 2777 deletions
--- a/app/serializers/rest/announcement_serializer.rb
+++ b/app/serializers/rest/announcement_serializer.rb
@ -23,7 +23,7 @@ class REST::AnnouncementSerializer < ActiveModel::Serializer
  end

  def read
-    object.announcement_mutes.where(account: current_user.account).exists?
+    object.announcement_mutes.exists?(account: current_user.account)
  end

  def content