diff options
Diffstat (limited to 'api')
| -rw-r--r-- | api/channel.go | 6 | ||||
| -rw-r--r-- | api/user.go | 2 |
2 files changed, 4 insertions, 4 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", "") diff --git a/api/user.go b/api/user.go index 292d2b61b..ada781bc7 100644 --- a/api/user.go +++ b/api/user.go @@ -593,7 +593,7 @@ func createProfileImage(username string, userId string) ([]byte, *model.AppError h.Write([]byte(userId)) seed := h.Sum32() - color := colors[int(seed)%len(colors)] + color := colors[int64(seed)%int64(len(colors))] img := image.NewRGBA(image.Rect(0, 0, int(utils.Cfg.ImageSettings.ProfileWidth), int(utils.Cfg.ImageSettings.ProfileHeight))) draw.Draw(img, img.Bounds(), &image.Uniform{color}, image.ZP, draw.Src) |