1
0
mirror of synced 2024-11-23 04:36:01 +03:00

Merge branch 'master' into release

This commit is contained in:
Alex Lushpai 2018-11-20 12:27:53 +03:00
commit 295084148f

View File

@ -615,7 +615,7 @@ func mgWebhookHandler(c *gin.Context) {
case v1.MsgTypeOrder:
mb = getOrderMessage(msg.Data.Order)
case v1.MsgTypeText:
mb = msg.Data.Content
mb = replaceMarkdownSymbols(msg.Data.Content)
}
m := tgbotapi.NewMessage(cid, mb)
@ -644,7 +644,7 @@ func mgWebhookHandler(c *gin.Context) {
c.JSON(http.StatusOK, gin.H{"external_message_id": strconv.Itoa(msgSend.MessageID)})
case "message_updated":
msgSend, err := bot.Send(tgbotapi.NewEditMessageText(cid, uid, msg.Data.Content))
msgSend, err := bot.Send(tgbotapi.NewEditMessageText(cid, uid, replaceMarkdownSymbols(msg.Data.Content)))
if err != nil {
logger.Error(err)
c.AbortWithStatus(http.StatusBadRequest)