Don't use jobs for open group polling
It's not necessary because we can always get the messages again from the server, and it helps with performance
This commit is contained in:
parent
97d0e0a1b6
commit
11df899db3
|
@ -65,17 +65,22 @@ public final class OpenGroupPollerV2 : NSObject {
|
||||||
// Sorting the messages by server ID before importing them fixes an issue where messages that quote older messages can't find those older messages
|
// Sorting the messages by server ID before importing them fixes an issue where messages that quote older messages can't find those older messages
|
||||||
let openGroupID = "\(server).\(body.room)"
|
let openGroupID = "\(server).\(body.room)"
|
||||||
let messages = body.messages.sorted { $0.serverID! < $1.serverID! } // Safe because messages with a nil serverID are filtered out
|
let messages = body.messages.sorted { $0.serverID! < $1.serverID! } // Safe because messages with a nil serverID are filtered out
|
||||||
messages.forEach { message in
|
storage.write { transaction in
|
||||||
guard let data = Data(base64Encoded: message.base64EncodedData) else {
|
messages.forEach { message in
|
||||||
return SNLog("Ignoring open group message with invalid encoding.")
|
guard let data = Data(base64Encoded: message.base64EncodedData) else {
|
||||||
}
|
return SNLog("Ignoring open group message with invalid encoding.")
|
||||||
let envelope = SNProtoEnvelope.builder(type: .sessionMessage, timestamp: message.sentTimestamp)
|
}
|
||||||
envelope.setContent(data)
|
let envelope = SNProtoEnvelope.builder(type: .sessionMessage, timestamp: message.sentTimestamp)
|
||||||
envelope.setSource(message.sender!) // Safe because messages with a nil sender are filtered out
|
envelope.setContent(data)
|
||||||
envelope.setServerTimestamp(message.sentTimestamp)
|
envelope.setSource(message.sender!) // Safe because messages with a nil sender are filtered out
|
||||||
let job = MessageReceiveJob(data: try! envelope.buildSerializedData(), openGroupMessageServerID: UInt64(message.serverID!), openGroupID: openGroupID, isBackgroundPoll: isBackgroundPoll)
|
envelope.setServerTimestamp(message.sentTimestamp)
|
||||||
storage.write { transaction in
|
do {
|
||||||
SessionMessagingKit.JobQueue.shared.add(job, using: transaction)
|
let data = try envelope.buildSerializedData()
|
||||||
|
let (message, proto) = try MessageReceiver.parse(data, openGroupMessageServerID: UInt64(message.serverID!), isRetry: false, using: transaction)
|
||||||
|
try MessageReceiver.handle(message, associatedWithProto: proto, openGroupID: openGroupID, isBackgroundPoll: isBackgroundPoll, using: transaction)
|
||||||
|
} catch {
|
||||||
|
SNLog("Couldn't receive open group message due to error: \(error).")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// - Moderators
|
// - Moderators
|
||||||
|
|
Loading…
Reference in New Issue