From 187a797648bc17f9350e408c6a2c5203437937f5 Mon Sep 17 00:00:00 2001 From: DmitryZagorulko Date: Tue, 6 Nov 2018 13:55:34 +0300 Subject: [PATCH 1/2] 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 +} From 2bdd42d20c40d312f75bb04a2640166625b1d0b8 Mon Sep 17 00:00:00 2001 From: DmitryZagorulko Date: Tue, 6 Nov 2018 14:35:52 +0300 Subject: [PATCH 2/2] add fields validation --- src/models.go | 20 ++++++++++---------- templates/form.html | 6 +++--- templates/home.html | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/models.go b/src/models.go index b7f5310..51893d3 100644 --- a/src/models.go +++ b/src/models.go @@ -6,10 +6,10 @@ import "time" type Connection struct { ID int `gorm:"primary_key"` ClientID string `gorm:"client_id type:varchar(70);not null;unique" json:"clientId,omitempty"` - APIKEY string `gorm:"api_key type:varchar(100);not null" json:"api_key,omitempty" binding:"required"` - APIURL string `gorm:"api_url type:varchar(255);not null" json:"api_url,omitempty" binding:"required,validatecrmurl"` - MGURL string `gorm:"mg_url type:varchar(255);not null;" json:"mg_url,omitempty"` - MGToken string `gorm:"mg_token type:varchar(100);not null;unique" json:"mg_token,omitempty"` + APIKEY string `gorm:"api_key type:varchar(100);not null" json:"api_key,omitempty" binding:"required,max=100"` + APIURL string `gorm:"api_url type:varchar(255);not null" json:"api_url,omitempty" binding:"required,validatecrmurl,max=255"` + MGURL string `gorm:"mg_url type:varchar(255);not null;" json:"mg_url,omitempty" binding:"max=255"` + MGToken string `gorm:"mg_token type:varchar(100);not null;unique" json:"mg_token,omitempty" binding:"max=100"` CreatedAt time.Time UpdatedAt time.Time Active bool `json:"active,omitempty"` @@ -21,10 +21,10 @@ type Bot struct { ID int `gorm:"primary_key"` ConnectionID int `gorm:"connection_id" json:"connectionId,omitempty"` Channel uint64 `gorm:"channel;not null;unique" json:"channel,omitempty"` - ChannelSettingsHash string `gorm:"channel_settings_hash type:varchar(70)"` - Token string `gorm:"token type:varchar(100);not null;unique" json:"token,omitempty"` - Name string `gorm:"name type:varchar(40)" json:"name,omitempty"` - Lang string `gorm:"lang type:varchar(2)" json:"lang,omitempty"` + ChannelSettingsHash string `gorm:"channel_settings_hash type:varchar(70)" binding:"max=70"` + Token string `gorm:"token type:varchar(100);not null;unique" json:"token,omitempty" binding:"max=100"` + Name string `gorm:"name type:varchar(40)" json:"name,omitempty" binding:"max=40"` + Lang string `gorm:"lang type:varchar(2)" json:"lang,omitempty" binding:"max=2"` CreatedAt time.Time UpdatedAt time.Time } @@ -33,8 +33,8 @@ type Bot struct { type User struct { ID int `gorm:"primary_key"` ExternalID int `gorm:"external_id;not null;unique"` - UserPhotoURL string `gorm:"user_photo_url type:varchar(255)"` - UserPhotoID string `gorm:"user_photo_id type:varchar(100)"` + UserPhotoURL string `gorm:"user_photo_url type:varchar(255)" binding:"max=255"` + UserPhotoID string `gorm:"user_photo_id type:varchar(100)" binding:"max=100"` CreatedAt time.Time UpdatedAt time.Time } diff --git a/templates/form.html b/templates/form.html index 988f6fa..708098b 100644 --- a/templates/form.html +++ b/templates/form.html @@ -12,12 +12,12 @@
- +
- +
@@ -40,7 +40,7 @@
- +
diff --git a/templates/home.html b/templates/home.html index ac7b2d5..d1489fe 100644 --- a/templates/home.html +++ b/templates/home.html @@ -4,13 +4,13 @@
-
- +