From 8ee4975ef92e329f98a3d65a608fbbb40ef5b3cd Mon Sep 17 00:00:00 2001 From: Pavel Date: Thu, 11 Jul 2024 18:10:16 +0300 Subject: [PATCH] added todo, so strange events with tdlib --- app/app.go | 10 +++++----- clients/telegram/tg.go | 1 + service/account_svc.go | 4 +++- workers/tg_worker.go | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/app.go b/app/app.go index 7c5331f..43cdc20 100644 --- a/app/app.go +++ b/app/app.go @@ -72,9 +72,8 @@ type Options struct { TrashLogHost string `env:"TRASH_LOG_HOST" default:"localhost:7113"` ModuleLogger string `env:"MODULE_LOGGER" default:"core-local"` ClickHouseCred string `env:"CLICK_HOUSE_CRED" default:"tcp://10.8.0.15:9000/default?sslmode=disable"` - BotID int `env:"BOT_ID"` // 6712573453 RedisHost string `env:"REDIS_HOST" default:"localhost:6379"` - RedisPassword string `env:"REDIS_PASSWORD"` + RedisPassword string `env:"REDIS_PASSWORD" default:"admin"` RedisDB uint64 `env:"REDIS_DB" default:"2"` } @@ -175,9 +174,10 @@ func New(ctx context.Context, opts interface{}, ver appInit.Version) (appInit.Co } tgWC := workers.NewTgListenerWC(workers.Deps{ - BotID: int64(options.BotID), - Redis: redisClient, - Dal: pgdal, + BotID: int64(6712573453), // todo убрать + Redis: redisClient, + Dal: pgdal, + TgClient: tgClient, }) go tgWC.Start(ctx) diff --git a/clients/telegram/tg.go b/clients/telegram/tg.go index bcdbe62..7f43d23 100644 --- a/clients/telegram/tg.go +++ b/clients/telegram/tg.go @@ -168,6 +168,7 @@ func (tg *TelegramClient) CreateChannel(channelName string, botID int64) (string var inviteLink string var channelId int64 for _, activeClient := range tg.TgClients { + // todo пока не понимаю это какой то рандом? в один день бот норм находится в другой уже не находится хотя абсолютно с точки зрения тг кода этой функции и бота не менялось _, err := activeClient.GetUser(&client.GetUserRequest{ UserId: botID, }) diff --git a/service/account_svc.go b/service/account_svc.go index 8ae08ae..3366be4 100644 --- a/service/account_svc.go +++ b/service/account_svc.go @@ -264,11 +264,13 @@ func (s *Service) PostLeadTarget(ctx *fiber.Ctx) error { return ctx.Status(fiber.StatusUnauthorized).SendString("account id is required") } + //accountID := "64f2cd7a7047f28fdabf6d9e" + if _, ok := model.ValidLeadTargetTypes[req.Type]; !ok { return ctx.Status(fiber.StatusBadRequest).SendString("Invalid type") } - if req.Type == "" || req.Target == "" { + if req.Type == "" || (req.Target == "" && req.Type != string(model.LeadTargetTg)) { return ctx.Status(fiber.StatusBadRequest).SendString("Type and Target don't be nil") } diff --git a/workers/tg_worker.go b/workers/tg_worker.go index 5f7b894..84e5c90 100644 --- a/workers/tg_worker.go +++ b/workers/tg_worker.go @@ -36,7 +36,7 @@ func NewTgListenerWC(deps Deps) *TgListenerWorker { } func (wc *TgListenerWorker) Start(ctx context.Context) { - ticker := time.NewTicker(10 * time.Second) + ticker := time.NewTicker(10 * time.Second) //time.Minute defer ticker.Stop() for {