Skip to content

Commit b66b2df

Browse files
committed
fix: incorrect dispatcher provided
1 parent 8103a5b commit b66b2df

File tree

2 files changed

+20
-16
lines changed

2 files changed

+20
-16
lines changed

internal/bots/telegram/telegram.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
func NewModules() fx.Option {
1919
return fx.Options(
2020
fx.Provide(NewBot()),
21+
fx.Provide(tgbot.NewDispatcher()),
2122
fx.Options(handlers.NewModules()),
2223
)
2324
}
@@ -27,17 +28,18 @@ type NewBotParam struct {
2728

2829
Lifecycle fx.Lifecycle
2930

30-
Config *configs.Config
31-
Logger *logger.Logger
32-
Handlers *handlers.Handlers
31+
Config *configs.Config
32+
Logger *logger.Logger
33+
Handlers *handlers.Handlers
34+
Dispatcher *tgbot.Dispatcher
3335

3436
ChatHistories *chathistories.Model
3537
TgChats *tgchats.Model
3638
}
3739

3840
func NewBot() func(param NewBotParam) (*tgbot.BotService, error) {
3941
return func(param NewBotParam) (*tgbot.BotService, error) {
40-
dispatcher := tgbot.NewDispatcher(param.Logger)
42+
dispatcher := param.Dispatcher
4143
dispatcher.Use(middlewares.RecordMessage(param.ChatHistories, param.TgChats))
4244
param.Handlers.InstallAll()
4345

pkg/bots/tgbot/dispatcher.go

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,22 @@ type Dispatcher struct {
2525
callbackQueryHandlers map[string]HandleFunc
2626
}
2727

28-
func NewDispatcher(logger *logger.Logger) *Dispatcher {
29-
d := &Dispatcher{
30-
Logger: logger,
31-
helpCommand: newHelpCommandHandler(),
32-
middlewares: make([]MiddlewareFunc, 0),
33-
commandHandlers: make(map[string]HandleFunc),
34-
messageHandlers: make(map[string]HandleFunc),
35-
channelPostHandlers: make([]Handler, 0),
36-
callbackQueryHandlers: make(map[string]HandleFunc),
37-
}
28+
func NewDispatcher() func(logger *logger.Logger) *Dispatcher {
29+
return func(logger *logger.Logger) *Dispatcher {
30+
d := &Dispatcher{
31+
Logger: logger,
32+
helpCommand: newHelpCommandHandler(),
33+
middlewares: make([]MiddlewareFunc, 0),
34+
commandHandlers: make(map[string]HandleFunc),
35+
messageHandlers: make(map[string]HandleFunc),
36+
channelPostHandlers: make([]Handler, 0),
37+
callbackQueryHandlers: make(map[string]HandleFunc),
38+
}
3839

39-
d.OnCommand(d.helpCommand)
40+
d.OnCommand(d.helpCommand)
4041

41-
return d
42+
return d
43+
}
4244
}
4345

4446
func (d *Dispatcher) Use(middleware MiddlewareFunc) {

0 commit comments

Comments
 (0)