When processing custom emoji, ensure a non-animated version exists (#5230)

Use the non-animated version in web UI, but return both in API

diff --git a/app/javascript/mastodon/emoji.js b/app/javascript/mastodon/emoji.js
index 1df2373d9e63a2057b14c31001de6e067650d54d..cf00779588dd3040314719b37328b394e0e8a169 100644 (file)
--- a/app/javascript/mastodon/emoji.js
+++ b/app/javascript/mastodon/emoji.js
@@ -52,7 +52,7 @@ export const buildCustomEmojis = customEmojis => {
 
   customEmojis.forEach(emoji => {
     const shortcode = emoji.get('shortcode');
-    const url       = emoji.get('url');
+    const url       = emoji.get('static_url');
     const name      = shortcode.replace(':', '');
 
     emojis.push({

diff --git a/app/javascript/mastodon/reducers/statuses.js b/app/javascript/mastodon/reducers/statuses.js
index 2d72b12e88af5d0b821a6237fcfd075bfa919dda..ed16e016f0843bd40be49fd11c63495460028c11 100644 (file)
--- a/app/javascript/mastodon/reducers/statuses.js
+++ b/app/javascript/mastodon/reducers/statuses.js
@@ -60,7 +60,7 @@ const normalizeStatus = (state, status) => {
 
   const searchContent = [status.spoiler_text, status.content].join(' ').replace(/<br \/>/g, '\n').replace(/<\/p><p>/g, '\n\n');
   const emojiMap = normalStatus.emojis.reduce((obj, emoji) => {
-    obj[`:${emoji.shortcode}:`] = emoji.url;
+    obj[`:${emoji.shortcode}:`] = emoji.static_url;
     return obj;
   }, {});
 

diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index 42cd7299034b68f7d87e7034aa06dd7791b9db81..d7f6ec47b584497db33d6aa5c0dfd094028145dc 100644 (file)
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -92,7 +92,7 @@ class Formatter
   def encode_custom_emojis(html, emojis)
     return html if emojis.empty?
 
-    emoji_map = emojis.map { |e| [e.shortcode, full_asset_url(e.image.url)] }.to_h
+    emoji_map = emojis.map { |e| [e.shortcode, full_asset_url(e.image.url(:static))] }.to_h
 
     i                     = -1
     inside_tag            = false

diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb
index e80c581553c8bb665c355b0db00aeaee3c1af27a..9e9be5e12c284464e15fd314bd8afdb2ed7f854f 100644 (file)
--- a/app/models/custom_emoji.rb
+++ b/app/models/custom_emoji.rb
@@ -21,7 +21,7 @@ class CustomEmoji < ApplicationRecord
     :(#{SHORTCODE_RE_FRAGMENT}):
     (?=[^[:alnum:]:]|$)/x
 
-  has_attached_file :image
+  has_attached_file :image, styles: { static: { format: 'png', convert_options: '-coalesce -strip' } }
 
   validates_attachment :image, content_type: { content_type: 'image/png' }, presence: true, size: { in: 0..50.kilobytes }
   validates :shortcode, uniqueness: { scope: :domain }, format: { with: /\A#{SHORTCODE_RE_FRAGMENT}\z/ }, length: { minimum: 2 }

diff --git a/app/serializers/rest/custom_emoji_serializer.rb b/app/serializers/rest/custom_emoji_serializer.rb
index b744dd4ec5dbf759478ae501a238c48156d52fb6..b958e6a5db03ff32bc167b9c4f7bdd8f01c2aa43 100644 (file)
--- 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