From 95ae136613a7271effbb05675fbcff4b646cbf51 Mon Sep 17 00:00:00 2001 From: cherryleafroad <13651622+cherryleafroad@users.noreply.github.com> Date: Fri, 19 Feb 2021 05:55:12 -0800 Subject: [PATCH 1/5] Update WeChat Emoji - Updated to latest 8.0 emoji - Updated PC emoji missing/incorrect entries - Added missing emoji - Fixed a few duplicates - Changed some other emoji to be more in-line with meaning and/or WeChat emoji style --- .../nevo/decorators/wechat/EmojiMap.java | 92 +++++++++++++++---- 1 file changed, 75 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/oasisfeng/nevo/decorators/wechat/EmojiMap.java b/src/main/java/com/oasisfeng/nevo/decorators/wechat/EmojiMap.java index 4120c85..6a935ce 100644 --- a/src/main/java/com/oasisfeng/nevo/decorators/wechat/EmojiMap.java +++ b/src/main/java/com/oasisfeng/nevo/decorators/wechat/EmojiMap.java @@ -17,33 +17,38 @@ class EmojiMap { { "OK", "OK", "๐Ÿ‘Œ" }, { "่€ถ", "Yeah!", "โœŒ" }, { "ๅ˜˜", "Silent", "๐Ÿคซ" }, - { "ๆ™•", "Dizzy", "๐Ÿ˜ฒ" }, + { null, "Shhh", "๐Ÿคซ" }, // same as above in newer versions + { "ๆ™•", "Dizzy", "๐Ÿ˜ต" }, { "่กฐ", "BadLuck", "๐Ÿ˜ณ" }, - { "่‰ฒ", "Drool", "๐Ÿ˜" }, - { "ๅ›ง", "Tension", "โ˜บ" }, + { null, "Toasted", "๐Ÿ˜ณ" }, // same as above in newer versions + { "่‰ฒ", "Drool", "๐Ÿคค" }, + { "ๅ›ง", "Tension", "๐Ÿ˜ณ" }, + { null, "Blush", "๐Ÿ˜ณ" }, // same as above in newer versions { "้ธก", "Chick", "๐Ÿฅ" }, { "ๅผบ", "Thumbs Up", "๐Ÿ‘" }, + { null, "ThumbsUp", "๐Ÿ‘" }, // same as above in newer versions { "ๅผฑ", "Weak", "๐Ÿ‘Ž" }, + { null, "ThumbsDown", "๐Ÿ‘Ž" }, // same as above in newer versions { "็ก", "Sleep", "๐Ÿ˜ด" }, { "ๅ", "Puke", "๐Ÿคข" }, { "ๅ›ฐ", "Drowsy", "๐Ÿ˜ช" }, { "็™ผ", "Rich", "๐Ÿ€…" }, - { "ๅพฎ็ฌ‘", "Smile", "๐Ÿ˜ƒ" }, + { "ๅพฎ็ฌ‘", "Smile", "๐Ÿ™‚" }, { "ๆ’‡ๅ˜ด", "Grimace", "๐Ÿ˜–" }, { "ๅ‘ๅ‘†", "Scowl", "๐Ÿ˜ณ" }, { "ๅพ—ๆ„", "CoolGuy", "๐Ÿ˜Ž" }, { "ๆตๆณช", "Sob", "๐Ÿ˜ญ" }, { "ๅฎณ็พž", "Shy", "โ˜บ" }, { "้—ญๅ˜ด", "Shutup", "๐Ÿค" }, - { "ๅคงๅ“ญ", "Cry", "๐Ÿ˜ฃ" }, + { "ๅคงๅ“ญ", "Cry", "๐Ÿ˜ข" }, { "ๅฐดๅฐฌ", "Awkward", "๐Ÿ˜ฐ" }, { "ๅ‘ๆ€’", "Angry", "๐Ÿ˜ก" }, { "่ฐƒ็šฎ", "Tongue", "๐Ÿ˜œ" }, { "ๅ‘ฒ็‰™", "Grin", "๐Ÿ˜" }, - { "ๆƒŠ่ฎถ", "Surprise", "๐Ÿ˜ฑ" }, + { "ๆƒŠ่ฎถ", "Surprise", "๐Ÿ˜ฒ" }, { "้šพ่ฟ‡", "Frown", "๐Ÿ™" }, { "ๆŠ“็‹‚", "Scream", "๐Ÿ˜ซ" }, - { "ๅท็ฌ‘", "Chuckle", "๐Ÿ˜…" }, + { "ๅท็ฌ‘", "Chuckle", "๐Ÿคญ" }, { "ๆ„‰ๅฟซ", "Joyful", "โ˜บ" }, { "็™ฝ็œผ", "Slight", "๐Ÿ™„" }, { "ๅ‚ฒๆ…ข", "Smug", "๐Ÿ˜•" }, @@ -52,8 +57,9 @@ class EmojiMap { { "ๆ†จ็ฌ‘", "Laugh", "๐Ÿ˜„" }, { "ๆ‚ ้—ฒ", "Loafer", "๐Ÿ˜Œ" }, { "ๅฅ‹ๆ–—", "Strive", "๐Ÿ’ช" }, - { "ๅ’’้ช‚", "Scold", "๐Ÿ˜ค" }, - { "็–‘้—ฎ", "Doubt", "โ“" }, + { "ๅ’’้ช‚", "Scold", "๐Ÿคฌ" }, + { "็–‘้—ฎ", "Doubt", "๐Ÿคจ" }, + { null, "Shocked", "๐Ÿคจ" }, // same as above for newer versions { "้ชท้ซ…", "Skull", "๐Ÿ’€" }, { "ๆ•ฒๆ‰“", "Hammer", "๐Ÿ‘Š" }, { "ๆ‚่„ธ", "Facepalm", "๐Ÿคฆ" }, @@ -62,12 +68,15 @@ class EmojiMap { { "็บขๅŒ…", "Packet", SDK_INT > O_MR1 ? "๐Ÿงง"/* Emoji 11+ */: "๐Ÿ’ฐ" }, { "ๅฐ็‹—", "Pup", "๐Ÿถ" }, { "ๅ†่ง", "Bye", "๐Ÿ™‹" }, - { "ๆ“ฆๆฑ—", "Relief", "๐Ÿ˜ฅ" }, + { "ๆ“ฆๆฑ—", "Relief", "๐Ÿ˜ถ" }, + { null, "Speechless", "๐Ÿ˜ถ" }, // same as above in newer versions { "้ผ“ๆŽŒ", "Clap", "๐Ÿ‘" }, { "ๅ็ฌ‘", "Trick", "๐Ÿ‘ป" }, - { "ๅ“ˆๆฌ ", "Yawn", "๐Ÿ˜ช" }, + { "ๅ“ˆๆฌ ", "Yawn", "๐Ÿฅฑ" }, { "้„™่ง†", "Lookdown", "๐Ÿ˜’" }, - { "ๅง”ๅฑˆ", "Wronged", "๐Ÿ˜ฃ" }, + { null, "Pooh-pooh", "๐Ÿ˜’" }, // same as above for newer wechat + { "ๅง”ๅฑˆ", "Wronged", "๐Ÿ˜ž" }, + { null, "Shrunken", "๐Ÿ˜ž" }, { "้˜ด้™ฉ", "Sly", "๐Ÿ˜ˆ" }, { "ไบฒไบฒ", "Kiss", "๐Ÿ˜˜" }, { "่œๅˆ€", "Cleaver", "๐Ÿ”ช" }, @@ -77,7 +86,8 @@ class EmojiMap { { "็Œชๅคด", "Pig", "๐Ÿท" }, { "็Žซ็‘ฐ", "Rose", "๐ŸŒน" }, { "ๅ‡‹่ฐข", "Wilt", "๐Ÿฅ€" }, - { "ๅ˜ดๅ”‡", "Lip", "๐Ÿ’‹" }, + { "ๅ˜ดๅ”‡", "Lip", "๐Ÿ‘„" }, + { null, "Lips", "๐Ÿ‘„" }, // same as above for newer wechat { "็ˆฑๅฟƒ", "Heart", "โค" }, { "ๅฟƒ็ขŽ", "BrokenHeart", "๐Ÿ’”" }, { "่›‹็ณ•", "Cake", "๐ŸŽ‚" }, @@ -88,6 +98,7 @@ class EmojiMap { { "ๆ‹ฅๆŠฑ", "Hug", "๐Ÿค—" }, { "ๆกๆ‰‹", "Shake", "๐Ÿค" }, { "่ƒœๅˆฉ", "Victory", "โœŒ" }, + { null, "Peace", "โœŒ" }, // same as above in newer versions { "ๆŠฑๆ‹ณ", "Salute", "๐Ÿ™" }, { "ๆ‹ณๅคด", "Fist", "โœŠ" }, // { "่ทณ่ทณ", "Waddle", "" }, @@ -99,11 +110,42 @@ class EmojiMap { // { "ๅ˜ฟๅ“ˆ", "Hey", "" }, // { "ๆœบๆ™บ", "Smart", "" }, // { "ๆŠ ้ผป", "DigNose", "" }, -// { "ๅฏๆ€œ", "Whimper", "" }, - { "ๅฟซๅ“ญไบ†", "Puling", "๐Ÿ˜”" }, +// { null, "NosePick", "" }, // same as above for newer wechat + { "ๅฏๆ€œ", "Whimper", "๐Ÿฅบ" }, + { "ๅฟซๅ“ญไบ†", "Puling", "๐Ÿ˜ข" }, + { null, "TearingUp", "๐Ÿ˜ข" }, // same as above for newer wechat // { "ๅทฆๅ“ผๅ“ผ", "Bah๏ผL", "" }, // { "ๅณๅ“ผๅ“ผ", "Bah๏ผR", "" }, { "็ ดๆถ•ไธบ็ฌ‘", "Lol", "๐Ÿ˜‚" }, + { "ๆ‚ ้—ฒ", "Commando", "๐Ÿช–" }, + { "็ฌ‘่„ธ", "Happy", "๐Ÿ˜„" }, + { "็”Ÿ็—…", "Sick", "๐Ÿ˜ท" }, + { "่„ธ็บข", "Flushed", "๐Ÿ˜ณ" }, + { "ๆๆƒง", "Terror", "๐Ÿ˜ฑ" }, + { "ๅคฑๆœ›", "Let Down", "๐Ÿ˜”" }, + { "ๆ— ่ฏญ", "Duh", "๐Ÿ˜’" }, +// { "ๅƒ็“œ", "Onlooker", "" }, + { "ๅŠ ๆฒน", "GoForIt", "โœŠ" }, + { "ๅŠ ๆฒนๅŠ ๆฒน", "KeepFighting", "๐Ÿ˜ท" }, + { "ๆฑ—", "Sweats", "๐Ÿ˜ถ" }, + { "ๅคฉๅ•Š", "OMG", "๐Ÿคฏ" }, +// { null, "Emm", "" }, + { "็คพไผš็คพไผš", "Respect", "๐Ÿ‘" }, + { "ๆ—บๆŸด", "Doge", "๐Ÿถ" }, + { "ๅฅฝ็š„", "NoProb", "๐Ÿ‘Œ" }, + { "ๆ‰“่„ธ", "MyBad", "๐Ÿ‘Š" }, + { "ๅ“‡", "Wow", "๐Ÿคฉ" }, + { "็ฟป็™ฝ็œผ", "Boring", "๐Ÿ˜‘" }, + { "666", "Awesome", "๐Ÿ˜" }, +// { "่ฎฉๆˆ‘็œ‹็œ‹", "LetMeSee", "" }, + { "ๅนๆฐ”", "Sigh", "๐Ÿ˜Œ" }, // will have its own in next standard => ๐Ÿ˜ฎโ€๐Ÿ’จ + { "่‹ฆๆถฉ", "Hurt", "๐Ÿ˜ฅ" }, + { "่ฃ‚ๅผ€", "Broken", "๐Ÿ’”" }, + { "ๅˆๅ", "Worship", "๐Ÿ™" }, + { "็ฆ", "Blessing", "๐ŸŒ " }, //wishing star is often used as a "blessing" or "wish" + { "็ƒŸ่Šฑ", "Fireworks", "๐ŸŽ†" }, + { "็ˆ†็ซน", "Firecracker", "๐Ÿงจ" }, + // From WeChat for iOS { "ๅผบๅฃฎ", null, "๐Ÿ’ช"}, @@ -121,7 +163,7 @@ class EmojiMap { { "็ˆฑๆƒ…", "InLove", "๐Ÿ’•" }, { "้ฃžๅป", "Blowkiss", "๐Ÿ˜˜" }, { "้—ช็”ต", "Lightning", "โšก" }, - { "ๅˆ€", null, "๐Ÿ”ช" }, // Dup of "Cleaver" + { "ๅˆ€", "Dagger", "๐Ÿ—ก๏ธ" }, // Dup of "Cleaver" { "่ถณ็ƒ", "Soccer", "โšฝ" }, { "ๆฃ’็ƒ", "Baseball", "โšพ" }, { "ๆฉ„ๆฆ„็ƒ", "Football", "๐Ÿˆ" }, @@ -131,7 +173,23 @@ class EmojiMap { { "ๅฎ็Ÿณ", "Gem", "๐Ÿ’Ž" }, { "่Œถ", "Tea", "๐Ÿต" }, { "่ฏไธธ", "Pill", "๐Ÿ’Š" }, - { "ๅบ†็ฅ", "Party", "๐ŸŽ†" }, + { "ๅบ†็ฅ", "Party", "๐ŸŽ‰" }, { "็ซ็ฎญ", "Rocket ship", "๐Ÿš€" }, + { "้ฅฅ้ฅฟ", "Hungry", "๐Ÿ˜‹" }, + { "้…ท", "Ruthless", "๐Ÿ˜ˆ" }, + { "ๅ“", "Uh Oh", "๐Ÿ˜ " }, + { null, "Wrath", "๐Ÿ˜ " }, // Dup of above + { "ๅฅ‹ๆ–—", "Determined", "๐Ÿ˜ฃ" }, + { "็–ฏไบ†", "Tormented", "๐Ÿ˜ค" }, + { "็ณ—ๅคงไบ†", "Shame", "๐Ÿ˜ณ" }, + { "็ฃ•ๅคด", "Kowtow", "๐Ÿ™‡" }, + { "ๅ›žๅคด", "Lookback", "๐Ÿคš" }, +// { "่ทณ็ปณ", "Jump", "" }, + { "ๆŠ•้™", "Surrender", "๐Ÿณ๏ธ" }, + { "ๆฟ€ๅŠจ", "Hooray", "๐Ÿ™Œ" }, +// { "ไนฑ่ˆž", "HeyHey", "" }, + { "็Œฎๅป", "Smooch", "๐Ÿ˜˜" }, +// { "ๅทฆๅคชๆž", "Tai Ji L", "" }, +// { "ๅณๅคชๆž", "Tai Ji R", "" }, }; } From 3954cb09903c98f0aaed34d8e25d3657ca57da16 Mon Sep 17 00:00:00 2001 From: cherryleafroad <13651622+cherryleafroad@users.noreply.github.com> Date: Sun, 21 Feb 2021 18:14:00 -0800 Subject: [PATCH 2/5] Add version for Smart --- .../java/com/oasisfeng/nevo/decorators/wechat/EmojiMap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/oasisfeng/nevo/decorators/wechat/EmojiMap.java b/src/main/java/com/oasisfeng/nevo/decorators/wechat/EmojiMap.java index 6a935ce..5df6c68 100644 --- a/src/main/java/com/oasisfeng/nevo/decorators/wechat/EmojiMap.java +++ b/src/main/java/com/oasisfeng/nevo/decorators/wechat/EmojiMap.java @@ -108,7 +108,7 @@ class EmojiMap { { "่œก็ƒ›", "Candle", "๐Ÿ•ฏ๏ธ" }, // { "ๅ‹พๅผ•", "Beckon", ""}, // { "ๅ˜ฟๅ“ˆ", "Hey", "" }, -// { "ๆœบๆ™บ", "Smart", "" }, + { "ๆœบๆ™บ", "Smart", "๐Ÿ‘‰" }, // { "ๆŠ ้ผป", "DigNose", "" }, // { null, "NosePick", "" }, // same as above for newer wechat { "ๅฏๆ€œ", "Whimper", "๐Ÿฅบ" }, From 992e19321992ab9ee842f41ea154065aeb446ae5 Mon Sep 17 00:00:00 2001 From: cherryleafroad <13651622+cherryleafroad@users.noreply.github.com> Date: Sun, 21 Feb 2021 18:33:21 -0800 Subject: [PATCH 3/5] Tremble emoji can easily mean "cold" --- .../java/com/oasisfeng/nevo/decorators/wechat/EmojiMap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/oasisfeng/nevo/decorators/wechat/EmojiMap.java b/src/main/java/com/oasisfeng/nevo/decorators/wechat/EmojiMap.java index 5df6c68..eac1de9 100644 --- a/src/main/java/com/oasisfeng/nevo/decorators/wechat/EmojiMap.java +++ b/src/main/java/com/oasisfeng/nevo/decorators/wechat/EmojiMap.java @@ -102,7 +102,7 @@ class EmojiMap { { "ๆŠฑๆ‹ณ", "Salute", "๐Ÿ™" }, { "ๆ‹ณๅคด", "Fist", "โœŠ" }, // { "่ทณ่ทณ", "Waddle", "" }, -// { "ๅ‘ๆŠ–", "Tremble", "" }, + { "ๅ‘ๆŠ–", "Tremble", "๐Ÿฅถ" }, { "ๆ€„็ซ", "Aaagh!", "๐Ÿ˜ก" }, // { "่ฝฌๅœˆ", "Twirl", "" }, { "่œก็ƒ›", "Candle", "๐Ÿ•ฏ๏ธ" }, From a4fec0c166db5d72c874e7c811e7a0ab2ed27761 Mon Sep 17 00:00:00 2001 From: cherryleafroad <13651622+cherryleafroad@users.noreply.github.com> Date: Mon, 22 Feb 2021 07:18:20 -0800 Subject: [PATCH 4/5] Verify and fix emoji bugs Plus some improvements Also, fixed some missing ones that were uncaught in latest 8.0 --- .../nevo/decorators/wechat/EmojiMap.java | 90 ++++++++++--------- 1 file changed, 46 insertions(+), 44 deletions(-) diff --git a/src/main/java/com/oasisfeng/nevo/decorators/wechat/EmojiMap.java b/src/main/java/com/oasisfeng/nevo/decorators/wechat/EmojiMap.java index eac1de9..c85cbbb 100644 --- a/src/main/java/com/oasisfeng/nevo/decorators/wechat/EmojiMap.java +++ b/src/main/java/com/oasisfeng/nevo/decorators/wechat/EmojiMap.java @@ -16,8 +16,7 @@ class EmojiMap { static final String[][] MAP = new String[][] { { "OK", "OK", "๐Ÿ‘Œ" }, { "่€ถ", "Yeah!", "โœŒ" }, - { "ๅ˜˜", "Silent", "๐Ÿคซ" }, - { null, "Shhh", "๐Ÿคซ" }, // same as above in newer versions + { "ๅ˜˜", "Shhh" , "๐Ÿคซ" }, { "ๆ™•", "Dizzy", "๐Ÿ˜ต" }, { "่กฐ", "BadLuck", "๐Ÿ˜ณ" }, { null, "Toasted", "๐Ÿ˜ณ" }, // same as above in newer versions @@ -26,9 +25,9 @@ class EmojiMap { { null, "Blush", "๐Ÿ˜ณ" }, // same as above in newer versions { "้ธก", "Chick", "๐Ÿฅ" }, { "ๅผบ", "Thumbs Up", "๐Ÿ‘" }, - { null, "ThumbsUp", "๐Ÿ‘" }, // same as above in newer versions + { null, "ThumbsUp", "๐Ÿ‘" }, // same as above in newer versions { "ๅผฑ", "Weak", "๐Ÿ‘Ž" }, - { null, "ThumbsDown", "๐Ÿ‘Ž" }, // same as above in newer versions + { null, "ThumbsDown", "๐Ÿ‘Ž" }, // same as above in newer versions { "็ก", "Sleep", "๐Ÿ˜ด" }, { "ๅ", "Puke", "๐Ÿคข" }, { "ๅ›ฐ", "Drowsy", "๐Ÿ˜ช" }, @@ -40,6 +39,7 @@ class EmojiMap { { "ๆตๆณช", "Sob", "๐Ÿ˜ญ" }, { "ๅฎณ็พž", "Shy", "โ˜บ" }, { "้—ญๅ˜ด", "Shutup", "๐Ÿค" }, + { null, "Silent", "๐Ÿค" }, // same as above in newer versions { "ๅคงๅ“ญ", "Cry", "๐Ÿ˜ข" }, { "ๅฐดๅฐฌ", "Awkward", "๐Ÿ˜ฐ" }, { "ๅ‘ๆ€’", "Angry", "๐Ÿ˜ก" }, @@ -59,7 +59,7 @@ class EmojiMap { { "ๅฅ‹ๆ–—", "Strive", "๐Ÿ’ช" }, { "ๅ’’้ช‚", "Scold", "๐Ÿคฌ" }, { "็–‘้—ฎ", "Doubt", "๐Ÿคจ" }, - { null, "Shocked", "๐Ÿคจ" }, // same as above for newer versions + { null, "Shocked", "๐Ÿคจ" }, // same as above for newer versions { "้ชท้ซ…", "Skull", "๐Ÿ’€" }, { "ๆ•ฒๆ‰“", "Hammer", "๐Ÿ‘Š" }, { "ๆ‚่„ธ", "Facepalm", "๐Ÿคฆ" }, @@ -68,15 +68,16 @@ class EmojiMap { { "็บขๅŒ…", "Packet", SDK_INT > O_MR1 ? "๐Ÿงง"/* Emoji 11+ */: "๐Ÿ’ฐ" }, { "ๅฐ็‹—", "Pup", "๐Ÿถ" }, { "ๅ†่ง", "Bye", "๐Ÿ™‹" }, + { null, "Wave", "๐Ÿ™‹" }, // same as above { "ๆ“ฆๆฑ—", "Relief", "๐Ÿ˜ถ" }, - { null, "Speechless", "๐Ÿ˜ถ" }, // same as above in newer versions + { null, "Speechless", "๐Ÿ˜ถ" }, // same as above in newer versions { "้ผ“ๆŽŒ", "Clap", "๐Ÿ‘" }, { "ๅ็ฌ‘", "Trick", "๐Ÿ‘ป" }, { "ๅ“ˆๆฌ ", "Yawn", "๐Ÿฅฑ" }, { "้„™่ง†", "Lookdown", "๐Ÿ˜’" }, - { null, "Pooh-pooh", "๐Ÿ˜’" }, // same as above for newer wechat + { null, "Pooh-pooh", "๐Ÿ˜’" }, // same as above for newer wechat { "ๅง”ๅฑˆ", "Wronged", "๐Ÿ˜ž" }, - { null, "Shrunken", "๐Ÿ˜ž" }, + { null, "Shrunken", "๐Ÿ˜ž" }, { "้˜ด้™ฉ", "Sly", "๐Ÿ˜ˆ" }, { "ไบฒไบฒ", "Kiss", "๐Ÿ˜˜" }, { "่œๅˆ€", "Cleaver", "๐Ÿ”ช" }, @@ -87,7 +88,7 @@ class EmojiMap { { "็Žซ็‘ฐ", "Rose", "๐ŸŒน" }, { "ๅ‡‹่ฐข", "Wilt", "๐Ÿฅ€" }, { "ๅ˜ดๅ”‡", "Lip", "๐Ÿ‘„" }, - { null, "Lips", "๐Ÿ‘„" }, // same as above for newer wechat + { null, "Lips", "๐Ÿ‘„" }, // same as above for newer wechat { "็ˆฑๅฟƒ", "Heart", "โค" }, { "ๅฟƒ็ขŽ", "BrokenHeart", "๐Ÿ’”" }, { "่›‹็ณ•", "Cake", "๐ŸŽ‚" }, @@ -98,8 +99,9 @@ class EmojiMap { { "ๆ‹ฅๆŠฑ", "Hug", "๐Ÿค—" }, { "ๆกๆ‰‹", "Shake", "๐Ÿค" }, { "่ƒœๅˆฉ", "Victory", "โœŒ" }, - { null, "Peace", "โœŒ" }, // same as above in newer versions + { null, "Peace", "โœŒ" }, // same as above in newer versions { "ๆŠฑๆ‹ณ", "Salute", "๐Ÿ™" }, + { null, "Fight", "๐Ÿ™" }, // same as above { "ๆ‹ณๅคด", "Fist", "โœŠ" }, // { "่ทณ่ทณ", "Waddle", "" }, { "ๅ‘ๆŠ–", "Tremble", "๐Ÿฅถ" }, @@ -110,41 +112,41 @@ class EmojiMap { // { "ๅ˜ฟๅ“ˆ", "Hey", "" }, { "ๆœบๆ™บ", "Smart", "๐Ÿ‘‰" }, // { "ๆŠ ้ผป", "DigNose", "" }, -// { null, "NosePick", "" }, // same as above for newer wechat +// { null, "NosePick", "" }, // same as above for newer wechat { "ๅฏๆ€œ", "Whimper", "๐Ÿฅบ" }, { "ๅฟซๅ“ญไบ†", "Puling", "๐Ÿ˜ข" }, - { null, "TearingUp", "๐Ÿ˜ข" }, // same as above for newer wechat -// { "ๅทฆๅ“ผๅ“ผ", "Bah๏ผL", "" }, -// { "ๅณๅ“ผๅ“ผ", "Bah๏ผR", "" }, - { "็ ดๆถ•ไธบ็ฌ‘", "Lol", "๐Ÿ˜‚" }, - { "ๆ‚ ้—ฒ", "Commando", "๐Ÿช–" }, + { null, "TearingUp", "๐Ÿ˜ข" }, // same as above for newer wechat + { "ๅทฆๅ“ผๅ“ผ", "Bah๏ผL", "๐Ÿ˜—" }, + { "ๅณๅ“ผๅ“ผ", "Bah๏ผR", "๐Ÿ˜—" }, + { "็ ดๆถ•ไธบ็ฌ‘", "Lol", "๐Ÿ˜‚" }, + { "ๆ‚ ้—ฒ", "Commando", "๐Ÿช–" }, { "็ฌ‘่„ธ", "Happy", "๐Ÿ˜„" }, { "็”Ÿ็—…", "Sick", "๐Ÿ˜ท" }, { "่„ธ็บข", "Flushed", "๐Ÿ˜ณ" }, { "ๆๆƒง", "Terror", "๐Ÿ˜ฑ" }, - { "ๅคฑๆœ›", "Let Down", "๐Ÿ˜”" }, - { "ๆ— ่ฏญ", "Duh", "๐Ÿ˜’" }, -// { "ๅƒ็“œ", "Onlooker", "" }, + { "ๅคฑๆœ›", "LetDown", "๐Ÿ˜”" }, + { "ๆ— ่ฏญ", "Duh", "๐Ÿ˜’" }, + { "ๅƒ็“œ", "Onlooker", "๐Ÿ‰" }, { "ๅŠ ๆฒน", "GoForIt", "โœŠ" }, - { "ๅŠ ๆฒนๅŠ ๆฒน", "KeepFighting", "๐Ÿ˜ท" }, - { "ๆฑ—", "Sweats", "๐Ÿ˜ถ" }, - { "ๅคฉๅ•Š", "OMG", "๐Ÿคฏ" }, -// { null, "Emm", "" }, + { "ๅŠ ๆฒนๅŠ ๆฒน", "KeepFighting", "๐Ÿ˜ท" }, + { "ๆฑ—", "Sweats", "๐Ÿ˜‘" }, + { "ๅคฉๅ•Š", "OMG", "๐Ÿคฏ" }, +// { null, "Emm", "" }, { "็คพไผš็คพไผš", "Respect", "๐Ÿ‘" }, { "ๆ—บๆŸด", "Doge", "๐Ÿถ" }, { "ๅฅฝ็š„", "NoProb", "๐Ÿ‘Œ" }, { "ๆ‰“่„ธ", "MyBad", "๐Ÿ‘Š" }, - { "ๅ“‡", "Wow", "๐Ÿคฉ" }, - { "็ฟป็™ฝ็œผ", "Boring", "๐Ÿ˜‘" }, + { "ๅ“‡", "Wow", "๐Ÿคฉ" }, + { "็ฟป็™ฝ็œผ", "Boring", "๐Ÿ™„" }, { "666", "Awesome", "๐Ÿ˜" }, -// { "่ฎฉๆˆ‘็œ‹็œ‹", "LetMeSee", "" }, +// { "่ฎฉๆˆ‘็œ‹็œ‹", "LetMeSee", "" }, { "ๅนๆฐ”", "Sigh", "๐Ÿ˜Œ" }, // will have its own in next standard => ๐Ÿ˜ฎโ€๐Ÿ’จ { "่‹ฆๆถฉ", "Hurt", "๐Ÿ˜ฅ" }, { "่ฃ‚ๅผ€", "Broken", "๐Ÿ’”" }, { "ๅˆๅ", "Worship", "๐Ÿ™" }, - { "็ฆ", "Blessing", "๐ŸŒ " }, //wishing star is often used as a "blessing" or "wish" - { "็ƒŸ่Šฑ", "Fireworks", "๐ŸŽ†" }, - { "็ˆ†็ซน", "Firecracker", "๐Ÿงจ" }, + { "็ฆ", "Blessing", "๐ŸŒ " }, //wishing star is often used as a "blessing" or "wish" + { "็ƒŸ่Šฑ", "Fireworks", "๐ŸŽ†" }, + { "็ˆ†็ซน", "Firecracker", "๐Ÿงจ" }, // From WeChat for iOS @@ -163,7 +165,7 @@ class EmojiMap { { "็ˆฑๆƒ…", "InLove", "๐Ÿ’•" }, { "้ฃžๅป", "Blowkiss", "๐Ÿ˜˜" }, { "้—ช็”ต", "Lightning", "โšก" }, - { "ๅˆ€", "Dagger", "๐Ÿ—ก๏ธ" }, // Dup of "Cleaver" + { "ๅˆ€", "Dagger", "๐Ÿ—ก๏ธ" }, // Dup of "Cleaver" { "่ถณ็ƒ", "Soccer", "โšฝ" }, { "ๆฃ’็ƒ", "Baseball", "โšพ" }, { "ๆฉ„ๆฆ„็ƒ", "Football", "๐Ÿˆ" }, @@ -176,20 +178,20 @@ class EmojiMap { { "ๅบ†็ฅ", "Party", "๐ŸŽ‰" }, { "็ซ็ฎญ", "Rocket ship", "๐Ÿš€" }, { "้ฅฅ้ฅฟ", "Hungry", "๐Ÿ˜‹" }, - { "้…ท", "Ruthless", "๐Ÿ˜ˆ" }, - { "ๅ“", "Uh Oh", "๐Ÿ˜ " }, - { null, "Wrath", "๐Ÿ˜ " }, // Dup of above - { "ๅฅ‹ๆ–—", "Determined", "๐Ÿ˜ฃ" }, - { "็–ฏไบ†", "Tormented", "๐Ÿ˜ค" }, + { "้…ท", "Ruthless", "๐Ÿ˜ˆ" }, + { "ๅ“", "Uh Oh", "๐Ÿ˜ " }, + { null, "Wrath", "๐Ÿ˜ " }, // Dup of above + { "ๅฅ‹ๆ–—", "Determined", "๐Ÿ˜ฃ" }, + { "็–ฏไบ†", "Tormented", "๐Ÿ˜ค" }, { "็ณ—ๅคงไบ†", "Shame", "๐Ÿ˜ณ" }, - { "็ฃ•ๅคด", "Kowtow", "๐Ÿ™‡" }, - { "ๅ›žๅคด", "Lookback", "๐Ÿคš" }, -// { "่ทณ็ปณ", "Jump", "" }, - { "ๆŠ•้™", "Surrender", "๐Ÿณ๏ธ" }, - { "ๆฟ€ๅŠจ", "Hooray", "๐Ÿ™Œ" }, -// { "ไนฑ่ˆž", "HeyHey", "" }, - { "็Œฎๅป", "Smooch", "๐Ÿ˜˜" }, -// { "ๅทฆๅคชๆž", "Tai Ji L", "" }, -// { "ๅณๅคชๆž", "Tai Ji R", "" }, + { "็ฃ•ๅคด", "Kowtow", "๐Ÿ™‡" }, + { "ๅ›žๅคด", "Lookback", "๐Ÿคš" }, +// { "่ทณ็ปณ", "Jump", "" }, + { "ๆŠ•้™", "Surrender", "๐Ÿณ๏ธ" }, + { "ๆฟ€ๅŠจ", "Hooray", "๐Ÿ™Œ" }, +// { "ไนฑ่ˆž", "HeyHey", "" }, + { "็Œฎๅป", "Smooch", "๐Ÿ˜˜" }, +// { "ๅทฆๅคชๆž", "Tai Ji L", "" }, +// { "ๅณๅคชๆž", "Tai Ji R", "" }, }; } From 8b11b2aaeceed31aca82d4edec7e48759b32d0ca Mon Sep 17 00:00:00 2001 From: cherryleafroad <13651622+cherryleafroad@users.noreply.github.com> Date: Mon, 22 Feb 2021 07:25:23 -0800 Subject: [PATCH 5/5] Fix mispelling --- .../java/com/oasisfeng/nevo/decorators/wechat/EmojiMap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/oasisfeng/nevo/decorators/wechat/EmojiMap.java b/src/main/java/com/oasisfeng/nevo/decorators/wechat/EmojiMap.java index c85cbbb..f646862 100644 --- a/src/main/java/com/oasisfeng/nevo/decorators/wechat/EmojiMap.java +++ b/src/main/java/com/oasisfeng/nevo/decorators/wechat/EmojiMap.java @@ -184,7 +184,7 @@ class EmojiMap { { "ๅฅ‹ๆ–—", "Determined", "๐Ÿ˜ฃ" }, { "็–ฏไบ†", "Tormented", "๐Ÿ˜ค" }, { "็ณ—ๅคงไบ†", "Shame", "๐Ÿ˜ณ" }, - { "็ฃ•ๅคด", "Kowtow", "๐Ÿ™‡" }, + { "็ฃ•ๅคด", "Kotow", "๐Ÿ™‡" }, { "ๅ›žๅคด", "Lookback", "๐Ÿคš" }, // { "่ทณ็ปณ", "Jump", "" }, { "ๆŠ•้™", "Surrender", "๐Ÿณ๏ธ" },