diff options
Diffstat (limited to 'web')
-rw-r--r-- | web/react/utils/utils.jsx | 2 | ||||
-rw-r--r-- | web/static/images/bing.mp3 | bin | 0 -> 5760 bytes | |||
-rw-r--r-- | web/web.go | 5 |
3 files changed, 6 insertions, 1 deletions
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index fff9c460b..9ce7ca1e8 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -155,7 +155,7 @@ var canDing = true; export function ding() { if (!isBrowserFirefox() && canDing) { - var audio = new Audio('/static/images/ding.mp3'); + var audio = new Audio('/static/images/bing.mp3'); audio.play(); canDing = false; setTimeout(() => canDing = true, 3000); diff --git a/web/static/images/bing.mp3 b/web/static/images/bing.mp3 Binary files differnew file mode 100644 index 000000000..2827addd4 --- /dev/null +++ b/web/static/images/bing.mp3 diff --git a/web/web.go b/web/web.go index 51f6664b6..96f826359 100644 --- a/web/web.go +++ b/web/web.go @@ -983,6 +983,11 @@ func incomingWebhook(c *api.Context, w http.ResponseWriter, r *http.Request) { parsedRequest = model.IncomingWebhookRequestFromJson(strings.NewReader(r.FormValue("payload"))) } + if parsedRequest == nil { + c.Err = model.NewAppError("incomingWebhook", "Unable to parse incoming data", "") + return + } + text := parsedRequest.Text if len(text) == 0 { c.Err = model.NewAppError("incomingWebhook", "No text specified", "") |