This commit is contained in:
cdle
2021-10-13 17:57:08 +08:00
parent 3b7855c8b2
commit 31bf646cef
+15 -11
View File
@@ -2,12 +2,12 @@ package tg
import ( import (
"fmt" "fmt"
"net/http"
"net/url"
"os" "os"
"regexp" "regexp"
"strings" "strings"
"time" "time"
"net/http"
"net/url"
"github.com/astaxie/beego/httplib" "github.com/astaxie/beego/httplib"
"github.com/beego/beego/v2/core/logs" "github.com/beego/beego/v2/core/logs"
@@ -59,18 +59,22 @@ func init() {
logs.Warn("未提供telegram机器人token") logs.Warn("未提供telegram机器人token")
return return
} }
client, clientErr := buildClientWithProxy(tg.Get("url"))
if clientErr != nil { settings := tb.Settings{
logs.Warn("监听telegram机器人失败clientErr%v", clientErr)
return
}
var err error
b, err = tb.NewBot(tb.Settings{
Client: client,
Token: token, Token: token,
Poller: &tb.LongPoller{Timeout: 10 * time.Second}, Poller: &tb.LongPoller{Timeout: 10 * time.Second},
// ParseMode: tb.ModeMarkdownV2, // ParseMode: tb.ModeMarkdownV2,
}) }
if url := tg.Get("url"); url != "" {
client, clientErr := buildClientWithProxy(url)
if clientErr != nil {
logs.Warn("监听telegram代理失败:%v", clientErr)
return
}
settings.Client = client
}
var err error
b, err = tb.NewBot(settings)
if err != nil { if err != nil {
logs.Warn("监听telegram机器人失败:%v", err) logs.Warn("监听telegram机器人失败:%v", err)