X-Git-Url: https://git.giacomolli.uk/onechat/blobdiff_plain/eeb821ff17ad79c87ca9b64cd9be26f8612f4a03..ec230eee6b06580031637bc97c99ec6db7b41926:/telegram.go diff --git a/telegram.go b/telegram.go index c560104..16eff80 100644 --- a/telegram.go +++ b/telegram.go @@ -185,7 +185,7 @@ func (b *TelegramBot) Notify(event Event) { // Run polls for the messages of the owner and sends the queued events to the // chat until ctx ends. It returns an error only when a message or the offset // cannot be written, because then the bot would lose or repeat messages. -func (b *TelegramBot) Run(ctx context.Context, l *TurnLoop) error { +func (b *TelegramBot) Run(ctx context.Context, l *TurnLoop, whatsapp *WhatsApp) error { ctx, cancel := context.WithCancel(ctx) defer cancel() @@ -197,7 +197,7 @@ func (b *TelegramBot) Run(ctx context.Context, l *TurnLoop) error { b.send(ctx) }() - err := b.poll(ctx, l) + err := b.poll(ctx, l, whatsapp) cancel() sender.Wait() @@ -247,7 +247,7 @@ func (b *TelegramBot) send(ctx context.Context) { // poll gets the updates from the stored offset on and handles each one, until // ctx ends. Each update is handled to its end also when ctx ends during it, so // a stop does not repeat its message. -func (b *TelegramBot) poll(ctx context.Context, l *TurnLoop) error { +func (b *TelegramBot) poll(ctx context.Context, l *TurnLoop, whatsapp *WhatsApp) error { offset, err := telegramLoadOffset(b.offsetPath) if err != nil { return err @@ -273,7 +273,7 @@ func (b *TelegramBot) poll(ctx context.Context, l *TurnLoop) error { return nil } - err = b.handle(context.WithoutCancel(ctx), l, update) + err = b.handle(context.WithoutCancel(ctx), l, whatsapp, update) if err != nil { return err } @@ -349,10 +349,12 @@ func (b *TelegramBot) pause(ctx context.Context, err error, wait, asked time.Dur // handle runs one update. A text message of the owner in the private chat goes // to the agent, and handle returns when it is durable in the log. The line -// /stop interrupts the turn, and the line /stop NAME stops the subagent NAME. -// Any other message of the owner gets the answer that only text is supported. -// Every other update is ignored, and its content is not logged. -func (b *TelegramBot) handle(ctx context.Context, l *TurnLoop, update TelegramUpdate) error { +// /stop interrupts the turn, the line /stop NAME stops the subagent NAME, and a +// line that starts with /whatsapp runs a WhatsApp command on whatsapp, whose +// answers go to the chat only. Any other message of the owner gets the answer +// that only text is supported. Every other update is ignored, and its content +// is not logged. +func (b *TelegramBot) handle(ctx context.Context, l *TurnLoop, whatsapp *WhatsApp, update TelegramUpdate) error { message := update.Message if message == nil || message.Chat.Type != "private" || message.Chat.ID != b.owner || message.From == nil || message.From.ID != b.owner { b.logger.Print("update ignored: not a message of the owner in the private chat") @@ -360,6 +362,7 @@ func (b *TelegramBot) handle(ctx context.Context, l *TurnLoop, update TelegramUp } name, stop := stopSubagentName(message.Text) + args, isWhatsApp := whatsappCommandArgs(message.Text) switch { case message.Text == "": b.notice(telegramTextOnly) @@ -376,6 +379,8 @@ func (b *TelegramBot) handle(ctx context.Context, l *TurnLoop, update TelegramUp if !found { b.notice("No subagent " + name + " runs.") } + case isWhatsApp: + whatsapp.Command(args, b.notice) default: _, err := l.Submit(telegramSource, message.Text) if err != nil {