add MatchTypeCommandStartMaybeWithBotUsernameSuffix command match method

bot.go

@@ -36,6 +36,7 @@ type Bot struct {
 
 	url                string
 	token              string
+	username           string
 	pollTimeout        time.Duration
 	skipGetMe          bool
 	webhookSecretToken string
@@ -92,10 +93,11 @@ func New(token string, options ...Option) (*Bot, error) {
 	defer cancel()
 
 	if !b.skipGetMe {
-		_, err := b.GetMe(ctx)
+		botInfo, err := b.GetMe(ctx)
 		if err != nil {
 			return nil, fmt.Errorf("error call getMe, %w", err)
 		}
+		b.username = botInfo.Username
 	}
 
 	return b, nil
@@ -121,6 +123,13 @@ func (b *Bot) Token() string {
 	return b.token
 }
 
+// Username returns the bot username without `@` prefix
+//
+// Return empty string if bot with the `bot.WithSkipGetMe()` option
+func (b *Bot) Username() string {
+	return b.username
+}
+
 // StartWebhook starts the Bot with webhook mode
 func (b *Bot) StartWebhook(ctx context.Context) {
 	wg := sync.WaitGroup{}

bot_test.go

@@ -396,3 +396,13 @@ func TestBot_SetToken(t *testing.T) {
 		t.Errorf("SetToken() = %s, want %s", b.token, "123456:xxx")
 	}
 }
+
+func TestBot_Username(t *testing.T) {
+	b := &Bot{username: "example_bot"}
+
+	username := b.Username()
+
+	if username != "example_bot" {
+		t.Errorf("Username() = %s, want %s", username, "example_bot")
+	}
+}

handlers.go

@@ -24,6 +24,7 @@ const (
 	MatchTypeContains
 	MatchTypeCommand
 	MatchTypeCommandStartOnly
+	MatchTypeCommandStartMaybeWithBotUsernameSuffix // example `/command@example_bot`, can't match username suffix if bot with the `bot.WithSkipGetMe()` option
 
 	matchTypeRegexp
 	matchTypeFunc
@@ -36,6 +37,7 @@ type handler struct {
 	handler     HandlerFunc
 
 	pattern   string
+	username  string
 	re        *regexp.Regexp
 	matchFunc MatchFunc
 }
@@ -100,6 +102,15 @@ func (h handler) match(update *models.Update) bool {
 			}
 		}
 	}
+	if h.matchType == MatchTypeCommandStartMaybeWithBotUsernameSuffix {
+		for _, e := range entities {
+			if e.Type == models.MessageEntityTypeBotCommand {
+				if e.Offset == 0 && (data[e.Offset+1:e.Offset+e.Length] == h.pattern || data[e.Offset+1:e.Offset+e.Length] == h.pattern+"@"+h.username) {
+					return true
+				}
+			}
+		}
+	}
 	if h.matchType == matchTypeRegexp {
 		return h.re.Match([]byte(data))
 	}
@@ -154,6 +165,7 @@ func (b *Bot) RegisterHandler(handlerType HandlerType, pattern string, matchType
 		handlerType: handlerType,
 		matchType:   matchType,
 		pattern:     pattern,
+		username:    b.username,
 		handler:     applyMiddlewares(f, m...),
 	}