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

Load groups from disk when recommending, handle network errors better

Browse source
This commit is contained in:
Jackson Harper 2022-12-14 16:55:25 +08:00
parent 7ac26365b2
commit 21bb3f1397
2 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
apple/OmnivoreKit/Sources/App/Views/WebReader/RecommendToView.swift
View file

@ -1,3 +1,4 @@
import CoreData
import Models
import Services
import SwiftUI
@ -26,6 +27,20 @@ import Views
isLoading = true
do {
dataService.viewContext.performAndWait {
let fetchRequest: NSFetchRequest<Models.RecommendationGroup> = RecommendationGroup.fetchRequest()
let sort = NSSortDescriptor(key: #keyPath(RecommendationGroup.createdAt), ascending: false)
fetchRequest.sortDescriptors = [sort]
fetchRequest.predicate = NSPredicate(format: "canPost == %@", NSNumber(value: true))
// If this fails we will fallback to making the API call
let groups = try? dataService.viewContext.fetch(fetchRequest).compactMap { object in
InternalRecommendationGroup.make(from: object)
}
if let groups = groups {
self.recommendationGroups = groups
}
}
recommendationGroups = try await dataService.recommendationGroups().filter(\.canPost)
} catch {
print("ERROR fetching recommendationGroups: ", error)
@ -35,8 +50,9 @@ import Views
isLoading = false
}
func recommend(dataService: DataService) async {
func recommend(dataService: DataService) async -> Bool {
isRunning = true
defer { isRunning = false }
do {
try await dataService.recommendPage(pageID: pageID,
@ -45,9 +61,11 @@ import Views
withHighlights: withHighlights)
} catch {
showError = true
return false
}
isRunning = false
return true
}
}
@ -72,9 +90,10 @@ struct RecommendToView: View {
} else {
return AnyView(Button(action: {
Task {
await viewModel.recommend(dataService: dataService)
Snackbar.show(message: "Recommendation sent")
dismiss()
if await viewModel.recommend(dataService: dataService) {
Snackbar.show(message: "Recommendation sent")
dismiss()
}
}
}, label: {
Text("Send")

4
apple/OmnivoreKit/Sources/Services/InternalModels/InternalRecommendationGroup.swift
View file

@ -28,12 +28,14 @@ public struct InternalRecommendationGroup: Identifiable {
recommendationGroup.id = id
recommendationGroup.name = name
recommendationGroup.canPost = canPost
recommendationGroup.canSeeMembers = canSeeMembers
recommendationGroup.inviteUrl = inviteUrl
return recommendationGroup
}
static func make(from recommendationGroup: RecommendationGroup) -> InternalRecommendationGroup? {
public static func make(from recommendationGroup: RecommendationGroup) -> InternalRecommendationGroup? {
if let id = recommendationGroup.id,
let name = recommendationGroup.name,
let inviteUrl = recommendationGroup.inviteUrl