diff options
| -rw-r--r-- | docker-compose-test.yaml | 9 | ||||
| -rw-r--r-- | docker-compose.yaml | 2 | ||||
| -rw-r--r-- | telebot/go.sum | 2 | ||||
| -rw-r--r-- | telebot/telebot.go | 12 |
4 files changed, 13 insertions, 12 deletions
diff --git a/docker-compose-test.yaml b/docker-compose-test.yaml index fa82a35..75ff334 100644 --- a/docker-compose-test.yaml +++ b/docker-compose-test.yaml @@ -12,7 +12,7 @@ services: - mainnet - telenet ports: - - "8008:8008" + - "10008:8008" depends_on: - redis - telebot @@ -21,7 +21,6 @@ services: - ALL environment: - SERVER_DEPLOYMENT_TYPE=test - - HTTPS_PROXY=socks5://192.168.1.214:9995 telebot: image: telebot build: @@ -31,13 +30,12 @@ services: networks: - telenet ports: - - "9009:8000" + - "10009:8000" entrypoint: ["/telebot/docker-entrypoint.sh"] cap_drop: - ALL environment: - SERVER_DEPLOYMENT_TYPE=test - - HTTPS_PROXY=socks5://192.168.1.214:9995 arbiter: image: arbiter build: @@ -51,13 +49,12 @@ services: - ALL environment: - SERVER_DEPLOYMENT_TYPE=test - - HTTPS_PROXY=socks5://192.168.1.214:9995 redis: image: redis:6.2-alpine networks: - mainnet ports: - - "6379:6379" + - "6380:6379" environment: - ALLOW_EMPTY_PASSWORD=yes volumes: diff --git a/docker-compose.yaml b/docker-compose.yaml index 4bcec7d..dc131b7 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -13,7 +13,7 @@ services: - telenet restart: unless-stopped ports: - - "8008:8008" + - "8007:8008" depends_on: - redis - telebot diff --git a/telebot/go.sum b/telebot/go.sum index 7478d0b..15eca2b 100644 --- a/telebot/go.sum +++ b/telebot/go.sum @@ -1221,6 +1221,8 @@ github.com/go-pdf/fpdf v0.5.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhO github.com/go-pdf/fpdf v0.6.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M= github.com/go-telegram-bot-api/telegram-bot-api v4.6.4+incompatible h1:2cauKuaELYAEARXRkq2LrJ0yDDv1rW7+wrTEdVL3uaU= github.com/go-telegram-bot-api/telegram-bot-api v4.6.4+incompatible/go.mod h1:qf9acutJ8cwBUhm1bqgz6Bei9/C/c93FPDljKWwsOgM= +github.com/go-telegram/bot v0.8.2 h1:5EeOHM6p4H1X1IyXB0uaqw1tnWqLCW8StJAwqfQh+UU= +github.com/go-telegram/bot v0.8.2/go.mod h1:i2TRs7fXWIeaceF3z7KzsMt/he0TwkVC680mvdTFYeM= github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= diff --git a/telebot/telebot.go b/telebot/telebot.go index d452519..5cf2045 100644 --- a/telebot/telebot.go +++ b/telebot/telebot.go @@ -69,12 +69,13 @@ func GetProxiedClient() (*http.Client, error) { func getTGBot() *tgbotapi.BotAPI { token := os.Getenv(telegramBotTokenEnvVar) - client, err := GetProxiedClient() - if err != nil { - log.Fatal().Err(err) - } + // client, err := GetProxiedClient() + // if err != nil { + // log.Fatal().Err(err) + // } - bot, err := tgbotapi.NewBotAPIWithClient(token[1:len(token)-1], client) + // bot, err := tgbotapi.NewBotAPIWithClient(token[1:len(token)-1], client) + bot, err := tgbotapi.NewBotAPI(token[1 : len(token)-1]) if err != nil { log.Fatal().Err(err) } @@ -84,6 +85,7 @@ func getTGBot() *tgbotapi.BotAPI { func sendMessage(bot *tgbotapi.BotAPI, msgText string, channelID int64) error { msg := tgbotapi.NewMessage(channelID, msgText) + fmt.Println("XXXXXXXXXXXXXXXXXX", msg) _, err := bot.Send(msg) return err |