Merge pull request '🎨 优化被移除群聊通知逻辑' (#73) from hotfix into main

Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/73

initialization/plugin.go

@@ -6,6 +6,7 @@ import (
 	plugin "go-wechat/plugin"
 	"go-wechat/plugin/plugins"
 	"go-wechat/service"
+	"go-wechat/types"
 )
 
 // Plugin
@@ -23,6 +24,16 @@ func Plugin() {
 		return true
 	}, plugins.SaveToDb)
 
+	// 通知邀请入群消息到配置用户
+	dispatcher.RegisterHandler(func(m *dto.Message) bool {
+		flag, _ := m.IsInvitationJoinGroup()
+		return flag
+	}, plugins.NotifyInvitationJoinGroup)
+	// 被移除群聊通知到配置用户
+	dispatcher.RegisterHandler(func(m *dto.Message) bool {
+		return m.Type == types.MsgTypeSys
+	}, plugins.NotifyRemoveFromChatroom)
+
 	// 私聊指令消息
 	dispatcher.RegisterHandler(func(m *dto.Message) bool {
 		// 私聊消息 或 群聊艾特机器人并且以/开头的消息

model/dto/message.go

@@ -209,7 +209,9 @@ func (m Message) IsInvitationJoinGroup() (flag bool, str string) {
 		if err := xml.Unmarshal([]byte(m.Content), &md); err != nil {
 			return
 		}
-		return md.AppMsg.Type == "5" && strings.Contains(md.AppMsg.Content, "邀请你加入群聊"), md.AppMsg.Des
+		flag = md.AppMsg.Type == "5" && md.AppMsg.Title == "邀请你加入群聊"
+		str = strings.ReplaceAll(md.AppMsg.Des, "，进入可查看详情。", "")
+		return
 	}
 	return
 }

mq/handler.go

@@ -3,10 +3,8 @@ package mq
 import (
 	"encoding/json"
 	"go-wechat/common/current"
-	"go-wechat/config"
 	"go-wechat/model/dto"
 	"go-wechat/types"
-	"go-wechat/utils"
 	"log"
 	"strings"
 )
@@ -39,16 +37,6 @@ func parse(msg []byte) {
 	}
 	log.Printf("收到新微信消息\n消息来源: %s\n群成员: %s\n消息类型: %v\n消息内容: %s", m.FromUser, m.GroupUser, m.Type, m.Content)
 
-	// 如果是邀请进群，推送到配置的用户
-	if flag, dec := m.IsInvitationJoinGroup(); flag {
-		for _, user := range config.Conf.System.NewFriendNotify.ToUser {
-			if user != "" {
-				// 发送一条新消息
-				utils.SendMessage(user, "", dec, 0)
-			}
-		}
-	}
-
 	// 插件不为空，开始执行
 	if p := current.GetRobotMessageHandler(); p != nil {
 		p(&m)

plugin/plugins/notify2configuser.go

@@ -0,0 +1,52 @@
+package plugins
+
+import (
+	"fmt"
+	"go-wechat/config"
+	"go-wechat/plugin"
+	"go-wechat/service"
+	"go-wechat/utils"
+	"strings"
+)
+
+// NotifyInvitationJoinGroup
+// @description: 通知邀请入群消息到配置用户
+// @param m
+func NotifyInvitationJoinGroup(m *plugin.MessageContext) {
+	// 先回复一条固定句子
+	utils.SendMessage(m.FromUser, m.GroupUser, "您的邀请消息已收到啦，正在通知我的主人来同意请求。在我加群之后将会进行初始化操作，直到收到我主动发送的消息就是初始化完成咯，在那之前请耐心等待喔~", 0)
+
+	// 如果是邀请进群，推送到配置的用户
+	if flag, dec := m.IsInvitationJoinGroup(); flag {
+		for _, user := range config.Conf.System.NewFriendNotify.ToUser {
+			if user != "" {
+				// 发送一条新消息
+				dec = fmt.Sprintf("#邀请入群提醒\n\n%s", dec)
+				utils.SendMessage(user, "", dec, 0)
+			}
+		}
+	}
+}
+
+// NotifyRemoveFromChatroom
+// @description: 被移除群聊通知到配置用户
+// @param m
+func NotifyRemoveFromChatroom(m *plugin.MessageContext) {
+	// 如果是被移出群聊，推送到配置的用户
+	if strings.HasPrefix(m.Content, "你被\"") && strings.HasSuffix(m.Content, "\"移出群聊") {
+		// 取出群名称
+		groupInfo, err := service.GetFriendInfoById(m.FromUser)
+		if err != nil {
+			return
+		}
+		// 组装消息
+		msg := fmt.Sprintf("#移除群聊提醒\n\n群Id: %s\n群名称: %s\n事件: %s", m.FromUser, groupInfo.Nickname, m.Content)
+
+		for _, user := range config.Conf.System.NewFriendNotify.ToUser {
+			if user != "" {
+				// 发送一条新消息
+				utils.SendMessage(user, "", msg, 0)
+			}
+		}
+	}
+}

service/friend.go

@@ -37,6 +37,16 @@ func GetAllFriend() (friends, groups []vo.FriendItem, err error) {
 	return
 }
 
+// GetFriendInfoById
+// @description: 通过wxId获取好友信息
+// @param wxId
+// @return ent
+// @return err
+func GetFriendInfoById(wxId string) (ent entity.Friend, err error) {
+	err = client.MySQL.Where("wxid = ?", wxId).First(&ent).Error
+	return
+}
+
 // GetAllEnableAI
 // @description: 取出所有启用了AI的好友或群组
 // @return []entity.Friend

tcpserver/parse.go

@@ -3,10 +3,8 @@ package tcpserver
 import (
 	"encoding/json"
 	"go-wechat/common/current"
-	"go-wechat/config"
 	"go-wechat/model/dto"
 	"go-wechat/types"
-	"go-wechat/utils"
 	"log"
 	"net"
 	"strings"
@@ -40,16 +38,6 @@ func parse(remoteAddr net.Addr, msg []byte) {
 	}
 	log.Printf("%s\n消息来源: %s\n群成员: %s\n消息类型: %v\n消息内容: %s", remoteAddr, m.FromUser, m.GroupUser, m.Type, m.Content)
 
-	// 如果是邀请进群，推送到配置的用户
-	if flag, dec := m.IsInvitationJoinGroup(); flag {
-		for _, user := range config.Conf.System.NewFriendNotify.ToUser {
-			if user != "" {
-				// 发送一条新消息
-				utils.SendMessage(user, "", dec, 0)
-			}
-		}
-	}
-
 	// 插件不为空，开始执行
 	if p := current.GetRobotMessageHandler(); p != nil {
 		p(&m)