diff options
author | Martin Kraft <martinkraft@gmail.com> | 2018-03-27 09:01:42 -0400 |
---|---|---|
committer | Martin Kraft <martinkraft@gmail.com> | 2018-03-27 09:01:42 -0400 |
commit | e13e64711f7a7e8ceadb8cbc6af72c4022c95b36 (patch) | |
tree | fe0e956b1d660cd08d41757d25c8adcb3463568c /app/webhook.go | |
parent | d8b42070186c12f6320fe54ea1c405149846404c (diff) | |
parent | 9e6db178b09387e21ac19ce85369cf1ca7a443e8 (diff) | |
download | chat-e13e64711f7a7e8ceadb8cbc6af72c4022c95b36.tar.gz chat-e13e64711f7a7e8ceadb8cbc6af72c4022c95b36.tar.bz2 chat-e13e64711f7a7e8ceadb8cbc6af72c4022c95b36.zip |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1
Diffstat (limited to 'app/webhook.go')
-rw-r--r-- | app/webhook.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/webhook.go b/app/webhook.go index abfc388b5..5c3e963ce 100644 --- a/app/webhook.go +++ b/app/webhook.go @@ -143,7 +143,7 @@ func (a *App) TriggerWebhook(payload *model.OutgoingWebhookPayload, hook *model. } } -func SplitWebhookPost(post *model.Post) ([]*model.Post, *model.AppError) { +func SplitWebhookPost(post *model.Post, maxPostSize int) ([]*model.Post, *model.AppError) { splits := make([]*model.Post, 0) remainingText := post.Message @@ -159,12 +159,12 @@ func SplitWebhookPost(post *model.Post) ([]*model.Post, *model.AppError) { return nil, model.NewAppError("SplitWebhookPost", "web.incoming_webhook.split_props_length.app_error", map[string]interface{}{"Max": model.POST_PROPS_MAX_USER_RUNES}, "", http.StatusBadRequest) } - for utf8.RuneCountInString(remainingText) > model.POST_MESSAGE_MAX_RUNES { + for utf8.RuneCountInString(remainingText) > maxPostSize { split := base x := 0 for index := range remainingText { x++ - if x > model.POST_MESSAGE_MAX_RUNES { + if x > maxPostSize { split.Message = remainingText[:index] remainingText = remainingText[index:] break @@ -266,7 +266,7 @@ func (a *App) CreateWebhookPost(userId string, channel *model.Channel, text, ove } } - splits, err := SplitWebhookPost(post) + splits, err := SplitWebhookPost(post, a.MaxPostSize()) if err != nil { return nil, err } |