Merge pull request #779 from openimsdk/cherry-pick-9f5abc4

mo3et · web-flow · commit a5f09a01b8b5 · 2024-11-15T15:43:22.000+08:00
deps: Merge #777 PRs into pre-release-v3.8.2
diff --git a/internal/conversation_msg/revoke.go b/internal/conversation_msg/revoke.go
@@ -154,7 +154,7 @@ func (c *Conversation) quoteMsgRevokeHandle(ctx context.Context, conversationID
 		return errs.New("QuoteMessage is nil").Wrap()
 	}
 	if s.QuoteMessage.ClientMsgID != revokedMsg.ClientMsgID {
-		return errs.New("quoteMessage ClientMsgID is not revokedMsg ClientMsgID").Wrap()
+		return nil
 	}
 
 	s.QuoteMessage.Content = utils.StructToJsonString(revokedMsg)

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ func (c *Conversation) quoteMsgRevokeHandle(ctx context.Context, conversationID`
`154`	`154`	`return errs.New("QuoteMessage is nil").Wrap()`
`155`	`155`	`}`
`156`	`156`	`if s.QuoteMessage.ClientMsgID != revokedMsg.ClientMsgID {`
`157`		`- return errs.New("quoteMessage ClientMsgID is not revokedMsg ClientMsgID").Wrap()`
	`157`	`+ return nil`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`s.QuoteMessage.Content = utils.StructToJsonString(revokedMsg)`