From 50117ea51b06c3805da8db7e50349504365afb01 Mon Sep 17 00:00:00 2001
From: JellyBrick <shlee1503@naver.com>
Date: Wed, 4 Oct 2023 22:53:25 +0900
Subject: [PATCH] fix: fix #29

---
 config/defaults.ts           |  2 +-
 plugins/adblocker/blocker.ts | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/config/defaults.ts b/config/defaults.ts
index ee2e0c3c..b0531bae 100644
--- 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
index 0f1fc268..dac06555 100644
--- 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,
   ];