From d01e732515b49d8a5e207e67a76f83e7d22877df Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Mon, 30 Nov 2020 16:10:58 +1100 Subject: [PATCH] Debug open group messaging --- SessionMessagingKit/Jobs/MessageSendJob.swift | 2 +- SessionMessagingKit/Open Groups/OpenGroupAPI.swift | 4 ++-- SessionMessagingKit/Open Groups/OpenGroupMessage.swift | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/SessionMessagingKit/Jobs/MessageSendJob.swift b/SessionMessagingKit/Jobs/MessageSendJob.swift index e3937f2e7..d6e297b66 100644 --- a/SessionMessagingKit/Jobs/MessageSendJob.swift +++ b/SessionMessagingKit/Jobs/MessageSendJob.swift @@ -53,7 +53,7 @@ public final class MessageSendJob : NSObject, Job, NSCoding { // NSObject/NSCodi switch destination { case .contact(let publicKey): coder.encode("contact(\(publicKey))", forKey: "destination") case .closedGroup(let groupPublicKey): coder.encode("closedGroup(\(groupPublicKey))", forKey: "destination") - case .openGroup(let channel, let server): coder.encode("openGroup(\(channel), \(server))") + case .openGroup(let channel, let server): coder.encode("openGroup(\(channel), \(server))", forKey: "destination") } coder.encode(id, forKey: "id") coder.encode(failureCount, forKey: "failureCount") diff --git a/SessionMessagingKit/Open Groups/OpenGroupAPI.swift b/SessionMessagingKit/Open Groups/OpenGroupAPI.swift index 004920a41..65a175abc 100644 --- a/SessionMessagingKit/Open Groups/OpenGroupAPI.swift +++ b/SessionMessagingKit/Open Groups/OpenGroupAPI.swift @@ -86,8 +86,8 @@ public final class OpenGroupAPI : DotNetAPI { } } let quote: OpenGroupMessage.Quote? - if let quoteAsJSON = value["quote"] as? JSON, let quotedMessageTimestamp = quoteAsJSON["id"] as? UInt64, let quoteePublicKey = quoteAsJSON["author"] as? String, - let quotedMessageBody = quoteAsJSON["text"] as? String { + if let quoteAsJSON = value["quote"] as? JSON, let quotedMessageTimestamp = quoteAsJSON["id"] as? UInt64, let quoteePublicKey = quoteAsJSON["author"] as? String { + let quotedMessageBody = quoteAsJSON["text"] as? String let quotedMessageServerID = message["reply_to"] as? UInt64 quote = OpenGroupMessage.Quote(quotedMessageTimestamp: quotedMessageTimestamp, quoteePublicKey: quoteePublicKey, quotedMessageBody: quotedMessageBody, quotedMessageServerID: quotedMessageServerID) diff --git a/SessionMessagingKit/Open Groups/OpenGroupMessage.swift b/SessionMessagingKit/Open Groups/OpenGroupMessage.swift index 7b26d50c0..cbcf22496 100644 --- a/SessionMessagingKit/Open Groups/OpenGroupMessage.swift +++ b/SessionMessagingKit/Open Groups/OpenGroupMessage.swift @@ -137,8 +137,9 @@ public final class OpenGroupMessage : NSObject { internal func toJSON() -> JSON { var value: JSON = [ "timestamp" : timestamp ] if let quote = quote { - value["quote"] = [ "id" : quote.quotedMessageTimestamp, "author" : quote.quoteePublicKey ] - if let quotedMessageBody = quote.quotedMessageBody { value["text"] = quotedMessageBody } + var quoteAsJSON: JSON = [ "id" : quote.quotedMessageTimestamp, "author" : quote.quoteePublicKey ] + if let quotedMessageBody = quote.quotedMessageBody { quoteAsJSON["text"] = quotedMessageBody } + value["quote"] = quoteAsJSON } if let signature = signature { value["sig"] = signature.data.toHexString()