Fix: solve conversation blocking in private chat when non friendship.

.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-pr-sign-comment: 'The signature to be committed in order to 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-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: '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-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

@@ -247,6 +247,7 @@ func (c *conversationServer) SetConversations(ctx context.Context, req *pbconver
 		}
 		conv = *cs[0]
 	}
+
 	var conversation dbModel.Conversation
 	conversation.ConversationID = req.Conversation.ConversationID
 	conversation.ConversationType = req.Conversation.ConversationType
@@ -259,12 +260,14 @@ func (c *conversationServer) SetConversations(ctx context.Context, req *pbconver
 			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 {
@@ -277,24 +280,48 @@ func (c *conversationServer) SetConversations(ctx context.Context, req *pbconver
 			unequal++
 		}
 	}
+
 	if req.Conversation.GroupAtType != nil {
 		m["group_at_type"] = req.Conversation.GroupAtType.Value
 		if req.Conversation.GroupAtType.Value != conv.GroupAtType {
 			unequal++
 		}
 	}
+
 	if req.Conversation.MsgDestructTime != nil {
 		m["msg_destruct_time"] = req.Conversation.MsgDestructTime.Value
 		if req.Conversation.MsgDestructTime.Value != conv.MsgDestructTime {
 			unequal++
 		}
 	}
+
 	if req.Conversation.IsMsgDestruct != nil {
 		m["is_msg_destruct"] = req.Conversation.IsMsgDestruct.Value
 		if req.Conversation.IsMsgDestruct.Value != conv.IsMsgDestruct {
 			unequal++
 		}
 	}
+
+	if req.Conversation.BurnDuration != nil {
+		m["burn_duration"] = req.Conversation.BurnDuration.Value
+		if req.Conversation.BurnDuration.Value != conv.BurnDuration {
+			unequal++
+		}
+	}
+
+	if len(m) != 0 {
+		if err := c.conversationDatabase.SetUsersConversationFieldTx(ctx, req.UserIDs, &conversation, m); err != nil {
+			return nil, err
+		}
+	}
+
+	if unequal > 0 {
+		for _, v := range req.UserIDs {
+			c.conversationNotificationSender.ConversationChangeNotification(ctx, v, []string{req.Conversation.ConversationID})
+		}
+		return &pbconversation.SetConversationsResp{}, nil
+	}
+
 	if req.Conversation.IsPrivateChat != nil && req.Conversation.ConversationType != constant.ReadGroupChatType {
 		var conversations []*dbModel.Conversation
 		for _, ownerUserID := range req.UserIDs {
@@ -313,23 +340,6 @@ func (c *conversationServer) SetConversations(ctx context.Context, req *pbconver
 		}
 	}
 
-	if req.Conversation.BurnDuration != 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 req.UserIDs {
-			c.conversationNotificationSender.ConversationChangeNotification(ctx, v, []string{req.Conversation.ConversationID})
-		}
-	}
-
 	return &pbconversation.SetConversationsResp{}, nil
 }