From 0cbba46018d3879234d3940e8ee6f23dd99a1c5a Mon Sep 17 00:00:00 2001
From: Stephen Kiers <stephen@stephenkiers.com>
Date: Mon, 12 Feb 2018 16:30:03 -0700
Subject: Fixes ICU-764

---
 app/notification.go      |  3 +++
 app/notification_test.go | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+)

(limited to 'app')

diff --git a/app/notification.go b/app/notification.go
index 1318308f8..6531f72f7 100644
--- a/app/notification.go
+++ b/app/notification.go
@@ -832,6 +832,9 @@ func GetExplicitMentions(message string, keywords map[string][]string) *Explicit
 				continue
 			}
 
+			// remove trailing '.', as that is the end of a sentence
+			word = strings.TrimSuffix(word, ".")
+
 			if word == "@here" {
 				ret.HereMentioned = true
 			}
diff --git a/app/notification_test.go b/app/notification_test.go
index 11f4df685..7f2a63ab9 100644
--- a/app/notification_test.go
+++ b/app/notification_test.go
@@ -109,6 +109,15 @@ func TestGetExplicitMentions(t *testing.T) {
 				},
 			},
 		},
+		"OnePersonAtEndOfSentence": {
+			Message:  "this is a message for @user.",
+			Keywords: map[string][]string{"@user": {id1}},
+			Expected: &ExplicitMentions{
+				MentionedUserIds: map[string]bool{
+					id1: true,
+				},
+			},
+		},
 		"OnePersonWithoutAtMention": {
 			Message:  "this is a message for @user",
 			Keywords: map[string][]string{"this": {id1}},
@@ -179,6 +188,15 @@ func TestGetExplicitMentions(t *testing.T) {
 				},
 			},
 		},
+		"UserWithPeriodAtEndOfSentence": {
+			Message:  "this is a message for user.period.",
+			Keywords: map[string][]string{"user.period": {id1}},
+			Expected: &ExplicitMentions{
+				MentionedUserIds: map[string]bool{
+					id1: true,
+				},
+			},
+		},
 		"PotentialOutOfChannelUser": {
 			Message:  "this is an message for @potential and @user",
 			Keywords: map[string][]string{"@user": {id1}},
-- 
cgit v1.2.3-1-g7c22