prehistoric-systems/omnivore
1
0
Fork 0
mirror of https://github.com/omnivore-app/omnivore.git synced 2026-03-11 08:54:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

create helper function to get unwrapped viewer properties

Browse source
This commit is contained in:
Satindar Dhillon 2022-04-18 15:30:16 -07:00
parent 1d92e64801
commit 905e628e5a
5 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apple/OmnivoreKit/Sources/App/PDFSupport/PDFViewerViewModel.swift
View file

@ -154,8 +154,8 @@ public final class PDFViewerViewModel: ObservableObject {
let baseURL = services.dataService.appEnvironment.serverBaseURL
var components = URLComponents(url: baseURL, resolvingAgainstBaseURL: false)
if let viewer = services.dataService.currentViewer?.username {
components?.path = "/\(viewer)/\(feedItem.slug)/highlights/\(shortId)"
if let username = services.dataService.currentViewer?.username {
components?.path = "/\(username)/\(feedItem.slug)/highlights/\(shortId)"
} else {
return nil
}

2
apple/OmnivoreKit/Sources/App/Views/LinkItemDetailView.swift
View file

@ -56,7 +56,7 @@ enum PDFProvider {
if let viewer = viewer {
createWebAppWrapperViewModel(
username: viewer.username ?? "",
username: viewer.unwrappedUsername,
dataService: dataService,
rawAuthCookie: rawAuthCookie
)

4
apple/OmnivoreKit/Sources/App/Views/Profile/ProfileView.swift
View file

@ -21,8 +21,8 @@ import Views
guard let viewer = try? await dataService.fetchViewer() else { return }
profileCardData = ProfileCardData(
name: viewer.name ?? "",
username: viewer.username ?? "",
name: viewer.unwrappedName,
username: viewer.unwrappedUsername,
imageURL: viewer.profileImageURL.flatMap { URL(string: $0) }
)
}

10
apple/OmnivoreKit/Sources/Models/DataModels/UserProfile.swift
View file

@ -44,3 +44,13 @@ public extension UserProfile {
return nil
}
}
public extension Viewer {
var unwrappedUsername: String {
username ?? ""
}
var unwrappedName: String {
name ?? ""
}
}

1
apple/OmnivoreKit/Sources/Services/DataService/DataService.swift
View file

@ -30,6 +30,7 @@ public final class DataService: ObservableObject {
public var currentViewer: Viewer? {
let fetchRequest: NSFetchRequest<Models.Viewer> = Viewer.fetchRequest()
fetchRequest.fetchLimit = 1 // we should only have one viewer saved
return try? persistentContainer.viewContext.fetch(fetchRequest).first
}