Skip to content

feat(IM): support checking whether joined conversation #336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 20, 2020
Merged

feat(IM): support checking whether joined conversation #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fac3b3
feat(IM): support checking whether joined conversation
zapcannon87 Feb 20, 2020
191fdc5
test: update case
zapcannon87 Feb 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions LeanCloudTests/IMConversationTestCase.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,16 @@ class IMConversationTestCase: RTMBaseTestCase {
clientA.convCollection.first?.value.uniqueID,
clientB.convCollection.first?.value.uniqueID
)

expecting { (exp) in
clientA.convCollection.first?.value.checkJoined(completion: { (result) in
XCTAssertTrue(Thread.isMainThread)
XCTAssertTrue(result.isSuccess)
XCTAssertNil(result.error)
XCTAssertEqual(result.value, true)
exp.fulfill()
})
}
}

func testCreateChatRoom() {
Expand Down
111 changes: 67 additions & 44 deletions Sources/RTM/IMConversation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,12 @@ public class IMConversation {
public func countMembers(completion: @escaping (LCCountResult) -> Void) {
self._countMembers(completion: completion)
}

/// Check whether *client* joined this conversation.
/// - Parameter completion: Result callback.
public func checkJoined(completion: @escaping (LCGenericResult<Bool>) -> Void) {
self._checkJoined(completion: completion)
}

/// Mute this conversation.
///
Expand Down Expand Up @@ -1711,6 +1717,52 @@ extension IMConversation {
}
}
}

func _checkJoined(completion: @escaping (LCGenericResult<Bool>) -> Void) {
self.client?.sendCommand(constructor: { () -> IMGenericCommand in
var outCommand = IMGenericCommand()
outCommand.cmd = .conv
outCommand.op = .isMember
var convCommand = IMConvCommand()
convCommand.cids = [self.ID]
outCommand.convMessage = convCommand
return outCommand
}, completion: { (client, result) in
switch result {
case .inCommand(let inCommand):
assert(client.specificAssertion)
do {
if let convMessage = (inCommand.hasConvMessage ? inCommand.convMessage : nil),
let jsonObject = (convMessage.hasResults ? convMessage.results : nil),
let dataString = (jsonObject.hasData ? jsonObject.data : nil),
let results: [String: Any] = try dataString.jsonObject(),
let boolValue = results[self.ID] as? Bool {
client.eventQueue.async {
completion(.success(
value: boolValue))
}
} else {
client.eventQueue.async {
completion(.failure(
error: LCError(
code: .commandInvalid)))
}
}
} catch {
client.eventQueue.async {
completion(.failure(
error: LCError(
error: error)))
}
}
case .error(let error):
client.eventQueue.async {
completion(.failure(
error: error))
}
}
})
}
}

extension IMConversation {
Expand Down Expand Up @@ -2744,6 +2796,11 @@ public class IMChatRoom: IMConversation {
case normal = 2
case low = 3
}

@available(*, unavailable)
public override func checkJoined(completion: @escaping (LCGenericResult<Bool>) -> Void) {
completion(.failure(error: LCError.conversationNotSupport(convType: type(of: self))))
}

@available(*, unavailable)
public override func read(message: IMMessage? = nil) {}
Expand Down Expand Up @@ -2917,52 +2974,12 @@ public class IMServiceConversation: IMConversation {
public func unsubscribe(completion: @escaping (LCBooleanResult) -> Void) throws {
try self.leave(completion: completion)
}

/// Check whether subscribed this Service Conversation.
///
/// - Parameter completion: callback, dispatch to client.eventQueue .

/// Check whether *client* subscribed this conversation.
/// - Parameter completion: Result callback.
public func checkSubscription(completion: @escaping (LCGenericResult<Bool>) -> Void) {
self.client?.sendCommand(constructor: { () -> IMGenericCommand in
var outCommand = IMGenericCommand()
outCommand.cmd = .conv
outCommand.op = .isMember
var convCommand = IMConvCommand()
convCommand.cids = [self.ID]
outCommand.convMessage = convCommand
return outCommand
}, completion: { (client, result) in
switch result {
case .inCommand(let inCommand):
assert(client.specificAssertion)
do {
if
let convMessage = (inCommand.hasConvMessage ? inCommand.convMessage : nil),
let jsonObject = (convMessage.hasResults ? convMessage.results : nil),
let dataString = (jsonObject.hasData ? jsonObject.data : nil),
let results: [String: Any] = try dataString.jsonObject(),
let boolValue: Bool = results[self.ID] as? Bool
{
client.eventQueue.async {
completion(.success(value: boolValue))
}
} else {
client.eventQueue.async {
completion(.failure(error: LCError(code: .commandInvalid)))
}
}
} catch {
client.eventQueue.async {
completion(.failure(error: LCError(error: error)))
}
}
case .error(let error):
client.eventQueue.async {
completion(.failure(error: error))
}
}
})
self._checkJoined(completion: completion)
}

}

/// IM Temporary Conversation
Expand Down Expand Up @@ -3005,9 +3022,15 @@ public class IMTemporaryConversation: IMConversation {
throw LCError.conversationNotSupport(convType: type(of: self))
}

@available(*, unavailable)
public override func countMembers(completion: @escaping (LCCountResult) -> Void) {
completion(.failure(error: LCError.conversationNotSupport(convType: type(of: self))))
}

@available(*, unavailable)
public override func checkJoined(completion: @escaping (LCGenericResult<Bool>) -> Void) {
completion(.failure(error: LCError.conversationNotSupport(convType: type(of: self))))
}

@available(*, unavailable)
public override func mute(completion: @escaping (LCBooleanResult) -> Void) {
Expand Down