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

group

Browse Source
This commit is contained in:
wangchuxiao
2022-01-27 01:08:02 +08:00
parent b992faa468
commit 0ed393b1a5
14 changed files with 588 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/rpc/group/group.go
+18 -8
View File
@@ -14,11 +14,12 @@ import (
open_im_sdk "Open_IM/pkg/proto/sdk_ws"
"Open_IM/pkg/utils"
"context"
"google.golang.org/grpc"
"net"
"strconv"
"strings"
"time"
"google.golang.org/grpc"
)
type groupServer struct {
@@ -648,7 +649,7 @@ func (s *groupServer) GetGroup(_ context.Context, req *pbGroup.GetGroupReq) (*pb
if err != nil {
return nil, err
}
for _, v:= range groups {
for _, v := range groups {
resp.GroupInfo = append(resp.GroupInfo, &open_im_sdk.GroupInfo{
GroupID: v.GroupID,
GroupName: v.GroupName,
@@ -664,14 +665,23 @@ func (s *groupServer) GetGroup(_ context.Context, req *pbGroup.GetGroupReq) (*pb
func (s *groupServer) GetGroups(_ context.Context, req *pbGroup.GetGroupsReq) (*pbGroup.GetGroupsResp, error) {
log.NewInfo(req.OperationID, "GetGroups ", req.String())
resp := &pbGroup.GetGroupsResp{
GroupInfo: []*open_im_sdk.GroupInfo{},
Pagination: &open_im_sdk.RequestPagination{},
}
groups, err := imdb.GetGroups(int(req.Pagination.PageNumber), int(req.Pagination.ShowNumber))
if err != nil {
return nil, err
return resp, err
}
resp := &pbGroup.GetGroupsResp{
GroupInfo: []*open_im_sdk.GroupInfo{},
groupsCountNum, err := imdb.GetGroupsCountNum()
log.NewInfo(req.OperationID, "groupsCountNum ", groupsCountNum)
if err != nil {
return resp, err
}
for _, v:= range groups {
resp.GroupNum = int32(groupsCountNum)
resp.Pagination.PageNumber = req.Pagination.PageNumber
resp.Pagination.ShowNumber = req.Pagination.ShowNumber
for _, v := range groups {
resp.GroupInfo = append(resp.GroupInfo, &open_im_sdk.GroupInfo{
GroupID: v.GroupID,
GroupName: v.GroupName,
@@ -681,11 +691,11 @@ func (s *groupServer) GetGroups(_ context.Context, req *pbGroup.GetGroupsReq) (*
CreatorUserID: v.CreatorUserID,
})
}
utils.CopyStructFields(resp.GroupInfo, groups)
return resp, nil
}
func (s *groupServer) BanGroupChat(_ context.Context, req *pbGroup.BanGroupChatReq) (*pbGroup.BanGroupChatResp, error){
func (s *groupServer) BanGroupChat(_ context.Context, req *pbGroup.BanGroupChatReq) (*pbGroup.BanGroupChatResp, error) {
log.NewInfo(req.OperationID, "BanGroupChat ", req.String())
resp := &pbGroup.BanGroupChatResp{}
if err := imdb.BanGroupChat(req.GroupId); err != nil {
internal/rpc/user/user.go
+21 -11
View File
@@ -15,10 +15,11 @@ import (
"Open_IM/pkg/utils"
"context"
"fmt"
"google.golang.org/grpc"
"net"
"strconv"
"strings"
"google.golang.org/grpc"
)
type userServer struct {
@@ -244,7 +245,7 @@ func (s *userServer) UpdateUserInfo(ctx context.Context, req *pbUser.UpdateUserI
func (s *userServer) GetUser(ctx context.Context, req *pbUser.GetUserReq) (*pbUser.GetUserResp, error) {
log.NewInfo(req.OperationID, "GetUser args ", req.String())
resp := &pbUser.GetUserResp{User:&pbUser.User{}}
resp := &pbUser.GetUserResp{User: &pbUser.User{}}
user, err := imdb.GetUserByUserID(req.UserId)
if err != nil {
return resp, nil
@@ -260,7 +261,7 @@ func (s *userServer) GetUser(ctx context.Context, req *pbUser.GetUserReq) (*pbUs
func (s *userServer) GetUsers(ctx context.Context, req *pbUser.GetUsersReq) (*pbUser.GetUsersResp, error) {
log.NewInfo(req.OperationID, "GetUsers args ", req.String())
resp := &pbUser.GetUsersResp{User:[]*pbUser.User{}}
resp := &pbUser.GetUsersResp{User: []*pbUser.User{}}
users, err := imdb.GetUsers(req.Pagination.ShowNumber, req.Pagination.PageNumber)
if err != nil {
return resp, nil
@@ -278,7 +279,7 @@ func (s *userServer) GetUsers(ctx context.Context, req *pbUser.GetUsersReq) (*pb
UserId: v.UserID,
CreateTime: v.CreateTime.String(),
Nickname: v.Nickname,
IsBlock: isBlock,
IsBlock: isBlock,
}
resp.User = append(resp.User, user)
}
@@ -297,7 +298,18 @@ func (s *userServer) ResignUser(ctx context.Context, req *pbUser.ResignUserReq)
func (s *userServer) AlterUser(ctx context.Context, req *pbUser.AlterUserReq) (*pbUser.AlterUserResp, error) {
log.NewInfo(req.OperationID, "AlterUser args ", req.String())
return &pbUser.AlterUserResp{}, nil
resp := &pbUser.AlterUserResp{}
user := db.Users{
PhoneNumber: strconv.FormatInt(req.PhoneNumber, 10),
Nickname: req.Nickname,
Email: req.Email,
UserID: req.UserId,
}
if err := imdb.UpdateUserInfo(user); err != nil {
log.NewError(req.OperationID, err)
return resp, err
}
return resp, nil
}
func (s *userServer) AddUser(ctx context.Context, req *pbUser.AddUserReq) (*pbUser.AddUserResp, error) {
@@ -332,8 +344,6 @@ func (s *userServer) UnBlockUser(ctx context.Context, req *pbUser.UnBlockUserReq
return resp, nil
}
//func (s *userServer) GetBlockUser(ctx context.Context, req *pbUser.GetBlockUserReq)
func (s *userServer) GetBlockUsers(ctx context.Context, req *pbUser.GetBlockUsersReq) (*pbUser.GetBlockUsersResp, error) {
log.NewInfo(req.OperationID, "GetBlockUsers args ", req.String())
resp := &pbUser.GetBlockUsersResp{}
@@ -355,7 +365,7 @@ func (s *userServer) GetBlockUsers(ctx context.Context, req *pbUser.GetBlockUser
IsBlock: true,
},
BeginDisableTime: (v.BeginDisableTime).String(),
EndDisableTime: (v.EndDisableTime).String(),
EndDisableTime: (v.EndDisableTime).String(),
})
}
resp.Pagination = &sdkws.ResponsePagination{}
@@ -368,8 +378,8 @@ func (s *userServer) GetBlockUsers(ctx context.Context, req *pbUser.GetBlockUser
func (s *userServer) GetBlockUser(_ context.Context, req *pbUser.GetBlockUserReq) (*pbUser.GetBlockUserResp, error) {
log.NewInfo(req.OperationID, "GetBlockUser args ", req.String())
resp := &pbUser.GetBlockUserResp{}
user, err := imdb.GetBlockUserById(req.UserId)
if err != nil{
user, err := imdb.GetBlockUserById(req.UserId)
if err != nil {
return resp, err
}
resp.BlockUser = &pbUser.BlockUser{}
@@ -377,4 +387,4 @@ func (s *userServer) GetBlockUser(_ context.Context, req *pbUser.GetBlockUserReq
resp.BlockUser.EndDisableTime = (user.EndDisableTime).String()
return resp, nil
}
}