Merge branch 'release/26.5' into trunk

Author: crazytonyli

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(?:-precomposed)\"[^>]*href=\"([^\"]+)\"[^>]*>"
     return try? NSRegularExpression(pattern: pattern, options: .caseInsensitive)
 }()
 

Modules/Sources/WordPressKit/ReaderFeed.swift

@@ -5,8 +5,8 @@ import Foundation
 /// (read/feed?q=query)
 ///
 public struct ReaderFeed: Decodable {
-    public let url: URL
-    public let title: String
+    public let url: URL?
+    public let title: String?
     public let feedDescription: String?
     public let feedID: String?
     public let blogID: String?
@@ -26,15 +26,7 @@ public struct ReaderFeed: Decodable {
 
     private enum DataKeys: CodingKey {
         case site
-    }
-
-    private enum SiteKeys: CodingKey {
-        case description
-        case icon
-    }
-
-    private enum IconKeys: CodingKey {
-        case img
+        case feed
     }
 
     public init(from decoder: Decoder) throws {
@@ -44,32 +36,77 @@ public struct ReaderFeed: Decodable {
         // - We want to decode whatever we can get, and not fail if neither of those exist
         let rootContainer = try decoder.container(keyedBy: CodingKeys.self)
 
-        url = try rootContainer.decode(URL.self, forKey: .url)
-        title = try rootContainer.decode(String.self, forKey: .title)
+        var feedURL = try? rootContainer.decodeIfPresent(URL.self, forKey: .url)
+        var title = try? rootContainer.decodeIfPresent(String.self, forKey: .title)
         feedID = try? rootContainer.decode(String.self, forKey: .feedID)
         blogID = try? rootContainer.decode(String.self, forKey: .blogID)
 
         var feedDescription: String?
         var blavatarURL: URL?
 
+        // Try to parse both site and feed data from meta.data
         do {
             let metaContainer = try rootContainer.nestedContainer(keyedBy: MetaKeys.self, forKey: .meta)
             let dataContainer = try metaContainer.nestedContainer(keyedBy: DataKeys.self, forKey: .data)
-            let siteContainer = try dataContainer.nestedContainer(keyedBy: SiteKeys.self, forKey: .site)
-            feedDescription = try? siteContainer.decode(String.self, forKey: .description)
 
-            let iconContainer = try siteContainer.nestedContainer(keyedBy: IconKeys.self, forKey: .icon)
-            blavatarURL = try? iconContainer.decode(URL.self, forKey: .img)
+            let siteData = try? dataContainer.decode(SiteOrFeedData.self, forKey: .site)
+            let feedData = try? dataContainer.decode(SiteOrFeedData.self, forKey: .feed)
+
+            // Use data from either source, preferring site data when both are available
+            feedDescription = siteData?.description ?? feedData?.description
+            blavatarURL = siteData?.iconURL ?? feedData?.iconURL
+
+            // Fixes CMM-1002: in some cases, the backend fails to embed certain fields
+            // directly in the feed object
+            if feedURL == nil {
+                feedURL = siteData?.url ?? feedData?.url
+            }
+            if title == nil {
+                title = siteData?.title ?? feedData?.title
+            }
         } catch {
         }
 
+        self.url = feedURL
+        self.title = title
         self.feedDescription = feedDescription
         self.blavatarURL = blavatarURL
     }
 }
 
+private struct SiteOrFeedData: Decodable {
+    var title: String?
+    var description: String?
+    var iconURL: URL?
+    var url: URL?
+
+    enum CodingKeys: String, CodingKey {
+        case description
+        case icon
+        case url = "URL"
+        case name
+    }
+
+    private enum IconKeys: CodingKey {
+        case img
+    }
+
+    init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+
+        title = try? container.decodeIfPresent(String.self, forKey: .name)
+        description = try? container.decodeIfPresent(String.self, forKey: .description)
+        url = try? container.decodeIfPresent(URL.self, forKey: .url)
+
+        // Try to decode the icon URL from the nested icon dictionary
+        if let iconContainer = try? container.nestedContainer(keyedBy: IconKeys.self, forKey: .icon) {
+            iconURL = try? iconContainer.decode(URL.self, forKey: .img)
+        }
+    }
+}
+
 extension ReaderFeed: CustomStringConvertible {
     public var description: String {
-        return "<Feed | URL: \(url), title: \(title), feedID: \(String(describing: feedID)), blogID: \(String(describing: blogID))>"
+        return "<Feed | URL: \(String(describing: url)), title: \(String(describing: title)), feedID: \(String(describing: feedID)), blogID: \(String(describing: blogID))>"
     }
 }

Modules/Sources/WordPressKit/ReaderPostServiceRemote+V2.swift

@@ -1,5 +1,15 @@
 import Foundation
 
+public struct ResolvedReaderPost: Decodable {
+    public let postId: UInt64
+    public let siteId: UInt64
+
+    enum CodingKeys: String, CodingKey {
+        case postId = "post_id"
+        case siteId = "site_id"
+    }
+}
+
 extension ReaderPostServiceRemote {
     /// Returns a collection of RemoteReaderPost
     /// This method returns the best available content for the given topics.
@@ -31,6 +41,23 @@ extension ReaderPostServiceRemote {
         })
     }
 
