From c5f565ff209740e35a81976e427c4fbb26d7d96e Mon Sep 17 00:00:00 2001
From: withchao <993506633@qq.com>
Date: Thu, 6 Jun 2024 09:57:47 +0800
Subject: [PATCH] sync option

---
 internal/rpc/friend/convert.go | 0
 internal/rpc/friend/friend.go  | 2 +-
 internal/rpc/friend/sync.go    | 8 ++++----
 internal/rpc/user/user.go      | 4 ----
 4 files changed, 5 insertions(+), 9 deletions(-)
 delete mode 100644 internal/rpc/friend/convert.go

diff --git a/internal/rpc/friend/convert.go b/internal/rpc/friend/convert.go
deleted file mode 100644
index e69de29bb..000000000
diff --git a/internal/rpc/friend/friend.go b/internal/rpc/friend/friend.go
index 51fae71c4..cbc16cca9 100644
--- a/internal/rpc/friend/friend.go
+++ b/internal/rpc/friend/friend.go
@@ -275,7 +275,7 @@ func (s *friendServer) GetDesignatedFriends(ctx context.Context, req *relation.G
 	if err != nil {
 		return nil, err
 	}
-	return &pbfriend.GetDesignatedFriendsResp{
+	return &relation.GetDesignatedFriendsResp{
 		FriendsInfo: friends,
 	}, nil
 }
diff --git a/internal/rpc/friend/sync.go b/internal/rpc/friend/sync.go
index 46bc1d66a..9af1c47d3 100644
--- a/internal/rpc/friend/sync.go
+++ b/internal/rpc/friend/sync.go
@@ -2,12 +2,12 @@ package friend
 
 import (
 	"context"
+	"github.com/openimsdk/protocol/sdkws"
 
 	"github.com/openimsdk/open-im-server/v3/internal/rpc/incrversion"
 	"github.com/openimsdk/open-im-server/v3/pkg/authverify"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/model"
 	"github.com/openimsdk/protocol/relation"
-	"github.com/openimsdk/tools/errs"
 )
 
 //func (s *friendServer) SearchFriends(ctx context.Context, req *pbfriend.SearchFriendsReq) (*pbfriend.SearchFriendsResp, error) {
@@ -38,7 +38,7 @@ func (s *friendServer) GetIncrementalFriends(ctx context.Context, req *relation.
 	if err := authverify.CheckAccessV3(ctx, req.UserID, s.config.Share.IMAdminUserID); err != nil {
 		return nil, err
 	}
-	opt := incrversion.Option[*sdkws.FriendInfo, pbfriend.GetIncrementalFriendsResp]{
+	opt := incrversion.Option[*sdkws.FriendInfo, relation.GetIncrementalFriendsResp]{
 		Ctx:             ctx,
 		VersionKey:      req.UserID,
 		VersionID:       req.VersionID,
@@ -51,8 +51,8 @@ func (s *friendServer) GetIncrementalFriends(ctx context.Context, req *relation.
 			return s.getFriend(ctx, req.UserID, ids)
 		},
 		ID: func(elem *sdkws.FriendInfo) string { return elem.FriendUser.UserID },
-		Resp: func(version *model.VersionLog, delIDs []string, list []*sdkws.FriendInfo, full bool) *pbfriend.GetIncrementalFriendsResp {
-			return &pbfriend.GetIncrementalFriendsResp{
+		Resp: func(version *model.VersionLog, delIDs []string, list []*sdkws.FriendInfo, full bool) *relation.GetIncrementalFriendsResp {
+			return &relation.GetIncrementalFriendsResp{
 				VersionID:     version.ID.Hex(),
 				Version:       uint64(version.Version),
 				Full:          full,
diff --git a/internal/rpc/user/user.go b/internal/rpc/user/user.go
index b1b20dc40..96f784fab 100644
--- a/internal/rpc/user/user.go
+++ b/internal/rpc/user/user.go
@@ -16,10 +16,8 @@ package user
 
 import (
 	"context"
-	"errors"
 	"math/rand"
 	"strings"
-	"sync"
 	"time"
 
 	"github.com/openimsdk/open-im-server/v3/internal/rpc/friend"
@@ -29,8 +27,6 @@ import (
 	tablerelation "github.com/openimsdk/open-im-server/v3/pkg/common/storage/model"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/webhook"
 	"github.com/openimsdk/open-im-server/v3/pkg/localcache"
-	"github.com/openimsdk/protocol/group"
-	"github.com/openimsdk/protocol/relation"
 	"github.com/openimsdk/tools/db/redisutil"
 
 	"github.com/openimsdk/open-im-server/v3/pkg/authverify"