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

Merge remote-tracking branch 'origin/errcode' into errcode

Browse Source 
# Conflicts:
#	pkg/proto/sdk_ws/ws.proto
This commit is contained in:
withchao
2023-01-29 16:13:45 +08:00
parent 29a78c469d e241c65a9c
commit 0e1982083e
6 changed files with 989 additions and 3483 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/rpc/user/user.go
+4 -4
View File
@@ -138,9 +138,9 @@ func syncPeerUserConversation(conversation *pbConversation.Conversation, operati
return nil
}
func (s *userServer) GetUserInfo(ctx context.Context, req *pbUser.GetUserInfoReq) (*pbUser.GetUserInfoResp, error) {
resp := &pbUser.GetUserInfoResp{}
users, err := s.Find(ctx, req.UserIDList)
func (s *userServer) GetUsersInfo(ctx context.Context, req *pbUser.GetUsersInfoReq) (*pbUser.GetUsersInfoResp, error) {
resp := &pbUser.GetUsersInfoResp{}
users, err := s.Find(ctx, req.UserIDs)
if err != nil {
return nil, err
}
@@ -149,7 +149,7 @@ func (s *userServer) GetUserInfo(ctx context.Context, req *pbUser.GetUserInfoReq
if err != nil {
return nil, err
}
resp.UserInfoList = append(resp.UserInfoList, n)
resp.UsersInfo = append(resp.UsersInfo, n)
}
return resp, nil
}