remove ad tiles from horizontal shelf

webosbrew · Oct 25, 2023 · b1f1de5 · b1f1de5
1 parent 4540449
commit b1f1de5
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 *.ipk
 node_modules
 dist
+.DS_Store
diff --git a/.husky/pre-commit b/.husky/pre-commit
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/adblock.js b/src/adblock.js
@@ -14,20 +14,36 @@ import { configRead } from './config';
 const origParse = JSON.parse;
 JSON.parse = function () {
   const r = origParse.apply(this, arguments);
-  if (r.adPlacements && configRead('enableAdBlock')) {
+  if (!configRead('enableAdBlock')) {
+    return r;
+  }
+
+  if (r.adPlacements) {
     r.adPlacements = [];
   }
 
-  // Drop "masthead" ad from home screen
-  if (
+  const sectionListRenderer =
     r?.contents?.tvBrowseRenderer?.content?.tvSurfaceContentRenderer?.content
-      ?.sectionListRenderer?.contents &&
-    configRead('enableAdBlock')
-  ) {
-    r.contents.tvBrowseRenderer.content.tvSurfaceContentRenderer.content.sectionListRenderer.contents =
-      r.contents.tvBrowseRenderer.content.tvSurfaceContentRenderer.content.sectionListRenderer.contents.filter(
-        (elm) => !elm.tvMastheadRenderer
+      ?.sectionListRenderer;
+  if (sectionListRenderer?.contents) {
+    // Drop the full width ad card, usually appears at the top of the page
+    sectionListRenderer.contents = sectionListRenderer.contents.filter(
+      (elm) => !elm.tvMastheadRenderer
+    );
+
+    // Drop ad tile from the horizontal shelf
+    // Target to remove:
+    // contents.tvBrowseRenderer.content.tvSurfaceContentRenderer.content.sectionListRenderer.contents[0].shelfRenderer.content.horizontalListRenderer.items[0].adSlotRenderer
+    const contentsWithShelfRenderer = sectionListRenderer.contents.filter(
+      (elm) => elm.shelfRenderer
+    );
+    contentsWithShelfRenderer.forEach((content) => {
+      const horizontalRenderer =
+        content.shelfRenderer.content.horizontalListRenderer;
+      horizontalRenderer.items = horizontalRenderer.items.filter(
+        (elm) => !elm.adSlotRenderer
       );
+    });
   }
 
   return r;

diff --git a/src/ui.js b/src/ui.js
@@ -191,5 +191,5 @@ export function showNotification(text, time = 3000) {
 }
 
 setTimeout(() => {
-  showNotification('Press [GREEN] to open YTAF configuration screen');
+  showNotification('Press 🟩 to open YTAF configuration screen');
 }, 2000);