IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-14 05:56:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

proto modify

Browse Source
This commit is contained in:
wangchuxiao
2023-03-03 18:55:51 +08:00
parent ebe689324b
commit 3a93f60555
8 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/common/check/access.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
)
func (u *UserCheck) Access(ctx context.Context, ownerUserID string) (err error) {
_, err = u.GetUsersInfo(ctx, ownerUserID)
_, err = u.GetUserInfo(ctx, ownerUserID)
if err != nil {
return err
}
internal/common/check/user.go
+1 -1
View File
@@ -47,7 +47,7 @@ func (u *UserCheck) GetUsersInfos(ctx context.Context, userIDs []string, complet
return resp.UsersInfo, nil
}
func (u *UserCheck) GetUsersInfo(ctx context.Context, userID string) (*sdkws.UserInfo, error) {
func (u *UserCheck) GetUserInfo(ctx context.Context, userID string) (*sdkws.UserInfo, error) {
users, err := u.GetUsersInfos(ctx, []string{userID}, true)
if err != nil {
return nil, err
internal/common/convert/convert.go
+5 -5
View File
@@ -58,7 +58,7 @@ func (db *DBFriend) DB2PB(ctx context.Context, friends []*relation.FriendModel)
func (db *DBFriend) Convert(ctx context.Context) (*sdk.FriendInfo, error) {
pbfriend := &sdk.FriendInfo{FriendUser: &sdk.UserInfo{}}
utils.CopyStructFields(pbfriend, db)
user, err := db.userCheck.GetUsersInfo(ctx, db.FriendUserID)
user, err := db.userCheck.GetUserInfo(ctx, db.FriendUserID)
if err != nil {
return nil, err
}
@@ -139,14 +139,14 @@ func (pb *PBFriendRequest) Convert() (*relation.FriendRequestModel, error) {
func (db *DBFriendRequest) Convert(ctx context.Context) (*sdk.FriendRequest, error) {
pbFriendRequest := &sdk.FriendRequest{}
utils.CopyStructFields(pbFriendRequest, db)
user, err := db.userCheck.GetUsersInfo(ctx, db.FromUserID)
user, err := db.userCheck.GetUserInfo(ctx, db.FromUserID)
if err != nil {
return nil, err
}
pbFriendRequest.FromNickname = user.Nickname
pbFriendRequest.FromFaceURL = user.FaceURL
pbFriendRequest.FromGender = user.Gender
user, err = db.userCheck.GetUsersInfo(ctx, db.ToUserID)
user, err = db.userCheck.GetUserInfo(ctx, db.ToUserID)
if err != nil {
return nil, err
}
@@ -219,7 +219,7 @@ func (db *DBBlack) Convert(ctx context.Context) (*sdk.BlackInfo, error) {
pbBlack := &sdk.BlackInfo{}
utils.CopyStructFields(pbBlack, db)
pbBlack.CreateTime = db.CreateTime.Unix()
user, err := db.userCheck.GetUsersInfo(ctx, db.BlockUserID)
user, err := db.userCheck.GetUserInfo(ctx, db.BlockUserID)
if err != nil {
return nil, err
}
@@ -344,7 +344,7 @@ func (db *DBGroupMember) Convert(ctx context.Context) (*sdk.GroupMemberFullInfo,
dst := &sdk.GroupMemberFullInfo{}
utils.CopyStructFields(dst, db)
user, err := db.userCheck.GetUsersInfo(ctx, db.UserID)
user, err := db.userCheck.GetUserInfo(ctx, db.UserID)
if err != nil {
return nil, err
}