From 187a797648bc17f9350e408c6a2c5203437937f5 Mon Sep 17 00:00:00 2001 From: DmitryZagorulko Date: Tue, 6 Nov 2018 13:55:34 +0300 Subject: [PATCH] replace markdown symbols --- src/routing.go | 18 +++++++++--------- src/utils.go | 9 +++++++++ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/routing.go b/src/routing.go index fcfc9e6..1d321b7 100644 --- a/src/routing.go +++ b/src/routing.go @@ -591,7 +591,7 @@ func mgWebhookHandler(c *gin.Context) { var mb string switch msg.Data.Type { case v1.MsgTypeProduct: - mb = fmt.Sprintf("*%s*\n", msg.Data.Product.Name) + mb = fmt.Sprintf("*%s*\n", replaceMarkdownSymbols(msg.Data.Product.Name)) if msg.Data.Product.Cost != nil && msg.Data.Product.Cost.Value != 0 { mb += fmt.Sprintf( @@ -608,9 +608,9 @@ func mgWebhookHandler(c *gin.Context) { } if msg.Data.Product.Url != "" { - mb += msg.Data.Product.Url + mb += replaceMarkdownSymbols(msg.Data.Product.Url) } else { - mb += msg.Data.Product.Img + mb += replaceMarkdownSymbols(msg.Data.Product.Img) } case v1.MsgTypeOrder: mb = getOrderMessage(msg.Data.Order) @@ -678,7 +678,7 @@ func getOrderMessage(dataOrder *v1.MessageDataOrder) string { mb := "*" + getLocalizedMessage("order") if dataOrder.Number != "" { - mb += " " + dataOrder.Number + mb += " " + replaceMarkdownSymbols(dataOrder.Number) } if dataOrder.Date != "" { @@ -691,7 +691,7 @@ func getOrderMessage(dataOrder *v1.MessageDataOrder) string { mb += fmt.Sprintf( "%d. %s", k+1, - v.Name, + replaceMarkdownSymbols(v.Name), ) if v.Quantity != nil { @@ -727,7 +727,7 @@ func getOrderMessage(dataOrder *v1.MessageDataOrder) string { mb += fmt.Sprintf( "\n*%s:*\n%s", getLocalizedMessage("delivery"), - dataOrder.Delivery.Name, + replaceMarkdownSymbols(dataOrder.Delivery.Name), ) } @@ -747,7 +747,7 @@ func getOrderMessage(dataOrder *v1.MessageDataOrder) string { } if dataOrder.Delivery.Address != "" { - mb += ";\n" + dataOrder.Delivery.Address + mb += ";\n" + replaceMarkdownSymbols(dataOrder.Delivery.Address) } mb += "\n" @@ -759,7 +759,7 @@ func getOrderMessage(dataOrder *v1.MessageDataOrder) string { getLocalizedMessage("payment"), ) for _, v := range dataOrder.Payments { - mb += v.Name + mb += replaceMarkdownSymbols(v.Name) if v.Amount != nil { if val, ok := currency[strings.ToLower(v.Amount.Currency)]; ok && v.Amount.Value != 0 { @@ -779,7 +779,7 @@ func getOrderMessage(dataOrder *v1.MessageDataOrder) string { if v.Status != nil && v.Status.Name != "" { mb += fmt.Sprintf( " (%s)", - v.Status.Name, + replaceMarkdownSymbols(v.Status.Name), ) } diff --git a/src/utils.go b/src/utils.go index bb93420..b922617 100644 --- a/src/utils.go +++ b/src/utils.go @@ -24,6 +24,7 @@ var ( "/api/integration-modules/{code}", "/api/integration-modules/{code}/edit", } + markdownSymbols = []string{"*", "_", "`", "["} ) // GenerateToken function @@ -133,3 +134,11 @@ func getChannelSettingsHash() (hash string, err error) { return } + +func replaceMarkdownSymbols(s string) string { + for _, v := range markdownSymbols { + s = strings.Replace(s, v, "\\"+v, -1) + } + + return s +}