From 088f76ad6e2d10a1c50ef548f2226213271abde3 Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Mon, 2 Apr 2018 12:40:28 -0400
Subject: MM-9868 Fixed mentioning users when followed by multiple periods
 (#8548)

* MM-9868 Fixed mentioning users when followed by multiple periods

* Added additional unit test

* Added comment to clarify test purpose
---
 app/notification.go      | 13 +++++++++++--
 app/notification_test.go | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/app/notification.go b/app/notification.go
index 181ad4aac..6d0de2223 100644
--- a/app/notification.go
+++ b/app/notification.go
@@ -892,8 +892,17 @@ func GetExplicitMentions(message string, keywords map[string][]string) *Explicit
 			}
 
 			// remove trailing '.', as that is the end of a sentence
-			word = strings.TrimSuffix(word, ".")
-			if checkForMention(word) {
+			foundWithSuffix := false
+
+			for strings.HasSuffix(word, ".") {
+				word = strings.TrimSuffix(word, ".")
+				if checkForMention(word) {
+					foundWithSuffix = true
+					break
+				}
+			}
+
+			if foundWithSuffix {
 				continue
 			}
 
diff --git a/app/notification_test.go b/app/notification_test.go
index 05574eb08..c72610b60 100644
--- a/app/notification_test.go
+++ b/app/notification_test.go
@@ -344,6 +344,45 @@ func TestGetExplicitMentions(t *testing.T) {
 				ChannelMentioned: true,
 			},
 		},
+
+		// The following tests cover cases where the message mentions @user.name, so we shouldn't assume that
+		// the user might be intending to mention some @user that isn't in the channel.
+		"Don't include potential mention that's part of an actual mention (without trailing period)": {
+			Message:  "this is an message for @user.name",
+			Keywords: map[string][]string{"@user.name": {id1}},
+			Expected: &ExplicitMentions{
+				MentionedUserIds: map[string]bool{
+					id1: true,
+				},
+			},
+		},
+		"Don't include potential mention that's part of an actual mention (with trailing period)": {
+			Message:  "this is an message for @user.name.",
+			Keywords: map[string][]string{"@user.name": {id1}},
+			Expected: &ExplicitMentions{
+				MentionedUserIds: map[string]bool{
+					id1: true,
+				},
+			},
+		},
+		"Don't include potential mention that's part of an actual mention (with multiple trailing periods)": {
+			Message:  "this is an message for @user.name...",
+			Keywords: map[string][]string{"@user.name": {id1}},
+			Expected: &ExplicitMentions{
+				MentionedUserIds: map[string]bool{
+					id1: true,
+				},
+			},
+		},
+		"Don't include potential mention that's part of an actual mention (containing and followed by multiple periods)": {
+			Message:  "this is an message for @user...name...",
+			Keywords: map[string][]string{"@user...name": {id1}},
+			Expected: &ExplicitMentions{
+				MentionedUserIds: map[string]bool{
+					id1: true,
+				},
+			},
+		},
 	} {
 		t.Run(name, func(t *testing.T) {
 			m := GetExplicitMentions(tc.Message, tc.Keywords)
-- 
cgit v1.2.3-1-g7c22