From b45d3fb80ade74916e7d35c398b2b2f4e1ef0f29 Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Mon, 2 Jan 2023 11:36:06 -0500 Subject: [PATCH] Use WebURL for status URLs --- Packages/Pachyderm/Sources/Pachyderm/Model/Status.swift | 3 ++- Tusker/CoreData/StatusMO.swift | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Packages/Pachyderm/Sources/Pachyderm/Model/Status.swift b/Packages/Pachyderm/Sources/Pachyderm/Model/Status.swift index b488b068..6c105bf0 100644 --- a/Packages/Pachyderm/Sources/Pachyderm/Model/Status.swift +++ b/Packages/Pachyderm/Sources/Pachyderm/Model/Status.swift @@ -7,11 +7,12 @@ // import Foundation +import WebURL public final class Status: StatusProtocol, Decodable { public let id: String public let uri: String - public let url: URL? + public let url: WebURL? public let account: Account public let inReplyToID: String? public let inReplyToAccountID: String? diff --git a/Tusker/CoreData/StatusMO.swift b/Tusker/CoreData/StatusMO.swift index b7444bbd..6d910991 100644 --- a/Tusker/CoreData/StatusMO.swift +++ b/Tusker/CoreData/StatusMO.swift @@ -10,6 +10,7 @@ import Foundation import CoreData import Pachyderm +import WebURLFoundationExtras @objc(StatusMO) public final class StatusMO: NSManagedObject, StatusProtocol { @@ -127,7 +128,7 @@ extension StatusMO { self.sensitive = status.sensitive self.spoilerText = status.spoilerText self.uri = status.uri - self.url = status.url + self.url = status.url != nil ? URL(status.url!) : nil self.visibility = status.visibility self.poll = status.poll self.localOnly = status.localOnly ?? false