interact: separate interfaces

examples/interact/main.go

@@ -128,7 +128,6 @@ func main() {
 
 	globalInteraction := interact.New()
 	globalInteraction.SetMessenger(&interact.Telegram{
-		Interact: globalInteraction,
 		Bot:      b,
 	})
 

pkg/interact/interact.go

@@ -30,8 +30,18 @@ const (
 	StateAuthenticated State = "authenticated"
 )
 
-type Messenger interface {
+
+type TextMessageResponder interface {
+	SetTextMessageResponder(responder Responder)
+}
+
+type CommandResponder interface {
 	AddCommand(command string, responder Responder)
+}
+
+type Messenger interface {
+	TextMessageResponder
+	CommandResponder
 	Start()
 }
 
@@ -140,6 +150,9 @@ func (i *Interact) runCommand(command string, args []string, ctxObjects ...inter
 }
 
 func (i *Interact) SetMessenger(messenger Messenger) {
+	messenger.SetTextMessageResponder(func(reply Reply, response string) error {
+		return i.handleResponse(response, reply)
+	})
 	i.messenger = messenger
 }
 

pkg/interact/telegram.go

@@ -38,13 +38,15 @@ func (r *TelegramReply) build() {
 	r.menu.Reply(rows...)
 }
 
-//go:generate callbackgen -type Telegram
 type Telegram struct {
-	Interact *Interact
 	Bot *telebot.Bot
 
-	// messageCallbacks is used for interact to register its message handler
-	messageCallbacks []func(reply Reply, message string)
+	// textMessageResponder is used for interact to register its message handler
+	textMessageResponder Responder
+}
+
+func (b *Telegram) SetTextMessageResponder(textMessageResponder Responder) {
+	b.textMessageResponder = textMessageResponder
 }
 
 func (b *Telegram) Start() {
@@ -52,9 +54,11 @@ func (b *Telegram) Start() {
 		log.Infof("onText: %+v", m)
 
 		reply := b.newReply()
-		if err := b.Interact.handleResponse(m.Text, reply); err != nil {
+		if b.textMessageResponder != nil {
+			if err := b.textMessageResponder(reply, m.Text); err != nil {
 				log.WithError(err).Errorf("response handling error")
 			}
+		}
 
 		reply.build()
 		if _, err := b.Bot.Send(m.Sender, reply.message, reply.menu); err != nil {