Merge 6920880 into 921da78

Hoshinonyaruko · Jun 28, 2024 · f74c61a · f74c61a
2 parents 921da78 + 6920880
commit f74c61a
Show file tree

Hide file tree

Showing 12 changed files with 289 additions and 35 deletions.
diff --git a/Processor/ProcessC2CMessage.go b/Processor/ProcessC2CMessage.go
@@ -68,7 +68,7 @@ func (p *Processors) ProcessC2CMessage(data *dto.WSC2CMessageData) error {
 		//1,idmap还原真实userid,
 		//发信息使用的是userid
 
-		messageID64, err := idmap.StoreIDv2(data.ID)
+		messageID64, err := idmap.StoreCachev2(data.ID)
 		if err != nil {
 			log.Fatalf("Error storing ID: %v", err)
 		}
@@ -205,7 +205,7 @@ func (p *Processors) ProcessC2CMessage(data *dto.WSC2CMessageData) error {
 		//框架内指令
 		p.HandleFrameworkCommand(messageText, data, "group_private")
 		//映射str的messageID到int
-		messageID64, err := idmap.StoreIDv2(data.ID)
+		messageID64, err := idmap.StoreCachev2(data.ID)
 		if err != nil {
 			mylog.Printf("Error storing ID: %v", err)
 			return nil

diff --git a/Processor/ProcessChannelDirectMessage.go b/Processor/ProcessChannelDirectMessage.go
@@ -95,7 +95,7 @@ func (p *Processors) ProcessChannelDirectMessage(data *dto.WSDirectMessageData)
 		//3,通过idmap用channelid获取guildid,
 		//发信息使用的是guildid
 		//todo 优化数据库读写次数
-		messageID64, err := idmap.StoreIDv2(data.ID)
+		messageID64, err := idmap.StoreCachev2(data.ID)
 		if err != nil {
 			log.Fatalf("Error storing ID: %v", err)
 		}
@@ -344,7 +344,7 @@ func (p *Processors) ProcessChannelDirectMessage(data *dto.WSDirectMessageData)
 
 			//userid := int(userid64)
 			//映射str的messageID到int
-			messageID64, err := idmap.StoreIDv2(data.ID)
+			messageID64, err := idmap.StoreCachev2(data.ID)
 			if err != nil {
 				mylog.Printf("Error storing ID: %v", err)
 				return nil

diff --git a/Processor/ProcessGroupMessage.go b/Processor/ProcessGroupMessage.go
@@ -78,7 +78,7 @@ func (p *Processors) ProcessGroupMessage(data *dto.WSGroupATMessageData) error {
 	//框架内指令
 	p.HandleFrameworkCommand(messageText, data, "group")
 	//映射str的messageID到int
-	messageID64, err := idmap.StoreIDv2(data.ID)
+	messageID64, err := idmap.StoreCachev2(data.ID)
 	if err != nil {
 		mylog.Printf("Error storing ID: %v", err)
 		return nil

diff --git a/Processor/ProcessGuildATMessage.go b/Processor/ProcessGuildATMessage.go
@@ -195,7 +195,7 @@ func (p *Processors) ProcessGuildATMessage(data *dto.WSATMessageData) error {
 		echostr := fmt.Sprintf("%s_%d_%d", AppIDString, s, currentTimeMillis)
 
 		//映射str的messageID到int
-		messageID64, err := idmap.StoreIDv2(data.ID)
+		messageID64, err := idmap.StoreCachev2(data.ID)
 		if err != nil {
 			mylog.Printf("Error storing ID: %v", err)
 			return nil

diff --git a/Processor/ProcessGuildNormalMessage.go b/Processor/ProcessGuildNormalMessage.go
@@ -191,7 +191,7 @@ func (p *Processors) ProcessGuildNormalMessage(data *dto.WSMessageData) error {
 		// 构造echostr，包括AppID，原始的s变量和当前时间戳
 		echostr := fmt.Sprintf("%s_%d_%d", AppIDString, s, currentTimeMillis)
 		//映射str的messageID到int
-		messageID64, err := idmap.StoreIDv2(data.ID)
+		messageID64, err := idmap.StoreCachev2(data.ID)
 		if err != nil {
 			mylog.Printf("Error storing ID: %v", err)
 			return nil

diff --git a/Processor/ProcessThreadMessage.go b/Processor/ProcessThreadMessage.go
@@ -312,7 +312,7 @@ func (p *Processors) ProcessThreadMessage(data *dto.WSThreadData) error {
 			// 构造echostr，包括AppID，原始的s变量和当前时间戳
 			echostr := fmt.Sprintf("%s_%d_%d", AppIDString, s, currentTimeMillis)
 			//映射str的messageID到int
-			messageID64, err := idmap.StoreIDv2(data.ID)
+			messageID64, err := idmap.StoreCachev2(data.ID)
 			if err != nil {
 				mylog.Printf("Error storing ID: %v", err)
 				return nil

diff --git a/handlers/delete_msg.go b/handlers/delete_msg.go
@@ -18,7 +18,7 @@ func init() {
 func DeleteMsg(client callapi.Client, api openapi.OpenAPI, apiv2 openapi.OpenAPI, message callapi.ActionMessage) (string, error) {
 
 	//还原msgid
-	RealMsgID, err := idmap.RetrieveRowByIDv2(message.Params.MessageID.(string))
+	RealMsgID, err := idmap.RetrieveRowByCachev2(message.Params.MessageID.(string))
 	if err != nil {
 		mylog.Printf("error retrieving real RChannelID: %v", err)
 	}

diff --git a/handlers/message_parser.go b/handlers/message_parser.go
@@ -146,7 +146,7 @@ func SendResponse(client callapi.Client, err error, message *callapi.ActionMessa
 	// 设置响应值
 	response := ServerResponse{}
 	if resp != nil {
-		messageID64, mapErr = idmap.StoreIDv2(resp.Message.ID)
+		messageID64, mapErr = idmap.StoreCachev2(resp.Message.ID)
 		if mapErr != nil {
 			mylog.Printf("Error storing ID: %v", mapErr)
 			return "", nil
@@ -246,7 +246,7 @@ func SendGuildResponse(client callapi.Client, err error, message *callapi.Action
 	// 设置响应值
 	response := ServerResponse{}
 	if resp != nil {
-		messageID64, mapErr = idmap.StoreIDv2(resp.ID)
+		messageID64, mapErr = idmap.StoreCachev2(resp.ID)
 		if mapErr != nil {
 			mylog.Printf("Error storing ID: %v", mapErr)
 			return "", nil
@@ -304,7 +304,7 @@ func SendC2CResponse(client callapi.Client, err error, message *callapi.ActionMe
 	// 设置响应值
 	response := ServerResponse{}
 	if resp != nil {
-		messageID64, mapErr = idmap.StoreIDv2(resp.Message.ID)
+		messageID64, mapErr = idmap.StoreCachev2(resp.Message.ID)
 		if mapErr != nil {
 			mylog.Printf("Error storing ID: %v", mapErr)
 			return "", nil
@@ -361,7 +361,7 @@ func SendGuildPrivateResponse(client callapi.Client, err error, message *callapi
 	// 设置响应值
 	response := ServerResponse{}
 	if resp != nil {
-		messageID64, mapErr = idmap.StoreIDv2(resp.ID)
+		messageID64, mapErr = idmap.StoreCachev2(resp.ID)
 		if mapErr != nil {
 			mylog.Printf("Error storing ID: %v", mapErr)
 			return "", nil

diff --git a/handlers/send_group_msg_raw.go b/handlers/send_group_msg_raw.go
@@ -160,7 +160,7 @@ func HandleSendGroupMsgRaw(client callapi.Client, api openapi.OpenAPI, apiv2 ope
 
 		if isNumeric(messageID) && messageID != "0" {
 			// 当messageID是字符串形式的数字时，执行转换
-			RealMsgID, err := idmap.RetrieveRowByIDv2(messageID)
+			RealMsgID, err := idmap.RetrieveRowByCachev2(messageID)
 			if err != nil {
 				mylog.Printf("error retrieving real MessageID: %v", err)
 			} else {