Merge branch 'openimsdk:main' into main

.env

@@ -8,10 +8,10 @@ ALERTMANAGER_IMAGE=prom/alertmanager:v0.27.0
 GRAFANA_IMAGE=grafana/grafana:11.0.1
 
 OPENIM_WEB_FRONT_IMAGE=openim/openim-web-front:release-v3.8.1
-OPENIM_ADMIN_FRONT_IMAGE=openim/openim-admin-front:release-v1.8.2
+OPENIM_ADMIN_FRONT_IMAGE=openim/openim-admin-front:release-v1.8.3
 
 #FRONT_IMAGE: use aliyun images
 #OPENIM_WEB_FRONT_IMAGE=registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-web-front:release-v3.8.1
-#OPENIM_ADMIN_FRONT_IMAGE=registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-admin-front:release-v1.8.2
+#OPENIM_ADMIN_FRONT_IMAGE=registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-admin-front:release-v1.8.3
 
 DATA_DIR=./

internal/rpc/msg/as_read.go

@@ -181,14 +181,23 @@ func (m *msgServer) MarkConversationAsRead(ctx context.Context, req *msg.MarkCon
 			req.UserID, seqs, hasReadSeq)
 	}
 
+	if conversation.ConversationType == constant.SingleChatType {
+		reqCall := &cbapi.CallbackSingleMsgReadReq{
+			ConversationID: conversation.ConversationID,
+			UserID:         conversation.OwnerUserID,
+			Seqs:           req.Seqs,
+			ContentType:    conversation.ConversationType,
+		}
+		m.webhookAfterSingleMsgRead(ctx, &m.config.WebhooksConfig.AfterSingleMsgRead, reqCall)
+	} else if conversation.ConversationType == constant.ReadGroupChatType {
 		reqCall := &cbapi.CallbackGroupMsgReadReq{
 			SendID:       conversation.OwnerUserID,
 			ReceiveID:    req.UserID,
 			UnreadMsgNum: req.HasReadSeq,
 			ContentType:  int64(conversation.ConversationType),
 		}
-
 		m.webhookAfterGroupMsgRead(ctx, &m.config.WebhooksConfig.AfterGroupMsgRead, reqCall)
+	}
 	return &msg.MarkConversationAsReadResp{}, nil
 }
 

internal/rpc/msg/send.go

@@ -179,9 +179,6 @@ func (m *msgServer) sendMsgSingleChat(ctx context.Context, req *pbmsg.SendMsgReq
 		prommetrics.SingleChatMsgProcessFailedCounter.Inc()
 		return nil, nil
 	} else {
-		if err = m.webhookBeforeSendSingleMsg(ctx, &m.config.WebhooksConfig.BeforeSendSingleMsg, req); err != nil {
-			return nil, err
-		}
 		if err := m.webhookBeforeMsgModify(ctx, &m.config.WebhooksConfig.BeforeMsgModify, req); err != nil {
 			return nil, err
 		}

internal/rpc/msg/verify.go

@@ -59,6 +59,9 @@ func (m *msgServer) messageVerification(ctx context.Context, data *msg.SendMsgRe
 			data.MsgData.ContentType >= constant.NotificationBegin {
 			return nil
 		}
+		if err := m.webhookBeforeSendSingleMsg(ctx, &m.config.WebhooksConfig.BeforeSendSingleMsg, data); err != nil {
+			return err
+		}
 		black, err := m.FriendLocalCache.IsBlack(ctx, data.MsgData.SendID, data.MsgData.RecvID)
 		if err != nil {
 			return err

pkg/common/storage/controller/msg.go

@@ -444,10 +444,10 @@ func (db *commonMsgDatabase) GetMsgBySeqsRange(ctx context.Context, userID strin
 		}
 		successMsgs = append(mongoMsgs, successMsgs...)
 
-		_, err = db.msg.SetMessagesToCache(ctx, conversationID, mongoMsgs)
-		if err != nil {
-			return 0, 0, nil, err
-		}
+		//_, err = db.msg.SetMessagesToCache(ctx, conversationID, mongoMsgs)
+		//if err != nil {
+		//	return 0, 0, nil, err
+		//}
 	}
 
 	return minSeq, maxSeq, successMsgs, nil
@@ -506,10 +506,10 @@ func (db *commonMsgDatabase) GetMsgBySeqs(ctx context.Context, userID string, co
 
 		successMsgs = append(successMsgs, mongoMsgs...)
 
-		_, err = db.msg.SetMessagesToCache(ctx, conversationID, mongoMsgs)
-		if err != nil {
-			return 0, 0, nil, err
-		}
+		//_, err = db.msg.SetMessagesToCache(ctx, conversationID, mongoMsgs)
+		//if err != nil {
+		//	return 0, 0, nil, err
+		//}
 	}
 	return minSeq, maxSeq, successMsgs, nil
 }

version/version

@@ -1 +1 @@
-3.8.1
+main