Remove references to opening a post by URL

Author: jkmassel

Tests/KeystoneTests/Tests/Reader/ReaderDetailViewControllerTests.swift

@@ -6,16 +6,6 @@ import Nimble
 
 class ReaderDetailViewControllerTests: CoreDataTestCase {
 
-    /// Given a post URL. returns a ReaderDetailViewController
-    ///
-    func testControllerWithURL() {
-        let url = URL(string: "https://wpmobilep2.wordpress.com/post")!
-
-        let controller = ReaderDetailViewController.controllerWithPostURL(url)
-
-        expect(controller).to(beAKindOf(ReaderDetailViewController.self))
-    }
-
     /// Starts the coordinator with the ReaderPost and call start in viewDidLoad
     ///
     func testControllerWithPostRendersPostContent() {

WordPress/Classes/System/Root View/ReaderPresenter.swift

@@ -294,8 +294,6 @@ public final class ReaderPresenter: NSObject, SplitViewDisplayable {
             viewModel.selection = .allSubscriptions
         case let .post(postID, siteID, isFeed):
             push(ReaderDetailViewController.controllerWithPostID(NSNumber(value: postID), siteID: NSNumber(value: siteID), isFeed: isFeed))
-        case let .postURL(url):
-            push(ReaderDetailViewController.controllerWithPostURL(url))
         case let .topic(topic):
             viewModel.selection = nil
             show(ReaderStreamViewController.controllerWithTopic(topic))

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

@@ -25,7 +25,7 @@ class RouteMatcher {
     func routesMatching(_ url: URL) -> [MatchedRoute] {
         let pathComponents = url.pathComponents
 
-        return routes.compactMap({ route in
+        return routes.compactMap({ route -> MatchedRoute? in
             let values = valuesDictionary(forURL: url)
 
             // If the paths are the same, we definitely have a match
@@ -40,23 +40,15 @@ class RouteMatcher {
                 return nil
             }
 
-            guard let placeholderValues = placeholderDictionary(forKeyComponents: routeComponents,
-                                                                valueComponents: pathComponents) else {
-                                                                    return nil
-            }
-
-            let allValues = values.merging(placeholderValues,
-                                           uniquingKeysWith: { (current, _) in current })
-
-            // If it's a wpcomPost reader route, then check if it's a valid wpcom url.
-            // Need to check since we have no guarantee that it's a valid wpcom url,
-            // other than the path having 4 components.
-            if let readerRoute = route as? ReaderRoute,
-               readerRoute == .wpcomPost,
-               !readerRoute.isValidWpcomUrl(allValues) {
+            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)
         })
     }

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

@@ -15,7 +15,6 @@ enum ReaderRoute {
     case blog
     case feedsPost
     case blogsPost
-    case wpcomPost
 }
 
 extension ReaderRoute: Route {
@@ -47,8 +46,6 @@ extension ReaderRoute: Route {
             return "/read/feeds/:feed_id/posts/:post_id"
         case .blogsPost:
             return "/read/blogs/:blog_id/posts/:post_id"
-        case .wpcomPost:
-            return "/:post_year/:post_month/:post_day/:post_name"
         }
     }
 
@@ -112,12 +109,6 @@ extension ReaderRoute: NavigationAction {
             if let (blogID, postID) = blogAndPostID(from: values) {
                 presenter.showReader(path: .post(postID: postID, siteID: blogID))
             }
-        case .wpcomPost:
-            if let urlString = values[MatchedRouteURLComponentKey.url.rawValue],
-               let url = URL(string: urlString),
-               isValidWpcomUrl(values) {
-                presenter.showReader(path: .postURL(url))
-            }
         }
     }
 
@@ -142,27 +133,6 @@ extension ReaderRoute: NavigationAction {
 
         return (blogID, postID)
     }
-
-    func isValidWpcomUrl(_ values: [String: String]) -> Bool {
-        let year = Int(values["post_year"] ?? "") ?? 0
-        let month = Int(values["post_month"] ?? "") ?? 0
-        let day = Int(values["post_day"] ?? "") ?? 0
-
-        // we assume no posts were made in the 1800's or earlier
-        func isYear(_ year: Int) -> Bool {
-            year > 1900
-        }
-
-        func isMonth(_ month: Int) ->  Bool {
-            (1...12).contains(month)
-        }
-
-        func isDay(_ day: Int) -> Bool {
-            (1...31).contains(day)
-        }
-
-        return isYear(year) && isMonth(month) && isDay(day)
-    }
 }
 
 // MARK: - RootViewPresenter (Extensions)

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

@@ -82,7 +82,6 @@ struct UniversalLinkRouter: LinkRouter {
         ReaderRoute.blog,
         ReaderRoute.feedsPost,
         ReaderRoute.blogsPost,
-        ReaderRoute.wpcomPost
     ]
 
     static let statsRoutes: [Route] = [

WordPress/Classes/ViewRelated/Reader/Detail/ReaderDetailCoordinator.swift

@@ -476,8 +476,6 @@ class ReaderDetailCoordinator {
             presentWebViewController(url)
         } else if readerLinkRouter.canHandle(url: url) {
             readerLinkRouter.handle(url: url, shouldTrack: false, source: .inApp(presenter: viewController))
-        } else if url.isWordPressDotComPost {
-            presentReaderDetail(url)
         } else if url.isLinkProtocol {
             readerLinkRouter.handle(url: url, shouldTrack: false, source: .inApp(presenter: viewController))
         } else {
@@ -525,30 +523,6 @@ class ReaderDetailCoordinator {
                                      })
     }
 
-    /// Given a URL presents it in a new Reader detail screen
-    ///
-    private func presentReaderDetail(_ url: URL) {
-
-        // In cross post Notifications, if the user tapped the link to the original post in the Notification body,
-        // use the original post's info to display reader detail.
-        // The API endpoint used by controllerWithPostID returns subscription flags for the post.
-        // The API endpoint used by controllerWithPostURL does not return this information.
-        // These flags are needed to display the `Follow conversation by email` option.
-        // So if we can call controllerWithPostID, do so. Otherwise, fallback to controllerWithPostURL.
-        // Ref: https://github.com/wordpress-mobile/WordPress-iOS/issues/17158
-
-        let readerDetail: ReaderDetailViewController = {
-            if let post,
-               selectedUrlIsCrossPost(url) {
-                return ReaderDetailViewController.controllerWithPostID(post.crossPostMeta.postID, siteID: post.crossPostMeta.siteID)
-            }
-
-            return ReaderDetailViewController.controllerWithPostURL(url)
-        }()
-
-        viewController?.navigationController?.pushViewController(readerDetail, animated: true)
-    }
-
     private func selectedUrlIsCrossPost(_ url: URL) -> Bool {
         // Trim trailing slashes to facilitate URL comparison.
         let characterSet = CharacterSet(charactersIn: "/")

WordPress/Classes/ViewRelated/Reader/Detail/ReaderDetailViewController.swift

@@ -822,20 +822,6 @@ class ReaderDetailViewController: UIViewController, ReaderDetailView {
         return controller
     }
 
-    /// A View Controller that displays a Post content.
-    ///
-    /// Use this method to present content for the user.
-    /// - Parameter url: an URL of the post.
-    /// - Returns: A `ReaderDetailViewController` instance
-    @objc class func controllerWithPostURL(_ url: URL) -> ReaderDetailViewController {
-        let controller = ReaderDetailViewController.loadFromStoryboard()
-        let coordinator = ReaderDetailCoordinator(view: controller)
-        coordinator.postURL = url
-        controller.coordinator = coordinator
-
-        return controller
-    }
-
     /// Creates an instance from a Related post / Simple Post
     /// - Parameter simplePost: The related post object
     /// - Returns: If the related post URL is not valid

WordPress/Classes/ViewRelated/Reader/Navigation/ReaderNavigationPath.swift

@@ -10,7 +10,6 @@ enum ReaderNavigationPath: Hashable {
     case search
     case subscriptions
     case post(postID: Int, siteID: Int, isFeed: Bool = false)
-    case postURL(URL)
     case topic(ReaderAbstractTopic)
     case tag(String)
 }