diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index cfe766445..bb3bfcaee 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -457,9 +457,6 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbgroup.Invite if err := s.db.CreateGroup(ctx, nil, groupMembers); err != nil { return nil, err } - if err := s.conversationRpcClient.GroupChatFirstCreateConversation(ctx, req.GroupID, req.InvitedUserIDs); err != nil { - return nil, err - } if err = s.notification.MemberEnterNotification(ctx, req.GroupID, req.InvitedUserIDs...); err != nil { return nil, err @@ -832,9 +829,6 @@ func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbgroup } switch req.HandleResult { case constant.GroupResponseAgree: - if err := s.conversationRpcClient.GroupChatFirstCreateConversation(ctx, req.GroupID, []string{req.FromUserID}); err != nil { - return nil, err - } s.notification.GroupApplicationAcceptedNotification(ctx, req) if member == nil { log.ZDebug(ctx, "GroupApplicationResponse", "member is nil") @@ -901,9 +895,6 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbgroup.JoinGroupReq) return nil, err } - if err := s.conversationRpcClient.GroupChatFirstCreateConversation(ctx, req.GroupID, []string{req.InviterUserID}); err != nil { - return nil, err - } if err = s.notification.MemberEnterNotification(ctx, req.GroupID, req.InviterUserID); err != nil { return nil, err } diff --git a/internal/rpc/group/notification.go b/internal/rpc/group/notification.go index 52f18879a..bd0ebdb96 100644 --- a/internal/rpc/group/notification.go +++ b/internal/rpc/group/notification.go @@ -529,6 +529,10 @@ func (g *GroupNotificationSender) MemberEnterNotification(ctx context.Context, g } } + if err := g.conversationRpcClient.GroupChatFirstCreateConversation(ctx, groupID, entrantUserID); err != nil { + return err + } + var group *sdkws.GroupInfo group, err = g.getGroupInfo(ctx, groupID) if err != nil {