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

2024-12-06 12:17:45 +09:00 · 2024-12-06 12:17:45 +09:00 · 3c3ee557d0
commit 3c3ee557d0
parent 58ce8274e5 d29eddc401
187 changed files with 1105 additions and 537 deletions
--- a/app/controllers/api/v1/trends/tags_controller.rb
+++ b/app/controllers/api/v1/trends/tags_controller.rb
@ -27,7 +27,9 @@ class Api::V1::Trends::TagsController < Api::BaseController
  end

  def tags_from_trends
-    Trends.tags.query.allowed
+    scope = Trends.tags.query.allowed.in_locale(content_locale)
+    scope = scope.filtered_for(current_account) if user_signed_in?
+    scope
  end

  def next_path