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

This commit is contained in:
Gordon
2022-05-30 11:56:45 +08:00
8 changed files with 516 additions and 231 deletions
-14
View File
@@ -410,21 +410,7 @@ func (s *groupServer) GetGroupAllMember(ctx context.Context, req *pbGroup.GetGro
//log.Debug(req.OperationID, "cp value: ", node)
resp.MemberList = append(resp.MemberList, &node)
}
} else {
groupInfo, err := db.DB.GetSuperGroup(req.GroupID)
if err != nil {
resp.ErrCode = constant.ErrDB.ErrCode
resp.ErrMsg = constant.ErrDB.ErrMsg
log.NewError(req.OperationID, "GetSuperGroup failed,", err.Error(), req.GroupID)
return &resp, nil
}
for _, userID := range groupInfo.MemberIDList {
var node open_im_sdk.GroupMemberFullInfo
node.UserID = userID
resp.MemberList = append(resp.MemberList, &node)
}
}
log.NewInfo(req.OperationID, "GetGroupAllMember rpc return ", resp.String())
return &resp, nil
}
+20
View File
@@ -0,0 +1,20 @@
package group
import (
"Open_IM/pkg/common/db"
"Open_IM/pkg/common/log"
pbGroup "Open_IM/pkg/proto/group"
"Open_IM/pkg/utils"
"context"
)
func (s *groupServer) GetJoinedSuperGroupList(ctx context.Context, req *pbGroup.GetJoinedSuperGroupListReq) (*pbGroup.GetJoinedSuperGroupListResp, error) {
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
resp := &pbGroup.GetJoinedSuperGroupListResp{}
_, err := db.DB.GetSuperGroupByUserID(req.UserID)
if err != nil {
return resp, nil
}
log.NewError(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String())
return resp, nil
}