Handle /read and /reader URLs

Author: jkmassel

WordPress/Classes/Utility/Universal Links/Route.swift

@@ -8,14 +8,33 @@ import UIKit
 /// Path: /me/account/:username
 ///
 protocol Route {
-    var path: String { get }
+    var path: RoutePath { get }
+    var alternatePaths: [RoutePath] { get }
     var section: DeepLinkSection? { get }
     var source: DeepLinkSource { get }
     var action: NavigationAction { get }
     var shouldTrack: Bool { get }
     var jetpackPowered: Bool { get }
 }
 
+extension Route {
+    var alternatePaths: [RoutePath] {
+        []
+    }
+ 
+    var allPaths: [RoutePath] {
+        [path] + alternatePaths
+    }
+}
+
+typealias RoutePath = String
+
+extension RoutePath {
+    var components: [String] {
+        return (self as NSString).pathComponents
+    }
+}
+
 extension Route {
     // Default routes to handling links rather than other source types
     var source: DeepLinkSource {
@@ -75,11 +94,6 @@ struct FailureNavigationAction: NavigationAction {
 // MARK: - Route helper methods
 
 extension Route {
-    /// Returns the path components of a route's path.
-    var components: [String] {
-        return (path as NSString).pathComponents
-    }
-
     func isEqual(to route: Route) -> Bool {
         return path == route.path
     }

WordPress/Classes/Utility/Universal Links/RouteMatcher.swift

@@ -24,33 +24,33 @@ class RouteMatcher {
     ///
     func routesMatching(_ url: URL) -> [MatchedRoute] {
         let pathComponents = url.pathComponents
-
-        return routes.compactMap({ route -> MatchedRoute? in
-            let values = valuesDictionary(forURL: url)
-
-            // If the paths are the same, we definitely have a match
-            if route.path == url.path {
-                return route.matched(with: values)
-            }
-
-            let routeComponents = route.components
-
-            // Ensure the paths have the same number of components
-            guard routeComponents.count == pathComponents.count else {
-                return nil
-            }
-
-            guard let placeholderValues = placeholderDictionary(
-                forKeyComponents: routeComponents,
-                valueComponents: pathComponents
-            ) else {
-                return nil
-            }
-
-            let allValues = values.merging(placeholderValues, uniquingKeysWith: { (current, _) in current })
-
-            return route.matched(with: allValues)
-        })
+        let values = valuesDictionary(forURL: url)
+
+        return routes.compactMap { route -> MatchedRoute? in
+            route.allPaths.compactMap { candidate in
+                // If the paths are the same, we definitely have a match
+                if candidate == url.path {
+                    return route.matched(with: values)
+                }
+
+                let candidateComponents = candidate.components
+
+                // Ensure the paths have the same number of components
+                guard candidateComponents.count == pathComponents.count else {
+                    return nil
+                }
+
+                guard let placeholderValues = placeholderDictionary(
+                    forKeyComponents: candidateComponents,
+                    valueComponents: pathComponents
+                ) else {
+                    return nil
+                }
+
+                let allValues = values.merging(placeholderValues, uniquingKeysWith: { (current, _) in current })
+                return route.matched(with: allValues)
+            }.first
+        }
     }
 
     private func valuesDictionary(forURL url: URL) -> [String: String] {

WordPress/Classes/Utility/Universal Links/Routes+Reader.swift

@@ -20,35 +20,41 @@ enum ReaderRoute {
 
 extension ReaderRoute: Route {
     var path: String {
+        // Guaranteed to be safe force-unwrap if `alternatePaths` is exhaustive and returns at least one value
+        // for every variant
+        alternatePaths.first!
+    }
+
+    var alternatePaths: [RoutePath] {
         switch self {
         case .root:
-            return "/read"
+            return ["/read", "/reader"]
         case .discover:
-            return "/discover"
+            return ["/discover"]
         case .search:
-            return "/read/search"
+            return ["/read/search", "/reader/search"]
         case .a8c:
-            return "/read/a8c"
+            return ["/read/a8c", "/reader/a8c"]
         case .p2:
-            return "/read/p2"
+            return ["/read/p2", "/reader/p2"]
         case .likes:
-            return "/activities/likes"
+            return ["/activities/likes"]
         case .manageFollowing:
-            return "/following/manage"
+            return ["/following/manage"]
         case .list:
-            return "/read/list/:username/:list_name"
+            return ["/read/list/:username/:list_name", "/reader/list/:username/:list_name"]
         case .tag:
-            return "/tag/:tag_name"
+            return ["/tag/:tag_name"]
         case .feed:
-            return "/read/feeds/:feed_id"
+            return ["/read/feeds/:feed_id", "/reader/feeds/:feed_id"]
         case .blog:
-            return "/read/blogs/:blog_id"
+            return ["/read/blogs/:blog_id", "/reader/blogs/:blog_id"]
         case .feedsPost:
-            return "/read/feeds/:feed_id/posts/:post_id"
+            return ["/read/feeds/:feed_id/posts/:post_id", "/reader/feeds/:feed_id/posts/:post_id"]
         case .blogsPost:
-            return "/read/blogs/:blog_id/posts/:post_id"
+            return ["/read/blogs/:blog_id/posts/:post_id", "/reader/blogs/:blog_id/posts/:post_id"]
         case .wpcomPost:
-            return "/:post_year/:post_month/:post_day/:post_name"
+            return ["/:post_year/:post_month/:post_day/:post_name"]
         }
     }