diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-11-06 09:05:32 -0500 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-11-06 09:05:32 -0500 |
commit | 1ecad4301e6e511a426da5884a54111c5bb7a4fd (patch) | |
tree | 114dea884f0a08729f5b6b5f9e45d2e470bedc71 /web/web.go | |
parent | 6417d4728dc9351d5bf3180e458be8ce6e1e642f (diff) | |
parent | 195728b949a4f3aee75e01f4b0e4a0b2f67850da (diff) | |
download | chat-1ecad4301e6e511a426da5884a54111c5bb7a4fd.tar.gz chat-1ecad4301e6e511a426da5884a54111c5bb7a4fd.tar.bz2 chat-1ecad4301e6e511a426da5884a54111c5bb7a4fd.zip |
Merge pull request #1327 from florianorben/PLT-857-2
PLT-857: Support `attachments` for Incoming Webhooks
Diffstat (limited to 'web/web.go')
-rw-r--r-- | web/web.go | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/web/web.go b/web/web.go index 96f826359..1cae604ae 100644 --- a/web/web.go +++ b/web/web.go @@ -995,6 +995,16 @@ func incomingWebhook(c *api.Context, w http.ResponseWriter, r *http.Request) { } channelName := parsedRequest.ChannelName + webhookType := parsedRequest.Type + + //attachments is in here for slack compatibility + if parsedRequest.Attachments != nil { + if len(parsedRequest.Props) == 0 { + parsedRequest.Props = make(model.StringInterface) + } + parsedRequest.Props["attachments"] = parsedRequest.Attachments + webhookType = model.POST_SLACK_ATTACHMENT + } var hook *model.IncomingWebhook if result := <-hchan; result.Err != nil { @@ -1044,7 +1054,7 @@ func incomingWebhook(c *api.Context, w http.ResponseWriter, r *http.Request) { return } - if _, err := api.CreateWebhookPost(c, channel.Id, text, overrideUsername, overrideIconUrl); err != nil { + if _, err := api.CreateWebhookPost(c, channel.Id, text, overrideUsername, overrideIconUrl, parsedRequest.Props, webhookType); err != nil { c.Err = err return } |