From e6b2a9f8f9b38f2176bd1b697d56269d7f8d105b Mon Sep 17 00:00:00 2001
From: wangchuxiao <wangchuxiao97@outlook.com>
Date: Fri, 28 Apr 2023 11:01:48 +0800
Subject: [PATCH] msg

---
 internal/rpc/conversation/conversaion.go |  6 ++---
 internal/rpc/msg/server.go               | 32 +++++++++++++-----------
 pkg/rpcclient/msg.go                     |  2 +-
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/internal/rpc/conversation/conversaion.go b/internal/rpc/conversation/conversaion.go
index 3f3c00a3e..4409c284c 100644
--- a/internal/rpc/conversation/conversaion.go
+++ b/internal/rpc/conversation/conversaion.go
@@ -85,7 +85,7 @@ func (c *conversationServer) BatchSetConversations(ctx context.Context, req *pbC
 	if err != nil {
 		return nil, err
 	}
-	c.conversationNotificationSender.ConversationChangeNotification(ctx, req.OwnerUserID)
+	_ = c.conversationNotificationSender.ConversationChangeNotification(ctx, req.OwnerUserID)
 	return &pbConversation.BatchSetConversationsResp{}, nil
 }
 
@@ -98,7 +98,7 @@ func (c *conversationServer) SetConversation(ctx context.Context, req *pbConvers
 	if err != nil {
 		return nil, err
 	}
-	c.conversationNotificationSender.ConversationChangeNotification(ctx, req.Conversation.OwnerUserID)
+	_ = c.conversationNotificationSender.ConversationChangeNotification(ctx, req.Conversation.OwnerUserID)
 	resp := &pbConversation.SetConversationResp{}
 	return resp, nil
 }
@@ -107,7 +107,7 @@ func (c *conversationServer) SetRecvMsgOpt(ctx context.Context, req *pbConversat
 	if err := c.conversationDatabase.SetUsersConversationFiledTx(ctx, []string{req.OwnerUserID}, &tableRelation.ConversationModel{OwnerUserID: req.OwnerUserID, ConversationID: req.ConversationID, RecvMsgOpt: req.RecvMsgOpt}, map[string]interface{}{"recv_msg_opt": req.RecvMsgOpt}); err != nil {
 		return nil, err
 	}
-	c.conversationNotificationSender.ConversationChangeNotification(ctx, req.OwnerUserID)
+	_ = c.conversationNotificationSender.ConversationChangeNotification(ctx, req.OwnerUserID)
 	return &pbConversation.SetRecvMsgOptResp{}, nil
 }
 
diff --git a/internal/rpc/msg/server.go b/internal/rpc/msg/server.go
index e5b1f54e1..8719fc26a 100644
--- a/internal/rpc/msg/server.go
+++ b/internal/rpc/msg/server.go
@@ -2,6 +2,7 @@ package msg
 
 import (
 	"context"
+
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller"
@@ -124,7 +125,7 @@ func (m *msgServer) GetMaxAndMinSeq(ctx context.Context, req *sdkws.GetMaxAndMin
 	if err := tokenverify.CheckAccessV3(ctx, req.UserID); err != nil {
 		return nil, err
 	}
-	resp := new(sdkws.GetMaxAndMinSeqResp)
+
 	m2 := make(map[string]*sdkws.MaxAndMinSeq)
 	maxSeq, err := m.MsgDatabase.GetUserMaxSeq(ctx, req.UserID)
 	if err != nil && errs.Unwrap(err) != redis.Nil {
@@ -134,24 +135,25 @@ func (m *msgServer) GetMaxAndMinSeq(ctx context.Context, req *sdkws.GetMaxAndMin
 	if err != nil && errs.Unwrap(err) != redis.Nil {
 		return nil, err
 	}
+	resp := new(sdkws.GetMaxAndMinSeqResp)
 	resp.MaxSeq = maxSeq
 	resp.MinSeq = minSeq
-	if len(req.GroupIDs) > 0 {
-		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)
-			if err != nil && errs.Unwrap(err) != redis.Nil {
-				return nil, err
-			}
-			m2[groupID] = &sdkws.MaxAndMinSeq{
-				MaxSeq: maxSeq,
-				MinSeq: minSeq,
-			}
+
+	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)
+		if err != nil && errs.Unwrap(err) != redis.Nil {
+			return nil, err
+		}
+		m2[groupID] = &sdkws.MaxAndMinSeq{
+			MaxSeq: maxSeq,
+			MinSeq: minSeq,
 		}
 	}
+
 	resp.GroupMaxAndMinSeq = m2
 	return resp, nil
 }
diff --git a/pkg/rpcclient/msg.go b/pkg/rpcclient/msg.go
index fc2eee11e..b0a8dd24c 100644
--- a/pkg/rpcclient/msg.go
+++ b/pkg/rpcclient/msg.go
@@ -137,7 +137,7 @@ func (m *MsgClient) PullMessageBySeqList(ctx context.Context, req *sdkws.PullMes
 func (c *MsgClient) Notification(ctx context.Context, sendID, recvID string, contentType int32, m proto.Message, opts ...utils.OptionsOpt) error {
 	content, err := json.Marshal(m)
 	if err != nil {
-		log.ZError(ctx, "MsgClient Notification json.Marshal failed", err, "sendID", sendID, "recvID", recvID, "contentType", contentType, "sessionType", sessionType, "m", m)
+		log.ZError(ctx, "MsgClient Notification json.Marshal failed", err, "sendID", sendID, "recvID", recvID, "contentType", contentType, "msg", m)
 		return err
 	}
 	var req msg.SendMsgReq