diff options
| author | JoramWilander <jwawilander@gmail.com> | 2015-09-29 08:38:26 -0400 |
|---|---|---|
| committer | JoramWilander <jwawilander@gmail.com> | 2015-09-29 08:38:26 -0400 |
| commit | a9f5918a9df9fca2fcab97e2c7e623187755ae78 (patch) | |
| tree | c1af1e0471d22fdde9288bdd0203fc6351046c9a /web/web.go | |
| parent | 56e31fe4966008d64fd7e57a0efcb0f80b5b2424 (diff) | |
| download | chat-a9f5918a9df9fca2fcab97e2c7e623187755ae78.tar.gz chat-a9f5918a9df9fca2fcab97e2c7e623187755ae78.tar.bz2 chat-a9f5918a9df9fca2fcab97e2c7e623187755ae78.zip | |
Update incoming webhooks to hide DMs and accept direct JSON payloads.
Diffstat (limited to 'web/web.go')
| -rw-r--r-- | web/web.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/web/web.go b/web/web.go index da7eff13d..bf985a5a0 100644 --- a/web/web.go +++ b/web/web.go @@ -850,7 +850,12 @@ func incomingWebhook(c *api.Context, w http.ResponseWriter, r *http.Request) { r.ParseForm() - props := model.MapFromJson(strings.NewReader(r.FormValue("payload"))) + var props map[string]string + if r.Header.Get("Content-Type") == "application/json" { + props = model.MapFromJson(r.Body) + } else { + props = model.MapFromJson(strings.NewReader(r.FormValue("payload"))) + } text := props["text"] if len(text) == 0 { |