diff --git a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewModel.swift b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewModel.swift index 8c99130f9..919d858f1 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewModel.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewModel.swift @@ -303,10 +303,21 @@ import Views isLoading = false } + private var queryContainsFilter: Bool { + if searchTerm.contains("in:inbox") || searchTerm.contains("in:all") || searchTerm.contains("in:archive") { + return true + } + + return false + } + private var searchQuery: String { - let filter = LinkedItemFilter(rawValue: appliedFilter) ?? .inbox let sort = LinkedItemSort(rawValue: appliedSort) ?? .newest - var query = "\(filter.queryString) \(sort.queryString)" + var query = sort.queryString + + if !queryContainsFilter, let filter = LinkedItemFilter(rawValue: appliedFilter) { + query = "\(filter.queryString) \(sort.queryString)" + } if !searchTerm.isEmpty { query.append(" \(searchTerm)") @@ -322,6 +333,8 @@ import Views query.append(negatedLabels.map { $0.name ?? "" }.joined(separator: ",")) } + print("QUERY: `\(query)`") + return query } }