🩹 Check whitelist

Author: trickypr

src/backend/lib/remoteFunctions.ts

@@ -41,8 +41,7 @@ export const remoteFn = (name: string, payload?: any): Promise<any> => {
     backend.onMessage.addListener(function (msg: FunctionReturnData) {
       if (msg.id === id) {
         // This message is the correct return
-        console.log(msg)
-        setTimeout(() => resolve(msg.payload), 10)
+        resolve(msg.payload)
       }
     })
   })

src/backend/sites/cosmetic.ts

@@ -1,7 +1,7 @@
 // This performs cosmetic filtering on each website
 
 import { parse } from 'psl'
-import { defineFn, initFn, remoteFn } from '../lib/remoteFunctions'
+import { remoteFn } from '../lib/remoteFunctions'
 
 const getDomain = (url: string) =>
   parse(url.replace('https://', '').replace('http://', '').split('/')[0]).domain
@@ -11,7 +11,11 @@ const url = window.location.href
 const hostname = window.location.hostname
 const domain = getDomain(url)
 
+console.log('Cosmetics')
 ;(async () => {
+  const whitelist = await remoteFn('getWhitelist')
+  if (whitelist.includes(domain)) return
+
   const payload = await remoteFn('getCosmeticsFilters', {
     url,
     hostname,

src/backend/sites/youtube.ts

@@ -1,26 +1,33 @@
-// TODO [#25]: Check the whitelist to see if youtube has been whitelisted
 // Note that google really doesn't want ads blocked on youtube, hence why
 // the default adblock behavior doesn't work properly. Instead we need to create
 // a custom blocker that stops ads from being displayed. A really simple bodge
 // is to just click the skip button instantly and seem like we have properly skipped
 // the ad. The skip button ad is currently .ytp-ad-text.ytp-ad-skip-button-text
 
-setInterval(() => {
-  // Grab the skip button
-  const skipButton: HTMLDivElement = document.querySelector(
-    '.ytp-ad-text.ytp-ad-skip-button-text'
-  )
+import { remoteFn } from '../lib/remoteFunctions'
+
+// Needs to be in an async block to get the whitelist
+;(async () => {
+  const whitelist = await remoteFn('getWhitelist')
+  if (whitelist.includes('youtube.com')) return
 
-  // If the skip button does exists
-  if (skipButton) {
-    // Lets "smash that skip button"
-    skipButton.click()
-    // TODO [#26]: Automatically remove console.log's in production
-    // Provide feedback in the console
-    console.log('Video was skipped')
-  }
-}, 100)
+  setInterval(() => {
+    // Grab the skip button
+    const skipButton: HTMLDivElement = document.querySelector(
+      '.ytp-ad-text.ytp-ad-skip-button-text'
+    )
 
-console.log(
-  '================================\nDot Shield is enabled on youtube.com\nWe will try to block all ads on this webpage'
-)
+    // If the skip button does exists
+    if (skipButton) {
+      // Lets "smash that skip button"
+      skipButton.click()
+      // TODO [#26]: Automatically remove console.log's in production
+      // Provide feedback in the console
+      console.log('Video was skipped')
+    }
+  }, 100)
+
+  console.log(
+    '================================\nDot Shield is enabled on youtube.com\nWe will try to block all ads on this webpage'
+  )
+})()

src/frontend/ui/popup/app.tsx

@@ -27,8 +27,6 @@ export const App: Component = ({ state, setState, toggleWhitelist }) => {
       : '#000'
     : 'white'
 
-  console.log(state.favicon)
-
   return (
     <div className={styles.container}>
       <main