diff options
Diffstat (limited to 'api/channel.go')
-rw-r--r-- | api/channel.go | 93 |
1 files changed, 45 insertions, 48 deletions
diff --git a/api/channel.go b/api/channel.go index 9d36dd2eb..7b12849e3 100644 --- a/api/channel.go +++ b/api/channel.go @@ -5,14 +5,15 @@ package api import ( "fmt" + "net/http" + "strconv" + "strings" + l4g "github.com/alecthomas/log4go" "github.com/gorilla/mux" "github.com/mattermost/platform/model" "github.com/mattermost/platform/store" "github.com/mattermost/platform/utils" - "net/http" - "strconv" - "strings" ) const ( @@ -154,7 +155,7 @@ func CreateDirectChannel(userId string, otherUserId string) (*model.Channel, *mo } else { message := model.NewMessage("", channel.Id, userId, model.ACTION_DIRECT_ADDED) message.Add("teammate_id", otherUserId) - PublishAndForget(message) + go Publish(message) return result.Data.(*model.Channel), nil } @@ -291,42 +292,40 @@ func updateChannelHeader(c *Context, w http.ResponseWriter, r *http.Request) { c.Err = ucresult.Err return } else { - PostUpdateChannelHeaderMessageAndForget(c, channel.Id, oldChannelHeader, channelHeader) + go PostUpdateChannelHeaderMessage(c, channel.Id, oldChannelHeader, channelHeader) c.LogAudit("name=" + channel.Name) w.Write([]byte(channel.ToJson())) } } } -func PostUpdateChannelHeaderMessageAndForget(c *Context, channelId string, oldChannelHeader, newChannelHeader string) { - go func() { - uc := Srv.Store.User().Get(c.Session.UserId) +func PostUpdateChannelHeaderMessage(c *Context, channelId string, oldChannelHeader, newChannelHeader string) { + uc := Srv.Store.User().Get(c.Session.UserId) - if uresult := <-uc; uresult.Err != nil { - l4g.Error(utils.T("api.channel.post_update_channel_header_message_and_forget.retrieve_user.error"), uresult.Err) - return + if uresult := <-uc; uresult.Err != nil { + l4g.Error(utils.T("api.channel.post_update_channel_header_message_and_forget.retrieve_user.error"), uresult.Err) + return + } else { + user := uresult.Data.(*model.User) + + var message string + if oldChannelHeader == "" { + message = fmt.Sprintf(utils.T("api.channel.post_update_channel_header_message_and_forget.updated_to"), user.Username, newChannelHeader) + } else if newChannelHeader == "" { + message = fmt.Sprintf(utils.T("api.channel.post_update_channel_header_message_and_forget.removed"), user.Username, oldChannelHeader) } else { - user := uresult.Data.(*model.User) - - var message string - if oldChannelHeader == "" { - message = fmt.Sprintf(utils.T("api.channel.post_update_channel_header_message_and_forget.updated_to"), user.Username, newChannelHeader) - } else if newChannelHeader == "" { - message = fmt.Sprintf(utils.T("api.channel.post_update_channel_header_message_and_forget.removed"), user.Username, oldChannelHeader) - } else { - message = fmt.Sprintf(utils.T("api.channel.post_update_channel_header_message_and_forget.updated_from"), user.Username, oldChannelHeader, newChannelHeader) - } + message = fmt.Sprintf(utils.T("api.channel.post_update_channel_header_message_and_forget.updated_from"), user.Username, oldChannelHeader, newChannelHeader) + } - post := &model.Post{ - ChannelId: channelId, - Message: message, - Type: model.POST_HEADER_CHANGE, - } - if _, err := CreatePost(c, post, false); err != nil { - l4g.Error(utils.T("api.channel.post_update_channel_header_message_and_forget.join_leave.error"), err) - } + post := &model.Post{ + ChannelId: channelId, + Message: message, + Type: model.POST_HEADER_CHANGE, } - }() + if _, err := CreatePost(c, post, false); err != nil { + l4g.Error(utils.T("api.channel.post_update_channel_header_message_and_forget.join_leave.error"), err) + } + } } func updateChannelPurpose(c *Context, w http.ResponseWriter, r *http.Request) { @@ -490,7 +489,7 @@ func joinChannel(c *Context, channelChannel store.StoreChannel, userChannel stor if _, err := AddUserToChannel(user, channel); err != nil { return err, nil } - PostUserAddRemoveMessageAndForget(c, channel.Id, fmt.Sprintf(utils.T("api.channel.join_channel.post_and_forget"), user.Username)) + go PostUserAddRemoveMessage(c, channel.Id, fmt.Sprintf(utils.T("api.channel.join_channel.post_and_forget"), user.Username)) } else { return model.NewLocAppError("join", "api.channel.join_channel.permissions.app_error", nil, ""), nil } @@ -498,17 +497,15 @@ func joinChannel(c *Context, channelChannel store.StoreChannel, userChannel stor } } -func PostUserAddRemoveMessageAndForget(c *Context, channelId string, message string) { - go func() { - post := &model.Post{ - ChannelId: channelId, - Message: message, - Type: model.POST_JOIN_LEAVE, - } - if _, err := CreatePost(c, post, false); err != nil { - l4g.Error(utils.T("api.channel.post_user_add_remove_message_and_forget.error"), err) - } - }() +func PostUserAddRemoveMessage(c *Context, channelId string, message string) { + post := &model.Post{ + ChannelId: channelId, + Message: message, + Type: model.POST_JOIN_LEAVE, + } + if _, err := CreatePost(c, post, false); err != nil { + l4g.Error(utils.T("api.channel.post_user_add_remove_message_and_forget.error"), err) + } } func AddUserToChannel(user *model.User, channel *model.Channel) (*model.ChannelMember, *model.AppError) { @@ -539,7 +536,7 @@ func AddUserToChannel(user *model.User, channel *model.Channel) (*model.ChannelM InvalidateCacheForUser(user.Id) message := model.NewMessage(channel.TeamId, channel.Id, user.Id, model.ACTION_USER_ADDED) - PublishAndForget(message) + go Publish(message) }() return newMember, nil @@ -627,7 +624,7 @@ func leave(c *Context, w http.ResponseWriter, r *http.Request) { RemoveUserFromChannel(c.Session.UserId, c.Session.UserId, channel) - PostUserAddRemoveMessageAndForget(c, channel.Id, fmt.Sprintf(utils.T("api.channel.leave.left"), user.Username)) + go PostUserAddRemoveMessage(c, channel.Id, fmt.Sprintf(utils.T("api.channel.leave.left"), user.Username)) result := make(map[string]string) result["id"] = channel.Id @@ -722,7 +719,7 @@ func deleteChannel(c *Context, w http.ResponseWriter, r *http.Request) { go func() { InvalidateCacheForChannel(channel.Id) message := model.NewMessage(c.TeamId, channel.Id, c.Session.UserId, model.ACTION_CHANNEL_DELETED) - PublishAndForget(message) + go Publish(message) post := &model.Post{ ChannelId: channel.Id, @@ -758,7 +755,7 @@ func updateLastViewedAt(c *Context, w http.ResponseWriter, r *http.Request) { message := model.NewMessage(c.TeamId, id, c.Session.UserId, model.ACTION_CHANNEL_VIEWED) message.Add("channel_id", id) - PublishAndForget(message) + go Publish(message) result := make(map[string]string) result["id"] = id @@ -907,7 +904,7 @@ func addMember(c *Context, w http.ResponseWriter, r *http.Request) { c.LogAudit("name=" + channel.Name + " user_id=" + userId) - PostUserAddRemoveMessageAndForget(c, channel.Id, fmt.Sprintf(utils.T("api.channel.add_member.added"), nUser.Username, oUser.Username)) + go PostUserAddRemoveMessage(c, channel.Id, fmt.Sprintf(utils.T("api.channel.add_member.added"), nUser.Username, oUser.Username)) <-Srv.Store.Channel().UpdateLastViewedAt(id, oUser.Id) w.Write([]byte(cm.ToJson())) @@ -978,7 +975,7 @@ func RemoveUserFromChannel(userIdToRemove string, removerUserId string, channel message := model.NewMessage(channel.TeamId, channel.Id, userIdToRemove, model.ACTION_USER_REMOVED) message.Add("remover_id", removerUserId) - PublishAndForget(message) + go Publish(message) return nil } |