keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clean up OpenGroupPoller

Browse Source
pull/318/head
nielsandriesse 4 years ago
parent f2572e4c91
commit b49e50ff19
1 changed files with 63 additions and 67 deletions
Show Stats Download Patch File Download Diff File

130
SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPoller.swift
Unescape Escape View File

@ -6,7 +6,6 @@ public final class OpenGroupPoller : NSObject {
private var pollForNewMessagesTimer: Timer? = nil private var pollForNewMessagesTimer: Timer? = nil
private var pollForDeletedMessagesTimer: Timer? = nil private var pollForDeletedMessagesTimer: Timer? = nil
private var pollForModeratorsTimer: Timer? = nil private var pollForModeratorsTimer: Timer? = nil
private var pollForDisplayNamesTimer: Timer? = nil
private var hasStarted = false private var hasStarted = false
private var isPolling = false private var isPolling = false
@ -14,8 +13,7 @@ public final class OpenGroupPoller : NSObject {
private let pollForNewMessagesInterval: TimeInterval = 4 private let pollForNewMessagesInterval: TimeInterval = 4
private let pollForDeletedMessagesInterval: TimeInterval = 60 private let pollForDeletedMessagesInterval: TimeInterval = 60
private let pollForModeratorsInterval: TimeInterval = 10 * 60 private let pollForModeratorsInterval: TimeInterval = 10 * 60
private let pollForDisplayNamesInterval: TimeInterval = 60
// MARK: Lifecycle // MARK: Lifecycle
@objc(initForOpenGroup:) @objc(initForOpenGroup:)
public init(for openGroup: OpenGroup) { public init(for openGroup: OpenGroup) {
@ -30,12 +28,10 @@ public final class OpenGroupPoller : NSObject {
strongSelf.pollForNewMessagesTimer = Timer.scheduledTimer(withTimeInterval: strongSelf.pollForNewMessagesInterval, repeats: true) { _ in self?.pollForNewMessages() } strongSelf.pollForNewMessagesTimer = Timer.scheduledTimer(withTimeInterval: strongSelf.pollForNewMessagesInterval, repeats: true) { _ in self?.pollForNewMessages() }
strongSelf.pollForDeletedMessagesTimer = Timer.scheduledTimer(withTimeInterval: strongSelf.pollForDeletedMessagesInterval, repeats: true) { _ in self?.pollForDeletedMessages() } strongSelf.pollForDeletedMessagesTimer = Timer.scheduledTimer(withTimeInterval: strongSelf.pollForDeletedMessagesInterval, repeats: true) { _ in self?.pollForDeletedMessages() }
strongSelf.pollForModeratorsTimer = Timer.scheduledTimer(withTimeInterval: strongSelf.pollForModeratorsInterval, repeats: true) { _ in self?.pollForModerators() } strongSelf.pollForModeratorsTimer = Timer.scheduledTimer(withTimeInterval: strongSelf.pollForModeratorsInterval, repeats: true) { _ in self?.pollForModerators() }
strongSelf.pollForDisplayNamesTimer = Timer.scheduledTimer(withTimeInterval: strongSelf.pollForDisplayNamesInterval, repeats: true) { _ in self?.pollForDisplayNames() }
// Perform initial updates // Perform initial updates
strongSelf.pollForNewMessages() strongSelf.pollForNewMessages()
strongSelf.pollForDeletedMessages() strongSelf.pollForDeletedMessages()
strongSelf.pollForModerators() strongSelf.pollForModerators()
strongSelf.pollForDisplayNames()
strongSelf.hasStarted = true strongSelf.hasStarted = true
} }
} }
@ -44,7 +40,6 @@ public final class OpenGroupPoller : NSObject {
pollForNewMessagesTimer?.invalidate() pollForNewMessagesTimer?.invalidate()
pollForDeletedMessagesTimer?.invalidate() pollForDeletedMessagesTimer?.invalidate()
pollForModeratorsTimer?.invalidate() pollForModeratorsTimer?.invalidate()
pollForDisplayNamesTimer?.invalidate()
hasStarted = false hasStarted = false
} }
@ -70,71 +65,77 @@ public final class OpenGroupPoller : NSObject {
let cutoffIndex = senderPublicKey.index(endIndex, offsetBy: -8) let cutoffIndex = senderPublicKey.index(endIndex, offsetBy: -8)
return "\(rawDisplayName) (...\(senderPublicKey[cutoffIndex..<endIndex]))" return "\(rawDisplayName) (...\(senderPublicKey[cutoffIndex..<endIndex]))"
} }
let senderDisplayName = UserDisplayNameUtilities.getPublicChatDisplayName(for: senderPublicKey, in: openGroup.channel, on: openGroup.server) ?? generateDisplayName(from: NSLocalizedString("Anonymous", comment: "")) let senderDisplayName = UserDisplayNameUtilities.getPublicChatDisplayName(for: senderPublicKey, in: openGroup.channel, on: openGroup.server)
?? generateDisplayName(from: NSLocalizedString("Anonymous", comment: ""))
let id = LKGroupUtilities.getEncodedOpenGroupIDAsData(openGroup.id) let id = LKGroupUtilities.getEncodedOpenGroupIDAsData(openGroup.id)
let groupContext = SNProtoGroupContext.builder(id: id, type: .deliver) // Main message
groupContext.setName(openGroup.displayName) let dataMessageProto = SNProtoDataMessage.builder()
let dataMessage = SNProtoDataMessage.builder() let body = (message.body == message.timestamp.description) ? "" : message.body // The back-end doesn't accept messages without a body so we use this as a workaround
dataMessageProto.setBody(body)
dataMessageProto.setTimestamp(message.timestamp)
// Attachments
let attachments: [SNProtoAttachmentPointer] = message.attachments.compactMap { attachment in let attachments: [SNProtoAttachmentPointer] = message.attachments.compactMap { attachment in
guard attachment.kind == .attachment else { return nil } guard attachment.kind == .attachment else { return nil }
let result = SNProtoAttachmentPointer.builder(id: attachment.serverID) let attachmentProto = SNProtoAttachmentPointer.builder(id: attachment.serverID)
result.setContentType(attachment.contentType) attachmentProto.setContentType(attachment.contentType)
result.setSize(UInt32(attachment.size)) attachmentProto.setSize(UInt32(attachment.size))
result.setFileName(attachment.fileName) attachmentProto.setFileName(attachment.fileName)
result.setFlags(UInt32(attachment.flags)) attachmentProto.setFlags(UInt32(attachment.flags))
result.setWidth(UInt32(attachment.width)) attachmentProto.setWidth(UInt32(attachment.width))
result.setHeight(UInt32(attachment.height)) attachmentProto.setHeight(UInt32(attachment.height))
if let caption = attachment.caption { if let caption = attachment.caption { attachmentProto.setCaption(caption) }
result.setCaption(caption) attachmentProto.setUrl(attachment.url)
} return try! attachmentProto.build()
result.setUrl(attachment.url)
return try! result.build()
} }
dataMessage.setAttachments(attachments) dataMessageProto.setAttachments(attachments)
// Link preview
if let linkPreview = message.attachments.first(where: { $0.kind == .linkPreview }) { if let linkPreview = message.attachments.first(where: { $0.kind == .linkPreview }) {
let signalLinkPreview = SNProtoDataMessagePreview.builder(url: linkPreview.linkPreviewURL!) let linkPreviewProto = SNProtoDataMessagePreview.builder(url: linkPreview.linkPreviewURL!)
signalLinkPreview.setTitle(linkPreview.linkPreviewTitle!) linkPreviewProto.setTitle(linkPreview.linkPreviewTitle!)
let attachment = SNProtoAttachmentPointer.builder(id: linkPreview.serverID) let attachmentProto = SNProtoAttachmentPointer.builder(id: linkPreview.serverID)
attachment.setContentType(linkPreview.contentType) attachmentProto.setContentType(linkPreview.contentType)
attachment.setSize(UInt32(linkPreview.size)) attachmentProto.setSize(UInt32(linkPreview.size))
attachment.setFileName(linkPreview.fileName) attachmentProto.setFileName(linkPreview.fileName)
attachment.setFlags(UInt32(linkPreview.flags)) attachmentProto.setFlags(UInt32(linkPreview.flags))
attachment.setWidth(UInt32(linkPreview.width)) attachmentProto.setWidth(UInt32(linkPreview.width))
attachment.setHeight(UInt32(linkPreview.height)) attachmentProto.setHeight(UInt32(linkPreview.height))
if let caption = linkPreview.caption { if let caption = linkPreview.caption { attachmentProto.setCaption(caption) }
attachment.setCaption(caption) attachmentProto.setUrl(linkPreview.url)
} linkPreviewProto.setImage(try! attachmentProto.build())
attachment.setUrl(linkPreview.url) dataMessageProto.setPreview([ try! linkPreviewProto.build() ])
signalLinkPreview.setImage(try! attachment.build())
dataMessage.setPreview([ try! signalLinkPreview.build() ])
}
let profile = SNProtoDataMessageLokiProfile.builder()
profile.setDisplayName(message.displayName)
if let profilePicture = message.profilePicture {
profile.setProfilePicture(profilePicture.url)
dataMessage.setProfileKey(profilePicture.profileKey)
} }
dataMessage.setProfile(try! profile.build()) // Quote
dataMessage.setTimestamp(message.timestamp)
dataMessage.setGroup(try! groupContext.build())
if let quote = message.quote { if let quote = message.quote {
let signalQuote = SNProtoDataMessageQuote.builder(id: quote.quotedMessageTimestamp, author: quote.quoteePublicKey) let quoteProto = SNProtoDataMessageQuote.builder(id: quote.quotedMessageTimestamp, author: quote.quoteePublicKey)
if let quotedMessageBody = quote.quotedMessageBody { signalQuote.setText(quotedMessageBody) } if let quotedMessageBody = quote.quotedMessageBody { quoteProto.setText(quotedMessageBody) }
dataMessage.setQuote(try! signalQuote.build()) dataMessageProto.setQuote(try! quoteProto.build())
} }
let body = (message.body == message.timestamp.description) ? "" : message.body // Workaround for the fact that the back-end doesn't accept messages without a body // Profile
dataMessage.setBody(body) let profileProto = SNProtoDataMessageLokiProfile.builder()
profileProto.setDisplayName(message.displayName)
if let profilePicture = message.profilePicture {
profileProto.setProfilePicture(profilePicture.url)
dataMessageProto.setProfileKey(profilePicture.profileKey)
}
dataMessageProto.setProfile(try! profileProto.build())
// Open group info
if let messageServerID = message.serverID { if let messageServerID = message.serverID {
let openGroupInfo = SNProtoPublicChatInfo.builder() let openGroupProto = SNProtoPublicChatInfo.builder()
openGroupInfo.setServerID(messageServerID) openGroupProto.setServerID(messageServerID)
dataMessage.setPublicChatInfo(try! openGroupInfo.build()) dataMessageProto.setPublicChatInfo(try! openGroupProto.build())
} }
// Signal group context
let groupProto = SNProtoGroupContext.builder(id: id, type: .deliver)
groupProto.setName(openGroup.displayName)
dataMessageProto.setGroup(try! groupProto.build())
// Content
let content = SNProtoContent.builder() let content = SNProtoContent.builder()
if !wasSentByCurrentUser { if !wasSentByCurrentUser { // Incoming message
content.setDataMessage(try! dataMessage.build()) content.setDataMessage(try! dataMessageProto.build())
} else { } else { // Outgoing message
// FIXME: This needs to be updated as we removed sync message handling
let syncMessageSentBuilder = SNProtoSyncMessageSent.builder() let syncMessageSentBuilder = SNProtoSyncMessageSent.builder()
syncMessageSentBuilder.setMessage(try! dataMessage.build()) syncMessageSentBuilder.setMessage(try! dataMessageProto.build())
syncMessageSentBuilder.setDestination(userPublicKey) syncMessageSentBuilder.setDestination(userPublicKey)
syncMessageSentBuilder.setTimestamp(message.timestamp) syncMessageSentBuilder.setTimestamp(message.timestamp)
let syncMessageSent = try! syncMessageSentBuilder.build() let syncMessageSent = try! syncMessageSentBuilder.build()
@ -142,18 +143,17 @@ public final class OpenGroupPoller : NSObject {
syncMessageBuilder.setSent(syncMessageSent) syncMessageBuilder.setSent(syncMessageSent)
content.setSyncMessage(try! syncMessageBuilder.build()) content.setSyncMessage(try! syncMessageBuilder.build())
} }
// Envelope
let envelope = SNProtoEnvelope.builder(type: .unidentifiedSender, timestamp: message.timestamp) let envelope = SNProtoEnvelope.builder(type: .unidentifiedSender, timestamp: message.timestamp)
envelope.setSource(senderPublicKey) envelope.setSource(senderPublicKey)
envelope.setSourceDevice(1) envelope.setSourceDevice(1)
envelope.setContent(try! content.build().serializedData()) envelope.setContent(try! content.build().serializedData())
envelope.setServerTimestamp(message.serverTimestamp) envelope.setServerTimestamp(message.serverTimestamp)
Storage.write { transaction in Storage.write { transaction in
transaction.setObject(senderDisplayName, forKey: senderPublicKey, inCollection: openGroup.id) Storage.shared.setOpenGroupDisplayName(to: senderDisplayName, for: senderPublicKey, inOpenGroupWithID: openGroup.id, using: transaction)
let messageServerID = message.serverID let messageServerID = message.serverID
let job = MessageReceiveJob(data: try! envelope.buildSerializedData(), openGroupMessageServerID: messageServerID, openGroupID: openGroup.id) let job = MessageReceiveJob(data: try! envelope.buildSerializedData(), openGroupMessageServerID: messageServerID, openGroupID: openGroup.id)
Storage.write { transaction in SessionMessagingKit.JobQueue.shared.add(job, using: transaction)
SessionMessagingKit.JobQueue.shared.add(job, using: transaction)
}
} }
} }
} }
@ -174,8 +174,4 @@ public final class OpenGroupPoller : NSObject {
private func pollForModerators() { private func pollForModerators() {
let _ = OpenGroupAPI.getModerators(for: openGroup.channel, on: openGroup.server) let _ = OpenGroupAPI.getModerators(for: openGroup.channel, on: openGroup.server)
} }
private func pollForDisplayNames() {
let _ = OpenGroupAPI.getDisplayNames(for: openGroup.channel, on: openGroup.server)
}
} }

Write Preview
Loading…
Cancel
Save