From 2e6501ba6ce57fa70e973f7c06e7c7536e3d01f5 Mon Sep 17 00:00:00 2001
From: assimon <ashang@utf8.hk>
Date: Mon, 6 Mar 2023 18:05:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8A=A0=E7=BE=A4=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 telegram/handle.go | 35 ++++++++++++-----------------------
 telegram/root.go   |  5 +----
 2 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/telegram/handle.go b/telegram/handle.go
index 0019ccd..f66e41c 100644
--- a/telegram/handle.go
+++ b/telegram/handle.go
@@ -233,36 +233,25 @@ func VerificationProcess(c tb.Context) error {
 // UserJoinGroup 用户加群事件
 func UserJoinGroup(c tb.Context) error {
 	var err error
-	if err = c.Delete(); err != nil {
-		log.Sugar.Error("[UserJoinGroup] delete join message err:", err)
-	}
 	// 如果是管理员邀请的，直接通过
-	if isManage(c.Chat(), c.Sender().ID) {
-		return nil
-	}
-	// 如果是应该被限制的情况下，就不要再发送验证消息了，以免被限制的人利用，重新加群通过验证后解除限制
-	userRights, err := Bot.ChatMemberOf(c.Chat(), c.Message().UserJoined)
-	if err != nil {
-		return err
-	}
-	if userRights.Role == tb.Restricted {
+	if isManage(c.ChatMember().Chat, c.ChatMember().Sender.ID) {
 		return nil
 	}
 	// ban user
-	err = Bot.Restrict(c.Chat(), &tb.ChatMember{
+	err = Bot.Restrict(c.ChatMember().Chat, &tb.ChatMember{
 		Rights:          tb.NoRights(),
-		User:            c.Message().UserJoined,
+		User:            c.ChatMember().Sender,
 		RestrictedUntil: tb.Forever(),
 	})
 	if err != nil {
 		log.Sugar.Error("[UserJoinGroup] ban user err:", err)
 		return err
 	}
-	userLink := fmt.Sprintf("tg://user?id=%d", c.Message().UserJoined.ID)
+	userLink := fmt.Sprintf("tg://user?id=%d", c.ChatMember().Sender.ID)
 	joinMessage := fmt.Sprintf(config.MessageC.JoinHint,
-		c.Message().UserJoined.LastName+c.Message().UserJoined.FirstName,
+		c.ChatMember().Sender.LastName+c.ChatMember().Sender.FirstName,
 		userLink,
-		c.Chat().Title,
+		c.ChatMember().Chat.Title,
 		config.SystemC.JoinHintAfterDelTime)
 	chatToken := uuid.NewV4().String()
 	doCaptchaBtn := joinMessageMenu.URL("👉🏻点我开始人机验证🤖", fmt.Sprintf("https://t.me/%s?start=%s", Bot.Me.Username, chatToken))
@@ -271,21 +260,21 @@ func UserJoinGroup(c tb.Context) error {
 		joinMessageMenu.Row(manageBanBtn, managePassBtn),
 	)
 	LoadAdMenuBtn(joinMessageMenu)
-	captchaMessage, err := Bot.Send(c.Chat(), joinMessage, joinMessageMenu, tb.ModeMarkdownV2)
+	captchaMessage, err := Bot.Send(c.ChatMember().Chat, joinMessage, joinMessageMenu, tb.ModeMarkdownV2)
 	if err != nil {
 		log.Sugar.Error("[UserJoinGroup] send join hint message err:", err)
 		return err
 	}
 	// 设置token对于验证消息
-	gMessageTokenMap.Store(chatToken, fmt.Sprintf("%d|%d|%s", captchaMessage.ID, c.Chat().ID, c.Chat().Title))
-	gUserIdToJoinCaptchaMessageIdMap.Store(c.Sender().ID, captchaMessage)
+	gMessageTokenMap.Store(chatToken, fmt.Sprintf("%d|%d|%s", captchaMessage.ID, c.ChatMember().Chat.ID, c.ChatMember().Chat.Title))
+	gUserIdToJoinCaptchaMessageIdMap.Store(c.ChatMember().Sender.ID, captchaMessage)
 	captchaDataVal := &service.CaptchaPending{
 		PendingMessage: captchaMessage,
-		UserId:         c.Message().UserJoined.ID,
-		GroupId:        c.Chat().ID,
+		UserId:         c.ChatMember().Sender.ID,
+		GroupId:        c.ChatMember().Chat.ID,
 		JoinAt:         carbon.Now().Timestamp(),
 	}
-	captchaDataKey := fmt.Sprintf("%d|%d", captchaMessage.ID, c.Chat().ID)
+	captchaDataKey := fmt.Sprintf("%d|%d", captchaMessage.ID, c.ChatMember().Chat.ID)
 	gUserCaptchaPendingTable.Set(captchaDataKey, captchaDataVal)
 	time.AfterFunc(time.Duration(config.SystemC.JoinHintAfterDelTime)*time.Second, func() {
 		if err = Bot.Delete(captchaMessage); err != nil {
diff --git a/telegram/root.go b/telegram/root.go
index 37d30b7..f6fad95 100644
--- a/telegram/root.go
+++ b/telegram/root.go
@@ -39,11 +39,8 @@ func RegisterHandle() {
 		return c.Send("pong")
 	})
 	Bot.Handle(START_CMD, StartCaptcha)
-	Bot.Handle(tb.OnUserJoined, UserJoinGroup)
+	Bot.Handle(tb.OnChatMember, UserJoinGroup)
 	Bot.Handle(tb.OnText, OnTextMessage)
-	Bot.Handle(tb.OnUserLeft, func(c tb.Context) error {
-		return c.Delete()
-	})
 	// 按钮点击事件
 	Bot.Handle(&manageBanBtn, ManageBan(), isManageMiddleware)
 	Bot.Handle(&managePassBtn, ManagePass(), isManageMiddleware)