fix(im): key-muted and key-joinedAt handling of system conversation

LeanCloudTests/IMConversationTestCase.swift

@@ -384,15 +384,12 @@ class IMConversationTestCase: RTMBaseTestCase {
 
     func testServiceConversationSubscription() {
         guard let client = newOpenedClient(),
-            let serviceConversationID = IMConversationTestCase.newServiceConversation() else {
-                XCTFail()
-                return
+              let serviceConversationID = IMConversationTestCase.newServiceConversation() else {
+            XCTFail()
+            return
         }
-
         delay()
-
         var serviceConversation: IMServiceConversation?
-
         expecting { (exp) in
             try! client.conversationQuery.getConversation(by: serviceConversationID) { (result) in
                 XCTAssertTrue(result.isSuccess)
@@ -404,7 +401,10 @@ class IMConversationTestCase: RTMBaseTestCase {
                 exp.fulfill()
             }
         }
-
+        guard let _ = serviceConversation else {
+            XCTFail()
+            return
+        }
         expecting(
             description: "service conversation subscription",
             count: 3)
@@ -428,6 +428,21 @@ class IMConversationTestCase: RTMBaseTestCase {
                 })
             })
         }
+        let query = client.conversationQuery
+        expecting { (exp) in
+            try! query.getConversation(by: serviceConversationID) { (result) in
+                XCTAssertNil(result.error)
+                if let conv = result.value as? IMServiceConversation {
+                    XCTAssertEqual(conv.isMuted, false)
+                    XCTAssertTrue(conv.rawData["muted"] != nil)
+                    XCTAssertNotNil(conv.subscribedTimestamp)
+                    XCTAssertNotNil(conv.subscribedAt)
+                } else {
+                    XCTFail()
+                }
+                exp.fulfill()
+            }
+        }
     }
 
     func testNormalConversationUnreadEvent() {

Sources/Foundation/Utility.swift

@@ -67,15 +67,15 @@ protocol InternalSynchronizing {
 
 extension InternalSynchronizing {
 
-    func sync<T>(_ closure: @autoclosure () -> T) -> T {
-        self.sync(closure: closure)
+    func sync<T>(_ closure: @autoclosure () throws -> T) rethrows -> T {
+        return try self.sync(closure: closure)
     }
 
-    func sync<T>(closure: () -> T) -> T {
+    func sync<T>(closure: () throws -> T) rethrows -> T {
         self.mutex.lock()
         defer {
             self.mutex.unlock()
         }
-        return closure()
+        return try closure()
     }
 }

Sources/RTM/IMConversation.swift

@@ -27,6 +27,8 @@ public class IMConversation {
         case transient = "tr"
         case system = "sys"
         case joined = "joined"
+        case joinedAt = "joinedAt"
+        case muted = "muted"
         case temporary = "temp"
         case temporaryTTL = "ttl"
         case convType = "conv_type"
@@ -104,7 +106,7 @@ public class IMConversation {
         return self.safeDecodingRawData(with: .members)
     }
 
-    /// Indicates whether the conversation has been muted.
+    /// Whether the offline notification of this conversation has been muted by the client.
     public var isMuted: Bool {
         if let mutedMembers: [String] = self.safeDecodingRawData(with: .mutedMembers) {
             return mutedMembers.contains(self.clientID)
@@ -2940,6 +2942,22 @@ public class IMServiceConversation: IMConversation {
         return self.safeDecodingRawData(with: .joined)
     }
 
+    /// The date when the client subscribe this service conversation.
+    public var subscribedAt: Date? {
+        return IMClient.date(
+            fromMillisecond: self.subscribedTimestamp)
+    }
+
+    /// The timestamp when the client subscribe this service conversation, unit of measurement is millisecond.
+    public var subscribedTimestamp: Int64? {
+        return self.safeDecodingRawData(with: .joinedAt)
+    }
+
+    /// Whether the offline notification of this service conversation has been muted by the client.
+    public override var isMuted: Bool {
+        return self.safeDecodingRawData(with: .muted) ?? false
+    }
+
     @available(*, unavailable)
     public override func countMembers(completion: @escaping (LCCountResult) -> Void) {
         completion(.failure(error: LCError.conversationNotSupport(convType: type(of: self))))