diff options
| author | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-03-12 16:47:55 -0400 |
|---|---|---|
| committer | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-03-12 16:47:55 -0400 |
| commit | 0d1177cdf9058a033ae7c714162245f696df1b4d (patch) | |
| tree | 2cae0ded6b25e9942372a42ab83a0d41cdc23112 /app | |
| parent | f2d26801b9647715fb43af873354d8def753868b (diff) | |
| parent | 2b460da1d54944c5c16ef15e966843b00f06aa63 (diff) | |
| download | chat-0d1177cdf9058a033ae7c714162245f696df1b4d.tar.gz chat-0d1177cdf9058a033ae7c714162245f696df1b4d.tar.bz2 chat-0d1177cdf9058a033ae7c714162245f696df1b4d.zip | |
Merge remote-tracking branch 'origin/release-4.8' into t3mergetomaster
Diffstat (limited to 'app')
| -rw-r--r-- | app/notification.go | 2 |
1 files changed, 1 insertions, 1 deletions
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 { |