Use in_order_of in trends/* classes (#33531)

app/models/trends/links.rb

@@ -16,7 +16,7 @@ class Trends::Links < Trends::Base
   class Query < Trends::Query
     def to_arel
       scope = PreviewCard.joins(:trend).reorder(score: :desc)
-      scope = scope.reorder(language_order_clause.desc, score: :desc) if preferred_languages.present?
+      scope = scope.merge(language_order_clause) if preferred_languages.present?
       scope = scope.merge(PreviewCardTrend.allowed) if @allowed
       scope = scope.offset(@offset) if @offset.present?
       scope = scope.limit(@limit) if @limit.present?
@@ -26,7 +26,7 @@ class Trends::Links < Trends::Base
     private
 
     def language_order_clause
-      Arel::Nodes::Case.new.when(PreviewCardTrend.arel_table[:language].in(preferred_languages)).then(1).else(0)
+      language_order_for(PreviewCardTrend)
     end
   end
 

app/models/trends/query.rb

@@ -94,6 +94,13 @@ class Trends::Query
     to_arel.to_a
   end
 
+  def language_order_for(trend_class)
+    trend_class
+      .reorder(nil)
+      .in_order_of(:language, [preferred_languages], filter: false)
+      .order(score: :desc)
+  end
+
   def preferred_languages
     if @account&.chosen_languages.present?
       @account.chosen_languages

app/models/trends/statuses.rb

@@ -15,7 +15,7 @@ class Trends::Statuses < Trends::Base
   class Query < Trends::Query
     def to_arel
       scope = Status.joins(:trend).reorder(score: :desc)
-      scope = scope.reorder(language_order_clause.desc, score: :desc) if preferred_languages.present?
+      scope = scope.merge(language_order_clause) if preferred_languages.present?
       scope = scope.merge(StatusTrend.allowed) if @allowed
       scope = scope.not_excluded_by_account(@account).not_domain_blocked_by_account(@account) if @account.present?
       scope = scope.offset(@offset) if @offset.present?
@@ -26,7 +26,7 @@ class Trends::Statuses < Trends::Base
     private
 
     def language_order_clause
-      Arel::Nodes::Case.new.when(StatusTrend.arel_table[:language].in(preferred_languages)).then(1).else(0)
+      language_order_for(StatusTrend)
     end
   end
 

app/models/trends/tags.rb

@@ -15,7 +15,8 @@ class Trends::Tags < Trends::Base
 
   class Query < Trends::Query
     def to_arel
-      scope = Tag.joins(:trend).reorder(language_order_clause.desc, score: :desc)
+      scope = Tag.joins(:trend).reorder(score: :desc)
+      scope = scope.merge(language_order_clause) if preferred_languages.present?
       scope = scope.merge(TagTrend.allowed) if @allowed
       scope = scope.offset(@offset) if @offset.present?
       scope = scope.limit(@limit) if @limit.present?
@@ -25,7 +26,7 @@ class Trends::Tags < Trends::Base
     private
 
     def language_order_clause
-      Arel::Nodes::Case.new.when(TagTrend.arel_table[:language].in(preferred_languages)).then(1).else(0)
+      language_order_for(TagTrend)
     end
   end