|
|
@ -858,14 +858,14 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbgroup.JoinGroupReq)
|
|
|
|
JoinTime: time.Now(),
|
|
|
|
JoinTime: time.Now(),
|
|
|
|
MuteEndTime: time.UnixMilli(0),
|
|
|
|
MuteEndTime: time.UnixMilli(0),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if err := CallbackBeforeMemberJoinGroup(ctx, s.config, groupMember, group.Ex); err != nil {
|
|
|
|
if err = CallbackBeforeMemberJoinGroup(ctx, s.config, groupMember, group.Ex); err != nil {
|
|
|
|
return nil, err
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if err := s.db.CreateGroup(ctx, nil, []*relationtb.GroupMemberModel{groupMember}); err != nil {
|
|
|
|
if err = s.db.CreateGroup(ctx, nil, []*relationtb.GroupMemberModel{groupMember}); err != nil {
|
|
|
|
return nil, err
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if err := s.conversationRpcClient.GroupChatFirstCreateConversation(ctx, req.GroupID, []string{req.InviterUserID}); err != nil {
|
|
|
|
if err = s.conversationRpcClient.GroupChatFirstCreateConversation(ctx, req.GroupID, []string{req.InviterUserID}); err != nil {
|
|
|
|
return nil, err
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
s.Notification.MemberEnterNotification(ctx, req.GroupID, req.InviterUserID)
|
|
|
|
s.Notification.MemberEnterNotification(ctx, req.GroupID, req.InviterUserID)
|
|
|
@ -883,7 +883,7 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbgroup.JoinGroupReq)
|
|
|
|
HandledTime: time.Unix(0, 0),
|
|
|
|
HandledTime: time.Unix(0, 0),
|
|
|
|
Ex: req.Ex,
|
|
|
|
Ex: req.Ex,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if err := s.db.CreateGroupRequest(ctx, []*relationtb.GroupRequestModel{&groupRequest}); err != nil {
|
|
|
|
if err = s.db.CreateGroupRequest(ctx, []*relationtb.GroupRequestModel{&groupRequest}); err != nil {
|
|
|
|
return nil, err
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
s.Notification.JoinGroupApplicationNotification(ctx, req)
|
|
|
|
s.Notification.JoinGroupApplicationNotification(ctx, req)
|
|
|
|