From dbcf8572e5af1c0c244850627437d97616098740 Mon Sep 17 00:00:00 2001 From: David Lu Date: Wed, 15 Jun 2016 05:13:47 -0700 Subject: Fixed @all not working as intended (#3335) --- api/post.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'api') diff --git a/api/post.go b/api/post.go index 408e96377..2eef5eabd 100644 --- a/api/post.go +++ b/api/post.go @@ -515,14 +515,10 @@ func sendNotifications(c *Context, post *model.Post, team *model.Team, channel * keywordMap[profile.FirstName] = append(keywordMap[profile.FirstName], profile.Id) } - //Add @all to keywords if user has them turned on - if profile.NotifyProps["all"] == "true" { - keywordMap["@all"] = append(keywordMap["@all"], profile.Id) - } - - // Add @channel to keywords if user has them turned on + // Add @channel and @all to keywords if user has them turned on if profile.NotifyProps["channel"] == "true" { keywordMap["@channel"] = append(keywordMap["@channel"], profile.Id) + keywordMap["@all"] = append(keywordMap["@all"], profile.Id) } if profile.NotifyProps["push"] == model.USER_NOTIFY_ALL && -- cgit v1.2.3-1-g7c22