Merge pull request #201 from JaCzekanski/shorts-block

Remove shorts from Subscriptions tab

src/config.js

@@ -2,6 +2,7 @@ const CONFIG_KEY = 'ytaf-configuration';
 
 const configOptions = new Map([
   ['enableAdBlock', { default: true, desc: 'Enable ad blocking' }],
+  ['removeShorts', { default: true, desc: 'Remove Shorts from subscriptions' }],
   ['enableSponsorBlock', { default: true, desc: 'Enable SponsorBlock' }],
   [
     'enableSponsorBlockSponsor',

src/shorts.js

@@ -0,0 +1,44 @@
+/* eslint no-redeclare: 0 */
+/* global fetch:writable */
+import { configRead } from './config';
+
+const origParse = JSON.parse;
+JSON.parse = function () {
+  const r = origParse.apply(this, arguments);
+  if (!configRead('removeShorts')) {
+    return r;
+  }
+
+  // First page of subscriptions tab
+  const gridRenderer = findFirstObject(r, 'gridRenderer');
+  if (gridRenderer?.items) {
+    removeShorts(gridRenderer);
+  }
+
+  // Pagination
+  const gridContinuation = findFirstObject(r, 'gridContinuation');
+  if (gridContinuation?.items) {
+    removeShorts(gridContinuation);
+  }
+
+  return r;
+};
+
+function removeShorts(container) {
+  container.items = container.items.filter(
+    (elm) => elm?.tileRenderer?.onSelectCommand?.reelWatchEndpoint == null
+  );
+}
+
+function findFirstObject(haystack, needle) {
+  for (const key in haystack) {
+    if (key === needle) {
+      return haystack[key];
+    }
+    if (typeof haystack[key] === 'object') {
+      const result = findFirstObject(haystack[key], needle);
+      if (result) return result;
+    }
+  }
+  return null;
+}

src/ui.js

@@ -121,6 +121,7 @@ function createOptionsPanel() {
 
   elmContainer.appendChild(createConfigCheckbox('enableAdBlock'));
   elmContainer.appendChild(createConfigCheckbox('hideLogo'));
+  elmContainer.appendChild(createConfigCheckbox('removeShorts'));
   elmContainer.appendChild(createConfigCheckbox('enableSponsorBlock'));
 
   const elmBlock = document.createElement('blockquote');

src/userScript.js

@@ -13,6 +13,7 @@ document.addEventListener(
 );
 
 import './adblock.js';
+import './shorts.js';
 import './sponsorblock.js';
 import './ui.js';