Release build 4.22.3 [ci release]

Author: shakyShane

Sources/ContentScopeScripts/dist/contentScopeIsolated.js

@@ -3654,7 +3654,15 @@
              */
             bindEvents: (video) => {
                 if (video) {
+                    const before = video.href;
                     addTrustedEventListener(video, 'mouseover', () => {
+                        // don't allow the hover overlay to be shown if the video has changed
+                        // this can occur with 'shorts'
+                        if (video.href !== before) {
+                            if (!VideoThumbnail.isSingleVideoURL(video.href)) {
+                                return console.log('bailing because the video has changed')
+                            }
+                        }
                         IconOverlay.moveHoverOverlayToVideoElement(video);
                     });
 
@@ -4031,7 +4039,7 @@
      * For example, to enable the Duck Player Overlay on YouTube, the following config is used:
      *
      * ```json
-     * [[include:integration-test/test-pages/duckplayer/config/overlays.json]]```
+     * [[include:integration-test/test-pages/duckplayer/config/overlays-live.json]]```
      *
      */
 

build/android/contentScope.js

@@ -8827,7 +8827,15 @@
              */
             bindEvents: (video) => {
                 if (video) {
+                    const before = video.href;
                     addTrustedEventListener(video, 'mouseover', () => {
+                        // don't allow the hover overlay to be shown if the video has changed
+                        // this can occur with 'shorts'
+                        if (video.href !== before) {
+                            if (!VideoThumbnail.isSingleVideoURL(video.href)) {
+                                return console.log('bailing because the video has changed')
+                            }
+                        }
                         IconOverlay.moveHoverOverlayToVideoElement(video);
                     });
 
@@ -9204,7 +9212,7 @@
      * For example, to enable the Duck Player Overlay on YouTube, the following config is used:
      *
      * ```json
-     * [[include:integration-test/test-pages/duckplayer/config/overlays.json]]```
+     * [[include:integration-test/test-pages/duckplayer/config/overlays-live.json]]```
      *
      */
 

build/chrome-mv3/inject.js

@@ -0,0 +1,22 @@
+import { test } from '@playwright/test'
+import { DuckplayerOverlays } from './page-objects/duckplayer-overlays.js'
+
+test.describe('e2e: Duck Player Thumbnail Overlays on YouTube.com', () => {
+    test('e2e: Overlays never appear on "shorts"', async ({ page }, workerInfo) => {
+        // @ts-expect-error - TS doesn't know about the "use.e2e" property
+        workerInfo.skip(!workerInfo.project.use?.e2e)
+
+        const overlays = DuckplayerOverlays.create(page, workerInfo)
+
+        await overlays.overlaysEnabled({ json: 'overlays-live' })
+        await overlays.gotoYoutubeHomepage()
+
+        // Ensure the hover works normally to prevent false positives
+        await overlays.hoverAYouTubeThumbnail()
+        await overlays.isVisible()
+
+        // now ensure the hover doesn't work on shorts
+        await overlays.hoverShort()
+        await overlays.overlaysDontShow()
+    })
+})

build/chrome/inject.js

@@ -15,6 +15,19 @@ test.describe('Duck Player Thumbnail Overlays on YouTube.com', () => {
         // Then our overlay shows
         await overlays.isVisible()
     })
+    test('Overlays never appear on "shorts"', async ({ page }, workerInfo) => {
+        const overlays = DuckplayerOverlays.create(page, workerInfo)
+        await overlays.overlaysEnabled()
+        await overlays.gotoThumbsPage()
+
+        // Ensure the hover works normally to prevent false positives
+        await overlays.hoverAThumbnail()
+        await overlays.isVisible()
+
+        // now ensure the hover doesn't work on shorts
+        await overlays.hoverShort()
+        await overlays.overlaysDontShow()
+    })
     test('Overlays don\'t show on thumbnails when disabled', async ({ page }, workerInfo) => {
         const overlays = DuckplayerOverlays.create(page, workerInfo)
 

build/contentScope.js

@@ -54,6 +54,12 @@ export class DuckplayerOverlays {
         await this.page.goto(this.overlaysPage)
     }
 
+    async gotoYoutubeHomepage () {
+        await this.page.goto('https://www.youtube.com')
+        // cookie banner
+        await this.page.getByRole('button', { name: 'Reject the use of cookies and other data for the purposes described' }).click()
+    }
+
     /**
      * @param {object} [params]
      * @param {"default" | "incremental-dom"} [params.variant]
@@ -100,9 +106,14 @@ export class DuckplayerOverlays {
         await this.page.getByRole('link', { name: 'Duck Player', exact: true }).waitFor({ state: 'attached' })
     }
 
-    // Given the "overlays" feature is enabled
-    async overlaysEnabled () {
-        await this.setup({ config: loadConfig('overlays') })
+    /**
+     * @param {object} [params]
+     * @param {'overlays' | 'overlays-live'} [params.json="overlays"] - default is settings for localhost
+     */
+    async overlaysEnabled (params = {}) {
+        const { json = 'overlays' } = params
+
+        await this.setup({ config: loadConfig(json) })
     }
 
     async serpProxyEnabled () {
@@ -156,6 +167,16 @@ export class DuckplayerOverlays {
         await this.page.locator('.thumbnail[href="/watch?v=1"]').first().hover()
     }
 
+    async hoverAYouTubeThumbnail () {
+        await this.page.locator('a.ytd-thumbnail[href^="/watch"]').first().hover({ force: true })
+    }
+
+    async hoverShort () {
+        // this should auto-wait for our test code to modify the DOM like YouTube does
+        await this.page.getByRole('heading', { name: 'Shorts', exact: true }).scrollIntoViewIfNeeded()
+        await this.page.locator('a[href*="/shorts"]').first().hover({ force: true })
+    }
+
     async clickDDGOverlay () {
         await this.hoverAThumbnail()
         await this.page.locator('.ddg-play-privately').click({ force: true })
@@ -166,7 +187,21 @@ export class DuckplayerOverlays {
     }
 
     async overlaysDontShow () {
-        expect(await this.page.locator('.ddg-overlay.ddg-overlay-hover').count()).toEqual(0)
+        const elements = await this.page.locator('.ddg-overlay.ddg-overlay-hover').count()
+
+        // if the element exists, assert that it is hidden
+        if (elements > 0) {
+            const style = await this.page.evaluate(() => {
+                const div = /** @type {HTMLDivElement|null} */(document.querySelector('.ddg-overlay.ddg-overlay-hover'))
+                if (div) {
+                    return div.style.display
+                }
+                return ''
+            })
+            expect(style).toEqual('none')
+        }
+
+        // if we get here, the element was absent
     }
 
     async watchInDuckPlayer () {
@@ -316,7 +351,7 @@ export class DuckplayerOverlays {
 }
 
 /**
- * @param {"overlays"} name
+ * @param {"overlays" | "overlays-live"} name
  * @return {Record<string, any>}
  */
 function loadConfig (name) {

build/firefox/inject.js

@@ -0,0 +1,41 @@
+{
+  "unprotectedTemporary": [],
+  "features": {
+    "duckPlayer": {
+      "state": "enabled",
+      "exceptions": [],
+      "settings": {
+        "overlays": {
+          "youtube": {
+            "state": "disabled"
+          },
+          "serpProxy": {
+            "state": "disabled"
+          }
+        },
+        "domains": [
+          {
+            "domain": "youtube.com",
+            "patchSettings": [
+              {
+                "op": "replace",
+                "path": "/overlays/youtube/state",
+                "value": "enabled"
+              }
+            ]
+          },
+          {
+            "domain": "duckduckgo.com",
+            "patchSettings": [
+              {
+                "op": "replace",
+                "path": "/overlays/serpProxy/state",
+                "value": "enabled"
+              }
+            ]
+          }
+        ]
+      }
+    }
+  }
+}

build/integration/contentScope.js

@@ -6,22 +6,34 @@
     <title>Runtime checks</title>
     <link rel="stylesheet" href="../../shared/style.css">
     <style>
+        .thumbnails {
+            display: grid;
+            grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
+        }
         .thumbnail {
-            height: 100px;
-            width: 200px;
             margin: 5px;
             background: lightblue;
             border: 1px solid black;
-            float: left;
+            aspect-ratio: 16/9;
+            display: block;
         }
 
-        .thumbnail img {
+        .thumbnail img, .short img {
             width: 100%;
             height: 100%;
+            object-fit: cover;
+            display: block;
+        }
+
+        .short {
+            margin: 5px;
+            background: lightblue;
+            border: 1px solid black;
+            aspect-ratio: 9/16;
+            display: block;
         }
 
         .playlist {
-            clear: both;
             width: 100px;
 
         }
@@ -37,8 +49,6 @@
         }
 
         #loaded {
-            clear: both;
-            float: none;
             width: 300px;
         }
 
@@ -81,7 +91,44 @@ <h2>MORE THUMBNAILS</h2>
     </div>
 </div>
 
+<h2>Shorts</h2>
+<div class="thumbnails">
+    <a class="ytd-thumbnail short" href="/watch?v=1"><img src="thumbnail-dark.jpg"></a>
+    <a class="ytd-thumbnail short" href="/watch?v=2"><img src="thumbnail-light.jpg"></a>
+    <a class="ytd-thumbnail short" href="/watch?v=3"><img src="thumbnail-dark.jpg"></a>
+    <a class="ytd-thumbnail short" href="/watch?v=4"><img src="thumbnail-light.jpg"></a>
+    <a class="ytd-thumbnail short" href="/watch?v=5"><img src="thumbnail-dark.jpg"></a>
+</div>
+
 <div id="loaded"></div>
 
+<script type="module">
+    const variant = new URLSearchParams(window.location.search).get('variant') || 'default';
+
+    const knownVariants = {
+        "default": () => {
+            setTimeout(() => {
+                /**
+                 * This will change '/watch?v=3' links to '/shorts/3'
+                 * It roughly mimics the behaviour of the YouTube Homepage
+                 */
+                const shorts = document.querySelectorAll('.short');
+                shorts.forEach((short) => {
+                    const params = new URLSearchParams(short.search);
+                    short.pathname = "/shorts/" + params.get('v');
+                    short.search = ''
+                })
+            }, 200);
+        },
+    }
+
+    if (variant in knownVariants) {
+        console.log('executing page variant', variant)
+        knownVariants[variant]();
+    } else {
+        console.warn('variant not found', variant)
+    }
+
+</script>
 </body>
 </html>