post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Fix custom emoji error

Browse source
This commit is contained in:
KMY 2023-03-13 10:59:42 +09:00
parent 37f708f8ab
commit 120dfe7042
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/serializers/rest/custom_emoji_serializer.rb
View file

@ -3,9 +3,11 @@
class REST::CustomEmojiSerializer < ActiveModel::Serializer class REST::CustomEmojiSerializer < ActiveModel::Serializer
include RoutingHelper include RoutingHelper
attributes :shortcode, :url, :static_url, :visible_in_picker, :width, :height attributes :shortcode, :url, :static_url, :visible_in_picker
attribute :category, if: :category_loaded? attribute :category, if: :category_loaded?
attribute :width, if: :width?
attribute :height, if: :height?
def url def url
full_asset_url(object.image.url) full_asset_url(object.image.url)
@ -23,11 +25,19 @@ class REST::CustomEmojiSerializer < ActiveModel::Serializer
object.association(:category).loaded? && object.category.present? object.association(:category).loaded? && object.category.present?
end end
def width?
object.respond_to?(:image_width) || object.respond_to?(:width)
end
def height?
object.respond_to?(:image_height) || object.respond_to?(:height)
end
def width def width
object.image_width object.respond_to?(:image_width) ? object.image_width : object.width
end end
def height def height
object.image_height object.respond_to?(:image_height) ? object.image_height : object.height
end end
end end