diff options
| author | George Goldberg <george@gberg.me> | 2018-03-13 13:36:23 +0000 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2018-03-13 13:36:23 +0000 |
| commit | fadcdd271a68b38571b75d1d38ab023f940ac83a (patch) | |
| tree | 7f413edd35401b54b2f4eb4a687da1ac273bcd4b /app/webhook.go | |
| parent | b66e4bc932ed76c1cfd2b5f4ec0cfce70cd9fbb4 (diff) | |
| parent | f2d26801b9647715fb43af873354d8def753868b (diff) | |
| download | chat-fadcdd271a68b38571b75d1d38ab023f940ac83a.tar.gz chat-fadcdd271a68b38571b75d1d38ab023f940ac83a.tar.bz2 chat-fadcdd271a68b38571b75d1d38ab023f940ac83a.zip | |
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'app/webhook.go')
| -rw-r--r-- | app/webhook.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/webhook.go b/app/webhook.go index f3777ab48..abfc388b5 100644 --- a/app/webhook.go +++ b/app/webhook.go @@ -225,7 +225,7 @@ func SplitWebhookPost(post *model.Post) ([]*model.Post, *model.AppError) { func (a *App) CreateWebhookPost(userId string, channel *model.Channel, text, overrideUsername, overrideIconUrl string, props model.StringInterface, postType string, postRootId string) (*model.Post, *model.AppError) { // parse links into Markdown format - linkWithTextRegex := regexp.MustCompile(`<([^<\|]+)\|([^>]+)>`) + linkWithTextRegex := regexp.MustCompile(`<([^\n<\|>]+)\|([^\n>]+)>`) text = linkWithTextRegex.ReplaceAllString(text, "[${2}](${1})") post := &model.Post{UserId: userId, ChannelId: channel.Id, Message: text, Type: postType, RootId: postRootId} |