Test4

echo/echo.go

@@ -16,21 +16,21 @@ var globalEchoMapping = &EchoMapping{
 	msgIDMapping:   make(map[string]string),
 }
 
-func (e *EchoMapping) generateKey(appid string, s int64) string {
+func (e *EchoMapping) GenerateKey(appid string, s int64) string {
 	return appid + "_" + strconv.FormatInt(s, 10)
 }
 
 // 添加echo对应的类型
 func AddMsgType(appid string, s int64, msgType string) {
-	key := globalEchoMapping.generateKey(appid, s)
+	key := globalEchoMapping.GenerateKey(appid, s)
 	globalEchoMapping.mu.Lock()
 	defer globalEchoMapping.mu.Unlock()
 	globalEchoMapping.msgTypeMapping[key] = msgType
 }
 
 // 添加echo对应的messageid
 func AddMsgID(appid string, s int64, msgID string) {
-	key := globalEchoMapping.generateKey(appid, s)
+	key := globalEchoMapping.GenerateKey(appid, s)
 	globalEchoMapping.mu.Lock()
 	defer globalEchoMapping.mu.Unlock()
 	globalEchoMapping.msgIDMapping[key] = msgID

handlers/get_group_info.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"log"
-	"strconv"
 
 	"github.com/hoshinonyaruko/gensokyo/callapi"
 	"github.com/hoshinonyaruko/gensokyo/idmap"
@@ -28,11 +27,13 @@ type OnebotGroupInfo struct {
 }
 
 func ConvertGuildToGroupInfo(guild *dto.Guild, GroupId string) *OnebotGroupInfo {
-	groupidstr, err := strconv.ParseInt(GroupId, 10, 64)
+	// 使用idmap.StoreIDv2映射GroupId到一个int64的值
+	groupid64, err := idmap.StoreIDv2(GroupId)
 	if err != nil {
-		log.Printf("groupidstr: %v", err)
+		log.Printf("Error storing GroupID: %v", err)
 		return nil
 	}
+
 	ts, err := guild.JoinedAt.Time()
 	if err != nil {
 		log.Printf("转换JoinedAt失败: %v", err)
@@ -41,7 +42,7 @@ func ConvertGuildToGroupInfo(guild *dto.Guild, GroupId string) *OnebotGroupInfo
 	groupCreateTime := uint32(ts.Unix())
 
 	return &OnebotGroupInfo{
-		GroupID:         groupidstr,
+		GroupID:         groupid64,
 		GroupName:       guild.Name,
 		GroupMemo:       guild.Desc,
 		GroupCreateTime: groupCreateTime,

handlers/send_guild_channel_msg.go

@@ -56,6 +56,11 @@ func handleSendGuildChannelMsg(client callapi.Client, api openapi.OpenAPI, apiv2
 			messageID = echo.GetMsgIDByKey(echoStr)
 			log.Println("echo取频道发信息对应的message_id:", messageID)
 		}
+		// 如果messageID为空，通过函数获取
+		if messageID == "" {
+			messageID = GetMessageIDByUseridOrGroupid(config.GetAppIDStr(), channelID)
+			log.Println("通过GetMessageIDByUserid函数获取的message_id:", messageID)
+		}
 		log.Println("频道发信息messageText:", messageText)
 		log.Println("foundItems:", foundItems)
 		var err error

handlers/send_msg.go

@@ -169,6 +169,11 @@ func handleSendMsg(client callapi.Client, api openapi.OpenAPI, apiv2 openapi.Ope
 			messageID = echo.GetMsgIDByKey(echoStr)
 			log.Println("echo取私聊发信息对应的message_id:", messageID)
 		}
+		// 如果messageID为空，通过函数获取
+		if messageID == "" {
+			messageID = GetMessageIDByUseridOrGroupid(config.GetAppIDStr(), UserID)
+			log.Println("通过GetMessageIDByUserid函数获取的message_id:", messageID)
+		}
 		log.Println("私聊发信息messageText:", messageText)
 		log.Println("foundItems:", foundItems)
 

handlers/send_private_msg.go

@@ -47,6 +47,12 @@ func handleSendPrivateMsg(client callapi.Client, api openapi.OpenAPI, apiv2 open
 			messageID = echo.GetMsgIDByKey(echoStr)
 			log.Println("echo取私聊发信息对应的message_id:", messageID)
 		}
+		// 如果messageID仍然为空，尝试使用config.GetAppID和UserID的组合来获取messageID
+		// 如果messageID为空，通过函数获取
+		if messageID == "" {
+			messageID = GetMessageIDByUseridOrGroupid(config.GetAppIDStr(), UserID)
+			log.Println("通过GetMessageIDByUserid函数获取的message_id:", messageID)
+		}
 		log.Println("私聊发信息messageText:", messageText)
 		log.Println("foundItems:", foundItems)
 
@@ -66,6 +72,8 @@ func handleSendPrivateMsg(client callapi.Client, api openapi.OpenAPI, apiv2 open
 			if err != nil {
 				log.Printf("发送文本私聊信息失败: %v", err)
 			}
+			//发送成功回执
+			SendResponse(client, err, &message)
 		}
 
 		// 遍历 foundItems 并发送每种信息
@@ -85,6 +93,8 @@ func handleSendPrivateMsg(client callapi.Client, api openapi.OpenAPI, apiv2 open
 			if err != nil {
 				log.Printf("发送 %s 私聊信息失败: %v", key, err)
 			}
+			//发送成功回执
+			SendResponse(client, err, &message)
 		}
 	case "guild_private":
 		//当收到发私信调用 并且来源是频道