about summary refs log tree commit diff
path: root/lib/tasks/emojis.rake
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-01-02 20:03:32 +0100
committerGitHub <noreply@github.com>2019-01-02 20:03:32 +0100
commit0acd51acdc1e670bf57f58671cb8e30743782c63 (patch)
treef5ff0b5c3b1e8fd94691264f2bc147e5fa233ecb /lib/tasks/emojis.rake
parentb300948526d967aaf5608c93546ee0d54940c0ef (diff)
parente77ceb1b29547ed89b4110b3cc3edc9ac325b620 (diff)
Merge pull request #878 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'lib/tasks/emojis.rake')
-rw-r--r--lib/tasks/emojis.rake4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/tasks/emojis.rake b/lib/tasks/emojis.rake
index 625a6e55d..892afd898 100644
--- a/lib/tasks/emojis.rake
+++ b/lib/tasks/emojis.rake
@@ -15,7 +15,7 @@ end
 namespace :emojis do
   desc 'Generate a unicode to filename mapping'
   task :generate do
-    source = 'http://www.unicode.org/Public/emoji/5.0/emoji-test.txt'
+    source = 'http://www.unicode.org/Public/emoji/11.0/emoji-test.txt'
     codes  = []
     dest   = Rails.root.join('app', 'javascript', 'mastodon', 'features', 'emoji', 'emoji_map.json')
 
@@ -43,6 +43,8 @@ namespace :emojis do
     existence_maps.each do |group|
       existing_one = group.key(true)
 
+      next if existing_one.nil?
+
       group.each_key do |key|
         map[codepoints_to_unicode(key)] = codepoints_to_filename(existing_one)
       end