fix(IM): add a property for recalled message to indicate whether generated by recalling message function

LeanCloudTests/IMMessageTestCase.swift

@@ -892,6 +892,7 @@ class IMMessageTestCase: RTMBaseTestCase {
         })) as ()??)
         wait(for: [exp], timeout: timeout)
 
+        delay()
         XCTAssertNotNil(receivingTuple?.client.localRecord.lastPatchTimestamp)
     }
 
@@ -917,6 +918,7 @@ class IMMessageTestCase: RTMBaseTestCase {
             XCTAssertEqual(patchedMessage.sentTimestamp, originMessage.sentTimestamp)
             XCTAssertEqual(originMessage.content?.string, oldContent)
             XCTAssertTrue(patchedMessage is IMRecalledMessage)
+            XCTAssertEqual((patchedMessage as? IMRecalledMessage)?.isRecall, true)
         }
 
         let exp = expectation(description: "message patch")
@@ -938,7 +940,7 @@ class IMMessageTestCase: RTMBaseTestCase {
                 break
             }
         }
-        ((try? sendingTuple?.conversation.recall(message: oldMessage, completion: { (result) in
+        try! sendingTuple?.conversation.recall(message: oldMessage, completion: { (result) in
             XCTAssertTrue(Thread.isMainThread)
             XCTAssertTrue(result.isSuccess)
             XCTAssertNil(result.error)
@@ -949,9 +951,10 @@ class IMMessageTestCase: RTMBaseTestCase {
                 XCTFail()
             }
             exp.fulfill()
-        })) as ()??)
+        })
         wait(for: [exp], timeout: timeout)
 
+        delay()
         XCTAssertNotNil(receivingTuple?.client.localRecord.lastPatchTimestamp)
     }
 

Sources/RTM/IMConversation.swift

@@ -958,10 +958,10 @@ extension IMConversation {
         throws
     {
         let recalledMessage = IMRecalledMessage()
+        recalledMessage.isRecall = true
         try self.patch(
             oldMessage: message,
-            newMessage: recalledMessage,
-            isRecall: true)
+            newMessage: recalledMessage)
         { (result) in
             switch result {
             case .success:
@@ -975,7 +975,6 @@ extension IMConversation {
     private func patch(
         oldMessage: IMMessage,
         newMessage: IMMessage,
-        isRecall: Bool = false,
         progressQueue: DispatchQueue = .main,
         progress: ((Double) -> Void)? = nil,
         completion: @escaping (LCBooleanResult) -> Void)
@@ -1016,7 +1015,8 @@ extension IMConversation {
                 patchItem.cid = oldMessageConvID
                 patchItem.mid = oldMessageID
                 patchItem.timestamp = oldMessageTimestamp
-                if isRecall {
+                if let recalledMessage = newMessage as? IMRecalledMessage,
+                    recalledMessage.isRecall {
                     patchItem.recall = true
                 }
                 if let content: IMMessage.Content = newMessage.content {
@@ -1095,6 +1095,11 @@ extension IMConversation {
             content: patchItem.lcMessageContent,
             isAllMembersMentioned: (patchItem.hasMentionAll ? patchItem.mentionAll : nil),
             mentionedMembers: (patchItem.mentionPids.isEmpty ? nil : patchItem.mentionPids))
+        if patchItem.hasRecall,
+            patchItem.recall,
+            let recalledMessage = patchedMessage as? IMRecalledMessage {
+            recalledMessage.isRecall = true
+        }
         self.safeUpdatingLastMessage(
             newMessage: patchedMessage,
             client: client)

Sources/RTM/IMMessage.swift

@@ -807,6 +807,9 @@ open class IMLocationMessage: IMCategorizedMessage {
 /// IM Recalled Message
 open class IMRecalledMessage: IMCategorizedMessage {
 
+    /// Indicating whether this message was generated by recalling message function.
+    public internal(set) var isRecall: Bool = false
+
     public class override var messageType: MessageType {
         return ReservedType.recalled.rawValue
     }