Skip to content

fix(IM): rcp event should not update last delivered & read date #345

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 23, 2020
Merged

fix(IM): rcp event should not update last delivered & read date #345

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
dc78451
fix(IM): rcp event should not update last delivered & read date
zapcannon87 Feb 23, 2020
a3a39d1
test: update case
zapcannon87 Feb 23, 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
4 changes: 1 addition & 3 deletions LeanCloudTests/IMMessageTestCase.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1161,11 +1161,9 @@ class IMMessageTestCase: RTMBaseTestCase {
wait(for: [getReadFlagExp], timeout: timeout)

let sendNeedRCPMessageExp = expectation(description: "send need RCP message")
sendNeedRCPMessageExp.expectedFulfillmentCount = 4
sendNeedRCPMessageExp.expectedFulfillmentCount = 3
sendingTuple?.delegator.conversationEvent = { client, conv, event in
switch event {
case .lastDeliveredAtUpdated:
sendNeedRCPMessageExp.fulfill()
case .message(event: let messageEvent):
switch messageEvent {
case .delivered(toClientID: _, messageID: _, deliveredTimestamp: _):
Expand Down
4 changes: 0 additions & 4 deletions Sources/RTM/IMClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2229,10 +2229,6 @@ extension IMClient {
}
client.localRecord.update(
lastServerTimestamp: serverTimestamp)
conversation.process(
rcpTimestamp: timestamp,
isRead: isRead,
client: client)
client.eventQueue.async {
client.delegate?.client(
client, conversation: conversation,
Expand Down
51 changes: 28 additions & 23 deletions Sources/RTM/IMConversation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1165,18 +1165,20 @@ extension IMConversation {
assert(client.specificAssertion)
let rcpResult: LCGenericResult<MessageReceiptFlag>
if let convMessage = (inCommand.hasConvMessage ? inCommand.convMessage : nil) {
let readTimestamp = (convMessage.hasMaxReadTimestamp ? convMessage.maxReadTimestamp : nil)
if let timestamp = readTimestamp {
self.process(rcpTimestamp: timestamp, isRead: true, client: client)
}
let deliveredTimestamp = (convMessage.hasMaxAckTimestamp ? convMessage.maxAckTimestamp : nil)
if let timestamp = deliveredTimestamp {
self.process(rcpTimestamp: timestamp, isRead: false, client: client)
}
let maxReadTimestamp = (convMessage.hasMaxReadTimestamp
? convMessage.maxReadTimestamp
: nil)
let maxDeliveredTimestamp = (convMessage.hasMaxAckTimestamp
? convMessage.maxAckTimestamp
: nil)
self.process(
maxReadTimestamp: maxReadTimestamp,
maxDeliveredTimestamp: maxDeliveredTimestamp,
client: client)
rcpResult = .success(
value: MessageReceiptFlag(
readFlagTimestamp: readTimestamp,
deliveredFlagTimestamp: deliveredTimestamp))
readFlagTimestamp: maxReadTimestamp,
deliveredFlagTimestamp: maxDeliveredTimestamp))
} else {
rcpResult = .failure(
error: LCError(
Expand All @@ -1197,25 +1199,28 @@ extension IMConversation {
})
}

func process(rcpTimestamp: Int64, isRead: Bool, client: IMClient) {
private func process(
maxReadTimestamp: Int64?,
maxDeliveredTimestamp: Int64?,
client: IMClient)
{
assert(client.specificAssertion)
var event: IMConversationEvent?
if isRead {
if rcpTimestamp > (self.lastReadTimestamp ?? 0) {
self.lastReadTimestamp = rcpTimestamp
event = .lastReadAtUpdated
}
} else {
if rcpTimestamp > (self.lastDeliveredTimestamp ?? 0) {
self.lastDeliveredTimestamp = rcpTimestamp
event = .lastDeliveredAtUpdated
if let maxReadTimestamp = maxReadTimestamp,
maxReadTimestamp > (self.lastReadTimestamp ?? 0) {
self.lastReadTimestamp = maxReadTimestamp
client.eventQueue.async {
client.delegate?.client(
client, conversation: self,
event: .lastReadAtUpdated)
}
}
if let event = event {
if let maxDeliveredTimestamp = maxDeliveredTimestamp,
maxDeliveredTimestamp > (self.lastDeliveredTimestamp ?? 0) {
self.lastDeliveredTimestamp = maxDeliveredTimestamp
client.eventQueue.async {
client.delegate?.client(
client, conversation: self,
event: event)
event: .lastDeliveredAtUpdated)
}
}
}
Expand Down