mastofe

commit: f49339ca9ca2fbc7feca30be217ed2311ebd106a
parent: 994d948c3947b75140c2a2a7de5b81713c7b8ea3
Author: Ondřej Hruška <ondra@ondrovo.com>
Date:   Thu, 27 Jul 2017 01:02:15 +0200

Fix multipoint shortcode bug (#4387)

* Fix multipoint shortcode bug

* Added testcase for composite emoji shortcode

Diffstat:
M
app/lib/emoji.rb
2
+-
M
spec/helpers/emoji_helper_spec.rb
5
+++++

2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/app/lib/emoji.rb b/app/lib/emoji.rb
@@ -32,7 +32,7 @@ class Emoji
 
   def codepoint_to_unicode(codepoint)
     if codepoint.include?('-')
-      codepoint.split('-').map(&:hex).pack('U')
+      codepoint.split('-').map(&:hex).pack('U*')
     else
       [codepoint.hex].pack('U')
     end
diff --git a/spec/helpers/emoji_helper_spec.rb b/spec/helpers/emoji_helper_spec.rb
@@ -7,6 +7,11 @@ RSpec.describe EmojiHelper, type: :helper do
       expect(emojify(text)).to eq '📖 Book'
     end
 
+    it 'converts composite emoji shortcodes to unicode' do
+      text = ':couple_ww:'
+      expect(emojify(text)).to eq '👩❤👩'
+    end
+
     it 'does not convert shortcodes that are part of a string into unicode' do
       text = ':see_no_evil::hear_no_evil::speak_no_evil:'
       expect(emojify(text)).to eq text