fix: ignore common use command with exact mismatched with bot username (#142)

Author: nekomeowww

pkg/bots/tgbot/cancel_command.go

@@ -1,6 +1,8 @@
 package tgbot
 
 import (
+	"fmt"
+
 	"github.com/nekomeowww/fo"
 	"github.com/nekomeowww/insights-bot/pkg/types/telegram"
 	"github.com/samber/lo"
@@ -38,8 +40,8 @@ func (h *cancelCommandHandler) handle(c *Context) (Response, error) {
 	if is &&
 		c.Update.Message != nil &&
 		c.Update.Message.Chat != nil &&
-		c.Update.Message.CommandWithAt() == h.Command() &&
-		lo.Contains([]telegram.ChatType{telegram.ChatTypeGroup, telegram.ChatTypeSuperGroup}, telegram.ChatType(c.Update.Message.Chat.Type)) {
+		lo.Contains([]telegram.ChatType{telegram.ChatTypeGroup, telegram.ChatTypeSuperGroup}, telegram.ChatType(c.Update.Message.Chat.Type)) &&
+		c.Update.Message.CommandWithAt() != fmt.Sprintf("%s@%s", h.Command(), c.Bot.Self.UserName) {
 		return nil, nil
 	}
 

pkg/bots/tgbot/help_command.go

@@ -48,8 +48,11 @@ func (h *helpCommandHandler) handle(c *Context) (Response, error) {
 	if is &&
 		c.Update.Message != nil &&
 		c.Update.Message.Chat != nil &&
-		c.Update.Message.CommandWithAt() == h.Command() &&
-		lo.Contains([]telegram.ChatType{telegram.ChatTypeGroup, telegram.ChatTypeSuperGroup}, telegram.ChatType(c.Update.Message.Chat.Type)) {
+		lo.Contains([]telegram.ChatType{telegram.ChatTypeGroup, telegram.ChatTypeSuperGroup}, telegram.ChatType(c.Update.Message.Chat.Type)) &&
+		!lo.Contains([]string{
+			fmt.Sprintf("%s@%s", h.Command(), c.Bot.Self.UserName),
+			fmt.Sprintf("%s@%s", "start", c.Bot.Self.UserName),
+		}, c.Update.Message.CommandWithAt()) {
 		return nil, nil
 	}
 

pkg/bots/tgbot/start_command.go

@@ -1,6 +1,8 @@
 package tgbot
 
 import (
+	"fmt"
+
 	"github.com/nekomeowww/insights-bot/pkg/types/telegram"
 	"github.com/samber/lo"
 )
@@ -34,8 +36,8 @@ func (h *startCommandHandler) handle(c *Context) (Response, error) {
 	if is &&
 		c.Update.Message != nil &&
 		c.Update.Message.Chat != nil &&
-		c.Update.Message.CommandWithAt() == h.Command() &&
-		lo.Contains([]telegram.ChatType{telegram.ChatTypeGroup, telegram.ChatTypeSuperGroup}, telegram.ChatType(c.Update.Message.Chat.Type)) {
+		lo.Contains([]telegram.ChatType{telegram.ChatTypeGroup, telegram.ChatTypeSuperGroup}, telegram.ChatType(c.Update.Message.Chat.Type)) &&
+		c.Update.Message.CommandWithAt() != fmt.Sprintf("%s@%s", h.Command(), c.Bot.Self.UserName) {
 		return nil, nil
 	}