From 29e1a853601514284c2af3f3302f30ad0d3c6d54 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Mon, 11 Apr 2016 09:04:56 -0400 Subject: PLT-2553 Additional backstage UI Improvements (#2673) * Renamed Commands to Slash Commands in backstage UI * Updated displayed info for listed commands and outgoing webhooks * Disallowed empty outgoing webhook trigger words and improved client-side validation for them --- model/outgoing_webhook.go | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'model/outgoing_webhook.go') diff --git a/model/outgoing_webhook.go b/model/outgoing_webhook.go index e13de9080..ef1807e7a 100644 --- a/model/outgoing_webhook.go +++ b/model/outgoing_webhook.go @@ -98,6 +98,14 @@ func (o *OutgoingWebhook) IsValid() *AppError { return NewLocAppError("OutgoingWebhook.IsValid", "model.outgoing_hook.is_valid.words.app_error", nil, "") } + if len(o.TriggerWords) != 0 { + for _, triggerWord := range o.TriggerWords { + if len(triggerWord) == 0 { + return NewLocAppError("OutgoingWebhook.IsValid", "model.outgoing_hook.is_valid.trigger_words.app_error", nil, "") + } + } + } + if len(o.CallbackURLs) == 0 || len(fmt.Sprintf("%s", o.CallbackURLs)) > 1024 { return NewLocAppError("OutgoingWebhook.IsValid", "model.outgoing_hook.is_valid.callback.app_error", nil, "") } -- cgit v1.2.3-1-g7c22