tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix remove_emoji_modifiers.

Browse Source
This commit is contained in:
levlam 2022-11-11 22:20:38 +03:00
parent e35a81dbe9
commit 97f14fb6a9
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tdutils/td/utils/emoji.cpp
View File

@ -277,7 +277,9 @@ void remove_emoji_modifiers_in_place(string &emoji) {
emoji[j++] = emoji[i++]; emoji[j++] = emoji[i++];
} }
} }
emoji.resize(j); if (j != 0) {
emoji.resize(j);
}
} }
string remove_emoji_selectors(Slice emoji) { string remove_emoji_selectors(Slice emoji) {

13
tdutils/test/emoji.cpp
View File

@ -76,11 +76,11 @@ TEST(Emoji, remove_emoji_modifiers) {
test_remove_emoji_modifiers("πŸ‘‹πŸ½", "πŸ‘‹"); test_remove_emoji_modifiers("πŸ‘‹πŸ½", "πŸ‘‹");
test_remove_emoji_modifiers("πŸ‘‹πŸΎ", "πŸ‘‹"); test_remove_emoji_modifiers("πŸ‘‹πŸΎ", "πŸ‘‹");
test_remove_emoji_modifiers("πŸ‘‹πŸΏ", "πŸ‘‹"); test_remove_emoji_modifiers("πŸ‘‹πŸΏ", "πŸ‘‹");
test_remove_emoji_modifiers("🏻", ""); test_remove_emoji_modifiers("🏻", "🏻");
test_remove_emoji_modifiers("🏼", ""); test_remove_emoji_modifiers("🏼", "🏼");
test_remove_emoji_modifiers("🏽", ""); test_remove_emoji_modifiers("🏽", "🏽");
test_remove_emoji_modifiers("🏾", ""); test_remove_emoji_modifiers("🏾", "🏾");
test_remove_emoji_modifiers("🏿", ""); test_remove_emoji_modifiers("🏿", "🏿");
test_remove_emoji_modifiers("⌚", "⌚"); test_remove_emoji_modifiers("⌚", "⌚");
test_remove_emoji_modifiers("↔", "↔"); test_remove_emoji_modifiers("↔", "↔");
test_remove_emoji_modifiers("πŸͺ—", "πŸͺ—"); test_remove_emoji_modifiers("πŸͺ—", "πŸͺ—");
@ -89,6 +89,9 @@ TEST(Emoji, remove_emoji_modifiers) {
test_remove_emoji_modifiers("❀️", "❀"); test_remove_emoji_modifiers("❀️", "❀");
test_remove_emoji_modifiers("❀", "❀"); test_remove_emoji_modifiers("❀", "❀");
test_remove_emoji_modifiers("⌚", "⌚"); test_remove_emoji_modifiers("⌚", "⌚");
test_remove_emoji_modifiers("️", "️");
test_remove_emoji_modifiers("️️️🏻", "️️️🏻");
test_remove_emoji_modifiers("️️️🏻a", "a");
test_remove_emoji_modifiers("πŸŽ„", "πŸŽ„"); test_remove_emoji_modifiers("πŸŽ„", "πŸŽ„");
test_remove_emoji_modifiers("πŸ§‘β€πŸŽ„", "πŸ§‘β€πŸŽ„"); test_remove_emoji_modifiers("πŸ§‘β€πŸŽ„", "πŸ§‘β€πŸŽ„");
} }