From 70c9a40edf003cb10ad5fa9a7ea88b86dc04e80c Mon Sep 17 00:00:00 2001 From: prplecake Date: Mon, 7 Nov 2022 17:47:56 -0600 Subject: [PATCH] Fix sending empty search query to Mastodon API (#101) --- .../Sources/ServiceLayer/Services/SearchService.swift | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ServiceLayer/Sources/ServiceLayer/Services/SearchService.swift b/ServiceLayer/Sources/ServiceLayer/Services/SearchService.swift index f63c753..8743642 100644 --- a/ServiceLayer/Sources/ServiceLayer/Services/SearchService.swift +++ b/ServiceLayer/Sources/ServiceLayer/Services/SearchService.swift @@ -36,6 +36,10 @@ extension SearchService: CollectionService { public func request(maxId: String?, minId: String?, search: Search?) -> AnyPublisher { guard let search = search else { return Empty().eraseToAnyPublisher() } + if (search.query.trimmingCharacters(in: .whitespaces).isEmpty){ + return Empty().eraseToAnyPublisher() + } + return mastodonAPIClient.request(ResultsEndpoint.search(search)) .flatMap { results in contentDatabase.insert(results: results).collect().map { _ in results } } .handleEvents(receiveOutput: { resultsSubject.send(($0, search)) })