From 5377eb75417c8c1cb217a061afc67a7c59702a47 Mon Sep 17 00:00:00 2001
From: Nikkel Mollenhauer <57323886+NikkelM@users.noreply.github.com>
Date: Wed, 26 Jun 2024 18:16:27 +0100
Subject: [PATCH] Reverted UI changes made while the playlist generation
 feature was broken (#304)

---
 CHANGELOG.md              | 1 +
 package-lock.json         | 4 ++--
 package.json              | 2 +-
 src/config.js             | 3 +--
 src/html/popup/popup.js   | 6 ------
 static/html/popup.html    | 7 -------
 static/manifest.json      | 4 ++--
 test/shuffleVideo.test.js | 2 --
 8 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c0e5e14..43995e6b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## v3.1.6
 
 <!--Releasenotes start-->
+- Reverted UI changes made while the playlist generation feature was broken.
 - Removed hints from the breaking news page.
 <!--Releasenotes end-->
 
diff --git a/package-lock.json b/package-lock.json
index 82d7dbb7..29f2f000 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "random-youtube-video",
-  "version": "3.1.5",
+  "version": "3.1.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "random-youtube-video",
-      "version": "3.1.5",
+      "version": "3.1.6",
       "dependencies": {
         "@babel/runtime": "^7.18.6",
         "firebase": "^9.22.0"
diff --git a/package.json b/package.json
index 85cbaf51..6da0c8f2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "random-youtube-video",
-  "version": "3.1.5",
+  "version": "3.1.6",
   "description": "Customize, shuffle and play random videos from any YouTube channel.",
   "scripts": {
 		"dev": "concurrently \"npm run dev:chromium\" \"npm run dev:firefox\"",
diff --git a/src/config.js b/src/config.js
index 42f01fa4..a5ebc9ea 100644
--- a/src/config.js
+++ b/src/config.js
@@ -13,8 +13,7 @@ export const configSyncDefaults = {
 	"shuffleReUseNewTabOption": true,
 	// 0 = only shorts, 1 = no option set (shorts are included), 2 = ignore shorts
 	"shuffleIgnoreShortsOption": 1,
-	// TODO: Revert when fixed
-	"shuffleOpenAsPlaylistOption": false,
+	"shuffleOpenAsPlaylistOption": true,
 	// How many random videos to add to a playlist (0-50)
 	"shuffleNumVideosInPlaylist": 10,
 	// If shuffled videos are opened in a new tab, save the tab ID of that tab here to reuse the tab when the user shuffles again
diff --git a/src/html/popup/popup.js b/src/html/popup/popup.js
index 1bd6bd59..39d99cb5 100644
--- a/src/html/popup/popup.js
+++ b/src/html/popup/popup.js
@@ -226,12 +226,6 @@ async function setPopupDomElementEventListeners(domElements) {
 		await setSyncStorageValue("shuffleOpenAsPlaylistOption", this.checked);
 
 		manageDependents(domElements, domElements.shuffleOpenAsPlaylistOptionToggle, this.checked);
-
-		// TODO: Revert when fixed
-		// v3.1.5: Playlist generation may be broken, open an overlay in the popup
-		if (this.checked) {
-			alert("A recent change to YouTube has broken playlist generation.\nThis feature may not work until the behaviour is fixed.");
-		}
 	});
 
 	// Shuffling: Number of videos in playlist input
diff --git a/static/html/popup.html b/static/html/popup.html
index 73bc6c72..7207a26a 100644
--- a/static/html/popup.html
+++ b/static/html/popup.html
@@ -121,13 +121,6 @@ <h3>Shuffle Settings</h3>
 					</label>
 				</div>
 
-				<!-- TODO: Remove when fixed -->
-				<div class="optionsRow-item">
-					<p style="color: #c32e04;" title="As of June 26th 2024, automatic playlist generation using these options may not work for you. A change to YouTube broke the generation method the extension uses, and there currently is no other known way to create this behaviour. If YouTube reverts the change or another method is found, the extension will receive an update as soon as possible.">
-						YouTube recently broke playlists, these options may not work!
-					</p>
-				</div>
-
 				<!-- Shuffling: Open as playlist number of videos input -->
 				<div id="shuffleNumVideosInPlaylistDiv" class="optionsRow-item optionTextInput" title="Choose how many videos should be in the playlist when shuffling. YouTube limits the number of videos in this playlist type to 50. With higher values the shuffle may take slightly longer than usual.">
 					<p>Videos in playlist:</p>
diff --git a/static/manifest.json b/static/manifest.json
index 7652ed01..bdf180ae 100644
--- a/static/manifest.json
+++ b/static/manifest.json
@@ -1,8 +1,8 @@
 {
 	"name": "Random YouTube Video",
 	"description": "Customize, shuffle and play random videos from any YouTube channel.",
-	"version": "3.1.5",
-	"version_name": "3.1.5",
+	"version": "3.1.6",
+	"version_name": "3.1.6",
 	"manifest_version": 3,
 	"content_scripts": [
 		{
diff --git a/test/shuffleVideo.test.js b/test/shuffleVideo.test.js
index 9acef2c4..fe56b739 100644
--- a/test/shuffleVideo.test.js
+++ b/test/shuffleVideo.test.js
@@ -828,8 +828,6 @@ describe('shuffleVideo', function () {
 
 												await chooseRandomVideo(input.channelId, false, domElement);
 
-												console.log(windowOpenStub.args[0][0])
-
 												const chosenVideos = windowOpenStub.args[0][0].split('video_ids=')[1].split(',');
 
 												// Depending on the activeOption, make sure that only videos that match the filter are chosen