diff --git a/Sources/XXClient/Models/E2ESendReport.swift b/Sources/XXClient/Models/E2ESendReport.swift index f334ab71c0c9c9c5dd1179b661c75e74407f4b10..b4b08ec587e6dcf052bea0f25e6a5543aff6d47d 100644 --- a/Sources/XXClient/Models/E2ESendReport.swift +++ b/Sources/XXClient/Models/E2ESendReport.swift @@ -2,18 +2,21 @@ import Foundation public struct E2ESendReport: Equatable { public init( - roundList: [Int]?, + rounds: [Int]?, + roundURL: String?, messageId: Data?, timestamp: Int?, keyResidue: Data? ) { - self.roundList = roundList + self.rounds = rounds + self.roundURL = roundURL self.messageId = messageId self.timestamp = timestamp self.keyResidue = keyResidue } - public var roundList: [Int]? + public var rounds: [Int]? + public var roundURL: String? public var messageId: Data? public var timestamp: Int? public var keyResidue: Data? @@ -21,7 +24,8 @@ public struct E2ESendReport: Equatable { extension E2ESendReport: Codable { enum CodingKeys: String, CodingKey { - case roundList = "Rounds" + case rounds = "Rounds" + case roundURL = "RoundURL" case messageId = "MessageID" case timestamp = "Timestamp" case keyResidue = "KeyResidue" diff --git a/Tests/XXClientTests/Models/E2ESendReportTests.swift b/Tests/XXClientTests/Models/E2ESendReportTests.swift index d931009e3dddc4be16542db57f7c14866480daf7..e3824bf581bdccb1ddc42f451e33d24274b1616f 100644 --- a/Tests/XXClientTests/Models/E2ESendReportTests.swift +++ b/Tests/XXClientTests/Models/E2ESendReportTests.swift @@ -5,12 +5,14 @@ import XCTest final class E2ESendReportTests: XCTestCase { func testCoding() throws { let rounds = [1, 5, 9] + let roundURL = "https://dashboard.xx.network/rounds/25?xxmessenger=true" let messageIdB64 = "iM34yCIr4Je8ZIzL9iAAG1UWAeDiHybxMTioMAaezvs=" let timestamp: Int = 1_661_532_254_302_612_000 let keyResidueB64 = "9q2/A69EAuFM1hFAT7Bzy5uGOQ4T6bPFF72h5PlgCWE=" let jsonString = """ { "Rounds": [\(rounds.map { "\($0)" }.joined(separator: ", "))], + "RoundURL": "\(roundURL)", "MessageID": "\(messageIdB64)", "Timestamp": \(timestamp), "KeyResidue": "\(keyResidueB64)" @@ -20,7 +22,8 @@ final class E2ESendReportTests: XCTestCase { let model = try E2ESendReport.decode(jsonData) XCTAssertNoDifference(model, E2ESendReport( - roundList: rounds, + rounds: rounds, + roundURL: roundURL, messageId: Data(base64Encoded: messageIdB64)!, timestamp: timestamp, keyResidue: Data(base64Encoded: keyResidueB64) @@ -38,7 +41,8 @@ final class E2ESendReportTests: XCTestCase { let model = try E2ESendReport.decode(jsonData) XCTAssertNoDifference(model, E2ESendReport( - roundList: nil, + rounds: nil, + roundURL: nil, messageId: nil, timestamp: nil, keyResidue: nil