From 1c827d1f7e42bcfaea521f8c0309c90091b198bf Mon Sep 17 00:00:00 2001 From: prajeet Date: Tue, 3 Jan 2023 20:00:08 +0545 Subject: [PATCH] Made filtered key optional (#25) --- Packages/Models/Sources/Models/Status.swift | 6 +++--- Packages/Status/Sources/Status/Row/StatusRowViewModel.swift | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Packages/Models/Sources/Models/Status.swift b/Packages/Models/Sources/Models/Status.swift index 0b87f579..d7a7d920 100644 --- a/Packages/Models/Sources/Models/Status.swift +++ b/Packages/Models/Sources/Models/Status.swift @@ -38,7 +38,7 @@ public protocol AnyStatus { var visibility: Visibility { get } var poll: Poll? { get } var spoilerText: String { get } - var filtered: [Filtered] { get } + var filtered: [Filtered]? { get } } @@ -69,7 +69,7 @@ public struct Status: AnyStatus, Codable, Identifiable { public let visibility: Visibility public let poll: Poll? public let spoilerText: String - public let filtered: [Filtered] + public let filtered: [Filtered]? public static func placeholder() -> Status { .init(id: UUID().uuidString, @@ -128,5 +128,5 @@ public struct ReblogStatus: AnyStatus, Codable, Identifiable { public let visibility: Visibility public let poll: Poll? public let spoilerText: String - public let filtered: [Filtered] + public let filtered: [Filtered]? } diff --git a/Packages/Status/Sources/Status/Row/StatusRowViewModel.swift b/Packages/Status/Sources/Status/Row/StatusRowViewModel.swift index 81a23d2b..493e4242 100644 --- a/Packages/Status/Sources/Status/Row/StatusRowViewModel.swift +++ b/Packages/Status/Sources/Status/Row/StatusRowViewModel.swift @@ -19,7 +19,7 @@ public class StatusRowViewModel: ObservableObject { @Published var isFiltered: Bool = false var filter: Filtered? { - status.reblog?.filtered.first ?? status.filtered.first + status.reblog?.filtered?.first ?? status.filtered?.first } var client: Client?