diff options
author | Alexander Smaga <smagaan@gmail.com> | 2016-10-17 15:12:56 +0300 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-10-17 08:12:56 -0400 |
commit | e7b25f4cd8b7d87b99153fd4a901d3f9f92d7b0d (patch) | |
tree | 9dfad731f8a4320e72e287732b50f46946ce76fe /api | |
parent | b1e2b23b882ec062cfd7209abeed417eb07e121e (diff) | |
download | chat-e7b25f4cd8b7d87b99153fd4a901d3f9f92d7b0d.tar.gz chat-e7b25f4cd8b7d87b99153fd4a901d3f9f92d7b0d.tar.bz2 chat-e7b25f4cd8b7d87b99153fd4a901d3f9f92d7b0d.zip |
GH-4187 Create direct channel during incoming webhook if not exists (#4206)
Diffstat (limited to 'api')
-rw-r--r-- | api/channel.go | 23 | ||||
-rw-r--r-- | api/webhook.go | 15 | ||||
-rw-r--r-- | api/webhook_test.go | 2 |
3 files changed, 16 insertions, 24 deletions
diff --git a/api/channel.go b/api/channel.go index 538c2d497..f40c979ca 100644 --- a/api/channel.go +++ b/api/channel.go @@ -137,36 +137,19 @@ func createDirectChannel(c *Context, w http.ResponseWriter, r *http.Request) { func CreateDirectChannel(userId string, otherUserId string) (*model.Channel, *model.AppError) { uc := Srv.Store.User().Get(otherUserId) - channel := new(model.Channel) - - channel.DisplayName = "" - channel.Name = model.GetDMNameFromIds(otherUserId, userId) - - channel.Header = "" - channel.Type = model.CHANNEL_DIRECT - if uresult := <-uc; uresult.Err != nil { return nil, model.NewLocAppError("CreateDirectChannel", "api.channel.create_direct_channel.invalid_user.app_error", nil, otherUserId) } - cm1 := &model.ChannelMember{ - UserId: userId, - NotifyProps: model.GetDefaultChannelNotifyProps(), - Roles: model.ROLE_CHANNEL_USER.Id, - } - cm2 := &model.ChannelMember{ - UserId: otherUserId, - NotifyProps: model.GetDefaultChannelNotifyProps(), - Roles: model.ROLE_CHANNEL_USER.Id, - } - - if result := <-Srv.Store.Channel().SaveDirectChannel(channel, cm1, cm2); result.Err != nil { + if result := <-Srv.Store.Channel().CreateDirectChannel(userId, otherUserId); result.Err != nil { if result.Err.Id == store.CHANNEL_EXISTS_ERROR { return result.Data.(*model.Channel), nil } else { return nil, result.Err } } else { + channel := result.Data.(*model.Channel) + message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_DIRECT_ADDED, "", channel.Id, "", nil) message.Add("teammate_id", otherUserId) go Publish(message) diff --git a/api/webhook.go b/api/webhook.go index 2995a4a9d..2daac03f2 100644 --- a/api/webhook.go +++ b/api/webhook.go @@ -412,6 +412,7 @@ func incomingWebhook(c *Context, w http.ResponseWriter, r *http.Request) { var channel *model.Channel var cchan store.StoreChannel + var directUserId string if len(channelName) != 0 { if channelName[0] == '@' { @@ -419,7 +420,8 @@ func incomingWebhook(c *Context, w http.ResponseWriter, r *http.Request) { c.Err = model.NewLocAppError("incomingWebhook", "web.incoming_webhook.user.app_error", nil, "err="+result.Err.Message) return } else { - channelName = model.GetDMNameFromIds(result.Data.(*model.User).Id, hook.UserId) + directUserId = result.Data.(*model.User).Id + channelName = model.GetDMNameFromIds(directUserId, hook.UserId) } } else if channelName[0] == '#' { channelName = channelName[1:] @@ -433,7 +435,16 @@ func incomingWebhook(c *Context, w http.ResponseWriter, r *http.Request) { overrideUsername := parsedRequest.Username overrideIconUrl := parsedRequest.IconURL - if result := <-cchan; result.Err != nil { + result := <-cchan + if result.Err != nil && result.Err.Id == store.MISSING_CHANNEL_ERROR && directUserId != "" { + newChanResult := <-Srv.Store.Channel().CreateDirectChannel(directUserId, hook.UserId) + if newChanResult.Err != nil { + c.Err = model.NewLocAppError("incomingWebhook", "web.incoming_webhook.channel.app_error", nil, "err="+newChanResult.Err.Message) + return + } else { + channel = newChanResult.Data.(*model.Channel) + } + } else if result.Err != nil { c.Err = model.NewLocAppError("incomingWebhook", "web.incoming_webhook.channel.app_error", nil, "err="+result.Err.Message) return } else { diff --git a/api/webhook_test.go b/api/webhook_test.go index b3fa04d88..ae3b48032 100644 --- a/api/webhook_test.go +++ b/api/webhook_test.go @@ -597,8 +597,6 @@ func TestIncomingWebhooks(t *testing.T) { t.Fatal(err) } - Client.Must(Client.CreateDirectChannel(user2.Id)) - if _, err := Client.DoPost(url, fmt.Sprintf("{\"text\":\"this is a test\", \"channel\":\"@%s\"}", user2.Username), "application/json"); err != nil { t.Fatal(err) } |