Merge remote-tracking branch 'origin/errcode' into errcode

# Conflicts:
#	pkg/proto/sdkws/sdkws.pb.go

internal/rpc/msg/delete.go

@@ -34,10 +34,11 @@ func (m *msgServer) UserClearAllMsg(ctx context.Context, req *msg.UserClearAllMs
 	if err := tokenverify.CheckAccessV3(ctx, req.UserID); err != nil {
 		return nil, err
 	}
-	conversationIDs, err := m.Conversation.GetConversationIDs(ctx, req.UserID)
+	conversationIDs, err := m.ConversationLocalCache.GetConversationIDs(ctx, req.UserID)
 	if err != nil {
 		return nil, err
 	}
+	log.ZDebug(ctx, "GetMaxSeq", "conversationIDs", conversationIDs)
 	maxSeqs, err := m.MsgDatabase.GetMaxSeqs(ctx, conversationIDs)
 	if err != nil {
 		return nil, err

internal/rpc/msg/revoke.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"time"
 
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
 	unRelationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
@@ -82,6 +81,7 @@ func (m *msgServer) RevokeMsg(ctx context.Context, req *msg.RevokeMsgReq) (*msg.
 	if err != nil {
 		return nil, err
 	}
+
 	tips := sdkws.RevokeMsgTips{
 		RevokerUserID:  req.UserID,
 		ClientMsgID:    "",
@@ -90,36 +90,13 @@ func (m *msgServer) RevokeMsg(ctx context.Context, req *msg.RevokeMsgReq) (*msg.
 		SesstionType:   msgs[0].SessionType,
 		ConversationID: req.ConversationID,
 	}
-	detail, err := json.Marshal(&tips)
-	if err != nil {
-		return nil, err
+	var recvID string
+	if msgs[0].SessionType == constant.SuperGroupChatType {
+		recvID = msgs[0].GroupID
+	} else {
+		recvID = msgs[0].RecvID
 	}
-	notificationElem := sdkws.NotificationElem{Detail: string(detail)}
-	content, err := json.Marshal(&notificationElem)
-	if err != nil {
-		return nil, errs.Wrap(err)
-	}
-	msgData := sdkws.MsgData{
-		SendID:      req.UserID,
-		RecvID:      msgs[0].RecvID,
-		GroupID:     msgs[0].GroupID,
-		Content:     content,
-		MsgFrom:     constant.SysMsgType,
-		ContentType: constant.MsgRevokeNotification,
-		SessionType: msgs[0].SessionType,
-		CreateTime:  utils.GetCurrentTimestampByMill(),
-		ClientMsgID: utils.GetMsgID(req.UserID),
-		Options: config.GetOptionsByNotification(config.NotificationConf{
-			IsSendMsg:        false,
-			ReliabilityLevel: 2,
-		}),
-		OfflinePushInfo: nil,
-	}
-	if msgData.SessionType == constant.SuperGroupChatType {
-		msgData.GroupID = msgData.RecvID
-	}
-	_, err = m.SendMsg(ctx, &msg.SendMsgReq{MsgData: &msgData})
-	if err != nil {
+	if err := m.notificationSender.Notification(ctx, req.UserID, recvID, constant.MsgRevokeNotification, &tips, utils.WithSendMsg(false), utils.WithHistory(true), utils.WithPersistent()); err != nil {
 		return nil, err
 	}
 	return &msg.RevokeMsgResp{}, nil

internal/rpc/msg/server.go

@@ -29,6 +29,7 @@ type msgServer struct {
 	ConversationLocalCache *localcache.ConversationLocalCache
 	MessageLocker          MessageLocker
 	Handlers               MessageInterceptorChain
+	notificationSender     *rpcclient.NotificationSender
 }
 
 func (m *msgServer) addInterceptorHandler(interceptorFunc ...MessageInterceptorFunc) {
@@ -64,7 +65,6 @@ func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) e
 	extendMsgCacheModel := cache.NewExtendMsgSetCacheRedis(rdb, extendMsgModel, cache.GetDefaultOpt())
 	extendMsgDatabase := controller.NewExtendMsgDatabase(extendMsgModel, extendMsgCacheModel, tx.NewMongo(mongo.GetClient()))
 	msgDatabase := controller.NewCommonMsgDatabase(msgDocModel, cacheModel)
-
 	s := &msgServer{
 		Conversation:           rpcclient.NewConversationClient(client),
 		User:                   rpcclient.NewUserClient(client),
@@ -78,6 +78,7 @@ func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) e
 		friend:                 rpcclient.NewFriendClient(client),
 		MessageLocker:          NewLockerMessage(cacheModel),
 	}
+	s.notificationSender = rpcclient.NewNotificationSender(rpcclient.WithLocalSendMsg(s.SendMsg))
 	s.addInterceptorHandler(MessageHasReadEnabled, MessageModifyCallback)
 	s.initPrometheus()
 	msg.RegisterMsgServer(server, s)