Add categories for custom emojis (#11196)

Fix #7940
2019-06-28 15:54:10 +02:00
parent 072158ee97
commit e64e6a03dd
13 changed files with 86 additions and 18 deletions
--- a/app/controllers/api/v1/custom_emojis_controller.rb
+++ b/app/controllers/api/v1/custom_emojis_controller.rb
@ -7,7 +7,7 @@ class Api::V1::CustomEmojisController < Api::BaseController

  def index
    render_cached_json('api:v1:custom_emojis', expires_in: 1.minute) do
-      ActiveModelSerializers::SerializableResource.new(CustomEmoji.local.where(disabled: false), each_serializer: REST::CustomEmojiSerializer)
+      ActiveModelSerializers::SerializableResource.new(CustomEmoji.local.where(disabled: false).includes(:category), each_serializer: REST::CustomEmojiSerializer)
    end
  end
 end