diff --git a/slackerbot/internal/bot/bot.go b/slackerbot/internal/bot/bot.go index ed1a2f4..1677366 100644 --- a/slackerbot/internal/bot/bot.go +++ b/slackerbot/internal/bot/bot.go @@ -152,13 +152,12 @@ func (b *Bot) onEvent(ctx context.Context, ev slackevents.EventsAPIEvent) { if e.BotID != "" { return } - text := strings.TrimSpace(strings.ReplaceAll(e.Text, "<@"+b.botID+">", "")) - b.onMessage(ctx, incoming{e.User, e.Channel, e.TimeStamp, e.ThreadTimeStamp, text, false, false}) + b.onMessage(ctx, incoming{e.User, e.Channel, e.TimeStamp, e.ThreadTimeStamp, b.stripMention(e.Text), false, false}) case *slackevents.MessageEvent: if e.BotID != "" || e.SubType != "" || e.User == "" || e.User == b.botID { return } - text := strings.TrimSpace(e.Text) + text := b.stripMention(e.Text) switch { case e.ChannelType == "im": b.onMessage(ctx, incoming{e.User, e.Channel, e.TimeStamp, e.ThreadTimeStamp, text, true, false}) @@ -174,6 +173,10 @@ func (b *Bot) onEvent(ctx context.Context, ev slackevents.EventsAPIEvent) { } } +func (b *Bot) stripMention(text string) string { + return strings.TrimSpace(strings.ReplaceAll(text, "<@"+b.botID+">", "")) +} + func (b *Bot) onMessage(ctx context.Context, m incoming) { if b.listenCommand(ctx, m) { return diff --git a/slackerbot/internal/bot/bot_test.go b/slackerbot/internal/bot/bot_test.go index c424e13..c9e8f3e 100644 --- a/slackerbot/internal/bot/bot_test.go +++ b/slackerbot/internal/bot/bot_test.go @@ -311,6 +311,22 @@ func TestStopReactionCancelsPrompt(t *testing.T) { } } +func TestMentionedCommandInDM(t *testing.T) { + log := &slackLog{text: map[string]string{}, under: map[string]string{}} + srv := httptest.NewServer(log) + defer srv.Close() + store, _ := state.Open(filepath.Join(t.TempDir(), "state.json")) + b := &Bot{store: store, botID: "UBOT", api: slack.New("xoxb", slack.OptionAPIURL(srv.URL+"/"))} + b.onEvent(context.Background(), slackevents.EventsAPIEvent{InnerEvent: slackevents.EventsAPIInnerEvent{ + Data: &slackevents.MessageEvent{User: "U1", Channel: "D1", ChannelType: "im", TimeStamp: "3.0", Text: "<@UBOT> help"}, + }}) + log.mu.Lock() + defer log.mu.Unlock() + if len(log.order) != 1 || !strings.Contains(log.text[log.order[0]], "Commands") { + t.Fatalf("@mentioning the bot in a DM should still run the command: %v %v", log.order, log.text) + } +} + func TestCommandsInAssistantThreads(t *testing.T) { log := &slackLog{text: map[string]string{}, under: map[string]string{}} srv := httptest.NewServer(log)