Merge pull request '🐛 Fix a bug.' (#27 ) from hotfix into main

Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/27
🐛 Fix a bug.
2024-03-08 07:45:51 +08:00 · 2024-03-08 07:45:05 +08:00 · 2024-03-07 10:04:47 +08:00 · 2024-03-07 10:04:03 +08:00 · 2024-03-07 09:49:37 +08:00 · 2024-03-07 09:48:52 +08:00
1 changed files with 8 additions and 2 deletions
--- a/model/message.go
+++ b/model/message.go
@@ -88,7 +88,13 @@ func (m Message) IsRevokeMsg() bool {
 // @receiver m
 // @return bool
 func (m Message) IsNewUserJoin() bool {
-	sysFlag := m.Type == types.MsgTypeSys && strings.Contains(m.Content, "\"邀请\"") && strings.Contains(m.Content, "\"加入了群聊")
+	if m.Type != types.MsgTypeSys {
+		return false
+	}
+
+	isInvitation := strings.Contains(m.Content, "\"邀请\"") && strings.Contains(m.Content, "\"加入了群聊")
+	isScanQrCode := strings.Contains(m.Content, "通过扫描") && strings.Contains(m.Content, "加入群聊")
+	sysFlag := isInvitation || isScanQrCode
 	if sysFlag {
 		return true
 	}
@@ -97,7 +103,7 @@ func (m Message) IsNewUserJoin() bool {
 	if err := xml.Unmarshal([]byte(m.Content), &d); err != nil {
 		return false
 	}
-	return m.Type == types.MsgTypeSys && d.Type == "delchatroommember"
+	return d.Type == "delchatroommember"
 }

 // IsAt
Author	SHA1	Message	Date
李寻欢	0f7cf5515d	Merge pull request '🐛 Fix a bug.' (#27 ) from hotfix into main Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/27	2024-03-08 07:45:51 +08:00
李寻欢	a2d84dea08	🐛 Fix a bug.	2024-03-08 07:45:05 +08:00
李寻欢	d3f8a59390	Merge pull request 'hotfix' (#26 ) from hotfix into main Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/26	2024-03-07 10:04:47 +08:00
李寻欢	165fefdb48	🐛 修复扫码加入群聊的成员无法识别的BUG	2024-03-07 10:04:03 +08:00
李寻欢	22474efc57	🎨 逻辑完善	2024-03-07 09:49:37 +08:00
李寻欢	797821e2ed	🎨 逻辑完善	2024-03-07 09:48:52 +08:00