Add ~1500 new emojis to the Javascript selector

movim · Oct 31, 2020 · 5d1a053 · 5d1a053
1 parent 2369097
commit 5d1a053
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ v0.18.1 (trunk)
  * Handle Caps in PresenceBuffer to save lots of SQL request
  * Preload the MUC Presences when preparing groups of Messages in Chat
  * Handle vcard-temp avatars refresh in PresenceBuffer to also save some SQL requests
+ * Add ~1500 new emojis to the Javascript selector
 
 v0.18
 ---------------------------

diff --git a/public/scripts/movim_emojis_list.js b/public/scripts/movim_emojis_list.js
diff --git a/src/Movim/Console/ConfigCommand.php b/src/Movim/Console/ConfigCommand.php
@@ -98,5 +98,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 );
             }
         }
+
+        return 1;
     }
 }
diff --git a/src/Movim/Console/EmojisToJsonCommand.php b/src/Movim/Console/EmojisToJsonCommand.php
@@ -23,19 +23,49 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $emojis = (Emoji::getInstance())->getEmojis();
 
         foreach ($emojis as $key => $value) {
-            if  (strpos($key, '-') === false) {
-                $filtered[$key] = $value;
-            }
+            $value = str_replace([
+                '+ ',
+                'ZERO WIDTH JOINER ',
+                'EMOJI MODIFIER FITZPATRICK',
+                'MAN ',
+                'WOMAN ',
+                'FEMALE ',
+                'MALE ',
+                'EMOJI COMPONENT ',
+                '  '
+            ], [
+                '',
+                '',
+                '',
+                '',
+                '',
+                '',
+                '',
+                '',
+                ' '
+            ], $value);
+            echo $value."\n";
+            $filtered[$key] = $value;
         }
 
         $json = [];
         foreach ($filtered as $key => $value) {
-            sscanf('U+'.$key, 'U+%x', $codepoint);
-            $json[emojiShortcut($value)] = ['e' => \IntlChar::chr($codepoint), 'c' => $key];
+            $emojiCode = '';
+            $exploded = explode('-', $key);
+            foreach ($exploded as $keyElement) {
+                $emojiCode .= '\u{'.$keyElement.'}';
+            }
+
+            $json[emojiShortcut($value)] = ['e' => $emojiCode, 'c' => $key];
         }
 
-        \file_put_contents(PUBLIC_PATH.'scripts/movim_emojis_list.js', 'var emojis = '.\json_encode($json));
+        $encoded = \json_encode($json);
+        $encoded = str_replace('\\\\', '\\', $encoded);
+
+        \file_put_contents(PUBLIC_PATH.'scripts/movim_emojis_list.js', 'var emojis = '.$encoded);
 
         $output->writeln('<info>'.\count($json).' emojis saved</info>');
+
+        return 1;
     }
 }