From 46cf57764cf1ddc90bfba48aa1ddccdc59df1ace Mon Sep 17 00:00:00 2001
From: Vaala Cat <me@vaala.cat>
Date: Mon, 28 Aug 2023 14:10:31 +0800
Subject: [PATCH] feat: ignore bot msg

---
 .gitignore            | 2 +-
 services/mc/helper.go | 7 +++++++
 services/mc/mc.go     | 2 +-
 services/tgbot/bot.go | 4 +++-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index b5b1db9..509be2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 .env
 run.sh
 mcbot
-*.sqlite
\ No newline at end of file
+*.sqlite
diff --git a/services/mc/helper.go b/services/mc/helper.go
index d1fd718..ebd4bcc 100644
--- a/services/mc/helper.go
+++ b/services/mc/helper.go
@@ -97,3 +97,10 @@ func CronKick() {
 		}
 	})
 }
+
+func isBotMsg(msg chat.Message) bool {
+	if msg.Translate == "commands.message.display.outgoing" {
+		return true
+	}
+	return false
+}
diff --git a/services/mc/mc.go b/services/mc/mc.go
index be5acd4..e2d7c4d 100644
--- a/services/mc/mc.go
+++ b/services/mc/mc.go
@@ -97,7 +97,7 @@ func onPlayerMsg(msg chat.Message, validated bool) error {
 		}
 		log.Printf("Player: %s", msg)
 		s := strings.Split(msg.String(), " ")
-		if len(s) > 1 {
+		if len(s) > 1 && !isBotMsg(msg) {
 			if s[0] != fmt.Sprintf("<%v>", conf.GetBotSettings().MCBotName) {
 				m := tgbotapi.NewMessage(conf.GetBotSettings().GroupID, fmt.Sprintf("%v", msg))
 				_, err := conf.Bot.Send(m)
diff --git a/services/tgbot/bot.go b/services/tgbot/bot.go
index 60acc3e..f241bc2 100644
--- a/services/tgbot/bot.go
+++ b/services/tgbot/bot.go
@@ -60,7 +60,9 @@ func Run(sendFunc func(string)) {
 					logrus.Infof("id is %d", m.Chat.ID)
 					m := fmt.Sprintf("%v: %v", m.From.UserName, m.CommandArguments())
 					sendFunc(m)
-					logrus.WithError(err).Error("send message error")
+					if err != nil {
+						logrus.WithError(err).Error("send message error")
+					}
 					return
 				}
 				if m.Command() == "list" {