fix: fix #29

th-ch · Oct 4, 2023 · 50117ea · 50117ea
1 parent 78d8160
commit 50117ea
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/config/defaults.ts b/config/defaults.ts
@@ -74,7 +74,7 @@ const defaultConfig = {
       cache: true,
       blocker: 'With blocklists',
       additionalBlockLists: [], // Additional list of filters, e.g "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt"
-      disableDefaultLists: [],
+      disableDefaultLists: false,
     },
     'album-color-theme': {},
     'audio-compressor': {},

diff --git a/plugins/adblocker/blocker.ts b/plugins/adblocker/blocker.ts
@@ -21,14 +21,14 @@ export const loadAdBlockerEngine = (
   session: Electron.Session | undefined = undefined,
   cache = true,
   additionalBlockLists = [],
-  disableDefaultLists: boolean | string[] = false,
+  disableDefaultLists: boolean | unknown[] = false,
 ) => {
   // Only use cache if no additional blocklists are passed
   let cacheDirectory: string;
   if (app.isPackaged) {
-    cacheDirectory = path.join(app.getPath('userData'), 'cache');
+    cacheDirectory = path.join(app.getPath('userData'), 'adblock_cache');
   } else {
-    cacheDirectory = path.resolve(__dirname, 'cache');
+    cacheDirectory = path.resolve(__dirname, 'adblock_cache');
   }
   if (!fs.existsSync(cacheDirectory)) {
     fs.mkdirSync(cacheDirectory);
@@ -42,7 +42,10 @@ export const loadAdBlockerEngine = (
     }
     : undefined;
   const lists = [
-    ...(disableDefaultLists ? [] : SOURCES),
+    ...(
+      (disableDefaultLists && !Array.isArray(disableDefaultLists)) ||
+      (Array.isArray(disableDefaultLists) && disableDefaultLists.length > 0) ? [] : SOURCES
+    ),
     ...additionalBlockLists,
   ];