mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-06-02 04:40:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some polls crashing at decoding

Browse source
This commit is contained in:
Thomas Ricouard 2023-01-24 21:19:14 +01:00
parent d9cf9ea59a
commit 5b3afc72de
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Packages/Models/Sources/Models/Poll.swift
View file

@ -20,12 +20,24 @@ public struct Poll: Codable, Equatable, Hashable {
}
public let id: String
public let expiresAt: ServerDate
public let expiresAt: NullableString
public let expired: Bool
public let multiple: Bool
public let votesCount: Int
public let votersCount: Int?
public let voted: Bool?
public let ownVotes: [Int]?
public let options: [Option]
}
public struct NullableString: Codable, Equatable, Hashable {
public let value: String?
public init(from decoder: Decoder) throws {
do {
let container = try decoder.singleValueContainer()
self.value = try container.decode(String.self)
} catch {
self.value = nil
}
}
}

4
Packages/Status/Sources/Status/Poll/StatusPollView.swift
View file

@ -72,9 +72,9 @@ public struct StatusPollView: View {
Text(" ⸱ ")
if viewModel.poll.expired {
Text("status.poll.closed")
} else {
} else if let date = viewModel.poll.expiresAt.value?.asDate {
Text("status.poll.closes-in")
Text(viewModel.poll.expiresAt.asDate, style: .timer)
Text(date, style: .timer)
}
}
.font(.scaledFootnote)