Merge pull request 'hotfix' (#28) from hotfix into main

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

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

readme.md

@@ -48,7 +48,7 @@ version: '3.9'
 
 services:
   wechat:
-    image: lxh01/wxhelper-docker:3.9.5.81-v11
+    image: lxh01/wxhelper-docker:3.9.5.81-v11-novnc # 如果不用noVNC网页，就删掉后面的-novnc
     container_name: gw-wechat
     restart: unless-stopped
     environment:
@@ -56,8 +56,9 @@ services:
     volumes:
       - ./data/wechat:/home/app/.wine/drive_c/users/app/Documents/WeChat\ Files
     ports:
-      - "19087:8080"
-      - "19088:19088"
+      - "19086:5900" # vnc端口
+      - "19087:8080" # noVNC端口
+      - "19088:19088" # 微信HOOK端口
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:19088/api/checkLogin"]
       interval: 60s
@@ -100,4 +101,8 @@ services:
 # 以下命令选个能用的就行
 docker-compose up -d # 老版本
 docker compose up -d # 新版本
-```
+```
+
+## 注意事项
+1. 宿主机必须是`debian`系，因为`wine`的玄学`BUG`，其他系统可能会出现各种问题
+2. 登录微信可以用`vnc viewer`连接`5900`端口或者访问`noVNC`端口的`vnc_lite.html`页面进行扫码登录

tasks/watergroup/month.go

@@ -2,7 +2,9 @@ package watergroup
 
 import (
 	"fmt"
+	"go-wechat/client"
 	"go-wechat/config"
+	"go-wechat/entity"
 	"go-wechat/service"
 	"go-wechat/utils"
 	"log"
@@ -55,6 +57,23 @@ func dealMonth(gid string) {
 		log.Printf("上月群[%s]无对话记录", gid)
 		return
 	}
+
+	// 查询群成员总数
+	var groupUsers int64
+	err = client.MySQL.Model(&entity.GroupUser{}).
+		Where("group_id = ?", gid).
+		Where("is_member IS TRUE").
+		Count(&groupUsers).Error
+	if err != nil {
+		log.Printf("查询群成员总数失败, 错误信息: %v", err)
+	}
+	// 计算活跃度
+	showActivity := err == nil && groupUsers > 0
+	activity := "0.00"
+	if groupUsers > 0 {
+		activity = fmt.Sprintf("%.2f", (float64(len(records))/float64(groupUsers))*100)
+	}
+
 	// 计算消息总数
 	var msgCount int64
 	for _, v := range records {
@@ -63,6 +82,9 @@ func dealMonth(gid string) {
 	// 组装消息总数推送信息
 	notifyMsgs = append(notifyMsgs, " ")
 	notifyMsgs = append(notifyMsgs, fmt.Sprintf("🗣️ %s本群 %d 位朋友共产生 %d 条发言", monthStr, len(records), msgCount))
+	if showActivity {
+		notifyMsgs = append(notifyMsgs, fmt.Sprintf("🎭 活跃度: %s%", activity))
+	}
 	notifyMsgs = append(notifyMsgs, "\n🏵 活跃用户排行榜 🏵")
 
 	notifyMsgs = append(notifyMsgs, " ")

tasks/watergroup/utils.go

@@ -18,7 +18,7 @@ type rankUser struct {
 // @return err
 func getRankData(groupId, date string) (rank []rankUser, err error) {
 	tx := client.MySQL.Table("t_message AS tm").
-		Joins("LEFT JOIN t_group_user AS tgu ON tgu.wxid = tm.group_user AND tm.from_user = tgu.group_id AND tgu.skip_chat_rank = 0").
+		Joins("LEFT JOIN t_group_user AS tgu ON tgu.wxid = tm.group_user AND tm.from_user = tgu.group_id AND tgu.skip_chat_rank = 0 AND is_member = 1").
 		Select("tm.group_user", "tgu.nickname", "count( 1 ) AS `count`").
 		Where("tm.from_user = ?", groupId).
 		Where("tm.type < 10000").

tasks/watergroup/week.go

@@ -2,7 +2,9 @@ package watergroup
 
 import (
 	"fmt"
+	"go-wechat/client"
 	"go-wechat/config"
+	"go-wechat/entity"
 	"go-wechat/service"
 	"go-wechat/utils"
 	"log"
@@ -54,6 +56,23 @@ func dealWeek(gid string) {
 		log.Printf("上周群[%s]无对话记录", gid)
 		return
 	}
+
+	// 查询群成员总数
+	var groupUsers int64
+	err = client.MySQL.Model(&entity.GroupUser{}).
+		Where("group_id = ?", gid).
+		Where("is_member IS TRUE").
+		Count(&groupUsers).Error
+	if err != nil {
+		log.Printf("查询群成员总数失败, 错误信息: %v", err)
+	}
+	// 计算活跃度
+	showActivity := err == nil && groupUsers > 0
+	activity := "0.00"
+	if groupUsers > 0 {
+		activity = fmt.Sprintf("%.2f", (float64(len(records))/float64(groupUsers))*100)
+	}
+
 	// 计算消息总数
 	var msgCount int64
 	for _, v := range records {
@@ -62,6 +81,9 @@ func dealWeek(gid string) {
 	// 组装消息总数推送信息
 	notifyMsgs = append(notifyMsgs, " ")
 	notifyMsgs = append(notifyMsgs, fmt.Sprintf("🗣️ 上周本群 %d 位朋友共产生 %d 条发言", len(records), msgCount))
+	if showActivity {
+		notifyMsgs = append(notifyMsgs, fmt.Sprintf("🎭 活跃度: %s%", activity))
+	}
 	notifyMsgs = append(notifyMsgs, "\n🏵 活跃用户排行榜 🏵")
 
 	notifyMsgs = append(notifyMsgs, " ")

tasks/watergroup/year.go

@@ -2,7 +2,9 @@ package watergroup
 
 import (
 	"fmt"
+	"go-wechat/client"
 	"go-wechat/config"
+	"go-wechat/entity"
 	"go-wechat/service"
 	"go-wechat/utils"
 	"log"
@@ -54,6 +56,23 @@ func dealYear(gid string) {
 		log.Printf("去年本群[%s]无对话记录", gid)
 		return
 	}
+
+	// 查询群成员总数
+	var groupUsers int64
+	err = client.MySQL.Model(&entity.GroupUser{}).
+		Where("group_id = ?", gid).
+		Where("is_member IS TRUE").
+		Count(&groupUsers).Error
+	if err != nil {
+		log.Printf("查询群成员总数失败, 错误信息: %v", err)
+	}
+	// 计算活跃度
+	showActivity := err == nil && groupUsers > 0
+	activity := "0.00"
+	if groupUsers > 0 {
+		activity = fmt.Sprintf("%.2f", (float64(len(records))/float64(groupUsers))*100)
+	}
+
 	// 计算消息总数
 	var msgCount int64
 	for _, v := range records {
@@ -70,6 +89,9 @@ func dealYear(gid string) {
 	notifyMsgs = append(notifyMsgs, fmt.Sprintf("祝福你们新年快乐！让我们一起迎接%d年的到来！", time.Now().Local().Year()))
 	notifyMsgs = append(notifyMsgs, " ")
 	notifyMsgs = append(notifyMsgs, fmt.Sprintf("🗣️ 去年本群 %d 位朋友共产生 %d 条发言", len(records), msgCount))
+	if showActivity {
+		notifyMsgs = append(notifyMsgs, fmt.Sprintf("🎭 活跃度: %s%", activity))
+	}
 	notifyMsgs = append(notifyMsgs, "\n🏵 活跃用户排行榜 🏵")
 
 	notifyMsgs = append(notifyMsgs, " ")

tasks/watergroup/yesterday.go

@@ -2,7 +2,9 @@ package watergroup
 
 import (
 	"fmt"
+	"go-wechat/client"
 	"go-wechat/config"
+	"go-wechat/entity"
 	"go-wechat/service"
 	"go-wechat/utils"
 	"log"
@@ -56,6 +58,23 @@ func dealYesterday(gid string) {
 		log.Printf("昨日群[%s]无对话记录", gid)
 		return
 	}
+
+	// 查询群成员总数
+	var groupUsers int64
+	err = client.MySQL.Model(&entity.GroupUser{}).
+		Where("group_id = ?", gid).
+		Where("is_member IS TRUE").
+		Count(&groupUsers).Error
+	if err != nil {
+		log.Printf("查询群成员总数失败, 错误信息: %v", err)
+	}
+	// 计算活跃度
+	showActivity := err == nil && groupUsers > 0
+	activity := "0.00"
+	if groupUsers > 0 {
+		activity = fmt.Sprintf("%.2f", (float64(len(records))/float64(groupUsers))*100)
+	}
+
 	// 计算消息总数
 	var msgCount int64
 	for _, v := range records {
@@ -64,6 +83,9 @@ func dealYesterday(gid string) {
 	// 组装消息总数推送信息
 	notifyMsgs = append(notifyMsgs, " ")
 	notifyMsgs = append(notifyMsgs, fmt.Sprintf("🗣️ 昨日本群 %d 位朋友共产生 %d 条发言", len(records), msgCount))
+	if showActivity {
+		notifyMsgs = append(notifyMsgs, fmt.Sprintf("🎭 活跃度: %s%", activity))
+	}
 	notifyMsgs = append(notifyMsgs, "\n🏵 活跃用户排行榜 🏵")
 
 	notifyMsgs = append(notifyMsgs, " ")