about summary refs log tree commit diff
path: root/app/lib
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-10-05 23:41:47 +0200
committerGitHub <noreply@github.com>2017-10-05 23:41:47 +0200
commitb9c76e2edbc372e1b472f6ba480631b79fe24722 (patch)
tree86938e4c82781404d8adfde2555e1c26b77209b4 /app/lib
parent2559d9166cea24fceb9b72ca112804811d87a4a8 (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/lib')
-rw-r--r--app/lib/formatter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index 42cd72990..d7f6ec47b 100644
--- 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