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)