Add categories for custom emojis (#11196)

Fix #7940
2019-06-28 15:54:10 +02:00 · 2019-06-28 15:54:10 +02:00 · e64e6a03dd
commit e64e6a03dd
parent 072158ee97
13 changed files with 86 additions and 18 deletions
--- a/app/serializers/rest/custom_emoji_serializer.rb
+++ b/app/serializers/rest/custom_emoji_serializer.rb
@ -5,6 +5,8 @@ class REST::CustomEmojiSerializer < ActiveModel::Serializer

  attributes :shortcode, :url, :static_url, :visible_in_picker

+  attribute :category, if: :category_loaded?
+
  def url
    full_asset_url(object.image.url)
  end
@ -12,4 +14,12 @@ class REST::CustomEmojiSerializer < ActiveModel::Serializer
  def static_url
    full_asset_url(object.image.url(:static))
  end
+
+  def category
+    object.category.name
+  end
+
+  def category_loaded?
+    object.association(:category).loaded? && object.category.present?
+  end
 end