Beta138 (#314)

* beta122 * beta123 * beta124 * beta124 * beta124 * beta127 * beta128 * beta129 * beta130 * beta131 * beta132 * beta133 * beta134 * beta135 * beta136 * beta137 * beta138
Hoshinonyaruko · Jan 23, 2024 · 1cb57f4 · 1cb57f4
1 parent 4a88413
commit 1cb57f4
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 15 deletions.
diff --git a/echo/messageidmap.go b/echo/messageidmap.go
@@ -8,6 +8,8 @@ import (
 	"time"
 
 	"github.com/hoshinonyaruko/gensokyo/config"
+	"github.com/hoshinonyaruko/gensokyo/idmap"
+	"github.com/hoshinonyaruko/gensokyo/mylog"
 )
 
 type messageRecord struct {
@@ -50,7 +52,7 @@ func AddLazyMessageIdv2(groupID, userID, messageID string, timestamp time.Time)
 	store.records[key] = append(store.records[key], messageRecord{messageID: messageID, timestamp: timestamp})
 }
 
-// GetRecentMessages 获取指定群号中最近5分钟内的 message_id
+// GetRecentMessages 获取指定群号中最近5分钟内的 message_id~
 func GetLazyMessagesId(groupID string) string {
 	store := initInstance()
 	store.mu.RLock()
@@ -68,18 +70,23 @@ func GetLazyMessagesId(groupID string) string {
 		randomIndex := rand.Intn(len(recentMessages))
 		randomMessageID = recentMessages[randomIndex]
 	} else {
-		msgType := GetMessageTypeByGroupidv2(config.GetAppIDStr(), groupID)
+		groupIDint64, err := idmap.StoreIDv2(groupID)
+		if err != nil {
+			mylog.Printf("Error storing ID 75: %v", err)
+			return "2000" //主动信息(不知道消息类型,按2000,纯主动信息处理)
+		}
+		msgType := GetMessageTypeByGroupidv2(config.GetAppIDStr(), groupIDint64)
 		if strings.HasPrefix(msgType, "guild") {
 			randomMessageID = "1000" // 频道主动信息
 		} else {
-			randomMessageID = ""
+			randomMessageID = "2000" //群主动信息
 		}
 	}
 	return randomMessageID
 }
 
 // GetLazyMessagesIdv2 获取指定群号和用户ID中最近5分钟内的 message_id
-func GetLazyMessagesIdv2(groupID, userID string) string {
+func GetLazyMessagesIdv2(groupID, userID string) string { //1
 	store := initInstance()
 	store.mu.RLock()
 	defer store.mu.RUnlock()
@@ -101,18 +108,23 @@ func GetLazyMessagesIdv2(groupID, userID string) string {
 		randomMessageID = recentMessages[randomIndex]
 	} else {
 		// 如果没有找到最近消息，处理默认行为
-		msgType := GetMessageTypeByGroupidv2(config.GetAppIDStr(), groupID)
+		groupIDint64, err := idmap.StoreIDv2(groupID)
+		if err != nil {
+			mylog.Printf("Error storing ID 75: %v", err)
+			return "2000" //主动信息(不知道消息类型,按2000,纯主动信息处理)
+		}
+		msgType := GetMessageTypeByGroupidv2(config.GetAppIDStr(), groupIDint64)
 		if strings.HasPrefix(msgType, "guild") {
 			randomMessageID = "1000" // 频道主动信息
 		} else {
-			randomMessageID = ""
+			randomMessageID = "2000" //群主动信息
 		}
 	}
 	return randomMessageID
 }
 
 // 通过group_id获取类型
-func GetMessageTypeByGroupidv2(appID string, GroupID interface{}) string {
+func GetMessageTypeByGroupidv2(appID string, GroupID interface{}) string { //2
 	// 从appID和userID生成key
 	var GroupIDStr string
 	switch u := GroupID.(type) {

diff --git a/handlers/send_group_msg.go b/handlers/send_group_msg.go
@@ -87,11 +87,12 @@ func HandleSendGroupMsg(client callapi.Client, api openapi.OpenAPI, apiv2 openap
 			mylog.Printf("GetLazyMessagesId: %v", messageID)
 			//如果应用端传递了user_id 就让at不要顺序乱套
 			if message.Params.UserID != nil {
-				//messageID = echo.GetLazyMessagesId(message.Params.UserID.(string))
 				messageID = echo.GetLazyMessagesIdv2(message.Params.GroupID.(string), message.Params.UserID.(string))
 				mylog.Printf("GetLazyMessagesIdv2: %v", messageID)
 			}
-			if messageID != "" {
+			//2000是群主动 此时不能被动转主动
+			//仅在开启lazy_message_id时，有信息主动转被动特性，即，SSM
+			if messageID != "2000" {
 				//尝试发送栈内信息
 				SSM = true
 			}
@@ -144,6 +145,7 @@ func HandleSendGroupMsg(client callapi.Client, api openapi.OpenAPI, apiv2 openap
 		}
 		message.Params.GroupID = originalGroupID
 		message.Params.UserID = originalUserID
+		//2000是群主动 此时不能被动转主动
 		if SSM {
 			//mylog.Printf("正在使用Msgid:%v 补发之前失败的主动信息,请注意AtoP不要设置超过3,否则可能会影响正常信息发送", messageID)
 			//mylog.Printf("originalGroupID:%v ", originalGroupID)
@@ -166,9 +168,13 @@ func HandleSendGroupMsg(client callapi.Client, api openapi.OpenAPI, apiv2 openap
 			messageID = GetMessageIDByUseridOrGroupid(config.GetAppIDStr(), message.Params.GroupID)
 			mylog.Println("通过GetMessageIDByUseridOrGroupid函数获取的message_id:", message.Params.GroupID, messageID)
 		}
-		//开发环境用
-		if config.GetDevMsgID() {
-			messageID = "1000"
+		//开发环境用 1000在群里无效
+		// if config.GetDevMsgID() {
+		// 	messageID = "1000"
+		// }
+		if messageID == "2000" {
+			messageID = ""
+			mylog.Println("通过lazymessage_id模式发送群聊/频道主动信息,群聊每月仅4次机会,如果本信息非主动推送信息,请提交issue")
 		}
 		mylog.Printf("群组发信息使用messageID:[%v]", messageID)
 		var singleItem = make(map[string][]string)

diff --git a/handlers/send_guild_channel_msg.go b/handlers/send_guild_channel_msg.go
@@ -74,6 +74,11 @@ func HandleSendGuildChannelMsg(client callapi.Client, api openapi.OpenAPI, apiv2
 			messageID = GetMessageIDByUseridOrGroupid(config.GetAppIDStr(), channelID)
 			mylog.Println("通过GetMessageIDByUseridOrGroupid函数获取的message_id:", messageID)
 		}
+		//主动信息
+		if messageID == "2000" {
+			messageID = ""
+			mylog.Println("通过lazymsgid发送频道主动信息,若非主动信息请提交issue")
+		}
 		//开发环境用
 		if config.GetDevMsgID() {
 			messageID = "1000"

diff --git a/handlers/send_private_msg.go b/handlers/send_private_msg.go
@@ -111,10 +111,14 @@ func HandleSendPrivateMsg(client callapi.Client, api openapi.OpenAPI, apiv2 open
 			messageID = GetMessageIDByUseridOrGroupid(config.GetAppIDStr(), UserID)
 			mylog.Println("通过GetMessageIDByUserid函数获取的message_id:", messageID)
 		}
-		//开发环境用
-		if config.GetDevMsgID() {
-			messageID = "1000"
+		if messageID == "2000" {
+			messageID = ""
+			mylog.Println("通过lazymsgid发送群私聊主动信息,每月可发送1次")
 		}
+		//开发环境用 私聊不可用1000
+		// if config.GetDevMsgID() {
+		// 	messageID = "1000"
+		// }
 		mylog.Println("私聊发信息messageText:", messageText)
 		//mylog.Println("foundItems:", foundItems)
 
@@ -444,6 +448,10 @@ func HandleSendGuildChannelPrivateMsg(client callapi.Client, api openapi.OpenAPI
 			}
 		}
 	}
+	if messageID == "2000" {
+		messageID = ""
+		mylog.Println("通过lazymsgid发送频道私聊主动信息,若非主动信息请提交issue")
+	}
 	//开发环境用
 	if config.GetDevMsgID() {
 		messageID = "1000"