mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-09-04 17:37:19 +00:00
fix(tgbot): ignore commands for other bots (#4894)
Telegram group chats can contain multiple bots. Commands addressed to another bot, such as /status@other_bot, should not be handled by the 3x-ui bot. Closes #4893
This commit is contained in:
@@ -495,6 +495,10 @@ func (t *Tgbot) OnReceive() {
|
||||
}, th.TextEqual(t.I18nBot("tgbot.buttons.closeKeyboard")))
|
||||
|
||||
h.HandleMessage(func(ctx *th.Context, message telego.Message) error {
|
||||
if !t.isCommandForCurrentBot(&message) {
|
||||
return nil
|
||||
}
|
||||
|
||||
// Use goroutine with worker pool for concurrent command processing
|
||||
go func() {
|
||||
messageWorkerPool <- struct{}{} // Acquire worker
|
||||
@@ -684,6 +688,22 @@ func (t *Tgbot) answerCommand(message *telego.Message, chatId int64, isAdmin boo
|
||||
}
|
||||
}
|
||||
|
||||
func (t *Tgbot) isCommandForCurrentBot(message *telego.Message) bool {
|
||||
return isCommandForBot(message.Text, botUsername())
|
||||
}
|
||||
|
||||
func botUsername() string {
|
||||
if bot == nil {
|
||||
return ""
|
||||
}
|
||||
return bot.Username()
|
||||
}
|
||||
|
||||
func isCommandForBot(text string, username string) bool {
|
||||
_, commandUsername, _ := tu.ParseCommand(text)
|
||||
return commandUsername == "" || username == "" || strings.EqualFold(commandUsername, username)
|
||||
}
|
||||
|
||||
// sendResponse sends the response message based on the onlyMessage flag.
|
||||
func (t *Tgbot) sendResponse(chatId int64, msg string, onlyMessage, isAdmin bool) {
|
||||
if onlyMessage {
|
||||
|
||||
Reference in New Issue
Block a user