RetailCRM-Mirror/mg-transport-telegram
1
0
Fork 0
mirror of synced 2024-11-22 12:26:02 +03:00
Code Issues Projects Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
DmitryZagorulko 2018-06-01 14:46:07 +03:00
parent e2ffd603a8
commit 942dca0687
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
telegram.go
View File

@ -32,11 +32,6 @@ func GetBotName(bot *tgbotapi.BotAPI) string {
} }
func telegramWebhookHandler(w http.ResponseWriter, r *http.Request, token string) { func telegramWebhookHandler(w http.ResponseWriter, r *http.Request, token string) {
if config.Debug {
var v interface{}
json.NewDecoder(r.Body).Decode(&v)
logger.Debugf("token: %v mgWebhookHandler: %v", token, v)
}
b, err := getBotByToken(token) b, err := getBotByToken(token)
if err != nil { if err != nil {
raven.CaptureErrorAndWait(err, nil) raven.CaptureErrorAndWait(err, nil)
@ -74,6 +69,10 @@ func telegramWebhookHandler(w http.ResponseWriter, r *http.Request, token string
return return
} }
if config.Debug {
logger.Debugf("telegramWebhookHandler: %v", string(bytes))
}
err = json.Unmarshal(bytes, &update) err = json.Unmarshal(bytes, &update)
if err != nil { if err != nil {
raven.CaptureErrorAndWait(err, nil) raven.CaptureErrorAndWait(err, nil)
@ -113,7 +112,7 @@ func telegramWebhookHandler(w http.ResponseWriter, r *http.Request, token string
} }
if config.Debug { if config.Debug {
logger.Debugf("Bot: %v, Message: %v, Response: %v", b.ID, snd, data) logger.Debugf("telegramWebhookHandler Type: SendMessage, Bot: %v, Message: %v, Response: %v", b.ID, snd, data)
} }
} }
@ -138,7 +137,7 @@ func telegramWebhookHandler(w http.ResponseWriter, r *http.Request, token string
} }
if config.Debug { if config.Debug {
logger.Debugf("Bot: %v, Message: %v, Response: %v", b.ID, snd, data) logger.Debugf("telegramWebhookHandler Type: UpdateMessage, Bot: %v, Message: %v, Response: %v", b.ID, snd, data)
} }
} }
@ -146,11 +145,6 @@ func telegramWebhookHandler(w http.ResponseWriter, r *http.Request, token string
} }
func mgWebhookHandler(w http.ResponseWriter, r *http.Request) { func mgWebhookHandler(w http.ResponseWriter, r *http.Request) {
if config.Debug {
var v interface{}
json.NewDecoder(r.Body).Decode(&v)
logger.Debugf("mgWebhookHandler: %v", v)
}
bytes, err := ioutil.ReadAll(r.Body) bytes, err := ioutil.ReadAll(r.Body)
if err != nil { if err != nil {
raven.CaptureErrorAndWait(err, nil) raven.CaptureErrorAndWait(err, nil)
@ -158,6 +152,10 @@ func mgWebhookHandler(w http.ResponseWriter, r *http.Request) {
return return
} }
if config.Debug {
logger.Debugf("mgWebhookHandler: %v", string(bytes))
}
var msg v1.WebhookRequest var msg v1.WebhookRequest
err = json.Unmarshal(bytes, &msg) err = json.Unmarshal(bytes, &msg)
if err != nil { if err != nil {
@ -196,7 +194,7 @@ func mgWebhookHandler(w http.ResponseWriter, r *http.Request) {
} }
if config.Debug { if config.Debug {
logger.Debugf("%v", msg) logger.Debugf("mgWebhookHandler %v", msg)
} }
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
@ -213,7 +211,7 @@ func mgWebhookHandler(w http.ResponseWriter, r *http.Request) {
} }
if config.Debug { if config.Debug {
logger.Debugf("%v", msg) logger.Debugf("mgWebhookHandler %v", msg)
} }
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
@ -230,7 +228,7 @@ func mgWebhookHandler(w http.ResponseWriter, r *http.Request) {
} }
if config.Debug { if config.Debug {
logger.Debugf("%v", msg) logger.Debugf("mgWebhookHandler %v", msg)
} }
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)