From 65da36369d03561f75dba9f179b6696b6278329d Mon Sep 17 00:00:00 2001
From: Eliot Partridge <byte@code.horse>
Date: Tue, 14 May 2024 21:32:45 -0400
Subject: [PATCH] Pause spoilered videos on image pages, unpause on unspoiler
 (#259)

* Pause spoilered videos on image pages, unpause on unspoiler

* Add test

* Fix comment
---
 assets/js/image_expansion.js            |  5 +++--
 assets/js/utils/__tests__/image.spec.ts | 13 +++++++++++++
 assets/js/utils/image.ts                |  6 ++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/assets/js/image_expansion.js b/assets/js/image_expansion.js
index 66cc379e..7bd6cb26 100644
--- a/assets/js/image_expansion.js
+++ b/assets/js/image_expansion.js
@@ -87,11 +87,12 @@ function pickAndResize(elem) {
   }
 
   const muted = store.get('unmute_videos') ? '' : 'muted';
+  const autoplay = elem.classList.contains('hidden') ? '' : 'autoplay'; // Fix for spoilered image pages
 
   if (imageFormat === 'mp4') {
     elem.classList.add('full-height');
     elem.insertAdjacentHTML('afterbegin',
-      `<video controls autoplay loop ${muted} playsinline preload="auto" id="image-display"
+      `<video controls ${autoplay} loop ${muted} playsinline preload="auto" id="image-display"
            width="${imageWidth}" height="${imageHeight}">
         <source src="${uris.webm}" type="video/webm">
         <source src="${uris.mp4}" type="video/mp4">
@@ -104,7 +105,7 @@ function pickAndResize(elem) {
   }
   else if (imageFormat === 'webm') {
     elem.insertAdjacentHTML('afterbegin',
-      `<video controls autoplay loop ${muted} playsinline id="image-display">
+      `<video controls ${autoplay} loop ${muted} playsinline id="image-display">
         <source src="${uri}" type="video/webm">
         <source src="${uri.replace(/webm$/, 'mp4')}" type="video/mp4">
         <p class="block block--fixed block--warning">
diff --git a/assets/js/utils/__tests__/image.spec.ts b/assets/js/utils/__tests__/image.spec.ts
index b091380d..f27a1cd1 100644
--- a/assets/js/utils/__tests__/image.spec.ts
+++ b/assets/js/utils/__tests__/image.spec.ts
@@ -369,6 +369,19 @@ describe('Image utils', () => {
       expect(mockShowElement).toHaveClass(spoilerPendingClass);
     });
 
+    it('should play the video if it is present', () => {
+      const mockElement = document.createElement('div');
+      const { mockShowElement } = createImageShowElement(mockElement);
+      const mockVideo = document.createElement('video');
+      mockShowElement.appendChild(mockVideo);
+
+      const playSpy = vi.spyOn(mockVideo, 'play').mockReturnValue(Promise.resolve());
+
+      showBlock(mockElement);
+
+      expect(playSpy).toHaveBeenCalledTimes(1);
+    });
+
     it('should not throw if image-filtered element is missing', () => {
       const mockElement = document.createElement('div');
       createImageShowElement(mockElement);
diff --git a/assets/js/utils/image.ts b/assets/js/utils/image.ts
index 2004d11f..99ab2722 100644
--- a/assets/js/utils/image.ts
+++ b/assets/js/utils/image.ts
@@ -64,9 +64,15 @@ export function showThumb(img: HTMLDivElement) {
 export function showBlock(img: HTMLDivElement) {
   img.querySelector('.image-filtered')?.classList.add('hidden');
   const imageShowClasses = img.querySelector('.image-show')?.classList;
+
   if (imageShowClasses) {
     imageShowClasses.remove('hidden');
     imageShowClasses.add('spoiler-pending');
+
+    const vidEl = img.querySelector('video');
+    if (vidEl) {
+      vidEl.play();
+    }
   }
 }