From 65427a9592f488af2b2fb2f50ce10658b3d11353 Mon Sep 17 00:00:00 2001 From: "Xinwei Xiong (cubxxw)" <3293172751nss@gmail.com> Date: Fri, 15 Mar 2024 11:20:31 +0800 Subject: [PATCH] fix: fix tools erros code --- internal/rpc/msg/as_read.go | 2 ++ pkg/common/config/config.go | 3 ++- pkg/common/db/mgo/group.go | 2 +- pkg/rpcclient/third.go | 1 + pkg/rpcclient/user.go | 3 ++- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/internal/rpc/msg/as_read.go b/internal/rpc/msg/as_read.go index 1c0da6596..c6041d912 100644 --- a/internal/rpc/msg/as_read.go +++ b/internal/rpc/msg/as_read.go @@ -42,10 +42,12 @@ func (m *msgServer) GetConversationsHasReadAndMaxSeq(ctx context.Context, req *m if err != nil { return nil, err } + conversations, err := m.ConversationLocalCache.GetConversations(ctx, req.UserID, conversationIDs) if err != nil { return nil, err } + conversationMaxSeqMap := make(map[string]int64) for _, conversation := range conversations { if conversation.MaxSeq != 0 { diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go index 5ef211728..723825224 100644 --- a/pkg/common/config/config.go +++ b/pkg/common/config/config.go @@ -19,8 +19,9 @@ import ( "time" "github.com/OpenIMSDK/tools/discoveryregistry" - util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil" "gopkg.in/yaml.v3" + + util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil" ) var Config GlobalConfig diff --git a/pkg/common/db/mgo/group.go b/pkg/common/db/mgo/group.go index e09d7f792..dd5a1f7ba 100644 --- a/pkg/common/db/mgo/group.go +++ b/pkg/common/db/mgo/group.go @@ -16,9 +16,9 @@ package mgo import ( "context" - "github.com/OpenIMSDK/protocol/constant" "time" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/mgoutil" "github.com/OpenIMSDK/tools/pagination" diff --git a/pkg/rpcclient/third.go b/pkg/rpcclient/third.go index aa4e3f732..3ff37692e 100644 --- a/pkg/rpcclient/third.go +++ b/pkg/rpcclient/third.go @@ -16,6 +16,7 @@ package rpcclient import ( "context" + "github.com/OpenIMSDK/protocol/third" "github.com/OpenIMSDK/tools/discoveryregistry" "google.golang.org/grpc" diff --git a/pkg/rpcclient/user.go b/pkg/rpcclient/user.go index 16218e94c..8afeaec34 100644 --- a/pkg/rpcclient/user.go +++ b/pkg/rpcclient/user.go @@ -16,9 +16,10 @@ package rpcclient import ( "context" + "strings" + "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/common/config" - "strings" "github.com/OpenIMSDK/protocol/sdkws" "github.com/OpenIMSDK/protocol/user"