From 4c74d5d3d1441c25a3bf87d3e2f98c50a7143804 Mon Sep 17 00:00:00 2001
From: Dariusz Rybicki <dariusz@elixxir.io>
Date: Fri, 9 Sep 2022 09:52:53 +0200
Subject: [PATCH] Update Message model
---
Sources/XXClient/Models/Message.swift | 6 +++++-
Tests/XXClientTests/Models/MessageTests.swift | 7 +++++--
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/Sources/XXClient/Models/Message.swift b/Sources/XXClient/Models/Message.swift
index 3abaec65..55d43a77 100644
--- a/Sources/XXClient/Models/Message.swift
+++ b/Sources/XXClient/Models/Message.swift
@@ -10,7 +10,8 @@ public struct Message: Equatable {
ephemeralId: Int,
timestamp: Int,
encrypted: Bool,
- roundId: Int
+ roundId: Int,
+ roundURL: String
) {
self.messageType = messageType
self.id = id
@@ -21,6 +22,7 @@ public struct Message: Equatable {
self.timestamp = timestamp
self.encrypted = encrypted
self.roundId = roundId
+ self.roundURL = roundURL
}
public var messageType: Int
@@ -32,6 +34,7 @@ public struct Message: Equatable {
public var timestamp: Int
public var encrypted: Bool
public var roundId: Int
+ public var roundURL: String
}
extension Message: Codable {
@@ -45,6 +48,7 @@ extension Message: Codable {
case timestamp = "Timestamp"
case encrypted = "Encrypted"
case roundId = "RoundId"
+ case roundURL = "RoundURL"
}
public static func decode(_ data: Data) throws -> Self {
diff --git a/Tests/XXClientTests/Models/MessageTests.swift b/Tests/XXClientTests/Models/MessageTests.swift
index b62cf20f..6a0012e0 100644
--- a/Tests/XXClientTests/Models/MessageTests.swift
+++ b/Tests/XXClientTests/Models/MessageTests.swift
@@ -13,6 +13,7 @@ final class MessageTests: XCTestCase {
let timestamp: Int = 1_653_580_439_357_351_000
let encrypted = false
let roundId: Int = 19
+ let roundURL = "https://dashboard.xx.network/rounds/25?xxmessenger=true"
let jsonString = """
{
"MessageType": \(type),
@@ -23,7 +24,8 @@ final class MessageTests: XCTestCase {
"EphemeralID": \(ephemeralId),
"Timestamp": \(timestamp),
"Encrypted": \(encrypted),
- "RoundId": \(roundId)
+ "RoundId": \(roundId),
+ "RoundURL": "\(roundURL)"
}
"""
let jsonData = jsonString.data(using: .utf8)!
@@ -38,7 +40,8 @@ final class MessageTests: XCTestCase {
ephemeralId: ephemeralId,
timestamp: timestamp,
encrypted: encrypted,
- roundId: roundId
+ roundId: roundId,
+ roundURL: roundURL
))
let encodedModel = try model.encode()
--
GitLab