about summary refs log tree commit diff
path: root/app/lib/formatter.rb
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-11-27 16:26:18 +0100
committerGitHub <noreply@github.com>2018-11-27 16:26:18 +0100
commit33be091f506242b136b0d4a65cf06a0babc4d757 (patch)
tree0f9f6e40e40f4ecabfa1e5f906000abe756f42a9 /app/lib/formatter.rb
parent6b6e633c095485f95350c4308a942192e5fe8806 (diff)
parent55edfd6e0e1cb5377f0c3406d94ddfd84ddb7b20 (diff)
Merge pull request #828 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib/formatter.rb')
-rw-r--r--app/lib/formatter.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index d13884ec8..05fd9eeb1 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -128,9 +128,9 @@ class Formatter
     return html if emojis.empty?
 
     emoji_map = if animate
-                  emojis.map { |e| [e.shortcode, full_asset_url(e.image.url)] }.to_h
+                  emojis.each_with_object({}) { |e, h| h[e.shortcode] = full_asset_url(e.image.url) }
                 else
-                  emojis.map { |e| [e.shortcode, full_asset_url(e.image.url(:static))] }.to_h
+                  emojis.each_with_object({}) { |e, h| h[e.shortcode] = full_asset_url(e.image.url(:static)) }
                 end
 
     i                     = -1