VaalaCat/mc-tgbot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: ignore bot msg

Browse Source
This commit is contained in:
Vaala Cat 2023-08-28 14:10:31 +08:00
parent 8f7bb8feba
commit 46cf57764c
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
services/mc/helper.go
View File

@ -97,3 +97,10 @@ func CronKick() {
} }
}) })
} }
func isBotMsg(msg chat.Message) bool {
if msg.Translate == "commands.message.display.outgoing" {
return true
}
return false
}

2
services/mc/mc.go
View File

@ -97,7 +97,7 @@ func onPlayerMsg(msg chat.Message, validated bool) error {
} }
log.Printf("Player: %s", msg) log.Printf("Player: %s", msg)
s := strings.Split(msg.String(), " ") s := strings.Split(msg.String(), " ")
if len(s) > 1 { if len(s) > 1 && !isBotMsg(msg) {
if s[0] != fmt.Sprintf("<%v>", conf.GetBotSettings().MCBotName) { if s[0] != fmt.Sprintf("<%v>", conf.GetBotSettings().MCBotName) {
m := tgbotapi.NewMessage(conf.GetBotSettings().GroupID, fmt.Sprintf("%v", msg)) m := tgbotapi.NewMessage(conf.GetBotSettings().GroupID, fmt.Sprintf("%v", msg))
_, err := conf.Bot.Send(m) _, err := conf.Bot.Send(m)

2
services/tgbot/bot.go
View File

@ -60,7 +60,9 @@ func Run(sendFunc func(string)) {
logrus.Infof("id is %d", m.Chat.ID) logrus.Infof("id is %d", m.Chat.ID)
m := fmt.Sprintf("%v: %v", m.From.UserName, m.CommandArguments()) m := fmt.Sprintf("%v: %v", m.From.UserName, m.CommandArguments())
sendFunc(m) sendFunc(m)
if err != nil {
logrus.WithError(err).Error("send message error") logrus.WithError(err).Error("send message error")
}
return return
} }
if m.Command() == "list" { if m.Command() == "list" {