Use Arel `nulls_first` method in ordering CustomEmojiFilter scope (#28614)

10 months ago · 57f49c8191
parent 832b92ac3e
commit 57f49c8191
1 changed files with 1 additions and 1 deletions
--- a/app/models/custom_emoji_filter.rb
+++ b/app/models/custom_emoji_filter.rb
@ -31,7 +31,7 @@ class CustomEmojiFilter
  def scope_for(key, value)
    case key.to_s
    when 'local'
-      CustomEmoji.local.left_joins(:category).reorder(Arel.sql('custom_emoji_categories.name ASC NULLS FIRST, custom_emojis.shortcode ASC'))
+      CustomEmoji.local.left_joins(:category).reorder(CustomEmojiCategory.arel_table[:name].asc.nulls_first).order(shortcode: :asc)
    when 'remote'
      CustomEmoji.remote
    when 'by_domain'