From fa20d7c4f7ef65e37662bf2954da25d09c0bad09 Mon Sep 17 00:00:00 2001 From: Justin Mazzocchi <2831158+jzzocc@users.noreply.github.com> Date: Sun, 9 May 2021 22:10:14 -0700 Subject: [PATCH] Resolve all searches --- MastodonAPI/Sources/MastodonAPI/Endpoints/ResultsEndpoint.swift | 2 +- .../Sources/ServiceLayer/Services/NavigationService.swift | 2 +- ServiceLayer/Sources/ServiceLayer/Services/StatusService.swift | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MastodonAPI/Sources/MastodonAPI/Endpoints/ResultsEndpoint.swift b/MastodonAPI/Sources/MastodonAPI/Endpoints/ResultsEndpoint.swift index 15adaec..37311b6 100644 --- a/MastodonAPI/Sources/MastodonAPI/Endpoints/ResultsEndpoint.swift +++ b/MastodonAPI/Sources/MastodonAPI/Endpoints/ResultsEndpoint.swift @@ -21,7 +21,7 @@ public extension ResultsEndpoint { public init(query: String, type: SearchType? = nil, excludeUnreviewed: Bool = false, - resolve: Bool = false, + resolve: Bool = true, limit: Int? = nil, offset: Int? = nil, following: Bool = false) { diff --git a/ServiceLayer/Sources/ServiceLayer/Services/NavigationService.swift b/ServiceLayer/Sources/ServiceLayer/Services/NavigationService.swift index 9ffc66c..9c276cf 100644 --- a/ServiceLayer/Sources/ServiceLayer/Services/NavigationService.swift +++ b/ServiceLayer/Sources/ServiceLayer/Services/NavigationService.swift @@ -155,7 +155,7 @@ private extension NavigationService { func webfinger(url: URL) -> AnyPublisher { let navigationSubject = PassthroughSubject() - let request = mastodonAPIClient.request(ResultsEndpoint.search(.init(query: url.absoluteString, resolve: true))) + let request = mastodonAPIClient.request(ResultsEndpoint.search(.init(query: url.absoluteString))) .handleEvents( receiveSubscription: { _ in navigationSubject.send(.webfingerStart) }, receiveCompletion: { _ in navigationSubject.send(.webfingerEnd) }) diff --git a/ServiceLayer/Sources/ServiceLayer/Services/StatusService.swift b/ServiceLayer/Sources/ServiceLayer/Services/StatusService.swift index 502cbfb..d488cac 100644 --- a/ServiceLayer/Sources/ServiceLayer/Services/StatusService.swift +++ b/ServiceLayer/Sources/ServiceLayer/Services/StatusService.swift @@ -173,7 +173,7 @@ private extension StatusService { } return client - .request(ResultsEndpoint.search(.init(query: status.displayStatus.uri, resolve: true, limit: 1))) + .request(ResultsEndpoint.search(.init(query: status.displayStatus.uri, limit: 1))) .tryMap { guard let status = $0.statuses.first else { throw APIError.unableToFetchRemoteStatus }