Merge branch 'openimsdk:main' into main

.github/workflows/cla-assistant.yml

@@ -33,8 +33,8 @@ jobs:
           remote-repository-name: cla
           create-file-commit-message: 'Creating file for storing CLA Signatures'
           # signed-commit-message: '$contributorName has signed the CLA in $owner/$repo#$pullRequestNo'
-          custom-notsigned-prcomment: '💕 Thank you for your contribution and please kindly read and sign our [CLA Docs](https://github.com/OpenIM-Robot/cla/blob/main/README.md)'
+          custom-notsigned-prcomment: '💕 Thank you for your contribution and please kindly read and sign our CLA. [CLA Docs](https://github.com/OpenIM-Robot/cla/blob/main/README.md)'
-          custom-pr-sign-comment: 'The signature to be committed in order to sign the CLA'
+          custom-pr-sign-comment: 'I have read the CLA Document and I hereby sign the CLA'
-          custom-allsigned-prcomment: '🤖 All Contributors have signed the [CLA](https://github.com/OpenIM-Robot/cla/blob/main/README.md).<br> The signed information is recorded [🤖here](https://github.com/openim-sigs/cla/tree/main/signatures/cla.json)'
+          custom-allsigned-prcomment: '🤖 All Contributors have signed the [CLA](https://github.com/OpenIM-Robot/cla/blob/main/README.md).<br> The signed information is recorded [**here**](https://github.com/OpenIM-Robot/cla/blob/main/signatures/cla.json)'
           #lock-pullrequest-aftermerge: false - if you don't want this bot to automatically lock the pull request after merging (default - true)
           #use-dco-flag: true - If you are using DCO instead of CLA

CONTRIBUTING-zh_CN.md

@@ -77,7 +77,7 @@ git push origin fix-bug-123
 ### 9. 签署 CLA
 如果这是你第一次提交 PR，你需要在 PR 的评论中回复：
 ```
-The signature to be committed in order to sign the CLA
+I have read the CLA Document and I hereby sign the CLA
 ```
 
 ### 编程规范

CONTRIBUTING.md

@@ -75,7 +75,7 @@ Go to your fork on GitHub and click the "Pull Request" button. Ensure the PR des
 ### 9. Sign the CLA
 If this is your first time submitting a PR, you will need to reply in the comments of the PR:
 ```
-The signature to be committed in order to sign the CLA
+I have read the CLA Document and I hereby sign the CLA
 ```
 
 ### Programming Standards

internal/rpc/conversation/conversaion.go

@@ -221,11 +221,11 @@ func (c *conversationServer) SetConversation(ctx context.Context, req *pbconvers
 	return resp, nil
 }
 
