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

2024-09-26 08:29:41 +09:00 · 2024-09-26 08:29:41 +09:00 · c905714459
commit c905714459
parent 1a70ad95be db332553c9
517 changed files with 4284 additions and 3891 deletions
--- a/app/models/trends/preview_card_provider_filter.rb
+++ b/app/models/trends/preview_card_provider_filter.rb
@ -41,7 +41,7 @@ class Trends::PreviewCardProviderFilter
    when 'rejected'
      PreviewCardProvider.not_trendable
    when 'pending_review'
-      PreviewCardProvider.pending_review
+      PreviewCardProvider.unreviewed
    else
      raise Mastodon::InvalidParameterError, "Unknown status: #{value}"
    end