shadowfacts
/
Tusker
2
10
Fork 2
Code Issues 78 Pull Requests Releases Wiki Activity

Use WebURL for status URLs

This commit is contained in:
Shadowfacts 2023-01-02 11:36:06 -05:00
parent 3ea1ad5622
commit b45d3fb80a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Packages/Pachyderm/Sources/Pachyderm/Model/Status.swift
View File

@ -7,11 +7,12 @@
// //
import Foundation import Foundation
import WebURL
public final class Status: StatusProtocol, Decodable { public final class Status: StatusProtocol, Decodable {
public let id: String public let id: String
public let uri: String public let uri: String
public let url: URL? public let url: WebURL?
public let account: Account public let account: Account
public let inReplyToID: String? public let inReplyToID: String?
public let inReplyToAccountID: String? public let inReplyToAccountID: String?

3
Tusker/CoreData/StatusMO.swift
View File

@ -10,6 +10,7 @@
import Foundation import Foundation
import CoreData import CoreData
import Pachyderm import Pachyderm
import WebURLFoundationExtras
@objc(StatusMO) @objc(StatusMO)
public final class StatusMO: NSManagedObject, StatusProtocol { public final class StatusMO: NSManagedObject, StatusProtocol {
@ -127,7 +128,7 @@ extension StatusMO {
self.sensitive = status.sensitive self.sensitive = status.sensitive
self.spoilerText = status.spoilerText self.spoilerText = status.spoilerText
self.uri = status.uri self.uri = status.uri
self.url = status.url self.url = status.url != nil ? URL(status.url!) : nil
self.visibility = status.visibility self.visibility = status.visibility
self.poll = status.poll self.poll = status.poll
self.localOnly = status.localOnly ?? false self.localOnly = status.localOnly ?? false