conversations

internal/rpc/group/group.go

@@ -70,6 +70,7 @@ type groupServer struct {
 	User                  *rpcclient.UserClient
 	Notification          *notification.GroupNotificationSender
 	conversationRpcClient *rpcclient.ConversationClient
+	msgRpcClient          *rpcclient.MsgClient
 }
 
 func (s *groupServer) CheckGroupAdmin(ctx context.Context, groupID string) error {
@@ -462,6 +463,9 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbGroup.KickGrou
 		}
 		s.Notification.MemberKickedNotification(ctx, req, req.KickedUserIDs)
 	}
+	if err := s.deleteMemberAndSetConversationSeq(ctx, req.GroupID, req.KickedUserIDs); err != nil {
+		return nil, err
+	}
 	return resp, nil
 }
 
@@ -721,9 +725,28 @@ func (s *groupServer) QuitGroup(ctx context.Context, req *pbGroup.QuitGroupReq)
 		}
 		s.Notification.MemberQuitNotification(ctx, req)
 	}
+	if err := s.deleteMemberAndSetConversationSeq(ctx, req.GroupID, []string{mcontext.GetOpUserID(ctx)}); err != nil {
+		return nil, err
+	}
 	return resp, nil
 }
 
+func (s *groupServer) deleteMemberAndSetConversationSeq(ctx context.Context, groupID string, userIDs []string) error {
+	conevrsationID := utils.GetConversationIDBySessionType(constant.SuperGroupChatType, groupID)
+	resp, err := s.msgRpcClient.GetMaxAndMinSeq(ctx, &sdkws.GetMaxAndMinSeqReq{
+		ConversationIDs: []string{},
+		UserID:          mcontext.GetOpUserID(ctx),
+	})
+	if err != nil {
+		return err
+	}
+	seq, ok := resp.MaxAndMinSeqs[conevrsationID]
+	if !ok {
+		return errs.ErrInternalServer.Wrap("get max seq error")
+	}
+	return s.conversationRpcClient.DelGroupChatConversations(ctx, userIDs, groupID, seq.MaxSeq)
+}
+
 func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbGroup.SetGroupInfoReq) (*pbGroup.SetGroupInfoResp, error) {
 	if !tokenverify.IsAppManagerUid(ctx) {
 		groupMember, err := s.GroupDatabase.TakeGroupMember(ctx, req.GroupInfoForSet.GroupID, mcontext.GetOpUserID(ctx))

internal/rpc/msg/server.go

@@ -129,34 +129,22 @@ func (m *msgServer) GetMaxAndMinSeq(ctx context.Context, req *sdkws.GetMaxAndMin
 	}
 
 	m2 := make(map[string]*sdkws.MaxAndMinSeq)
-	maxSeq, err := m.MsgDatabase.GetUserMaxSeq(ctx, req.UserID)
-	if err != nil && errs.Unwrap(err) != redis.Nil {
-		return nil, err
-	}
-	minSeq, err := m.MsgDatabase.GetUserMinSeq(ctx, req.UserID)
-	if err != nil && errs.Unwrap(err) != redis.Nil {
-		return nil, err
-	}
 	resp := new(sdkws.GetMaxAndMinSeqResp)
-	resp.MaxSeq = maxSeq
+	for _, conversationID := range req.ConversationIDs {
-	resp.MinSeq = minSeq
+		maxSeq, err := m.MsgDatabase.GetGroupMaxSeq(ctx, conversationID)
-
-	for _, groupID := range req.GroupIDs {
-		maxSeq, err := m.MsgDatabase.GetGroupMaxSeq(ctx, groupID)
 		if err != nil && errs.Unwrap(err) != redis.Nil {
 			return nil, err
 		}
-		minSeq, err := m.MsgDatabase.GetGroupMinSeq(ctx, groupID)
+		minSeq, err := m.MsgDatabase.GetGroupMinSeq(ctx, conversationID)
 		if err != nil && errs.Unwrap(err) != redis.Nil {
 			return nil, err
 		}
-		m2[groupID] = &sdkws.MaxAndMinSeq{
+		m2[conversationID] = &sdkws.MaxAndMinSeq{
 			MaxSeq: maxSeq,
 			MinSeq: minSeq,
 		}
 	}
-
+	resp.MaxAndMinSeqs = m2
-	resp.GroupMaxAndMinSeq = m2
 	return resp, nil
 }
 

pkg/proto/sdkws/sdkws.proto

@@ -146,7 +146,7 @@ message PullMessageBySeqsResp {
 }
 
 message GetMaxAndMinSeqReq {
-  repeated string groupIDs = 1;
+  repeated string conversationIDs = 1;
   string userID = 2;
 }
 message MaxAndMinSeq{
@@ -154,9 +154,7 @@ message MaxAndMinSeq{
   int64 minSeq = 2;
 }
 message GetMaxAndMinSeqResp {
-  int64 maxSeq = 1;
+  map<string, MaxAndMinSeq> MaxAndMinSeqs = 1;
-  int64 minSeq = 2;
-  map<string, MaxAndMinSeq> groupMaxAndMinSeq = 5;
 }
 
 message UserSendMsgResp {