blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-11-04 11:22:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove unnecessary field.

Browse Source
This commit is contained in:
Monet Lee 2024-07-17 16:56:45 +08:00
parent 13a92eed6b
commit a6936f03af
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/rpc/conversation/sync.go
View File

@ -2,6 +2,7 @@ package conversation
import ( import (
"context" "context"
"github.com/openimsdk/open-im-server/v3/internal/rpc/incrversion" "github.com/openimsdk/open-im-server/v3/internal/rpc/incrversion"
"github.com/openimsdk/open-im-server/v3/pkg/common/storage/model" "github.com/openimsdk/open-im-server/v3/pkg/common/storage/model"
"github.com/openimsdk/open-im-server/v3/pkg/util/hashutil" "github.com/openimsdk/open-im-server/v3/pkg/util/hashutil"
@ -40,7 +41,6 @@ func (c *conversationServer) GetIncrementalConversation(ctx context.Context, req
Find: func(ctx context.Context, conversationIDs []string) ([]*conversation.Conversation, error) { Find: func(ctx context.Context, conversationIDs []string) ([]*conversation.Conversation, error) {
return c.getConversations(ctx, req.UserID, conversationIDs) return c.getConversations(ctx, req.UserID, conversationIDs)
}, },
ID: func(elem *conversation.Conversation) string { return elem.GroupID },
Resp: func(version *model.VersionLog, delIDs []string, insertList, updateList []*conversation.Conversation, full bool) *conversation.GetIncrementalConversationResp { Resp: func(version *model.VersionLog, delIDs []string, insertList, updateList []*conversation.Conversation, full bool) *conversation.GetIncrementalConversationResp {
return &conversation.GetIncrementalConversationResp{ return &conversation.GetIncrementalConversationResp{
VersionID: version.ID.Hex(), VersionID: version.ID.Hex(),

1
internal/rpc/friend/sync.go
View File

@ -62,7 +62,6 @@ func (s *friendServer) GetIncrementalFriends(ctx context.Context, req *relation.
Find: func(ctx context.Context, ids []string) ([]*sdkws.FriendInfo, error) { Find: func(ctx context.Context, ids []string) ([]*sdkws.FriendInfo, error) {
return s.getFriend(ctx, req.UserID, ids) return s.getFriend(ctx, req.UserID, ids)
}, },
ID: func(elem *sdkws.FriendInfo) string { return elem.FriendUser.UserID },
Resp: func(version *model.VersionLog, deleteIds []string, insertList, updateList []*sdkws.FriendInfo, full bool) *relation.GetIncrementalFriendsResp { Resp: func(version *model.VersionLog, deleteIds []string, insertList, updateList []*sdkws.FriendInfo, full bool) *relation.GetIncrementalFriendsResp {
return &relation.GetIncrementalFriendsResp{ return &relation.GetIncrementalFriendsResp{
VersionID: version.ID.Hex(), VersionID: version.ID.Hex(),

11
internal/rpc/incrversion/option.go
View File

@ -3,6 +3,7 @@ package incrversion
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/openimsdk/open-im-server/v3/pkg/common/storage/model" "github.com/openimsdk/open-im-server/v3/pkg/common/storage/model"
"github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/errs"
"go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/bson/primitive"
@ -20,7 +21,7 @@ const syncLimit = 200
const ( const (
tagQuery = iota + 1 tagQuery = iota + 1
tagFull tagFull
tageEqual tagEqual
) )
type Option[A, B any] struct { type Option[A, B any] struct {
@ -33,7 +34,6 @@ type Option[A, B any] struct {
Version func(ctx context.Context, dId string, version uint, limit int) (*model.VersionLog, error) Version func(ctx context.Context, dId string, version uint, limit int) (*model.VersionLog, error)
//SortID func(ctx context.Context, dId string) ([]string, error) //SortID func(ctx context.Context, dId string) ([]string, error)
Find func(ctx context.Context, ids []string) ([]A, error) Find func(ctx context.Context, ids []string) ([]A, error)
ID func(elem A) string
Resp func(version *model.VersionLog, deleteIds []string, insertList, updateList []A, full bool) *B Resp func(version *model.VersionLog, deleteIds []string, insertList, updateList []A, full bool) *B
} }
@ -60,9 +60,6 @@ func (o *Option[A, B]) check() error {
if o.Find == nil { if o.Find == nil {
return o.newError("func find is nil") return o.newError("func find is nil")
} }
if o.ID == nil {
return o.newError("func id is nil")
}
if o.Resp == nil { if o.Resp == nil {
return o.newError("func resp is nil") return o.newError("func resp is nil")
} }
@ -100,7 +97,7 @@ func (o *Option[A, B]) getVersion(tag *int) (*model.VersionLog, error) {
return cache, nil return cache, nil
} }
if o.VersionNumber == uint64(cache.Version) { if o.VersionNumber == uint64(cache.Version) {
*tag = tageEqual *tag = tagEqual
return cache, nil return cache, nil
} }
*tag = tagQuery *tag = tagQuery
@ -123,7 +120,7 @@ func (o *Option[A, B]) Build() (*B, error) {
full = version.ID.Hex() != o.VersionID || uint64(version.Version) < o.VersionNumber || len(version.Logs) != version.LogLen full = version.ID.Hex() != o.VersionID || uint64(version.Version) < o.VersionNumber || len(version.Logs) != version.LogLen
case tagFull: case tagFull:
full = true full = true
case tageEqual: case tagEqual:
full = false full = false
default: default:
panic(fmt.Errorf("undefined tag %d", tag)) panic(fmt.Errorf("undefined tag %d", tag))