Converted homeObserver back to adObserver, automated configStyle updates

Author: adamlui

youtube-classic/youtube-classic.user.js

@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name              YouTube™ Classic 📺 — (Remove rounded design + Return YouTube dislikes)
-// @version           2025.10.18.1
+// @version           2025.10.18.2
 // @author            Adam Lui, Magma_Craft, Anarios, JRWR, Fuim & hoothin
 // @namespace         https://github.com/adamlui
 // @description       Reverts YouTube to its classic design (before all the rounded corners & hidden dislikes) + redirects YouTube Shorts
@@ -90,16 +90,19 @@
 
     // Init SELECTORS for options
     const domSelectors = {
-        ads: { masthead: 'div#masthead-ad' }, // https://imgur.com/a/kOWzh3O
+        ad: { masthead: 'div#masthead-ad' }, // https://imgur.com/a/kOWzh3O
+        ai: {
+            askBtn: 'button:has(path[d*=M480-80q0-83])',
+            summary: 'div#header[class*=expandable-metadata]:has(path[d*=M480-80q0-83])'
+        },
+        playables: { shelf: 'ytd-rich-section-renderer:has(a[href*="/playables/"])' },
         shorts: {
             navEntry: 'a#endpoint[title=Shorts]',
             shelf: {
                 homepage: 'div.ytd-rich-shelf-renderer:has(a[href*="/shorts/"])', // https://imgur.com/a/LMdO92M
                 results: 'grid-shelf-view-model:has(a[href*="/shorts/"])' // https://imgur.com/a/vVzoEfH
             }
-        },
-        aiSummary: 'div#header[class*=expandable-metadata]:has(path[d*=M480-80q0-83]),' // AI summary
-                 + 'button:has(path[d*=M480-80q0-83])' // Ask AI button
+        }
     }
 
     // Define FUNCTIONS
@@ -293,12 +296,12 @@
         if (options?.updatedKey == 'disableShorts')
             shortsObserver[config.disableShorts ? 'observe' : 'disconnect'](document.body, obsConfig)
         else if (options?.updatedKey == 'adBlock')
-            homeObserver[config.adBlock ? 'observe' : 'disconnect'](document.documentElement, obsConfig)
+            adObserver[config.adBlock ? 'observe' : 'disconnect'](document.documentElement, obsConfig)
         if (options?.updatedKey.includes('Block'))
-            window.configStyle.textContent = `
-                ${ !config.shortsBlock ? '' : `${extractSelectors(domSelectors.shorts).join(',')} { display: none }` }
-                ${ !config.adBlock ? '' : `${extractSelectors(domSelectors.ads).join(',')} { display: none }` }
-                ${ !config.aiBlock ? '' : `${domSelectors.aiSummary} { display: none }` }`
+            window.configStyle.textContent = Object.entries(domSelectors)
+                .map(([key, selectors]) => !config[`${key}Block`] ? ''
+                    : `${extractSelectors(selectors).join(',')} { display: none }`
+                ).join('')
         toolbarMenu.refresh() // prefixes/suffixes
     }
 
@@ -2222,28 +2225,22 @@
     if (config.disableShorts) getLoadedElem('body').then(() => shortsObserver.observe(document.body, obsConfig))
 
     // Remove homepage ads/rich sections
-    const homeObserver = new MutationObserver(() => {
+    const adObserver = new MutationObserver(() => {
         if (location.pathname != locationPath) { // nav'd to diff page, re-observe
-            locationPath = location.pathname ; homeObserver.disconnect()
-            getLoadedElem('html').then(() => homeObserver.observe(document.documentElement, obsConfig))
-        } else if (locationPath == '/') { // remove homepage stuff
-            const adSlot = document.querySelector('ytd-ad-slot-renderer')
-            const richSection = document.querySelector(
-                `ytd-rich-section-renderer${ !config.shortsBlock ? ':not(:has(a[href*="/shorts/"]))' : '' }${
-                                             !config.playablesBlock ? ':not(:has(a[href*="/playables/"]))' : '' }`
-            )
-            adSlot?.closest('[rendered-from-rich-grid]')?.remove() ; richSection?.remove()
-        }
+            locationPath = location.pathname ; adObserver.disconnect()
+            getLoadedElem('html').then(() => adObserver.observe(document.documentElement, obsConfig))
+        } else if (locationPath == '/') // remove ads
+            document.querySelector('ytd-ad-slot-renderer')?.closest('[rendered-from-rich-grid]')?.remove()
     })
     if (config.shortsBlock || config.playablesBlock || config.adBlock)
-        getLoadedElem('html').then(() => homeObserver.observe(document.documentElement, obsConfig))
+        getLoadedElem('html').then(() => adObserver.observe(document.documentElement, obsConfig))
 
     // Block stuff
     document.head.append(window.configStyle ??= document.createElement('style'))
-    window.configStyle.textContent = `
-        ${ !config.shortsBlock ? '' : `${extractSelectors(domSelectors.shorts).join(',')} { display: none }` }
-        ${ !config.adBlock ? '' : `${extractSelectors(domSelectors.ads).join(',')} { display: none }` }
-        ${ !config.aiBlock ? '' : `${domSelectors.aiSummary} { display: none }` }`
+    window.configStyle.textContent = Object.entries(domSelectors)
+        .map(([key, selectors]) => !config[`${key}Block`] ? ''
+            : `${extractSelectors(selectors).join(',')} { display: none }`
+        ).join('')
     function extractSelectors(obj) {
         return Object.values(obj).flatMap(val => typeof val == 'object' ? extractSelectors(val) : val) }