diff --git a/apple/OmnivoreKit/Sources/App/Views/Home/Components/LibraryFeatureCardNavigationLink.swift b/apple/OmnivoreKit/Sources/App/Views/Home/Components/LibraryFeatureCardNavigationLink.swift index ce76a1310..389a3b4a8 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Home/Components/LibraryFeatureCardNavigationLink.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Home/Components/LibraryFeatureCardNavigationLink.swift @@ -51,7 +51,7 @@ struct LibraryFeatureCardNavigationLink: View { viewModel.setLinkArchived(dataService: dataService, objectID: item.objectID, archived: true) }) Button("Remove", action: { - viewModel.removeLink(dataService: dataService, objectID: item.objectID) + viewModel.removeLibraryItem(dataService: dataService, objectID: item.objectID) }) if FeaturedItemFilter(rawValue: viewModel.featureFilter) != .pinned { Button("Mark Read", action: { diff --git a/apple/OmnivoreKit/Sources/App/Views/Home/Components/LibraryItemFetcher.swift b/apple/OmnivoreKit/Sources/App/Views/Home/Components/LibraryItemFetcher.swift index 5b1471abc..1d26dcf88 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Home/Components/LibraryItemFetcher.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Home/Components/LibraryItemFetcher.swift @@ -246,6 +246,7 @@ import Views }.joined(separator: ",")) } + query.append(" use:folders") print("QUERY: `\(query)`") return query diff --git a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift index 6aea45a0c..8ae879074 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift @@ -731,7 +731,7 @@ struct AnimatingCellHeight: AnimatableModifier { case .delete: return AnyView(Button( action: { - viewModel.removeLink(dataService: dataService, objectID: item.objectID) + viewModel.removeLibraryItem(dataService: dataService, objectID: item.objectID) }, label: { Label("Remove", systemImage: "trash") @@ -768,7 +768,7 @@ struct AnimatingCellHeight: AnimatableModifier { case .toggleArchiveStatus: viewModel.setLinkArchived(dataService: dataService, objectID: item.objectID, archived: !item.isArchived) case .delete: - viewModel.removeLink(dataService: dataService, objectID: item.objectID) + viewModel.removeLibraryItem(dataService: dataService, objectID: item.objectID) case .editLabels: viewModel.itemUnderLabelEdit = item case .editTitle: diff --git a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewMac.swift b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewMac.swift index 23614150f..c7d456219 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewMac.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewMac.swift @@ -143,7 +143,7 @@ import Views Button("Remove Link", role: .destructive) { if let itemToRemove = itemToRemove { withAnimation { - viewModel.removeLink(dataService: dataService, objectID: itemToRemove.objectID) + viewModel.removeLibraryItem(dataService: dataService, objectID: itemToRemove.objectID) self.itemToRemove = nil } } diff --git a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewModel.swift b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewModel.swift index d175cd148..325b8c0a2 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewModel.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewModel.swift @@ -17,8 +17,6 @@ import Views @Published var itemUnderLabelEdit: Models.LibraryItem? @Published var itemUnderTitleEdit: Models.LibraryItem? @Published var itemForHighlightsView: Models.LibraryItem? - @Published var snoozePresented = false - @Published var itemToSnoozeID: String? @Published var linkRequest: LinkRequest? @Published var presentWebContainer = false @Published var showLoadingBar = false @@ -193,7 +191,7 @@ import Views snackbar(archived ? "Link archived" : "Link moved to Inbox") } - func removeLink(dataService: DataService, objectID: NSManagedObjectID) { + func removeLibraryItem(dataService: DataService, objectID: NSManagedObjectID) { removeLibraryItemAction(dataService: dataService, objectID: objectID) }