|
|
@ -16,6 +16,7 @@ package friend
|
|
|
|
|
|
|
|
|
|
|
|
import (
|
|
|
|
import (
|
|
|
|
"context"
|
|
|
|
"context"
|
|
|
|
|
|
|
|
tx2 "github.com/openimsdk/open-im-server/v3/pkg/common/db/tx"
|
|
|
|
|
|
|
|
|
|
|
|
"github.com/OpenIMSDK/protocol/sdkws"
|
|
|
|
"github.com/OpenIMSDK/protocol/sdkws"
|
|
|
|
|
|
|
|
|
|
|
@ -32,7 +33,6 @@ import (
|
|
|
|
pbfriend "github.com/OpenIMSDK/protocol/friend"
|
|
|
|
pbfriend "github.com/OpenIMSDK/protocol/friend"
|
|
|
|
registry "github.com/OpenIMSDK/tools/discoveryregistry"
|
|
|
|
registry "github.com/OpenIMSDK/tools/discoveryregistry"
|
|
|
|
"github.com/OpenIMSDK/tools/errs"
|
|
|
|
"github.com/OpenIMSDK/tools/errs"
|
|
|
|
"github.com/OpenIMSDK/tools/tx"
|
|
|
|
|
|
|
|
"github.com/OpenIMSDK/tools/utils"
|
|
|
|
"github.com/OpenIMSDK/tools/utils"
|
|
|
|
|
|
|
|
|
|
|
|
"github.com/openimsdk/open-im-server/v3/pkg/common/db/cache"
|
|
|
|
"github.com/openimsdk/open-im-server/v3/pkg/common/db/cache"
|
|
|
@ -89,14 +89,17 @@ func Start(client registry.SvcDiscoveryRegistry, server *grpc.Server) error {
|
|
|
|
&msgRpcClient,
|
|
|
|
&msgRpcClient,
|
|
|
|
notification.WithRpcFunc(userRpcClient.GetUsersInfo),
|
|
|
|
notification.WithRpcFunc(userRpcClient.GetUsersInfo),
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
tx, err := tx2.NewAuto(context.Background(), mongo.GetClient())
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
|
|
|
return err
|
|
|
|
|
|
|
|
}
|
|
|
|
// Register Friend server with refactored MongoDB and Redis integrations
|
|
|
|
// Register Friend server with refactored MongoDB and Redis integrations
|
|
|
|
pbfriend.RegisterFriendServer(server, &friendServer{
|
|
|
|
pbfriend.RegisterFriendServer(server, &friendServer{
|
|
|
|
friendDatabase: controller.NewFriendDatabase(
|
|
|
|
friendDatabase: controller.NewFriendDatabase(
|
|
|
|
friendMongoDB,
|
|
|
|
friendMongoDB,
|
|
|
|
friendRequestMongoDB,
|
|
|
|
friendRequestMongoDB,
|
|
|
|
cache.NewFriendCacheRedis(rdb, friendMongoDB, cache.GetDefaultOpt()),
|
|
|
|
cache.NewFriendCacheRedis(rdb, friendMongoDB, cache.GetDefaultOpt()),
|
|
|
|
tx.NewMongo(mongo.GetClient()),
|
|
|
|
tx,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
blackDatabase: controller.NewBlackDatabase(
|
|
|
|
blackDatabase: controller.NewBlackDatabase(
|
|
|
|
blackMongoDB,
|
|
|
|
blackMongoDB,
|
|
|
|