diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-10-05 23:41:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-05 23:41:47 +0200 |
commit | b9c76e2edbc372e1b472f6ba480631b79fe24722 (patch) | |
tree | 86938e4c82781404d8adfde2555e1c26b77209b4 /app/serializers/rest | |
parent | 2559d9166cea24fceb9b72ca112804811d87a4a8 (diff) |
When processing custom emoji, ensure a non-animated version exists (#5230)
Use the non-animated version in web UI, but return both in API
Diffstat (limited to 'app/serializers/rest')
-rw-r--r-- | app/serializers/rest/custom_emoji_serializer.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/serializers/rest/custom_emoji_serializer.rb b/app/serializers/rest/custom_emoji_serializer.rb index b744dd4ec..b958e6a5d 100644 --- a/app/serializers/rest/custom_emoji_serializer.rb +++ b/app/serializers/rest/custom_emoji_serializer.rb @@ -3,9 +3,13 @@ class REST::CustomEmojiSerializer < ActiveModel::Serializer include RoutingHelper - attributes :shortcode, :url + attributes :shortcode, :url, :static_url def url full_asset_url(object.image.url) end + + def static_url + full_asset_url(object.image.url(:static)) + end end |