+    public func resolveUrl(
+        _ url: URL,
+        success: @escaping (ResolvedReaderPost) -> Void,
+        failure: @escaping (Error) -> Void
+    ) {
+        let path = "/wpcom/v2/mobile/resolve-reader-url"
+
+        Task { @MainActor [wordPressComRestApi] in
+            await wordPressComRestApi.perform(.get, URLString: path, parameters: [
+                "url": url.absoluteString,
+            ], type: ResolvedReaderPost.self)
+                .map { $0.body }
+                .eraseToError()
+                .execute(onSuccess: success, onFailure: failure)
+        }
+    }
+
     private func postsEndpoint(for topics: [String], page: String? = nil) -> String? {
         var path = URLComponents(string: "read/tags/posts")
 

Modules/Sources/WordPressKit/ReaderSiteSearchServiceRemote.swift

@@ -20,7 +20,7 @@ public class ReaderSiteSearchServiceRemote: ServiceRemoteWordPressComREST {
     public func performSearch(_ query: String,
                               offset: Int = 0,
                               count: Int,
-                              success: @escaping (_ results: [ReaderFeed], _ hasMore: Bool, _ feedCount: Int) -> Void,
+                              success: @escaping (_ results: [ReaderFeed], _ hasMore: Bool, _ total: Int?) -> Void,
                               failure: @escaping (Error) -> Void) {
         let endpoint = "read/feed"
         let path = self.path(forEndpoint: endpoint, withVersion: ._1_1)
@@ -29,7 +29,7 @@ public class ReaderSiteSearchServiceRemote: ServiceRemoteWordPressComREST {
             "offset": offset as AnyObject,
             "exclude_followed": false as AnyObject,
             "sort": "relevance" as AnyObject,
-            "meta": "site" as AnyObject,
+            "meta": "site,feed" as AnyObject,
             "q": query as AnyObject
         ]
 
@@ -38,7 +38,7 @@ public class ReaderSiteSearchServiceRemote: ServiceRemoteWordPressComREST {
                                 success: { response, _ in
                                     do {
                                         let (results, total) = try self.mapSearchResponse(response)
-                                        let hasMore = total > (offset + count)
+                                        let hasMore = (total ?? 0) > (offset + count)
                                         success(results, hasMore, total)
                                     } catch {
                                         failure(error)
@@ -52,7 +52,7 @@ public class ReaderSiteSearchServiceRemote: ServiceRemoteWordPressComREST {
 
 private extension ReaderSiteSearchServiceRemote {
 
-    func mapSearchResponse(_ response: Any) throws -> ([ReaderFeed], Int) {
+    func mapSearchResponse(_ response: Any) throws -> ([ReaderFeed], Int?) {
         do {
             let decoder = JSONDecoder()
             let data = try JSONSerialization.data(withJSONObject: response, options: [])
@@ -73,9 +73,9 @@ private extension ReaderSiteSearchServiceRemote {
 /// The Reader feed search endpoint returns feeds in a key named `feeds` key.
 /// This entity allows us to do parse that and the total feed count using JSONDecoder.
 ///
-private struct ReaderFeedEnvelope: Decodable {
+struct ReaderFeedEnvelope: Decodable {
     let feeds: [ReaderFeed]
-    let total: Int
+    let total: Int?
 
     private enum CodingKeys: String, CodingKey {
         case feeds = "feeds"

Modules/Sources/WordPressReader/Settings/ReaderDisplaySettings.swift

@@ -249,6 +249,8 @@ public struct ReaderDisplaySettings: Codable, Equatable, Hashable, Sendable {
         case normal
         case large
         case extraLarge
+        case extraExtraLarge
+        case extraExtraExtraLarge
 
         public var scale: Double {
             switch self {
@@ -262,6 +264,10 @@ public struct ReaderDisplaySettings: Codable, Equatable, Hashable, Sendable {
                 return 1.15
             case .extraLarge:
                 return 1.25
+            case .extraExtraLarge:
+                return 1.4
+            case .extraExtraExtraLarge:
+                return 1.6
             }
         }
 
@@ -297,6 +303,18 @@ public struct ReaderDisplaySettings: Codable, Equatable, Hashable, Sendable {
                     value: "Extra Large",
                     comment: "Accessibility label for the Extra Large size option, used in the Reader's reading preferences."
                 )
+            case .extraExtraLarge:
+                return NSLocalizedString(
+                    "reader.preferences.size.extraExtraLarge",
+                    value: "Extra Extra Large",
+                    comment: "Accessibility label for the Extra Extra Large size option, used in the Reader's reading preferences."
+                )
+            case .extraExtraExtraLarge:
+                return NSLocalizedString(
+                    "reader.preferences.size.extraExtraExtraLarge",
+                    value: "Extra Extra Extra Large",
+                    comment: "Accessibility label for the Extra Extra Extra Large size option, used in the Reader's reading preferences."
+                )
             }
         }
 
@@ -312,6 +330,10 @@ public struct ReaderDisplaySettings: Codable, Equatable, Hashable, Sendable {
                 return "large"
             case .extraLarge:
                 return "extra_large"
+            case .extraExtraLarge:
+                return "extra_extra_large"
+            case .extraExtraExtraLarge:
+                return "extra_extra_extra_large"
             }
         }
     }

RELEASE-NOTES.txt

@@ -10,12 +10,22 @@
 * [*] Add "Access" section to "Post Settings" [#24942]
 * [*] Add "Discussion" to "Post Settings" [#24948]
 * [*] Add "File Size" to Site Media Details [#24947]
+* [*] Fix an issue with posts duplicated in Discover [#25015]
 * [*] Add "Email to Subscribers" row to "Publishing" sheet [#24946]
 * [*] Add permalink preview in the slug editor and make other improvements [#24949]
+* [*] Add two accessible font sizes to Reader display settings [#25013]
+* [*] Fix an issue with Reader failing to parse some search results [#25022]
+* [*] Fix search for RSS feeds in Reader [#25023]
 * [*] Add "Taxonomies" to Site Settings [#24955]
 * [*] Update "Categories" picker to indicate multiple selection [#24952]
 * [*] Fix a bug where the app can't access some Jetpack connected sites [#24976]
 * [*] Add support for editing custom taxonomy terms from "Post Settings" [#24964]
+* [*] Fix a bug where the app can't access some Jetpack connected sites [#24976]
+* [*] Add support for editing custom taxonomy terms from "Post Settings" [#24964]
+* [*] Fix overly long related post titles in Reader [#25011]
+* [*] Increase number of lines for post tiles in Reader to three [#25019]
+* [*] Fix horizontal insets in Reader article view [#25010]
+* [*] Fixed several reader bugs causing posts to load strangely, or not at all [#25016]
 
 26.4
 -----

Sources/WordPressData/Swift/ReaderCard+CoreDataClass.swift

@@ -43,27 +43,47 @@ public class ReaderCard: NSManagedObject {
         sites?.array as? [ReaderSiteTopic] ?? []
     }
 
-    public convenience init?(context: NSManagedObjectContext, from remoteCard: RemoteReaderCard) {
+    public static func createOrReuse(context: NSManagedObjectContext, from remoteCard: RemoteReaderCard) -> ReaderCard? {
         guard remoteCard.type != .unknown else {
             return nil
         }
 
-        self.init(context: context)
-
         switch remoteCard.type {
         case .post:
-            post = ReaderPost.createOrReplace(fromRemotePost: remoteCard.post, for: nil, context: context)
+            let post = ReaderPost.createOrReplace(fromRemotePost: remoteCard.post, for: nil, context: context)
+
+            // Check if a card already exists with this post to prevent duplicates
+            if let existingCard = findExistingCard(with: post, context: context) {
+                return existingCard
+            }
+
+            let card = ReaderCard(context: context)
+            card.post = post
+            return card
+
         case .interests:
-            topics = NSOrderedSet(array: remoteCard.interests?.prefix(5).map {
-                ReaderTagTopic.createOrUpdateIfNeeded(from: $0, context: context)
-            } ?? [])
+            return nil // Disabled in v26.5
         case .sites:
-            sites = NSOrderedSet(array: remoteCard.sites?.prefix(3).map {
+            let card = ReaderCard(context: context)
+            card.sites = NSOrderedSet(array: remoteCard.sites?.prefix(3).map {
                 ReaderSiteTopic.createIfNeeded(from: $0, context: context)
             } ?? [])
+            return card
 
         default:
-            break
+            return nil
         }
     }
+
+    private static func findExistingCard(with post: ReaderPost?, context: NSManagedObjectContext) -> ReaderCard? {
+        guard let post else {
+            return nil
+        }
+
+        let fetchRequest = ReaderCard.fetchRequest()
+        fetchRequest.predicate = NSPredicate(format: "post = %@", post)
+        fetchRequest.fetchLimit = 1
+
+        return try? context.fetch(fetchRequest).first
+    }
 }

Sources/WordPressData/Swift/ReaderPost+PostContentProvider.swift

@@ -12,8 +12,8 @@ extension ReaderPost {
     }
 
     @objc public override var featuredImageURL: URL? {
-        if !self.featuredImage.isEmpty {
-            return URL(string: self.featuredImage)
+        if let featuredImage, !featuredImage.isEmpty {
+            return URL(string: featuredImage)
         }
         return nil
     }

Sources/WordPressData/Swift/ReaderSiteTopic+Lookup.swift

@@ -3,6 +3,15 @@ import Foundation
 
 public extension ReaderSiteTopic {
 
+    /// The preferred display title for the site.
+    /// Returns the site title if not empty, otherwise returns the site host, or "–" if unavailable.
+    var preferredDisplayTitle: String {
+        if !title.isEmpty {
+            return title
+        }
+        return URL(string: siteURL)?.host ?? "–"
+    }
+
     /// Find a site topic by its site id
     ///
     /// - Parameter siteID: The site id of the topic