From e8c1db842eabf4e17a9e76c4d669b1912bd828ad Mon Sep 17 00:00:00 2001 From: Justin Mazzocchi <2831158+jzzocc@users.noreply.github.com> Date: Mon, 7 Nov 2022 16:16:57 -0800 Subject: [PATCH] Formatting --- .../Sources/ServiceLayer/Services/SearchService.swift | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ServiceLayer/Sources/ServiceLayer/Services/SearchService.swift b/ServiceLayer/Sources/ServiceLayer/Services/SearchService.swift index 8743642..3f99f67 100644 --- a/ServiceLayer/Sources/ServiceLayer/Services/SearchService.swift +++ b/ServiceLayer/Sources/ServiceLayer/Services/SearchService.swift @@ -34,12 +34,11 @@ public struct SearchService { extension SearchService: CollectionService { public func request(maxId: String?, minId: String?, search: Search?) -> AnyPublisher { - guard let search = search else { return Empty().eraseToAnyPublisher() } + guard + let search = search, + !search.query.trimmingCharacters(in: .whitespaces).isEmpty + 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)) })