diff options
author | Asaad Mahmood <Unknowngi@live.com> | 2015-07-07 22:57:57 +0500 |
---|---|---|
committer | Asaad Mahmood <Unknowngi@live.com> | 2015-07-07 22:57:57 +0500 |
commit | 69e5898f4b48660a8eb5736eb23f9f63d464a90f (patch) | |
tree | 07cace5f0f5eca1858222b3aab96add2e865b8ca /api/channel.go | |
parent | 14f02b770b5b5ea65003ae6e885d52d619a3f836 (diff) | |
parent | 4e856c29b20270997ef54bdcc4260ff28390873f (diff) | |
download | chat-69e5898f4b48660a8eb5736eb23f9f63d464a90f.tar.gz chat-69e5898f4b48660a8eb5736eb23f9f63d464a90f.tar.bz2 chat-69e5898f4b48660a8eb5736eb23f9f63d464a90f.zip |
Merge branch 'master' of https://github.com/mattermost/platform
Diffstat (limited to 'api/channel.go')
-rw-r--r-- | api/channel.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/api/channel.go b/api/channel.go index c0c2d1548..8264b3e74 100644 --- a/api/channel.go +++ b/api/channel.go @@ -366,7 +366,7 @@ func JoinChannel(c *Context, channelId string, role string) { post := &model.Post{ChannelId: channel.Id, Message: fmt.Sprintf( `User %v has joined this channel.`, - user.Username)} + user.Username), Type: model.POST_JOIN_LEAVE} if _, err := CreatePost(c, post, false); err != nil { l4g.Error("Failed to post join message %v", err) c.Err = model.NewAppError("joinChannel", "Failed to send join request", "") @@ -453,7 +453,7 @@ func leaveChannel(c *Context, w http.ResponseWriter, r *http.Request) { post := &model.Post{ChannelId: channel.Id, Message: fmt.Sprintf( `%v has left the channel.`, - user.Username)} + user.Username), Type: model.POST_JOIN_LEAVE} if _, err := CreatePost(c, post, false); err != nil { l4g.Error("Failed to post leave message %v", err) c.Err = model.NewAppError("leaveChannel", "Failed to send leave message", "") @@ -646,7 +646,7 @@ func addChannelMember(c *Context, w http.ResponseWriter, r *http.Request) { post := &model.Post{ChannelId: id, Message: fmt.Sprintf( `%v added to the channel by %v`, - nUser.Username, oUser.Username)} + nUser.Username, oUser.Username), Type: model.POST_JOIN_LEAVE} if _, err := CreatePost(c, post, false); err != nil { l4g.Error("Failed to post add message %v", err) c.Err = model.NewAppError("addChannelMember", "Failed to add member to channel", "") |