From 73206173d24e2a98b913792dc4c2a02415da64eb Mon Sep 17 00:00:00 2001
From: "L. Bradley LaBoon" <me@bradleylaboon.com>
Date: Mon, 17 Apr 2023 19:36:02 -0400
Subject: [PATCH] Version 2.1. Remove more unwanted tags/classes

---
 disable_shorts.js | 35 +++++++++++++++++++++++++----------
 manifest.json     |  2 +-
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/disable_shorts.js b/disable_shorts.js
index a13ecd4..41ce952 100644
--- a/disable_shorts.js
+++ b/disable_shorts.js
@@ -6,16 +6,31 @@
 		if (location.href.indexOf("/shorts/") != -1)
 			location.href = "https://www.youtube.com/watch?v=" + location.pathname.split("/")[2];
 
-		// Hide shorts-related elements and ads
-		var banners = document.getElementsByClassName("ytd-statement-banner-renderer");
-		for (var i = 0; i < banners.length; i++)
-			banners[i].remove();
-		var shelf = document.getElementsByTagName("ytd-rich-shelf-renderer");
-		for (var i = 0; i < shelf.length; i++)
-			shelf[i].remove();
-		var shortsResults = document.getElementsByTagName("ytd-reel-shelf-renderer");
-		for (var i = 0; i < shortsResults.length; i++)
-			shortsResults[i].remove();
+		// Classes and tags to remove from the page
+		var removeTags = [
+			"ytd-rich-shelf-renderer",
+			"ytd-reel-shelf-renderer",
+			"ytd-inline-survey-renderer",
+			"yt-mealbar-promo-renderer",
+			"ytd-inline-survey-renderer"
+		];
+		var removeClasses = [
+			"ytd-statement-banner-renderer",
+			"ytd-brand-video-shelf-renderer",
+			"ytd-primetime-promo-renderer"
+		];
+
+		for (var i = 0; i < removeTags.length; i++) {
+			var tags = document.getElementsByTagName(removeTags[i]);
+			for (var j = 0; j < tags.length; j++)
+				tags[j].remove();
+		}
+
+		for (var i = 0; i < removeClasses.length; i++) {
+			var classes = document.getElementsByClassName(removeClasses[i]);
+			for (var j = 0; j < classes.length; j++)
+				classes[j].remove();
+		}
 
 		// Turn any other shorts links into regular links
 		var links = document.getElementsByTagName("a");
diff --git a/manifest.json b/manifest.json
index f9fe0d5..db303ad 100644
--- a/manifest.json
+++ b/manifest.json
@@ -4,7 +4,7 @@
 	"name": "YouTube Shorts Disabler",
 	"author": "L. Bradley LaBoon",
 	"description": "Redirects YouTube shorts to regular videos",
-	"version": "2.0",
+	"version": "2.1",
 
 	"icons": {
 		"16": "ysd-16.png",