mirror of
https://github.com/metabolist/metatext.git
synced 2024-09-23 03:50:01 +00:00
Resolve all searches
This commit is contained in:
parent
e8662a1288
commit
fa20d7c4f7
3 changed files with 3 additions and 3 deletions
|
@ -21,7 +21,7 @@ public extension ResultsEndpoint {
|
||||||
public init(query: String,
|
public init(query: String,
|
||||||
type: SearchType? = nil,
|
type: SearchType? = nil,
|
||||||
excludeUnreviewed: Bool = false,
|
excludeUnreviewed: Bool = false,
|
||||||
resolve: Bool = false,
|
resolve: Bool = true,
|
||||||
limit: Int? = nil,
|
limit: Int? = nil,
|
||||||
offset: Int? = nil,
|
offset: Int? = nil,
|
||||||
following: Bool = false) {
|
following: Bool = false) {
|
||||||
|
|
|
@ -155,7 +155,7 @@ private extension NavigationService {
|
||||||
func webfinger(url: URL) -> AnyPublisher<Navigation, Never> {
|
func webfinger(url: URL) -> AnyPublisher<Navigation, Never> {
|
||||||
let navigationSubject = PassthroughSubject<Navigation, Never>()
|
let navigationSubject = PassthroughSubject<Navigation, Never>()
|
||||||
|
|
||||||
let request = mastodonAPIClient.request(ResultsEndpoint.search(.init(query: url.absoluteString, resolve: true)))
|
let request = mastodonAPIClient.request(ResultsEndpoint.search(.init(query: url.absoluteString)))
|
||||||
.handleEvents(
|
.handleEvents(
|
||||||
receiveSubscription: { _ in navigationSubject.send(.webfingerStart) },
|
receiveSubscription: { _ in navigationSubject.send(.webfingerStart) },
|
||||||
receiveCompletion: { _ in navigationSubject.send(.webfingerEnd) })
|
receiveCompletion: { _ in navigationSubject.send(.webfingerEnd) })
|
||||||
|
|
|
@ -173,7 +173,7 @@ private extension StatusService {
|
||||||
}
|
}
|
||||||
|
|
||||||
return client
|
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 {
|
.tryMap {
|
||||||
guard let status = $0.statuses.first else { throw APIError.unableToFetchRemoteStatus }
|
guard let status = $0.statuses.first else { throw APIError.unableToFetchRemoteStatus }
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue