diff options
| author | kibigo! <marrus-sh@users.noreply.github.com> | 2017-08-01 13:07:43 -0700 |
|---|---|---|
| committer | kibigo! <marrus-sh@users.noreply.github.com> | 2017-08-01 13:20:29 -0700 |
| commit | 8150689b48716bb016d492d28cef08600a4b315e (patch) | |
| tree | a05a2539e894c79ef17698dce0da5a6af0c25bf6 /app/lib/emoji.rb | |
| parent | b61e3daf983d87c6d2de7e54d420c2e8f5a531e6 (diff) | |
| parent | 7ef848256871454a790a9b7cc725053c67ba3da4 (diff) | |
Merge upstream (#111)
Diffstat (limited to 'app/lib/emoji.rb')
| -rw-r--r-- | app/lib/emoji.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/lib/emoji.rb b/app/lib/emoji.rb index e444b6893..45b7f53de 100644 --- a/app/lib/emoji.rb +++ b/app/lib/emoji.rb @@ -6,7 +6,7 @@ class Emoji include Singleton def initialize - data = Oj.load(File.open(File.join(Rails.root, 'lib', 'assets', 'emoji.json'))) + data = Oj.load(File.open(Rails.root.join('lib', 'assets', 'emoji.json'))) @map = {} @@ -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 |