blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gordon 2023-07-07 11:36:22 +08:00
commit 05889706dd
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/rpc/conversation/conversaion.go
View File

@ -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
@ -194,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