From 1463df21a57290f8c74fe4ad58deffb111b9f79e Mon Sep 17 00:00:00 2001 From: Hanzei Date: Wed, 19 Sep 2018 14:39:37 +0200 Subject: Add ChannelId and TeamId to PostActionIntegrationRequest (#9384) * Add ChannelId and TeamId to PostActionIntegrationRequest * Add tests --- app/post.go | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'app/post.go') diff --git a/app/post.go b/app/post.go index a36e9709f..9914f6db0 100644 --- a/app/post.go +++ b/app/post.go @@ -840,16 +840,26 @@ func (a *App) DoPostAction(postId, actionId, userId, selectedOption string) *mod post = result.Data.(*model.Post) } + cchan := a.Srv.Store.Channel().GetForPost(postId) + var channel *model.Channel + if result := <-cchan; result.Err != nil { + return result.Err + } else { + channel = result.Data.(*model.Channel) + } + action := post.GetAction(actionId) if action == nil || action.Integration == nil { return model.NewAppError("DoPostAction", "api.post.do_action.action_id.app_error", nil, fmt.Sprintf("action=%v", action), http.StatusNotFound) } request := &model.PostActionIntegrationRequest{ - UserId: userId, - PostId: postId, - Type: action.Type, - Context: action.Integration.Context, + UserId: userId, + ChannelId: post.ChannelId, + TeamId: channel.TeamId, + PostId: postId, + Type: action.Type, + Context: action.Integration.Context, } if action.Type == model.POST_ACTION_TYPE_SELECT { -- cgit v1.2.3-1-g7c22