mirror of https://github.com/oxen-io/session-ios
Fix conversion to JSON, use ISO8601DateFormatter & clean
Niels Andriesse
6 years ago
parent
a9a403a703
commit
a234019cb9
@ -1,81 +1,71 @@
|
|||||||
import PromiseKit
|
import PromiseKit
|
||||||
|
|
||||||
public enum LokiGroupChatAPIError: Error {
|
|
||||||
case failedToParseMessage
|
|
||||||
case failedToParseTimestamp
|
|
||||||
}
|
|
||||||
|
|
||||||
@objc(LKGroupChatAPI)
|
@objc(LKGroupChatAPI)
|
||||||
public final class LokiGroupChatAPI : NSObject {
|
public final class LokiGroupChatAPI : NSObject {
|
||||||
internal static let storage = OWSPrimaryStorage.shared()
|
internal static let storage = OWSPrimaryStorage.shared()
|
||||||
internal static let contactsManager = SSKEnvironment.shared.contactsManager
|
|
||||||
internal static var userHexEncodedPublicKey: String { return OWSIdentityManager.shared().identityKeyPair()!.hexEncodedPublicKey }
|
|
||||||
|
|
||||||
@objc public static let serverURL = "https://chat.lokinet.org"
|
@objc public static let serverURL = "https://chat.lokinet.org"
|
||||||
|
private static let batchCount = 8
|
||||||
@objc public static let publicChatMessageType = "network.loki.messenger.publicChat"
|
@objc public static let publicChatMessageType = "network.loki.messenger.publicChat"
|
||||||
@objc public static let publicChatID = 1
|
@objc public static let publicChatID = 1
|
||||||
|
|
||||||
private static let batchCount = 8
|
internal static var userDisplayName: String {
|
||||||
|
return SSKEnvironment.shared.contactsManager.displayName(forPhoneIdentifier: userHexEncodedPublicKey) ?? "Anonymous"
|
||||||
|
}
|
||||||
|
|
||||||
public static func getMessages(for groupID: UInt) -> Promise<[LokiGroupMessage]> {
|
private static var userHexEncodedPublicKey: String {
|
||||||
print("[Loki] Getting messages for group chat with ID: \(groupID)")
|
return OWSIdentityManager.shared().identityKeyPair()!.hexEncodedPublicKey
|
||||||
let url = URL(string: "\(serverURL)/channels/\(groupID)/messages?include_annotations=1&count=-\(batchCount)")!
|
}
|
||||||
|
|
||||||
|
public enum Error : Swift.Error {
|
||||||
|
case messageParsingFailed
|
||||||
|
}
|
||||||
|
|
||||||
|
public static func getMessages(for group: UInt) -> Promise<[LokiGroupMessage]> {
|
||||||
|
print("[Loki] Getting messages for group chat with ID: \(group).")
|
||||||
|
let queryParameters = "include_annotations=1&count=-\(batchCount)"
|
||||||
|
let url = URL(string: "\(serverURL)/channels/\(group)/messages?\(queryParameters)")!
|
||||||
let request = TSRequest(url: url)
|
let request = TSRequest(url: url)
|
||||||
return TSNetworkManager.shared().makePromise(request: request).map { $0.responseObject }.map { rawResponse in
|
return TSNetworkManager.shared().makePromise(request: request).map { $0.responseObject }.map { rawResponse in
|
||||||
guard let json = rawResponse as? JSON, let rawMessages = json["data"] as? [JSON] else {
|
guard let json = rawResponse as? JSON, let rawMessages = json["data"] as? [JSON] else {
|
||||||
print("[Loki] Failed to parse group messages from: \(rawResponse).")
|
print("[Loki] Couldn't parse messages for group chat with ID: \(group) from: \(rawResponse).")
|
||||||
return []
|
throw Error.messageParsingFailed
|
||||||
}
|
}
|
||||||
return rawMessages.flatMap { message in
|
return rawMessages.flatMap { message in
|
||||||
guard let annotations = message["annotations"] as? [JSON], let annotation = annotations.first, let value = annotation["value"] as? JSON,
|
guard let annotations = message["annotations"] as? [JSON], let annotation = annotations.first, let value = annotation["value"] as? JSON,
|
||||||
let serverID = message["id"] as? UInt, let body = message["text"] as? String, let hexEncodedPublicKey = value["source"] as? String, let displayName = value["from"] as? String, let timestamp = value["timestamp"] as? UInt64 else {
|
let serverID = message["id"] as? UInt, let body = message["text"] as? String, let hexEncodedPublicKey = value["source"] as? String, let displayName = value["from"] as? String, let timestamp = value["timestamp"] as? UInt64 else {
|
||||||
print("[Loki] Failed to parse message from: \(message).")
|
print("[Loki] Couldn't parse message for group chat with ID: \(group) from: \(message).")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
guard hexEncodedPublicKey != userHexEncodedPublicKey else { return nil }
|
|
||||||
|
|
||||||
return LokiGroupMessage(serverID: serverID, hexEncodedPublicKey: hexEncodedPublicKey, displayName: displayName, body: body, type: publicChatMessageType, timestamp: timestamp)
|
return LokiGroupMessage(serverID: serverID, hexEncodedPublicKey: hexEncodedPublicKey, displayName: displayName, body: body, type: publicChatMessageType, timestamp: timestamp)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static func sendMessage(_ message: LokiGroupMessage, groupID: UInt) -> Promise<LokiGroupMessage> {
|
public static func sendMessage(_ message: LokiGroupMessage, to group: UInt) -> Promise<LokiGroupMessage> {
|
||||||
let url = URL(string: "\(serverURL)/channels/\(groupID)/messages")!
|
print("[Loki] Sending message to group chat with ID: \(group).")
|
||||||
let request = TSRequest(url: url, method: "POST", parameters: message.toJSON())
|
let url = URL(string: "\(serverURL)/channels/\(group)/messages")!
|
||||||
request.allHTTPHeaderFields = [ "Authorization": "Bearer loki", "Content-Type": "application/json" ]
|
let parameters = message.toJSON()
|
||||||
|
let request = TSRequest(url: url, method: "POST", parameters: parameters)
|
||||||
|
request.allHTTPHeaderFields = [ "Content-Type" : "application/json", "Authorization" : "Bearer loki" ]
|
||||||
|
let displayName = userDisplayName
|
||||||
return TSNetworkManager.shared().makePromise(request: request).map { $0.responseObject }.map { rawResponse in
|
return TSNetworkManager.shared().makePromise(request: request).map { $0.responseObject }.map { rawResponse in
|
||||||
guard let json = rawResponse as? JSON, let message = json["data"] as? JSON, let serverID = message["id"] as? UInt, let body = message["text"] as? String, let dateAsString = message["created_at"] as? String else {
|
guard let json = rawResponse as? JSON, let message = json["data"] as? JSON, let serverID = message["id"] as? UInt, let body = message["text"] as? String, let dateAsString = message["created_at"] as? String, let date = ISO8601DateFormatter().date(from: dateAsString) else {
|
||||||
print("[Loki] Failed to parse group messages from: \(rawResponse).")
|
print("[Loki] Couldn't parse messages for group chat with ID: \(group) from: \(rawResponse).")
|
||||||
throw LokiGroupChatAPIError.failedToParseMessage
|
throw Error.messageParsingFailed
|
||||||
}
|
|
||||||
|
|
||||||
let formatter = DateFormatter()
|
|
||||||
formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ssZZZ"
|
|
||||||
|
|
||||||
guard let date = formatter.date(from: dateAsString) else {
|
|
||||||
print("[Loki] Failed to parse message timestamp from: \(message).")
|
|
||||||
throw LokiGroupChatAPIError.failedToParseTimestamp
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Timestmap needs to be in milliseconds
|
|
||||||
let timestamp = UInt64(date.timeIntervalSince1970) * 1000
|
let timestamp = UInt64(date.timeIntervalSince1970) * 1000
|
||||||
let displayName = contactsManager.displayName(forPhoneIdentifier: userHexEncodedPublicKey) ?? "Anonymous"
|
|
||||||
|
|
||||||
return LokiGroupMessage(serverID: serverID, hexEncodedPublicKey: userHexEncodedPublicKey, displayName: displayName, body: body, type: publicChatMessageType, timestamp: timestamp)
|
return LokiGroupMessage(serverID: serverID, hexEncodedPublicKey: userHexEncodedPublicKey, displayName: displayName, body: body, type: publicChatMessageType, timestamp: timestamp)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// MARK: Public API (Obj-C)
|
@objc(getMessagesForGroup:)
|
||||||
@objc(getMessagesForGroupID:)
|
public static func objc_getMessages(for group: UInt) -> AnyPromise {
|
||||||
public static func objc_getMessages(groupID: UInt) -> AnyPromise {
|
return AnyPromise.from(getMessages(for: group))
|
||||||
let promise = getMessages(for: groupID)
|
|
||||||
return AnyPromise.from(promise)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@objc(sendMessage:groupID:)
|
@objc(sendMessage:toGroup:)
|
||||||
public static func objc_sendMessage(message: LokiGroupMessage, groupID: UInt) -> AnyPromise {
|
public static func objc_sendMessage(_ message: LokiGroupMessage, to group: UInt) -> AnyPromise {
|
||||||
let promise = sendMessage(message, groupID: groupID)
|
return AnyPromise.from(sendMessage(message, to: group))
|
||||||
return AnyPromise.from(promise)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue