From 4bdf6be3722737290189afd7c5e05aa3daed9068 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Fri, 7 Jul 2023 10:52:54 +0800 Subject: [PATCH 1/2] set conversations update --- internal/rpc/conversation/conversaion.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/internal/rpc/conversation/conversaion.go b/internal/rpc/conversation/conversaion.go index 88836744b..8839bfd4e 100644 --- a/internal/rpc/conversation/conversaion.go +++ b/internal/rpc/conversation/conversaion.go @@ -172,6 +172,12 @@ func (c *conversationServer) SetConversations(ctx context.Context, req *pbConver if groupInfo.Status == constant.GroupStatusDismissed { return nil, err } + for _, userID := range req.UserIDs { + if _, err := c.groupRpcClient.GetGroupMemberCache(ctx, req.Conversation.GroupID, userID); err != nil { + log.ZError(ctx, "user not in group", err, "userID", userID, "groupID", req.Conversation.GroupID) + return nil, err + } + } } var conversation tableRelation.ConversationModel conversation.ConversationID = req.Conversation.ConversationID From 5d82447e92bccb3458f140f57eb113252a8be2ff Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Fri, 7 Jul 2023 11:14:15 +0800 Subject: [PATCH 2/2] set privateChat --- internal/rpc/conversation/conversaion.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/rpc/conversation/conversaion.go b/internal/rpc/conversation/conversaion.go index 8839bfd4e..a557c332c 100644 --- a/internal/rpc/conversation/conversaion.go +++ b/internal/rpc/conversation/conversaion.go @@ -200,7 +200,7 @@ func (c *conversationServer) SetConversations(ctx context.Context, req *pbConver if req.Conversation.GroupAtType != nil { m["group_at_type"] = req.Conversation.GroupAtType.Value } - if req.Conversation.IsPrivateChat != nil { + if req.Conversation.IsPrivateChat != nil && req.Conversation.ConversationType != constant.SuperGroupChatType { var conversations []*tableRelation.ConversationModel for _, ownerUserID := range req.UserIDs { conversation2 := conversation