diff --git a/Account/Sources/Account/AccountDelegates/FeedlyAccountDelegate.swift b/Account/Sources/Account/AccountDelegates/FeedlyAccountDelegate.swift index 9aa1df8c9..a454b6df8 100644 --- a/Account/Sources/Account/AccountDelegates/FeedlyAccountDelegate.swift +++ b/Account/Sources/Account/AccountDelegates/FeedlyAccountDelegate.swift @@ -798,6 +798,13 @@ final class FeedlyAccountDelegate: AccountDelegate { os_log(.debug, log: self.log, "Done sending article statuses.") } + func searchForFeed(url: String) async throws -> FeedlyFeedsSearchResponse { + + // To replace FeedlySearchOperation + + try await caller.getFeeds(for: url, count: 1, localeIdentifier: Locale.current.identifier) + } + // MARK: Suspend and Resume (for iOS) diff --git a/Account/Sources/Account/Feedly/FeedlyAPICaller.swift b/Account/Sources/Account/Feedly/FeedlyAPICaller.swift index 434a53503..1bedc6ef0 100644 --- a/Account/Sources/Account/Feedly/FeedlyAPICaller.swift +++ b/Account/Sources/Account/Feedly/FeedlyAPICaller.swift @@ -535,7 +535,7 @@ extension FeedlyAPICaller: FeedlyMarkArticlesService { extension FeedlyAPICaller: FeedlySearchService { - func getFeeds(for query: String, count: Int, locale: String) async throws -> FeedlyFeedsSearchResponse { + func getFeeds(for query: String, count: Int, localeIdentifier: String) async throws -> FeedlyFeedsSearchResponse { guard !isSuspended else { throw TransportError.suspended } @@ -544,7 +544,7 @@ extension FeedlyAPICaller: FeedlySearchService { components.queryItems = [ URLQueryItem(name: "query", value: query), URLQueryItem(name: "count", value: String(count)), - URLQueryItem(name: "locale", value: locale) + URLQueryItem(name: "locale", value: localeIdentifier) ] guard let url = components.url else { fatalError("\(components) does not produce a valid URL.") diff --git a/Account/Sources/Account/Feedly/Operations/FeedlyAddNewFeedOperation.swift b/Account/Sources/Account/Feedly/Operations/FeedlyAddNewFeedOperation.swift index 3cb8cbaf1..15eef5ea1 100644 --- a/Account/Sources/Account/Feedly/Operations/FeedlyAddNewFeedOperation.swift +++ b/Account/Sources/Account/Feedly/Operations/FeedlyAddNewFeedOperation.swift @@ -85,7 +85,7 @@ final class FeedlyAddNewFeedOperation: FeedlyOperation, FeedlyOperationDelegate, return didFinish(with: AccountError.createErrorNotFound) } - let feedResourceID = FeedlyFeedResourceID(id: first.feedId) + let feedResourceID = FeedlyFeedResourceID(id: first.feedID) self.feedResourceID = feedResourceID let addRequest = FeedlyAddFeedToCollectionOperation(folder: folder, feedResource: feedResourceID, feedName: feedName, collectionID: collectionID, service: addToCollectionService) diff --git a/Feedly/Sources/Feedly/FeedlyModel.swift b/Feedly/Sources/Feedly/FeedlyModel.swift index 19e316df0..390d5355e 100644 --- a/Feedly/Sources/Feedly/FeedlyModel.swift +++ b/Feedly/Sources/Feedly/FeedlyModel.swift @@ -298,7 +298,7 @@ public struct FeedlyFeedsSearchResponse: Decodable, Sendable { public struct Feed: Decodable, Sendable { public let title: String - public let feedId: String + public let feedID: String } public let results: [Feed] diff --git a/Feedly/Sources/Feedly/Operations/FeedlySearchOperation.swift b/Feedly/Sources/Feedly/Operations/FeedlySearchOperation.swift index edf0b0f6f..6de1e861a 100644 --- a/Feedly/Sources/Feedly/Operations/FeedlySearchOperation.swift +++ b/Feedly/Sources/Feedly/Operations/FeedlySearchOperation.swift @@ -10,7 +10,7 @@ import Foundation public protocol FeedlySearchService: AnyObject { - @MainActor func getFeeds(for query: String, count: Int, locale: String) async throws -> FeedlyFeedsSearchResponse + @MainActor func getFeeds(for query: String, count: Int, localeIdentifier: String) async throws -> FeedlyFeedsSearchResponse } public protocol FeedlySearchOperationDelegate: AnyObject { @@ -38,7 +38,7 @@ public final class FeedlySearchOperation: FeedlyOperation { Task { @MainActor in do { - let searchResponse = try await searchService.getFeeds(for: query, count: 1, locale: locale.identifier) + let searchResponse = try await searchService.getFeeds(for: query, count: 1, localeIdentifier: locale.identifier) self.searchDelegate?.feedlySearchOperation(self, didGet: searchResponse) self.didFinish()