-// nolint
 func (c *conversationServer) SetConversations(ctx context.Context, req *pbconversation.SetConversationsReq) (*pbconversation.SetConversationsResp, error) {
 	if req.Conversation == nil {
 		return nil, errs.ErrArgs.WrapMsg("conversation must not be nil")
 	}
+
 	if req.Conversation.ConversationType == constant.WriteGroupChatType {
 		groupInfo, err := c.groupRpcClient.GetGroupInfo(ctx, req.Conversation.GroupID)
 		if err != nil {
@@ -235,100 +235,144 @@ func (c *conversationServer) SetConversations(ctx context.Context, req *pbconver
 			return nil, servererrs.ErrDismissedAlready.WrapMsg("group dismissed")
 		}
 	}
-	var unequal int
+
-	var conv dbModel.Conversation
+	conversationMap := make(map[string]*dbModel.Conversation)
-	if len(req.UserIDs) == 1 {
+	var needUpdateUsersList []string
-		cs, err := c.conversationDatabase.FindConversations(ctx, req.UserIDs[0], []string{req.Conversation.ConversationID})
+
+	for _, userID := range req.UserIDs {
+		conversationList, err := c.conversationDatabase.FindConversations(ctx, userID, []string{req.Conversation.ConversationID})
 		if err != nil {
 			return nil, err
 		}
-		if len(cs) == 0 {
+		if len(conversationList) != 0 {
-			return nil, errs.ErrRecordNotFound.WrapMsg("conversation not found")
+			conversationMap[userID] = conversationList[0]
+		} else {
+			needUpdateUsersList = append(needUpdateUsersList, userID)
 		}
-		conv = *cs[0]
 	}
+
 	var conversation dbModel.Conversation
 	conversation.ConversationID = req.Conversation.ConversationID
 	conversation.ConversationType = req.Conversation.ConversationType
 	conversation.UserID = req.Conversation.UserID
 	conversation.GroupID = req.Conversation.GroupID
+
 	m := make(map[string]any)
+
+	setConversationFieldsFunc := func() {
 		if req.Conversation.RecvMsgOpt != nil {
 			m["recv_msg_opt"] = req.Conversation.RecvMsgOpt.Value
-		if req.Conversation.RecvMsgOpt.Value != conv.RecvMsgOpt {
-			unequal++
-		}
 		}
 		if req.Conversation.AttachedInfo != nil {
 			m["attached_info"] = req.Conversation.AttachedInfo.Value
-		if req.Conversation.AttachedInfo.Value != conv.AttachedInfo {
-			unequal++
-		}
 		}
 		if req.Conversation.Ex != nil {
 			m["ex"] = req.Conversation.Ex.Value
-		if req.Conversation.Ex.Value != conv.Ex {
+		}
-			unequal++
+		if req.Conversation.IsPinned != nil {
+			m["is_pinned"] = req.Conversation.IsPinned.Value
+		}
+		if req.Conversation.GroupAtType != nil {
+			m["group_at_type"] = req.Conversation.GroupAtType.Value
+		}
+		if req.Conversation.MsgDestructTime != nil {
+			m["msg_destruct_time"] = req.Conversation.MsgDestructTime.Value
+		}
+		if req.Conversation.MsgDestructTime != nil {
+			m["msg_destruct_time"] = req.Conversation.MsgDestructTime.Value
+		}
+		if req.Conversation.BurnDuration != nil {
+			m["burn_duration"] = req.Conversation.BurnDuration.Value
+		}
+	}
+
+	// set need set field in conversation
+	setConversationFieldsFunc()
+
+	for userID := range conversationMap {
+		unequal := len(m)
+
+		if req.Conversation.RecvMsgOpt != nil {
+			if req.Conversation.RecvMsgOpt.Value != conversationMap[userID].RecvMsgOpt {
+				unequal--
+			}
+		}
+
+		if req.Conversation.AttachedInfo != nil {
+			if req.Conversation.AttachedInfo.Value != conversationMap[userID].AttachedInfo {
+				unequal--
+			}
+		}
+
+		if req.Conversation.Ex != nil {
+			if req.Conversation.Ex.Value != conversationMap[userID].Ex {
+				unequal--
 			}
 		}
 		if req.Conversation.IsPinned != nil {
 			m["is_pinned"] = req.Conversation.IsPinned.Value
-		if req.Conversation.IsPinned.Value != conv.IsPinned {
+			if req.Conversation.IsPinned.Value != conversationMap[userID].IsPinned {
-			unequal++
+				unequal--
 			}
 		}
+
 		if req.Conversation.GroupAtType != nil {
-		m["group_at_type"] = req.Conversation.GroupAtType.Value
+			if req.Conversation.GroupAtType.Value != conversationMap[userID].GroupAtType {
-		if req.Conversation.GroupAtType.Value != conv.GroupAtType {
+				unequal--
-			unequal++
 			}
 		}
+
 		if req.Conversation.MsgDestructTime != nil {
-		m["msg_destruct_time"] = req.Conversation.MsgDestructTime.Value
+			if req.Conversation.MsgDestructTime.Value != conversationMap[userID].MsgDestructTime {
-		if req.Conversation.MsgDestructTime.Value != conv.MsgDestructTime {
+				unequal--
-			unequal++
 			}
 		}
+
 		if req.Conversation.IsMsgDestruct != nil {
-		m["is_msg_destruct"] = req.Conversation.IsMsgDestruct.Value
+			if req.Conversation.IsMsgDestruct.Value != conversationMap[userID].IsMsgDestruct {
-		if req.Conversation.IsMsgDestruct.Value != conv.IsMsgDestruct {
+				unequal--
-			unequal++
 			}
 		}
+
+		if req.Conversation.BurnDuration != nil {
+			if req.Conversation.BurnDuration.Value != conversationMap[userID].BurnDuration {
+				unequal--
+			}
+		}
+
+		if unequal > 0 {
+			needUpdateUsersList = append(needUpdateUsersList, userID)
+		}
+	}
+
 	if req.Conversation.IsPrivateChat != nil && req.Conversation.ConversationType != constant.ReadGroupChatType {
 		var conversations []*dbModel.Conversation
 		for _, ownerUserID := range req.UserIDs {
-			conversation2 := conversation
+			transConversation := conversation
-			conversation2.OwnerUserID = ownerUserID
+			transConversation.OwnerUserID = ownerUserID
-			conversation2.IsPrivateChat = req.Conversation.IsPrivateChat.Value
+			transConversation.IsPrivateChat = req.Conversation.IsPrivateChat.Value
-			conversations = append(conversations, &conversation2)
+			conversations = append(conversations, &transConversation)
 		}
 
 		if err := c.conversationDatabase.SyncPeerUserPrivateConversationTx(ctx, conversations); err != nil {
 			return nil, err
 		}
+
 		for _, userID := range req.UserIDs {
 			c.conversationNotificationSender.ConversationSetPrivateNotification(ctx, userID, req.Conversation.UserID,
 				req.Conversation.IsPrivateChat.Value, req.Conversation.ConversationID)
 		}
-	}
+	} else {
-
+		if len(m) != 0 {
-	if req.Conversation.BurnDuration != nil {
+			if err := c.conversationDatabase.SetUsersConversationFieldTx(ctx, needUpdateUsersList, &conversation, m); err != nil {
-		m["burn_duration"] = req.Conversation.BurnDuration.Value
-		if req.Conversation.BurnDuration.Value != conv.BurnDuration {
-			unequal++
-		}
-	}
-
-	if err := c.conversationDatabase.SetUsersConversationFieldTx(ctx, req.UserIDs, &conversation, m); err != nil {
 				return nil, err
 			}
 
-	if unequal > 0 {
+			for _, v := range needUpdateUsersList {
-		for _, v := range req.UserIDs {
 				c.conversationNotificationSender.ConversationChangeNotification(ctx, v, []string{req.Conversation.ConversationID})
 			}
 		}
+	}
 
 	return &pbconversation.SetConversationsResp{}, nil
 }

pkg/common/storage/database/mgo/user.go

@@ -167,6 +167,10 @@ func (u *UserMgo) DeleteUserCommand(ctx context.Context, userID string, Type int
 	filter := bson.M{"userID": userID, "type": Type, "uuid": UUID}
 
 	result, err := collection.DeleteOne(ctx, filter)
+	// when err is not nil, result might be nil
+	if err != nil {
+		return errs.Wrap(err)
+	}
 	if result.DeletedCount == 0 {
 		// No records found to update
 		return errs.Wrap(errs.ErrRecordNotFound)

pkg/rpcclient/msg.go

@@ -174,6 +174,9 @@ func (m *MessageRpcClient) GetMaxSeqs(ctx context.Context, conversationIDs []str
 	resp, err := m.Client.GetMaxSeqs(ctx, &msg.GetMaxSeqsReq{
 		ConversationIDs: conversationIDs,
 	})
+	if err != nil {
+		return nil, err
+	}
 	return resp.MaxSeqs, err
 }
 
@@ -182,6 +185,9 @@ func (m *MessageRpcClient) GetHasReadSeqs(ctx context.Context, userID string, co
 		UserID:          userID,
 		ConversationIDs: conversationIDs,
 	})
+	if err != nil {
+		return nil, err
+	}
 	return resp.MaxSeqs, err
 }
 
@@ -190,6 +196,9 @@ func (m *MessageRpcClient) GetMsgByConversationIDs(ctx context.Context, docIDs [
 		ConversationIDs: docIDs,
 		MaxSeqs:         seqs,
 	})
+	if err != nil {
+		return nil, err
+	}
 	return resp.MsgDatas, err
 }
 

tools/url2im/pkg/manage.go

@@ -234,7 +234,7 @@ func (m *Manage) RunTask(ctx context.Context, task Task) (string, error) {
 	}
 	for i, currentPartSize := range part.PartSizes {
 		md5Reader := NewMd5Reader(io.LimitReader(reader, currentPartSize))
-		if m.doPut(ctx, m.api.Client, initiateMultipartUploadResp.Upload.Sign, uploadParts[i], md5Reader, currentPartSize); err != nil {
+		if err := m.doPut(ctx, m.api.Client, initiateMultipartUploadResp.Upload.Sign, uploadParts[i], md5Reader, currentPartSize); err != nil {
 			return "", err
 		}
 		if md5val := md5Reader.Md5(); md5val != part.PartMd5s[i] {