Add RSS feed support in Reader search

Author: kean

Modules/Sources/AsyncImageKit/Helpers/FaviconService.swift

@@ -74,7 +74,7 @@ private final class FaviconCache: @unchecked Sendable {
 }
 
 private let regex: NSRegularExpression? = {
-    let pattern = "<link[^>]*rel=\"apple-touch-icon\"[^>]*href=\"([^\"]+)\"[^>]*>"
+    let pattern = "<link[^>]*rel=\"apple-touch-icon|apple-touch-icon-precomposed\"[^>]*href=\"([^\"]+)\"[^>]*>"
     return try? NSRegularExpression(pattern: pattern, options: .caseInsensitive)
 }()
 

WordPress/Classes/ViewRelated/Reader/Controllers/ReaderFeedCell.swift

@@ -4,10 +4,11 @@ import WordPressKit
 
 struct ReaderFeedCell: View {
     let feed: ReaderFeed
+    @State private var faviconURL: URL?
 
     var body: some View {
         HStack(alignment: .center, spacing: 16) {
-            SiteIconView(viewModel: .init(feed: feed))
+            SiteIconView(viewModel: .init(feed: feed, faviconURL: faviconURL))
                 .frame(width: 40, height: 40)
 
             VStack(alignment: .leading) {
@@ -23,6 +24,21 @@ struct ReaderFeedCell: View {
                 }
             }
         }
+        .task {
+            await loadFaviconIfNeeded()
+        }
+    }
+
+    private func loadFaviconIfNeeded() async {
+        guard feed.blavatarURL == nil, let url = feed.url else {
+            return
+        }
+
+        if let cachedFavicon = FaviconService.shared.cachedFavicon(forURL: url) {
+            faviconURL = cachedFavicon
+        } else {
+            faviconURL = try? await FaviconService.shared.favicon(forURL: url)
+        }
     }
 
     var title: String {
@@ -41,10 +57,12 @@ struct ReaderFeedCell: View {
 }
 
 extension SiteIconViewModel {
-    init(feed: ReaderFeed, size: Size = .regular) {
+    init(feed: ReaderFeed, faviconURL: URL? = nil, size: Size = .regular) {
         self.init(size: size)
         if let iconURL = feed.blavatarURL {
             self.imageURL = SiteIconViewModel.optimizedURL(for: iconURL.absoluteString, imageSize: size.size)
+        } else if let faviconURL {
+            self.imageURL = faviconURL
         }
     }
 }