Add T-T as a crying emoticon

Closes GH-10. Reviewed-by: Titus Wormer <tituswormer@gmail.com>
wooorm · Aug 5, 2024 · aca8be0 · aca8be0
1 parent 358aa7e
commit aca8be0
Show file tree

Hide file tree

Showing 4 changed files with 111 additions and 98 deletions.
diff --git a/index.js b/index.js
@@ -89,7 +89,8 @@ export const emoticon = [
       "='|",
       "='-(",
       "='-[",
-      "='-|"
+      "='-|",
+      'T-T'
     ]
   },
   {
@@ -260,7 +261,7 @@ export const emoticon = [
     name: 'rage',
     emoji: '😡',
     tags: ['angry'],
-    description: 'pouting face',
+    description: 'enraged face',
     emoticons: [':@', ':-@', '=@', '=-@']
   },
   {

diff --git a/schema.json b/schema.json
@@ -1,63 +1,68 @@
 {
-  "angry": [">", "eyesNormal", "noseOptional", "mouthNegative"],
-  "anguished": [],
-  "astonished": [],
-  "blush": ["eyesNormal", "noseOptional", "blush", "mouthPositive"],
-  "broken_heart": [["<"], ["\\", "/"], ["3"]],
-  "cold_sweat": [],
-  "confounded": [],
-  "confused": ["eyesNormal", "noseOptional", "mouthConfused"],
-  "cry": ["eyesNormal", "drop", "noseOptional", "mouthNotPositive"],
-  "disappointed": [],
-  "disappointed_relieved": [],
-  "dizzy_face": [],
-  "expressionless": [],
-  "fearful": [],
-  "flushed": [],
-  "frowning": ["eyesNormal", "noseOptional", "mouthNegative"],
-  "grimacing": [],
-  "grin": [],
-  "grinning": [],
-  "heart": [["<"], ["3"]],
-  "heart_eyes": [],
-  "hushed": [],
-  "imp": ["horns", "eyesNormal", "noseOptional", "mouthNegative"],
-  "innocent": ["halo", "eyesNormal", "noseOptional", "mouthPositive"],
-  "joy": ["eyesNormal", "drop", "noseOptional", "mouthPositive"],
-  "kissing": ["eyesNormal", "noseOptional", "mouthKissing"],
-  "kissing_closed_eyes": [],
-  "kissing_heart": [],
-  "kissing_smiling_eyes": [],
-  "laughing": ["eyesClosed", "noseOptional", "mouthPositive"],
-  "man": ["eyes", "noseOptional", "moustache"],
-  "mask": [],
-  "neutral_face": ["eyesNormal", "noseOptional", "mouthNeutral"],
-  "no_mouth": ["eyesNormal", "nose"],
-  "open_mouth": ["eyesNormal", "noseOptional", "mouthOpen"],
-  "pensive": [],
-  "persevere": [],
-  "rage": ["eyesNormal", "noseOptional", "mouthAngry"],
-  "relaxed": [],
-  "relieved": [],
-  "scream": [],
-  "sleeping": [],
-  "sleepy": [],
-  "smile": ["eyesNormal", "noseOptional", "mouthPositiveVery"],
-  "smiley": ["eyesNormal", "noseOptional", "mouthPositiveNormal"],
-  "smiling_imp": ["horns", "eyesNormal", "noseOptional", "mouthPositive"],
-  "smirk": [],
-  "sob": ["eyesNormal", "drop", "drop", "noseOptional", "mouthNegative"],
-  "stuck_out_tongue": ["eyesNormal", "noseOptional", "mouthTongue"],
-  "stuck_out_tongue_closed_eyes": ["eyesClosed", "noseOptional", "mouthTongue"],
-  "stuck_out_tongue_winking_eye": ["eyesWink", "noseOptional", "mouthTongue"],
-  "sunglasses": ["eyesGlasses", "noseOptional", "mouthPositive"],
-  "sweat": ["drop", "eyesNormal", "noseOptional", "mouthNegative"],
-  "sweat_smile": ["drop", "eyesNormal", "noseOptional", "mouthPositive"],
-  "tired_face": [],
-  "triumph": [],
-  "unamused": ["eyesNormal", "noseOptional", "mouthSquiggly"],
-  "weary": [],
-  "wink": ["eyesWink", "noseOptional", "mouthPositive"],
-  "worried": [],
-  "yum": []
+  "angry": [[">", "eyesNormal", "noseOptional", "mouthNegative"]],
+  "anguished": [[]],
+  "astonished": [[]],
+  "blush": [["eyesNormal", "noseOptional", "blush", "mouthPositive"]],
+  "broken_heart": [[["<"], ["\\", "/"], ["3"]]],
+  "cold_sweat": [[]],
+  "confounded": [[]],
+  "confused": [["eyesNormal", "noseOptional", "mouthConfused"]],
+  "cry": [
+    ["eyesNormal", "drop", "noseOptional", "mouthNotPositive"],
+    [["T"], ["-"], ["T"]]
+  ],
+  "disappointed": [[]],
+  "disappointed_relieved": [[]],
+  "dizzy_face": [[]],
+  "expressionless": [[]],
+  "fearful": [[]],
+  "flushed": [[]],
+  "frowning": [["eyesNormal", "noseOptional", "mouthNegative"]],
+  "grimacing": [[]],
+  "grin": [[]],
+  "grinning": [[]],
+  "heart": [[["<"], ["3"]]],
+  "heart_eyes": [[]],
+  "hushed": [[]],
+  "imp": [["horns", "eyesNormal", "noseOptional", "mouthNegative"]],
+  "innocent": [["halo", "eyesNormal", "noseOptional", "mouthPositive"]],
+  "joy": [["eyesNormal", "drop", "noseOptional", "mouthPositive"]],
+  "kissing": [["eyesNormal", "noseOptional", "mouthKissing"]],
+  "kissing_closed_eyes": [[]],
+  "kissing_heart": [[]],
+  "kissing_smiling_eyes": [[]],
+  "laughing": [["eyesClosed", "noseOptional", "mouthPositive"]],
+  "man": [["eyes", "noseOptional", "moustache"]],
+  "mask": [[]],
+  "neutral_face": [["eyesNormal", "noseOptional", "mouthNeutral"]],
+  "no_mouth": [["eyesNormal", "nose"]],
+  "open_mouth": [["eyesNormal", "noseOptional", "mouthOpen"]],
+  "pensive": [[]],
+  "persevere": [[]],
+  "rage": [["eyesNormal", "noseOptional", "mouthAngry"]],
+  "relaxed": [[]],
+  "relieved": [[]],
+  "scream": [[]],
+  "sleeping": [[]],
+  "sleepy": [[]],
+  "smile": [["eyesNormal", "noseOptional", "mouthPositiveVery"]],
+  "smiley": [["eyesNormal", "noseOptional", "mouthPositiveNormal"]],
+  "smiling_imp": [["horns", "eyesNormal", "noseOptional", "mouthPositive"]],
+  "smirk": [[]],
+  "sob": [["eyesNormal", "drop", "drop", "noseOptional", "mouthNegative"]],
+  "stuck_out_tongue": [["eyesNormal", "noseOptional", "mouthTongue"]],
+  "stuck_out_tongue_closed_eyes": [
+    ["eyesClosed", "noseOptional", "mouthTongue"]
+  ],
+  "stuck_out_tongue_winking_eye": [["eyesWink", "noseOptional", "mouthTongue"]],
+  "sunglasses": [["eyesGlasses", "noseOptional", "mouthPositive"]],
+  "sweat": [["drop", "eyesNormal", "noseOptional", "mouthNegative"]],
+  "sweat_smile": [["drop", "eyesNormal", "noseOptional", "mouthPositive"]],
+  "tired_face": [[]],
+  "triumph": [[]],
+  "unamused": [["eyesNormal", "noseOptional", "mouthSquiggly"]],
+  "weary": [[]],
+  "wink": [["eyesWink", "noseOptional", "mouthPositive"]],
+  "worried": [[]],
+  "yum": [[]]
 }
diff --git a/script/build-data.js b/script/build-data.js
@@ -1,3 +1,5 @@
+// @ts-check
+
 /**
  * @typedef Emoticon
  * @property {string} name
@@ -11,7 +13,7 @@ import assert from 'node:assert/strict'
 import fs from 'node:fs/promises'
 import {gemoji} from 'gemoji'
 
-/** @type {Record<string, Array<string>>} */
+/** @type {Record<string, Array<Array<string>>>} */
 const schema = JSON.parse(String(await fs.readFile('schema.json')))
 /** @type {Record<string, string|Array<string>>} */
 const alias = JSON.parse(String(await fs.readFile('alias.json')))
@@ -29,31 +31,36 @@ const data = Object.keys(schema)
   .map((ctx) => {
     assert(ctx.info, 'expected matching gemoji for `' + ctx.name + '`')
     const structure = ctx.structure
-    const flatStructure = structure.map((key) => flatten([key]))
-    /** @type {Array<string>|undefined} */
-    let result
-
-    while (flatStructure[1]) {
-      result = unpack(flatStructure)
-      flatStructure.shift()
-      flatStructure[0] = result
-    }
 
-    // Remove some dangerous emoticons.
-    result = (result || []).filter((emoticon) => {
-      if (
-        (/^[a-zA-Z]+$/.test(emoticon) &&
-          (emoticon.toUpperCase() === emoticon ||
-            emoticon.toLowerCase() === emoticon)) ||
-        /([\s\S])\1+/g.test(emoticon) ||
-        emoticon === '=-'
-      ) {
-        console.log('Removing dangerous/unused emoticon:', emoticon)
-        return false
-      }
-
-      return true
-    })
+    let result = structure
+      .flatMap((faceStructure) => {
+        const flatStructure = faceStructure.map((key) => flatten([key]))
+        /** @type {Array<string>|undefined} */
+        let result
+
+        while (flatStructure[1]) {
+          result = unpack(flatStructure)
+          flatStructure.shift()
+          flatStructure[0] = result
+        }
+
+        return result ?? []
+      })
+      .filter((emoticon) => {
+        // Remove some dangerous emoticons.
+        if (
+          (/^[a-zA-Z]+$/.test(emoticon) &&
+            (emoticon.toUpperCase() === emoticon ||
+              emoticon.toLowerCase() === emoticon)) ||
+          /([\s\S])\1+/g.test(emoticon) ||
+          emoticon === '=-'
+        ) {
+          console.log('Removing dangerous/unused emoticon:', emoticon)
+          return false
+        }
+
+        return true
+      })
 
     return {
       name: ctx.name,

diff --git a/support.md b/support.md
@@ -7,9 +7,9 @@ the first column!
 | :-: | :-: | :-: | :-: |
 | 😠 | angry | mad; annoyed | `>:(`; `>:[`; `>:-(`; `>:-[`; `>=(`; `>=[`; `>=-(`; `>=-[` |
 | 😊 | blush | proud | `:")`; `:"]`; `:"D`; `:-")`; `:-"]`; `:-"D`; `=")`; `="]`; `="D`; `=-")`; `=-"]`; `=-"D` |
-| 💔 | broken\_heart | | `<\3`; `</3` |
+| 💔 | broken_heart | | `<\3`; `</3` |
 | 😕 | confused | | `:/`; `:\`; `:-/`; `:-\`; `=/`; `=\`; `=-/`; `=-\` |
-| 😢 | cry | sad; tear | `:,(`; `:,[`; `:,\|`; `:,-(`; `:,-[`; `:,-\|`; `:'(`; `:'[`; `:'\|`; `:'-(`; `:'-[`; `:'-\|`; `=,(`; `=,[`; `=,\|`; `=,-(`; `=,-[`; `=,-\|`; `='(`; `='[`; `='\|`; `='-(`; `='-[`; `='-\|` |
+| 😢 | cry | sad; tear | `:,(`; `:,[`; `:,\|`; `:,-(`; `:,-[`; `:,-\|`; `:'(`; `:'[`; `:'\|`; `:'-(`; `:'-[`; `:'-\|`; `=,(`; `=,[`; `=,\|`; `=,-(`; `=,-[`; `=,-\|`; `='(`; `='[`; `='\|`; `='-(`; `='-[`; `='-\|`; `T-T` |
 | 😦 | frowning | | `:(`; `:[`; `:-(`; `:-[`; `=(`; `=[`; `=-(`; `=-[` |
 | ❤️ | heart | love | `<3` |
 | 👿 | imp | angry; devil; evil; horns | `]:(`; `]:[`; `]:-(`; `]:-[`; `]=(`; `]=[`; `]=-(`; `]=-[` |
@@ -18,19 +18,19 @@ the first column!
 | 😗 | kissing | | `:*`; `:-*`; `=*`; `=-*` |
 | 😆 | laughing | happy; haha | `x)`; `x]`; `xD`; `x-)`; `x-]`; `x-D`; `X)`; `X]`; `X-)`; `X-]`; `X-D` |
 | 👨 | man | mustache; father; dad | `:3`; `:-3`; `=3`; `=-3`; `;3`; `;-3`; `x3`; `x-3`; `X3`; `X-3` |
-| 😐 | neutral\_face | meh | `:\|`; `:-\|`; `=\|`; `=-\|` |
-| 😶 | no\_mouth | mute; silence | `:-` |
-| 😮 | open\_mouth | surprise; impressed; wow | `:o`; `:O`; `:0`; `:-o`; `:-O`; `:-0`; `=o`; `=O`; `=0`; `=-o`; `=-O`; `=-0` |
+| 😐 | neutral_face | meh | `:\|`; `:-\|`; `=\|`; `=-\|` |
+| 😶 | no_mouth | mute; silence | `:-` |
+| 😮 | open_mouth | surprise; impressed; wow | `:o`; `:O`; `:0`; `:-o`; `:-O`; `:-0`; `=o`; `=O`; `=0`; `=-o`; `=-O`; `=-0` |
 | 😡 | rage | angry | `:@`; `:-@`; `=@`; `=-@` |
 | 😄 | smile | happy; joy; laugh; pleased | `:D`; `:-D`; `=D`; `=-D` |
 | 😃 | smiley | happy; joy; haha | `:)`; `:]`; `:-)`; `:-]`; `=)`; `=]`; `=-)`; `=-]` |
-| 😈 | smiling\_imp | devil; evil; horns | `]:)`; `]:]`; `]:D`; `]:-)`; `]:-]`; `]:-D`; `]=)`; `]=]`; `]=D`; `]=-)`; `]=-]`; `]=-D` |
+| 😈 | smiling_imp | devil; evil; horns | `]:)`; `]:]`; `]:D`; `]:-)`; `]:-]`; `]:-D`; `]=)`; `]=]`; `]=D`; `]=-)`; `]=-]`; `]=-D` |
 | 😭 | sob | sad; cry; bawling | `:,'(`; `:,'[`; `:,'-(`; `:,'-[`; `:',(`; `:',[`; `:',-(`; `:',-[`; `=,'(`; `=,'[`; `=,'-(`; `=,'-[`; `=',(`; `=',[`; `=',-(`; `=',-[` |
-| 😛 | stuck\_out\_tongue | | `:p`; `:P`; `:d`; `:-p`; `:-P`; `:-d`; `=p`; `=P`; `=d`; `=-p`; `=-P`; `=-d` |
-| 😝 | stuck\_out\_tongue\_closed\_eyes | prank | `xP`; `x-p`; `x-P`; `x-d`; `Xp`; `Xd`; `X-p`; `X-P`; `X-d` |
-| 😜 | stuck\_out\_tongue\_winking\_eye | prank; silly | `;p`; `;P`; `;d`; `;-p`; `;-P`; `;-d` |
+| 😛 | stuck_out_tongue | | `:p`; `:P`; `:d`; `:-p`; `:-P`; `:-d`; `=p`; `=P`; `=d`; `=-p`; `=-P`; `=-d` |
+| 😝 | stuck_out_tongue_closed_eyes | prank | `xP`; `x-p`; `x-P`; `x-d`; `Xp`; `Xd`; `X-p`; `X-P`; `X-d` |
+| 😜 | stuck_out_tongue_winking_eye | prank; silly | `;p`; `;P`; `;d`; `;-p`; `;-P`; `;-d` |
 | 😎 | sunglasses | cool | `8)`; `8]`; `8D`; `8-)`; `8-]`; `8-D`; `B)`; `B]`; `B-)`; `B-]`; `B-D` |
 | 😓 | sweat | | `,:(`; `,:[`; `,:-(`; `,:-[`; `,=(`; `,=[`; `,=-(`; `,=-[`; `':(`; `':[`; `':-(`; `':-[`; `'=(`; `'=[`; `'=-(`; `'=-[` |
-| 😅 | sweat\_smile | hot | `,:)`; `,:]`; `,:D`; `,:-)`; `,:-]`; `,:-D`; `,=)`; `,=]`; `,=D`; `,=-)`; `,=-]`; `,=-D`; `':)`; `':]`; `':D`; `':-)`; `':-]`; `':-D`; `'=)`; `'=]`; `'=D`; `'=-)`; `'=-]`; `'=-D` |
+| 😅 | sweat_smile | hot | `,:)`; `,:]`; `,:D`; `,:-)`; `,:-]`; `,:-D`; `,=)`; `,=]`; `,=D`; `,=-)`; `,=-]`; `,=-D`; `':)`; `':]`; `':D`; `':-)`; `':-]`; `':-D`; `'=)`; `'=]`; `'=D`; `'=-)`; `'=-]`; `'=-D` |
 | 😒 | unamused | meh | `:$`; `:s`; `:z`; `:S`; `:Z`; `:-$`; `:-s`; `:-z`; `:-S`; `:-Z`; `=$`; `=s`; `=z`; `=S`; `=Z`; `=-$`; `=-s`; `=-z`; `=-S`; `=-Z` |
 | 😉 | wink | flirt | `;)`; `;]`; `;D`; `;-)`; `;-]`; `;-D` |