From f63223286295a1261c950c482701b99963fb260c Mon Sep 17 00:00:00 2001 From: Saturnino Abril Date: Wed, 25 Oct 2017 22:11:20 +0800 Subject: [PLT-7701] Fix emoji names that trigger mention (#7663) * fix emoji names that trigger mention * remove regex and rearrange based on comment * make ":@here:" to not trigger a mention --- app/notification_test.go | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) (limited to 'app/notification_test.go') diff --git a/app/notification_test.go b/app/notification_test.go index f5224e84e..51dba7c0e 100644 --- a/app/notification_test.go +++ b/app/notification_test.go @@ -200,6 +200,30 @@ func TestGetExplicitMentions(t *testing.T) { if mentions, _, _, _, _ := GetExplicitMentions(message, keywords); len(mentions) != 1 || !mentions[id1] || mentions[id2] || mentions[id3] { t.Fatal("should've only mentioned aaa") } + + message = ":smile:" + keywords = map[string][]string{"smile": {id1}, "smiley": {id2}, "smiley_cat": {id3}} + if mentions, _, _, _, _ := GetExplicitMentions(message, keywords); len(mentions) == 1 || mentions[id1] { + t.Fatal("should not mentioned smile") + } + + message = "smile" + keywords = map[string][]string{"smile": {id1}, "smiley": {id2}, "smiley_cat": {id3}} + if mentions, _, _, _, _ := GetExplicitMentions(message, keywords); len(mentions) != 1 || !mentions[id1] || mentions[id2] || mentions[id3] { + t.Fatal("should've only mentioned smile") + } + + message = ":smile" + keywords = map[string][]string{"smile": {id1}, "smiley": {id2}, "smiley_cat": {id3}} + if mentions, _, _, _, _ := GetExplicitMentions(message, keywords); len(mentions) != 1 || !mentions[id1] || mentions[id2] || mentions[id3] { + t.Fatal("should've only mentioned smile") + } + + message = "smile:" + keywords = map[string][]string{"smile": {id1}, "smiley": {id2}, "smiley_cat": {id3}} + if mentions, _, _, _, _ := GetExplicitMentions(message, keywords); len(mentions) != 1 || !mentions[id1] || mentions[id2] || mentions[id3] { + t.Fatal("should've only mentioned smile") + } } func TestGetExplicitMentionsAtHere(t *testing.T) { @@ -230,7 +254,7 @@ func TestGetExplicitMentionsAtHere(t *testing.T) { "\\@here\\": true, "|@here|": true, ";@here;": true, - ":@here:": true, + ":@here:": false, // This case shouldn't trigger a mention since it follows the format of reactions e.g. :word: "'@here'": true, "\"@here\"": true, ",@here,": true, -- cgit v1.2.3-1-g7c22