[34475] Support emoji 13.0 (#17741)
* generated data file from 'make emojis' * format * fix year * fix tests * fix header again
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
e989ff0c2a
Коммит
bbebd14296
@@ -1341,7 +1341,7 @@ func TestImportValidateDirectPostImportData(t *testing.T) {
|
|||||||
|
|
||||||
func TestImportValidateEmojiImportData(t *testing.T) {
|
func TestImportValidateEmojiImportData(t *testing.T) {
|
||||||
data := EmojiImportData{
|
data := EmojiImportData{
|
||||||
Name: ptrStr("parrot"),
|
Name: ptrStr("parrot2"),
|
||||||
Image: ptrStr("/path/to/image"),
|
Image: ptrStr("/path/to/image"),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -125,7 +125,7 @@ func removeUnicodeSkinTone(unicodeString string) string {
|
|||||||
if len(skinToneLocations) == 0 {
|
if len(skinToneLocations) == 0 {
|
||||||
return unicodeString
|
return unicodeString
|
||||||
}
|
}
|
||||||
if _, count := model.GetEmojiNameFromUnicode(unicodeString); count == 1 {
|
if _, count := model.GetEmojiNameFromUnicode(unicodeString); count > 0 {
|
||||||
return unicodeString
|
return unicodeString
|
||||||
}
|
}
|
||||||
unicodeWithRemovedSkinTone := unicodeString[:skinToneLocations[0]] + unicodeString[skinToneLocations[1]:]
|
unicodeWithRemovedSkinTone := unicodeString[:skinToneLocations[0]] + unicodeString[skinToneLocations[1]:]
|
||||||
|
|||||||
@@ -21,10 +21,10 @@ func TestGetCustomStatus(t *testing.T) {
|
|||||||
"👙Swimming": {Emoji: model.DefaultCustomStatusEmoji, Text: "👙Swimming"},
|
"👙Swimming": {Emoji: model.DefaultCustomStatusEmoji, Text: "👙Swimming"},
|
||||||
"👍🏿 Okay": {Emoji: "+1_dark_skin_tone", Text: "Okay"},
|
"👍🏿 Okay": {Emoji: "+1_dark_skin_tone", Text: "Okay"},
|
||||||
"🤴🏾 Dark king": {Emoji: "prince_medium_dark_skin_tone", Text: "Dark king"},
|
"🤴🏾 Dark king": {Emoji: "prince_medium_dark_skin_tone", Text: "Dark king"},
|
||||||
"⛹🏾♀️ Playing basketball": {Emoji: "basketball_woman", Text: "Playing basketball"},
|
"⛹🏾♀️ Playing basketball": {Emoji: "woman-bouncing-ball_medium_dark_skin_tone", Text: "Playing basketball"},
|
||||||
"🏋🏿♀️ Weightlifting": {Emoji: "weight_lifting_woman", Text: "Weightlifting"},
|
"🏋🏿♀️ Weightlifting": {Emoji: "woman-lifting-weights_dark_skin_tone", Text: "Weightlifting"},
|
||||||
"🏄 Surfing": {Emoji: "surfer", Text: "Surfing"},
|
"🏄 Surfing": {Emoji: "surfer", Text: "Surfing"},
|
||||||
"👨👨👦👦 Family": {Emoji: "family_man_man_boy_boy", Text: "Family"},
|
"👨👨👦👦 Family": {Emoji: "man-man-boy-boy", Text: "Family"},
|
||||||
} {
|
} {
|
||||||
actual := GetCustomStatus(msg)
|
actual := GetCustomStatus(msg)
|
||||||
if actual.Emoji != expected.Emoji || actual.Text != expected.Text {
|
if actual.Emoji != expected.Emoji || actual.Text != expected.Text {
|
||||||
|
|||||||
Различия файлов скрыты, потому что одна или несколько строк слишком длинны
Ссылка в новой задаче
Block a user