toby3d/telegram
toby3d/telegram
1
0
Fork 0
Code Actions

🏗️ Merge params in NewWebhookChannel

Browse Source 
'set' and 'listen' to 'setURL'; rename 'serve' to 'serveAddr'
This commit is contained in:
Maxim Lebedev 2018-05-31 18:32:17 +05:00
parent 5c91b6048f
commit 1ee56bb420
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
utils_update.go
View File

@ -3,6 +3,7 @@ package telegram
import (
"bytes"
"log"
"net/url"
"time"
"github.com/kirillDanshin/dlog"
@ -49,17 +50,17 @@ func (bot *Bot) NewLongPollingChannel(params *GetUpdatesParameters) UpdatesChann
// NewWebhookChannel creates channel for receive incoming updates via an outgoing
// webhook.
func (bot *Bot) NewWebhookChannel(params *SetWebhookParameters, certFile, keyFile, set, listen, serve string) (updates UpdatesChannel) {
func (bot *Bot) NewWebhookChannel(setURL *url.URL, params *SetWebhookParameters, certFile, keyFile, serveAddr string) (updates UpdatesChannel) {
if params == nil {
params = &SetWebhookParameters{
URL: set,
URL: setURL.String(),
MaxConnections: 40,
}
}
var err error
channel := make(chan Update, 100)
requiredPath := []byte(listen)
requiredPath := []byte(setURL.Path)
dlog.Ln("requiredPath:", string(requiredPath))
handleFunc := func(ctx *http.RequestCtx) {
dlog.Ln("Request path:", string(ctx.Path()))
@ -80,10 +81,10 @@ func (bot *Bot) NewWebhookChannel(params *SetWebhookParameters, certFile, keyFil
go func() {
if certFile != "" && keyFile != "" {
dlog.Ln("Creating TLS router...")
err = http.ListenAndServeTLS(serve, certFile, keyFile, handleFunc)
err = http.ListenAndServeTLS(serveAddr, certFile, keyFile, handleFunc)
} else {
dlog.Ln("Creating simple router...")
err = http.ListenAndServe(serve, handleFunc)
err = http.ListenAndServe(serveAddr, handleFunc)
}
if err != nil {
log.Fatalln(err.Error())