diff --git a/internal/rpc/conversation/conversaion.go b/internal/rpc/conversation/conversaion.go index a5bbb57ca..2e0679bf3 100644 --- a/internal/rpc/conversation/conversaion.go +++ b/internal/rpc/conversation/conversaion.go @@ -2,6 +2,7 @@ package conversation import ( "context" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller" diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 3b81a7270..fc7e63e06 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -3,6 +3,12 @@ package group import ( "context" "fmt" + "math/big" + "math/rand" + "strconv" + "strings" + "time" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller" @@ -22,11 +28,6 @@ import ( "github.com/OpenIMSDK/Open-IM-Server/pkg/utils" "google.golang.org/grpc" "gorm.io/gorm" - "math/big" - "math/rand" - "strconv" - "strings" - "time" ) func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error { @@ -120,7 +121,6 @@ func (s *groupServer) GenGroupID(ctx context.Context, groupID *string) error { } func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupReq) (*pbGroup.CreateGroupResp, error) { - resp := &pbGroup.CreateGroupResp{GroupInfo: &sdkws.GroupInfo{}} if err := tokenverify.CheckAccessV3(ctx, req.OwnerUserID); err != nil { return nil, err } @@ -151,6 +151,7 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR groupMember.OperatorUserID = tracelog.GetOpUserID(ctx) groupMember.JoinSource = constant.JoinByInvitation groupMember.InviterUserID = tracelog.GetOpUserID(ctx) + groupMember.JoinTime = time.Now() if err := CallbackBeforeMemberJoinGroup(ctx, groupMember, group.Ex); err != nil && err != errs.ErrCallbackContinue { return err } @@ -179,6 +180,7 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR if err := s.GroupDatabase.CreateGroup(ctx, []*relationTb.GroupModel{group}, groupMembers); err != nil { return nil, err } + resp := &pbGroup.CreateGroupResp{GroupInfo: &sdkws.GroupInfo{}} resp.GroupInfo = DbToPbGroupInfo(group, req.OwnerUserID, uint32(len(userIDs))) resp.GroupInfo.MemberCount = uint32(len(userIDs)) if req.GroupInfo.GroupType == constant.SuperGroup { diff --git a/pkg/common/db/controller/conversation.go b/pkg/common/db/controller/conversation.go index ee619ad7e..ba2d048f6 100644 --- a/pkg/common/db/controller/conversation.go +++ b/pkg/common/db/controller/conversation.go @@ -3,6 +3,7 @@ package controller import ( "context" "encoding/json" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" relationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" @@ -186,18 +187,18 @@ func (c *ConversationDataBase) GetConversation(ctx context.Context, ownerUserID } func (c *ConversationDataBase) GetUserAllConversation(ctx context.Context, ownerUserID string) ([]*relationTb.ConversationModel, error) { - getConversationIDList := func() (string, error) { - conversationIDList, err := c.conversationDB.FindUserIDAllConversationID(ctx, ownerUserID) + getConversationIDs := func() (string, error) { + conversationIDs, err := c.conversationDB.FindUserIDAllConversationID(ctx, ownerUserID) if err != nil { return "", utils.Wrap(err, "getConversationIDList failed") } - bytes, err := json.Marshal(conversationIDList) + bytes, err := json.Marshal(conversationIDs) if err != nil { return "", utils.Wrap(err, "") } return string(bytes), nil } - conversationIDList, err := c.cache.GetUserConversationIDs(ctx, ownerUserID, getConversationIDList) + conversationIDList, err := c.cache.GetUserConversationIDs(ctx, ownerUserID, getConversationIDs) if err != nil { return nil, err }