This commit is contained in:
wangchuxiao 2022-05-27 16:13:44 +08:00
parent 16a56457ed
commit bbe8c46df9
3 changed files with 70 additions and 61 deletions

View File

@ -91,12 +91,6 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR
log.NewError(req.OperationID, "CheckAccess false ", req.OpUserID, req.OwnerUserID)
return &pbGroup.CreateGroupResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil
}
canCreate, err := callbackBeforeCreateGroup(req)
if err != nil || !canCreate {
if err != nil {
log.NewError(req.OperationID, utils.GetSelfFuncName(), "callbackBeforeCreateGroup failed")
}
}
groupId := req.GroupInfo.GroupID
if groupId == "" {
@ -107,11 +101,14 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR
utils.CopyStructFields(&groupInfo, req.GroupInfo)
groupInfo.CreatorUserID = req.OpUserID
groupInfo.GroupID = groupId
err = imdb.InsertIntoGroup(groupInfo)
err := imdb.InsertIntoGroup(groupInfo)
if err != nil {
log.NewError(req.OperationID, "InsertIntoGroup failed, ", err.Error(), groupInfo)
return &pbGroup.CreateGroupResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}, http.WrapError(constant.ErrDB)
}
var okUserIDList []string
if req.GroupInfo.GroupType == constant.NormalGroup {
groupMember := db.GroupMember{}
us := &db.User{}
if req.OwnerUserID == "" {
@ -174,6 +171,13 @@ initMemberList:
resp.GroupInfo.OwnerUserID = req.OwnerUserID
okUserIDList = append(okUserIDList, req.OwnerUserID)
}
} else if req.GroupInfo.GroupType == constant.SuperGroup {
for _, v := range req.InitMemberList {
okUserIDList = append(okUserIDList, v.UserID)
}
//memberCount := len(okUserIDList)
}
if len(okUserIDList) != 0 {
addGroupMemberToCacheReq := &pbCache.AddGroupMemberToCacheReq{

View File

@ -154,7 +154,8 @@ const (
//GroupType
NormalGroup = 0
DepartmentGroup = 1
SuperGroup = 1
DepartmentGroup = 2
GroupBaned = 3
GroupBanPrivateChat = 4

View File

@ -878,6 +878,10 @@ func (d *DataBases) GetUserFriendWorkMoments(showNumber, pageNumber int32, userI
return workMomentList, err
}
func (d *DataBases) CreateSuperGroup() {
}
func generateTagID(tagName, userID string) string {
return utils.Md5(tagName + userID + strconv.Itoa(rand.Int()) + time.Now().String())
}