diff options
| author | Corey Hulen <corey@hulen.com> | 2015-09-29 11:31:54 -0700 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-09-29 11:31:54 -0700 |
| commit | e937beb51bc2166e0cb6658d5523aa584d2dd807 (patch) | |
| tree | a65948450736885eef3ea9a3d00ac4e4843a1a96 /web/web.go | |
| parent | adfe129fcc5b2d19eb25ffb4da9709006272a964 (diff) | |
| parent | ddf89518284649056c5884b209026ec1047e724f (diff) | |
| download | chat-e937beb51bc2166e0cb6658d5523aa584d2dd807.tar.gz chat-e937beb51bc2166e0cb6658d5523aa584d2dd807.tar.bz2 chat-e937beb51bc2166e0cb6658d5523aa584d2dd807.zip | |
Merge pull request #848 from mattermost/plt-488
PLT-488 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 { |