From 22f2245a26a0414f2c4c79d3852a94504d474714 Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Fri, 9 Mar 2018 12:16:27 -0500
Subject: ICU-682 Stopped sending out of channel mention warnings for system
 messages (#8426)

---
 app/notification.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/notification.go')

diff --git a/app/notification.go b/app/notification.go
index 8cb63fbaf..9a8096bbf 100644
--- a/app/notification.go
+++ b/app/notification.go
@@ -89,7 +89,7 @@ func (a *App) SendNotifications(post *model.Post, team *model.Team, channel *mod
 			delete(mentionedUserIds, post.UserId)
 		}
 
-		if len(m.OtherPotentialMentions) > 0 {
+		if len(m.OtherPotentialMentions) > 0 && !post.IsSystemMessage() {
 			if result := <-a.Srv.Store.User().GetProfilesByUsernames(m.OtherPotentialMentions, team.Id); result.Err == nil {
 				outOfChannelMentions := result.Data.([]*model.User)
 				if channel.Type != model.CHANNEL_GROUP {
-- 
cgit v1.2.3-1-g7c22