From 4d89d7c618c84ab3c9ec36833d61551959105e31 Mon Sep 17 00:00:00 2001
From: wangchuxiao <wangchuxiao97@outlook.com>
Date: Thu, 13 Jul 2023 11:03:22 +0800
Subject: [PATCH] fix bug: args error

---
 internal/rpc/friend/friend.go | 2 +-
 pkg/common/convert/black.go   | 3 +++
 pkg/common/convert/friend.go  | 6 ++++++
 pkg/proto/msg/msg.go          | 9 ---------
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/internal/rpc/friend/friend.go b/internal/rpc/friend/friend.go
index c07b1423c..4c528d1d1 100644
--- a/internal/rpc/friend/friend.go
+++ b/internal/rpc/friend/friend.go
@@ -246,7 +246,6 @@ func (s *friendServer) GetPaginationFriendsApplyTo(
 	req *pbfriend.GetPaginationFriendsApplyToReq,
 ) (resp *pbfriend.GetPaginationFriendsApplyToResp, err error) {
 	defer log.ZInfo(ctx, utils.GetFuncName()+" Return")
-	resp = &pbfriend.GetPaginationFriendsApplyToResp{}
 	if err := s.userRpcClient.Access(ctx, req.UserID); err != nil {
 		return nil, err
 	}
@@ -255,6 +254,7 @@ func (s *friendServer) GetPaginationFriendsApplyTo(
 	if err != nil {
 		return nil, err
 	}
+	resp = &pbfriend.GetPaginationFriendsApplyToResp{}
 	resp.FriendRequests, err = convert.FriendRequestDB2Pb(ctx, friendRequests, s.userRpcClient.GetUsersInfoMap)
 	if err != nil {
 		return nil, err
diff --git a/pkg/common/convert/black.go b/pkg/common/convert/black.go
index 684a40d0d..ba0e2a5da 100644
--- a/pkg/common/convert/black.go
+++ b/pkg/common/convert/black.go
@@ -27,6 +27,9 @@ func BlackDB2Pb(
 	blackDBs []*relation.BlackModel,
 	f func(ctx context.Context, userIDs []string) (map[string]*sdkws.UserInfo, error),
 ) (blackPbs []*sdk.BlackInfo, err error) {
+	if len(blackDBs) == 0 {
+		return nil, nil
+	}
 	var userIDs []string
 	for _, blackDB := range blackDBs {
 		userIDs = append(userIDs, blackDB.BlockUserID)
diff --git a/pkg/common/convert/friend.go b/pkg/common/convert/friend.go
index 018aee42f..0531ad195 100644
--- a/pkg/common/convert/friend.go
+++ b/pkg/common/convert/friend.go
@@ -54,6 +54,9 @@ func FriendsDB2Pb(
 	friendsDB []*relation.FriendModel,
 	getUsers func(ctx context.Context, userIDs []string) (map[string]*sdkws.UserInfo, error),
 ) (friendsPb []*sdkws.FriendInfo, err error) {
+	if len(friendsDB) == 0 {
+		return nil, nil
+	}
 	var userID []string
 	for _, friendDB := range friendsDB {
 		userID = append(userID, friendDB.FriendUserID)
@@ -80,6 +83,9 @@ func FriendRequestDB2Pb(
 	friendRequests []*relation.FriendRequestModel,
 	getUsers func(ctx context.Context, userIDs []string) (map[string]*sdkws.UserInfo, error),
 ) ([]*sdkws.FriendRequest, error) {
+	if len(friendRequests) == 0 {
+		return nil, nil
+	}
 	userIDMap := make(map[string]struct{})
 	for _, friendRequest := range friendRequests {
 		userIDMap[friendRequest.ToUserID] = struct{}{}
diff --git a/pkg/proto/msg/msg.go b/pkg/proto/msg/msg.go
index aeb6deece..6442390e6 100644
--- a/pkg/proto/msg/msg.go
+++ b/pkg/proto/msg/msg.go
@@ -165,9 +165,6 @@ func (x *ClearConversationsMsgReq) Check() error {
 	if x.UserID == "" {
 		return errs.ErrArgs.Wrap("userID is empty")
 	}
-	if x.DeleteSyncOpt == nil {
-		return errs.ErrArgs.Wrap("deleteSyncOpt is empty")
-	}
 	return nil
 }
 
@@ -175,9 +172,6 @@ func (x *UserClearAllMsgReq) Check() error {
 	if x.UserID == "" {
 		return errs.ErrArgs.Wrap("userID is empty")
 	}
-	if x.DeleteSyncOpt == nil {
-		return errs.ErrArgs.Wrap("deleteSyncOpt is empty")
-	}
 	return nil
 }
 
@@ -191,9 +185,6 @@ func (x *DeleteMsgsReq) Check() error {
 	if x.Seqs == nil {
 		return errs.ErrArgs.Wrap("seqs is empty")
 	}
-	if x.DeleteSyncOpt == nil {
-		return errs.ErrArgs.Wrap("deleteSyncOpt is empty")
-	}
 	return nil
 }