diff options
| author | Corey Hulen <corey@hulen.com> | 2015-12-04 11:30:50 -0800 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-12-04 11:30:50 -0800 |
| commit | 1bee1e06e4d0110db274c076860fa97f76471ddb (patch) | |
| tree | 8f971b54319ae90246ad13905851df545bbb7b89 /api | |
| parent | 1d67f26664f8cf98f52433ef8b081b6fb485eadb (diff) | |
| parent | 14d1ec5191867174837e15f616ad3fc1dc8e0dae (diff) | |
| download | chat-1bee1e06e4d0110db274c076860fa97f76471ddb.tar.gz chat-1bee1e06e4d0110db274c076860fa97f76471ddb.tar.bz2 chat-1bee1e06e4d0110db274c076860fa97f76471ddb.zip | |
Merge pull request #1613 from florianorben/PLT-1326
PLT-1326: Enable channel posts of type join or leave not trigger unread notifications
Diffstat (limited to 'api')
| -rw-r--r-- | api/channel.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api/channel.go b/api/channel.go index 99640e71a..6fa6ec295 100644 --- a/api/channel.go +++ b/api/channel.go @@ -421,7 +421,7 @@ func JoinChannel(c *Context, channelId string, role string) { c.Err = err return } - PostUserAddRemoveMessageAndForget(c, channel.Id, fmt.Sprintf(`User %v has joined this channel.`, user.Username)) + PostUserAddRemoveMessageAndForget(c, channel.Id, fmt.Sprintf(`%v has joined the channel.`, user.Username)) } else { c.Err = model.NewAppError("join", "You do not have the appropriate permissions", "") c.Err.StatusCode = http.StatusForbidden |