mstdn.y-zu.org/mastodon
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix custom emoji error

Browse Source
This commit is contained in:
KMY 2023-03-13 10:59:42 +09:00 committed by YoheiZuho
parent 7cf177d11e
commit c81b901f08
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/serializers/rest/custom_emoji_serializer.rb
View File

@ -3,11 +3,11 @@
class REST::CustomEmojiSerializer < ActiveModel::Serializer class REST::CustomEmojiSerializer < ActiveModel::Serializer
include RoutingHelper include RoutingHelper
# Please update `app/javascript/mastodon/api_types/custom_emoji.ts` when making changes to the attributes
attributes :shortcode, :url, :static_url, :visible_in_picker 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)
@ -24,4 +24,20 @@ class REST::CustomEmojiSerializer < ActiveModel::Serializer
def category_loaded? def category_loaded?
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
object.respond_to?(:image_width) ? object.image_width : object.width
end
def height
object.respond_to?(:image_height) ? object.image_height : object.height
end
end end