From f263d2b9510fb557fe075dee5097cb32e2b1e5e2 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Thu, 28 Sep 2017 12:08:16 -0400 Subject: PLT-7684 Add support to outgoing webhooks and slash commands to set post type and props (#7531) * Add support to outgoing webhooks and slash commands to set post type and props * Fix nil access --- app/webhook.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app/webhook.go') diff --git a/app/webhook.go b/app/webhook.go index 380839cdc..9531cba10 100644 --- a/app/webhook.go +++ b/app/webhook.go @@ -105,10 +105,10 @@ func (a *App) TriggerWebhook(payload *model.OutgoingWebhookPayload, hook *model. l4g.Error(utils.T("api.post.handle_webhook_events_and_forget.event_post.error"), err.Error()) } else { defer CloseBody(resp) - respProps := model.MapFromJson(resp.Body) + webhookResp := model.OutgoingWebhookResponseFromJson(resp.Body) - if text, ok := respProps["text"]; ok { - if _, err := a.CreateWebhookPost(hook.CreatorId, channel, text, respProps["username"], respProps["icon_url"], post.Props, post.Type); err != nil { + if webhookResp != nil && webhookResp.Text != nil { + if _, err := a.CreateWebhookPost(hook.CreatorId, channel, *webhookResp.Text, webhookResp.Username, webhookResp.IconURL, webhookResp.Props, webhookResp.Type); err != nil { l4g.Error(utils.T("api.post.handle_webhook_events_and_forget.create_post.error"), err) } } -- cgit v1.2.3-1-g7c22