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

Use the non-animated version in web UI, but return both in API
2017-10-05 23:41:47 +02:00
parent 2559d9166c
commit b9c76e2edb
5 changed files with 9 additions and 5 deletions
--- 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