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

Clean

Browse Source
pull/41/head
Niels Andriesse 6 years ago
parent 7ecfedbf9a
commit d5e56d9c9f
2 changed files with 22 additions and 88 deletions
Show Stats Download Patch File Download Diff File

56
Signal/src/Loki/LokiGroupChatPoller.swift
Unescape Escape View File

@ -45,30 +45,33 @@ public final class LokiGroupChatPoller : NSObject {
private func pollForNewMessages() { private func pollForNewMessages() {
let group = self.group let group = self.group
func parseGroupMessage(body: String, timestamp: UInt64, senderDisplayName: String) {
let id = group.id.data(using: String.Encoding.utf8)!
let x1 = SSKProtoGroupContext.builder(id: id, type: .deliver)
x1.setName(group.displayName)
let x2 = SSKProtoDataMessage.builder()
x2.setTimestamp(timestamp)
x2.setGroup(try! x1.build())
x2.setBody(body)
let x3 = SSKProtoContent.builder()
x3.setDataMessage(try! x2.build())
let x4 = SSKProtoEnvelope.builder(type: .ciphertext, timestamp: timestamp)
x4.setSource(senderDisplayName)
x4.setSourceDevice(OWSDevicePrimaryDeviceId)
x4.setContent(try! x3.build().serializedData())
OWSPrimaryStorage.shared().dbReadWriteConnection.readWrite { transaction in
SSKEnvironment.shared.messageManager.throws_processEnvelope(try! x4.build(), plaintextData: try! x3.build().serializedData(), wasReceivedByUD: false, transaction: transaction)
}
}
switch group.kind { switch group.kind {
case .publicChat(let id): case .publicChat(let id):
let _ = LokiGroupChatAPI.getMessages(for: id, on: group.server).done { messages in let _ = LokiGroupChatAPI.getMessages(for: id, on: group.server).done { messages in
messages.reversed().forEach { message in messages.reversed().forEach { message in
let id = group.id.data(using: String.Encoding.utf8)!
let x1 = SSKProtoGroupContext.builder(id: id, type: .deliver)
x1.setName(group.displayName)
let x2 = SSKProtoDataMessage.builder()
x2.setTimestamp(message.timestamp)
x2.setGroup(try! x1.build())
x2.setBody(message.body)
let x3 = SSKProtoContent.builder()
x3.setDataMessage(try! x2.build())
let x4 = SSKProtoEnvelope.builder(type: .ciphertext, timestamp: message.timestamp)
let senderHexEncodedPublicKey = message.hexEncodedPublicKey let senderHexEncodedPublicKey = message.hexEncodedPublicKey
let endIndex = senderHexEncodedPublicKey.endIndex let endIndex = senderHexEncodedPublicKey.endIndex
let cutoffIndex = senderHexEncodedPublicKey.index(endIndex, offsetBy: -8) let cutoffIndex = senderHexEncodedPublicKey.index(endIndex, offsetBy: -8)
let senderDisplayName = "\(message.displayName) (...\(senderHexEncodedPublicKey[cutoffIndex..<endIndex]))" let senderDisplayName = "\(message.displayName) (...\(senderHexEncodedPublicKey[cutoffIndex..<endIndex]))"
x4.setSource(senderDisplayName) parseGroupMessage(body: message.body, timestamp: message.timestamp, senderDisplayName: senderDisplayName)
x4.setSourceDevice(OWSDevicePrimaryDeviceId)
x4.setContent(try! x3.build().serializedData())
OWSPrimaryStorage.shared().dbReadWriteConnection.readWrite { transaction in
SSKEnvironment.shared.messageManager.throws_processEnvelope(try! x4.build(), plaintextData: try! x3.build().serializedData(), wasReceivedByUD: false, transaction: transaction)
}
} }
} }
case .rss(_): case .rss(_):
@ -76,25 +79,10 @@ public final class LokiGroupChatPoller : NSObject {
FeedParser(URL: url).parseAsync { wrapper in FeedParser(URL: url).parseAsync { wrapper in
guard case .rss(let feed) = wrapper, let items = feed.items else { return print("[Loki] Failed to parse RSS feed for: \(group.server)") } guard case .rss(let feed) = wrapper, let items = feed.items else { return print("[Loki] Failed to parse RSS feed for: \(group.server)") }
items.reversed().forEach { item in items.reversed().forEach { item in
let id = group.id.data(using: String.Encoding.utf8)! guard let title = item.title, let description = item.description, let date = item.pubDate else { return }
let x1 = SSKProtoGroupContext.builder(id: id, type: .deliver)
x1.setName(group.displayName)
let x2 = SSKProtoDataMessage.builder()
guard let date = item.pubDate else { return }
let timestamp = UInt64(date.timeIntervalSince1970 * 1000) let timestamp = UInt64(date.timeIntervalSince1970 * 1000)
x2.setTimestamp(timestamp) let body = "\(title) ... \(description)"
x2.setGroup(try! x1.build()) parseGroupMessage(body: body, timestamp: timestamp, senderDisplayName: NSLocalizedString("Loki", comment: ""))
guard let title = item.title, let description = item.description else { return }
x2.setBody("\(title) ... \(description)")
let x3 = SSKProtoContent.builder()
x3.setDataMessage(try! x2.build())
let x4 = SSKProtoEnvelope.builder(type: .ciphertext, timestamp: timestamp)
x4.setSource(NSLocalizedString("Loki", comment: ""))
x4.setSourceDevice(OWSDevicePrimaryDeviceId)
x4.setContent(try! x3.build().serializedData())
OWSPrimaryStorage.shared().dbReadWriteConnection.readWrite { transaction in
SSKEnvironment.shared.messageManager.throws_processEnvelope(try! x4.build(), plaintextData: try! x3.build().serializedData(), wasReceivedByUD: false, transaction: transaction)
}
} }
} }

54
SignalServiceKit/src/Loki/API/LokiRSSFeedParser.swift
Unescape Escape View File

@ -1,54 +0,0 @@
public final class LokiRSSFeedParser : NSObject, XMLParserDelegate {
private let url: URL
private var completion: (([Item]) -> Void)?
private var tag: Tag?
private var currentItem: Item?
private var items: [Item] = []
private enum Tag : String {
case item, title, description, date = "pubDate"
}
public struct Item {
public var title: String? = nil
public var description: String? = nil
public var dateAsString: String? = nil
}
public init(url: URL) {
self.url = url
super.init()
}
public func parse(completion: @escaping (([Item]) -> Void)) {
guard let parser = XMLParser(contentsOf: url) else { return }
self.completion = completion
parser.delegate = self
parser.parse()
}
public func parser(_ parser: XMLParser, didStartElement elementAsString: String, namespaceURI: String?, qualifiedName: String?, attributes: [String:String] = [:]) {
if let element = Tag(rawValue: elementAsString) { self.tag = element }
if tag == .item { currentItem = Item() }
}
public func parser(_ parser: XMLParser, foundCharacters string: String) {
guard let element = tag else { return }
switch element {
case .title: currentItem?.title = string
case .description: currentItem?.description = string
case .date: currentItem?.dateAsString = string
default: break
}
}
public func parser(_ parser: XMLParser, didEndElement elementAsString: String, namespaceURI: String?, qualifiedName: String?) {
guard let element = Tag(rawValue: elementAsString) else { return }
if element == .item, let currentItem = self.currentItem { items.append(currentItem) }
}
public func parserDidEndDocument(_ parser: XMLParser) {
completion?(items)
}
}
Write Preview
Loading…
Cancel
Save