diff options
author | David Lu <david.lu@hotmail.com> | 2016-06-15 05:13:47 -0700 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-06-15 08:13:47 -0400 |
commit | dbcf8572e5af1c0c244850627437d97616098740 (patch) | |
tree | 6d87e79abc0322fa53cad805d3edeb7d707fec0f /api | |
parent | ba77aefe02159325752cfa79210f5e4b5fcef77e (diff) | |
download | chat-dbcf8572e5af1c0c244850627437d97616098740.tar.gz chat-dbcf8572e5af1c0c244850627437d97616098740.tar.bz2 chat-dbcf8572e5af1c0c244850627437d97616098740.zip |
Fixed @all not working as intended (#3335)
Diffstat (limited to 'api')
-rw-r--r-- | api/post.go | 8 |
1 files changed, 2 insertions, 6 deletions
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 && |