[DuckPlayer] 26. Fix saved favs when DuckPlayer is disabled

DuckDuckGo/DuckPlayer/DuckPlayerNavigationHandler.swift

@@ -224,11 +224,13 @@ extension DuckPlayerNavigationHandler: DuckNavigationHandling {
             return
         }
 
+
         // Daily Unique View Pixel
         if url.isDuckPlayer,
            duckPlayer.settings.mode != .disabled {
             let setting = duckPlayer.settings.mode == .enabled ? Constants.duckPlayerAlwaysString : Constants.duckPlayerDefaultString
             DailyPixel.fire(pixel: Pixel.Event.duckPlayerDailyUniqueView, withAdditionalParameters: [Constants.settingsKey: setting])
+
         }
 
         // Pixel for Views From Youtube
@@ -237,16 +239,27 @@ extension DuckPlayerNavigationHandler: DuckNavigationHandling {
             Pixel.fire(pixel: Pixel.Event.duckPlayerViewFromYoutubeAutomatic)
         }
 
-        // If DuckPlayer is Enabled or in ask mode, render the video
-        if url.isDuckURLScheme,
-           duckPlayer.settings.mode == .enabled || duckPlayer.settings.mode == .alwaysAsk,
-            !url.hasWatchInYoutubeQueryParameter {
-            let newRequest = Self.makeDuckPlayerRequest(from: URLRequest(url: url))
-
-            Logger.duckPlayer.debug("DP: Loading Simulated Request for \(navigationAction.request.url?.absoluteString ?? "")")
-
-            DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
-                self.performRequest(request: newRequest, webView: webView)
+
+        if url.isDuckURLScheme {
+
+            // If DuckPlayer is Enabled or in ask mode, render the video
+            if duckPlayer.settings.mode == .enabled || duckPlayer.settings.mode == .alwaysAsk,
+               !url.hasWatchInYoutubeQueryParameter {
+                let newRequest = Self.makeDuckPlayerRequest(from: URLRequest(url: url))
+
+                Logger.duckPlayer.debug("DP: Loading Simulated Request for \(navigationAction.request.url?.absoluteString ?? "")")
+
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
+                    self.performRequest(request: newRequest, webView: webView)
+                }
+
+            // Otherwise, just redirect to YouTube
+            } else {
+                if let (videoID, timestamp) = url.youtubeVideoParams {
+                    let youtubeURL = URL.youtube(videoID, timestamp: timestamp)
+                    let request = URLRequest(url: youtubeURL)
+                    webView.load(request)
+                }
             }
             return
         }

DuckDuckGo/DuckPlayer/YoutubeOverlayUserScript.swift

@@ -55,25 +55,6 @@ final class YoutubeOverlayUserScript: NSObject, Subfeature {
             .store(in: &cancellables)
     }
 
-    enum MessageOrigin {
-        case duckPlayer, serpOverlay, youtubeOverlay
-
-        init?(url: URL) {
-            switch url.host {
-            case DuckPlayerSettings.OriginDomains.duckduckgo:
-                self = .serpOverlay
-            case DuckPlayerSettings.OriginDomains.youtubeMobile:
-                self = .youtubeOverlay
-            case DuckPlayerSettings.OriginDomains.youtube:
-                self = .youtubeOverlay
-            case DuckPlayerSettings.OriginDomains.youtubeWWW:
-                self = .youtubeOverlay
-            default:
-                return nil
-            }
-        }
-    }
-
     struct Handlers {
         static let setUserValues = "setUserValues"
         static let getUserValues = "getUserValues"
@@ -91,7 +72,8 @@ final class YoutubeOverlayUserScript: NSObject, Subfeature {
         .exact(hostname: "use-devtesting18.duckduckgo.com"),
         .exact(hostname: DuckPlayerSettings.OriginDomains.duckduckgo),
         .exact(hostname: DuckPlayerSettings.OriginDomains.youtube),
-        .exact(hostname: DuckPlayerSettings.OriginDomains.youtubeMobile)
+        .exact(hostname: DuckPlayerSettings.OriginDomains.youtubeMobile),
+        .exact(hostname: DuckPlayerSettings.OriginDomains.youtubeWWW)
     ])
     public var featureName: String = Constants.featureName
 

DuckDuckGoTests/YoutublePlayerNavigationHandlerTests.swift

@@ -284,6 +284,30 @@ class DuckPlayerNavigationHandlerTests: XCTestCase {
 
     }
 
+    @MainActor
+    func testHandleNavigationWithDuckPlayerDisabledRedirectsToYoutube() {
+
+        let link = URL(string: "duck://player/12345")!
+        let navigationAction = MockNavigationAction(request: URLRequest(url: link))
+        let playerSettings = MockDuckPlayerSettings(appSettings: mockAppSettings, privacyConfigManager: mockPrivacyConfig)
+        playerSettings.mode = .disabled
+        let player = MockDuckPlayer(settings: playerSettings)
+        let handler = DuckPlayerNavigationHandler(duckPlayer: player, featureFlagger: featureFlagger, appSettings: mockAppSettings)
+
+        handler.handleNavigation(navigationAction, webView: webView)
+
+        let expectation = self.expectation(description: "Youtube URL request")
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+
+
+            XCTAssertEqual(self.webView.url?.absoluteString, "https://m.youtube.com/watch?v=12345")
+            expectation.fulfill()
+        }
+
+        waitForExpectations(timeout: 1.0, handler: nil)
+
+    }
+
     @MainActor
     func testHandleReloadForDuckPlayerVideo() {
         let duckPlayerURL = URL(string: "https://www.youtube-nocookie.com/embed/abc123?t=10s")!