-
Notifications
You must be signed in to change notification settings - Fork 1.7k
feat(plugins): restore and fix adblocker plugin #4212
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Conversation
…tana Habilita el plugin transparent-player para Linux y corrige la configuración de ventana para asegurar compatibilidad con compositores (Picom). Cambios realizados: - Habilitado plugin para plataforma Linux y activado por defecto. - Añadido switch 'enable-transparent-visuals' en main process para Linux. - Configurada ventana principal con 'transparent: true' y 'backgroundColor' transparente cuando el plugin está activo. - Corregida la carga del icono usando rutas absolutas (soluciona icono faltante en build). - Establecido título de ventana explícito a 'Youtube Music'.
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Currently translated at 100.0% (463 of 463 strings) Translation: pear-devs/pear-desktop/i18n Translate-URL: https://hosted.weblate.org/projects/youtube-music/i18n/de/
- Restore missing adblocker plugin source files - Fix imports to use @ghostery/adblocker-electron instead of deprecated @cliqz dependencies
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remaining comments which cannot be posted as a review comment to avoid GitHub Rate Limit
eslint
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| const lists = [ |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| ...((disableDefaultLists && !Array.isArray(disableDefaultLists)) || |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ········
| (Array.isArray(disableDefaultLists) && disableDefaultLists.length > 0) |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
| ? [] |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
| : SOURCES), |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| ...additionalBlockLists, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| ]; |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···· with ··
| try { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| blocker = await ElectronBlocker.fromLists( |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ············ with ······
| (url: string) => net.fetch(url), |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
| lists, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ············ with ······
| { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ········
| // When generating the engine for caching, do not load network filters |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
| // So that enhancing the session works as expected |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
| // Allowing to define multiple webRequest listeners |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
| loadNetworkFilters: session !== undefined, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
| }, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ············ with ······
| cachingOptions, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ········ with ····
| ); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| if (session) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ············ with ······
| blocker.enableBlockingInSession(session); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| } |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| } catch (error) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| console.log('Error loading adBlocker engine', error); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| } |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| if (blocker) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ········ with ····
| blocker.disableBlockingInSession(session); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| } |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ··blocker·!==·undefined·&&·blocker.isBlockingEnabled(session); with blocker·!==·undefined·&&·blocker.isBlockingEnabled(session);⏎
| blocker !== undefined && blocker.isBlockingEnabled(session); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| isBlockerEnabled, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···· with ··
| loadAdBlockerEngine, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| unloadAdBlockerEngine, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| /** |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| * Whether to enable the adblocker. |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| * @default true |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ····· with ···
| */ |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| enabled: boolean; |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| /** |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ····· with ···
| * When enabled, the adblocker will cache the blocklists. |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| * @default true |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| */ |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| cache: boolean; |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| /** |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| * Which adblocker to use. |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| * @default blockers.InPlayer |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ····· with ···
| */ |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| blocker: (typeof blockers)[keyof typeof blockers]; |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···· with ··
| /** |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| * Additional list of filters to use. |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| * @example ["https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt"] |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| * @default [] |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| */ |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···· with ··
| additionalBlockLists: string[]; |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| /** |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| * Disable the default blocklists. |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| * @default false |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| */ |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| disableDefaultLists: boolean; |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| name: () => t('plugins.adblocker.name'), |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···· with ··
| description: () => t('plugins.adblocker.description'), |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| restartNeeded: false, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···· with ··
| config: { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| enabled: true, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| cache: true, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| blocker: blockers.InPlayer, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ········ with ····
| additionalBlockLists: [], |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ········ with ····
| disableDefaultLists: false, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| } as AdblockerConfig, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···· with ··
| menu: async ({ getConfig, setConfig }) => { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ········ with ····
| const config = await getConfig(); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| return [ |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ············ with ······
| { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
| label: t('plugins.adblocker.menu.blocker'), |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ········
| submenu: Object.values(blockers).map((blocker) => ({ |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···················· with ··········
| label: blocker, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···················· with ··········
| type: 'radio', |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···················· with ··········
| checked: (config.blocker || blockers.WithBlocklists) === blocker, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··········
| click() { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ························ with ············
| setConfig({ blocker }); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··········
| }, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
| })), |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ············ with ······
| }, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ········ with ····
| ]; |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···· with ··
| }, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···· with ··
| backend: { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| mainWindow: null as BrowserWindow | null, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| async start({ getConfig, window }) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
| const config = await getConfig(); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ············ with ······
| this.mainWindow = window; |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
| if (config.blocker === blockers.WithBlocklists) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
| await loadAdBlockerEngine( |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···················· with ··········
| window.webContents.session, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··········
| config.cache, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··········
| config.additionalBlockLists, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···················· with ··········
| config.disableDefaultLists, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ········
| ); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
| } |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ········ with ····
| }, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| stop({ window }) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
| if (isBlockerEnabled(window.webContents.session)) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
| unloadAdBlockerEngine(window.webContents.session); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
| } |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ········ with ····
| }, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| async onConfigChange(newConfig) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ············ with ······
| if (this.mainWindow) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ········
| if ( |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···················· with ··········
| newConfig.blocker === blockers.WithBlocklists && |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···················· with ··········
| !isBlockerEnabled(this.mainWindow.webContents.session) |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
pear-desktop/src/plugins/adblocker/index.ts
Line 100 in 0dfa52d
| ) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··········
pear-desktop/src/plugins/adblocker/index.ts
Line 101 in 0dfa52d
| await loadAdBlockerEngine( |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ························ with ············
pear-desktop/src/plugins/adblocker/index.ts
Line 102 in 0dfa52d
| this.mainWindow.webContents.session, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ············
pear-desktop/src/plugins/adblocker/index.ts
Line 103 in 0dfa52d
| newConfig.cache, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ························ with ············
pear-desktop/src/plugins/adblocker/index.ts
Line 104 in 0dfa52d
| newConfig.additionalBlockLists, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ························ with ············
pear-desktop/src/plugins/adblocker/index.ts
Line 105 in 0dfa52d
| newConfig.disableDefaultLists, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··········
pear-desktop/src/plugins/adblocker/index.ts
Line 106 in 0dfa52d
| ); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
pear-desktop/src/plugins/adblocker/index.ts
Line 107 in 0dfa52d
| } |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ············ with ······
pear-desktop/src/plugins/adblocker/index.ts
Line 108 in 0dfa52d
| } |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
pear-desktop/src/plugins/adblocker/index.ts
Line 109 in 0dfa52d
| }, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
pear-desktop/src/plugins/adblocker/index.ts
Line 110 in 0dfa52d
| }, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
pear-desktop/src/plugins/adblocker/index.ts
Line 111 in 0dfa52d
| preload: { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ········script: with ····script:⏎·····
pear-desktop/src/plugins/adblocker/index.ts
Line 112 in 0dfa52d
| script: 'window.JSON.parse = window._proxyJsonParse; window._proxyJsonParse = undefined; window.Response.prototype.json = window._proxyResponseJson; window._proxyResponseJson = undefined; 0', |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
pear-desktop/src/plugins/adblocker/index.ts
Line 113 in 0dfa52d
| async start({ getConfig }) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ············ with ······
pear-desktop/src/plugins/adblocker/index.ts
Line 114 in 0dfa52d
| const config = await getConfig(); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
pear-desktop/src/plugins/adblocker/index.ts
Line 116 in 0dfa52d
| if (config.blocker === blockers.WithBlocklists) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
pear-desktop/src/plugins/adblocker/index.ts
Line 117 in 0dfa52d
| // Preload adblocker to inject scripts/styles |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
pear-desktop/src/plugins/adblocker/index.ts
Line 118 in 0dfa52d
| await injectCliqzPreload(); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
pear-desktop/src/plugins/adblocker/index.ts
Line 119 in 0dfa52d
| } else if (config.blocker === blockers.InPlayer && !isInjected()) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
pear-desktop/src/plugins/adblocker/index.ts
Line 120 in 0dfa52d
| inject(contextBridge); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ········
pear-desktop/src/plugins/adblocker/index.ts
Line 121 in 0dfa52d
| await webFrame.executeJavaScript(this.script); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
pear-desktop/src/plugins/adblocker/index.ts
Line 122 in 0dfa52d
| } |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ········ with ····
pear-desktop/src/plugins/adblocker/index.ts
Line 123 in 0dfa52d
| }, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
pear-desktop/src/plugins/adblocker/index.ts
Line 124 in 0dfa52d
| async onConfigChange(newConfig) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
pear-desktop/src/plugins/adblocker/index.ts
Line 125 in 0dfa52d
| if (newConfig.blocker === blockers.WithBlocklists) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
pear-desktop/src/plugins/adblocker/index.ts
Line 126 in 0dfa52d
| await injectCliqzPreload(); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
pear-desktop/src/plugins/adblocker/index.ts
Line 127 in 0dfa52d
| } else if (newConfig.blocker === blockers.InPlayer && !isInjected()) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ········
pear-desktop/src/plugins/adblocker/index.ts
Line 128 in 0dfa52d
| inject(contextBridge); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
pear-desktop/src/plugins/adblocker/index.ts
Line 129 in 0dfa52d
| await webFrame.executeJavaScript(this.script); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
pear-desktop/src/plugins/adblocker/index.ts
Line 130 in 0dfa52d
| } |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ········ with ····
pear-desktop/src/plugins/adblocker/index.ts
Line 131 in 0dfa52d
| }, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
pear-desktop/src/plugins/adblocker/index.ts
Line 132 in 0dfa52d
| }, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Insert ⏎
pear-desktop/src/plugins/adblocker/index.ts
Line 133 in 0dfa52d
| }); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| await import('@ghostery/adblocker-electron-preload'); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Insert ⏎
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Insert ⏎
| export const isInjected: () => boolean; |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| WithBlocklists: 'With blocklists', |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···· with ··
| InPlayer: 'In player', |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Insert ⏎
| } as const; |
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remaining comments which cannot be posted as a review comment to avoid GitHub Rate Limit
eslint
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| ...((disableDefaultLists && !Array.isArray(disableDefaultLists)) || |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ········
| (Array.isArray(disableDefaultLists) && disableDefaultLists.length > 0) |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
| ? [] |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
| : SOURCES), |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ········ with ····
| ...additionalBlockLists, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| ]; |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| try { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| blocker = await ElectronBlocker.fromLists( |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ············ with ······
| (url: string) => net.fetch(url), |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
| lists, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ············ with ······
| { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ········
| // When generating the engine for caching, do not load network filters |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
| // So that enhancing the session works as expected |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
| // Allowing to define multiple webRequest listeners |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
| loadNetworkFilters: session !== undefined, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
| }, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ············ with ······
| cachingOptions, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ········ with ····
| ); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| if (session) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ············ with ······
| blocker.enableBlockingInSession(session); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| } |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| } catch (error) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| console.log('Error loading adBlocker engine', error); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| } |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| if (blocker) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ········ with ····
| blocker.disableBlockingInSession(session); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| } |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ··blocker·!==·undefined·&&·blocker.isBlockingEnabled(session); with blocker·!==·undefined·&&·blocker.isBlockingEnabled(session);⏎
| blocker !== undefined && blocker.isBlockingEnabled(session); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| isBlockerEnabled, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···· with ··
| loadAdBlockerEngine, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| unloadAdBlockerEngine, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| /** |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| * Whether to enable the adblocker. |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| * @default true |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ····· with ···
| */ |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| enabled: boolean; |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| /** |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ····· with ···
| * When enabled, the adblocker will cache the blocklists. |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| * @default true |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| */ |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| cache: boolean; |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| /** |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| * Which adblocker to use. |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| * @default blockers.InPlayer |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ····· with ···
| */ |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| blocker: (typeof blockers)[keyof typeof blockers]; |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···· with ··
| /** |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| * Additional list of filters to use. |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| * @example ["https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt"] |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| * @default [] |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| */ |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···· with ··
| additionalBlockLists: string[]; |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| /** |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| * Disable the default blocklists. |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| * @default false |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| */ |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| disableDefaultLists: boolean; |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| name: () => t('plugins.adblocker.name'), |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···· with ··
| description: () => t('plugins.adblocker.description'), |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| restartNeeded: false, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···· with ··
| config: { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| enabled: true, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| cache: true, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| blocker: blockers.InPlayer, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ········ with ····
| additionalBlockLists: [], |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ········ with ····
| disableDefaultLists: false, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| } as AdblockerConfig, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···· with ··
| menu: async ({ getConfig, setConfig }) => { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ········ with ····
| const config = await getConfig(); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| return [ |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ············ with ······
| { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
| label: t('plugins.adblocker.menu.blocker'), |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ········
| submenu: Object.values(blockers).map((blocker) => ({ |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···················· with ··········
| label: blocker, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···················· with ··········
| type: 'radio', |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···················· with ··········
| checked: (config.blocker || blockers.WithBlocklists) === blocker, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··········
| click() { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ························ with ············
| setConfig({ blocker }); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··········
| }, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
| })), |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ············ with ······
| }, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ········ with ····
| ]; |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···· with ··
| }, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···· with ··
| backend: { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| mainWindow: null as BrowserWindow | null, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| async start({ getConfig, window }) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
| const config = await getConfig(); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ············ with ······
| this.mainWindow = window; |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
| if (config.blocker === blockers.WithBlocklists) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
| await loadAdBlockerEngine( |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···················· with ··········
| window.webContents.session, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··········
| config.cache, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··········
| config.additionalBlockLists, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···················· with ··········
| config.disableDefaultLists, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ········
| ); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
| } |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ········ with ····
| }, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| stop({ window }) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
| if (isBlockerEnabled(window.webContents.session)) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
| unloadAdBlockerEngine(window.webContents.session); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
| } |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ········ with ····
| }, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| async onConfigChange(newConfig) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ············ with ······
| if (this.mainWindow) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ········
| if ( |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···················· with ··········
| newConfig.blocker === blockers.WithBlocklists && |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···················· with ··········
| !isBlockerEnabled(this.mainWindow.webContents.session) |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
pear-desktop/src/plugins/adblocker/index.ts
Line 100 in 6b1b336
| ) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··········
pear-desktop/src/plugins/adblocker/index.ts
Line 101 in 6b1b336
| await loadAdBlockerEngine( |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ························ with ············
pear-desktop/src/plugins/adblocker/index.ts
Line 102 in 6b1b336
| this.mainWindow.webContents.session, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ············
pear-desktop/src/plugins/adblocker/index.ts
Line 103 in 6b1b336
| newConfig.cache, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ························ with ············
pear-desktop/src/plugins/adblocker/index.ts
Line 104 in 6b1b336
| newConfig.additionalBlockLists, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ························ with ············
pear-desktop/src/plugins/adblocker/index.ts
Line 105 in 6b1b336
| newConfig.disableDefaultLists, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··········
pear-desktop/src/plugins/adblocker/index.ts
Line 106 in 6b1b336
| ); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
pear-desktop/src/plugins/adblocker/index.ts
Line 107 in 6b1b336
| } |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ············ with ······
pear-desktop/src/plugins/adblocker/index.ts
Line 108 in 6b1b336
| } |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
pear-desktop/src/plugins/adblocker/index.ts
Line 109 in 6b1b336
| }, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
pear-desktop/src/plugins/adblocker/index.ts
Line 110 in 6b1b336
| }, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
pear-desktop/src/plugins/adblocker/index.ts
Line 111 in 6b1b336
| preload: { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ········script: with ····script:⏎·····
pear-desktop/src/plugins/adblocker/index.ts
Line 112 in 6b1b336
| script: 'window.JSON.parse = window._proxyJsonParse; window._proxyJsonParse = undefined; window.Response.prototype.json = window._proxyResponseJson; window._proxyResponseJson = undefined; 0', |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
pear-desktop/src/plugins/adblocker/index.ts
Line 113 in 6b1b336
| async start({ getConfig }) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ············ with ······
pear-desktop/src/plugins/adblocker/index.ts
Line 114 in 6b1b336
| const config = await getConfig(); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
pear-desktop/src/plugins/adblocker/index.ts
Line 116 in 6b1b336
| if (config.blocker === blockers.WithBlocklists) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
pear-desktop/src/plugins/adblocker/index.ts
Line 117 in 6b1b336
| // Preload adblocker to inject scripts/styles |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
pear-desktop/src/plugins/adblocker/index.ts
Line 118 in 6b1b336
| await injectCliqzPreload(); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
pear-desktop/src/plugins/adblocker/index.ts
Line 119 in 6b1b336
| } else if (config.blocker === blockers.InPlayer && !isInjected()) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
pear-desktop/src/plugins/adblocker/index.ts
Line 120 in 6b1b336
| inject(contextBridge); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ········
pear-desktop/src/plugins/adblocker/index.ts
Line 121 in 6b1b336
| await webFrame.executeJavaScript(this.script); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
pear-desktop/src/plugins/adblocker/index.ts
Line 122 in 6b1b336
| } |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ········ with ····
pear-desktop/src/plugins/adblocker/index.ts
Line 123 in 6b1b336
| }, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
pear-desktop/src/plugins/adblocker/index.ts
Line 124 in 6b1b336
| async onConfigChange(newConfig) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
pear-desktop/src/plugins/adblocker/index.ts
Line 125 in 6b1b336
| if (newConfig.blocker === blockers.WithBlocklists) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
pear-desktop/src/plugins/adblocker/index.ts
Line 126 in 6b1b336
| await injectCliqzPreload(); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
pear-desktop/src/plugins/adblocker/index.ts
Line 127 in 6b1b336
| } else if (newConfig.blocker === blockers.InPlayer && !isInjected()) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ········
pear-desktop/src/plugins/adblocker/index.ts
Line 128 in 6b1b336
| inject(contextBridge); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
pear-desktop/src/plugins/adblocker/index.ts
Line 129 in 6b1b336
| await webFrame.executeJavaScript(this.script); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
pear-desktop/src/plugins/adblocker/index.ts
Line 130 in 6b1b336
| } |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ········ with ····
pear-desktop/src/plugins/adblocker/index.ts
Line 131 in 6b1b336
| }, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
pear-desktop/src/plugins/adblocker/index.ts
Line 132 in 6b1b336
| }, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Insert ⏎
pear-desktop/src/plugins/adblocker/index.ts
Line 133 in 6b1b336
| }); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| await import('@ghostery/adblocker-electron-preload'); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Insert ⏎
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Insert ⏎
| export const isInjected: () => boolean; |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| WithBlocklists: 'With blocklists', |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···· with ··
| InPlayer: 'In player', |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Insert ⏎
| } as const; |
src/plugins/adblocker/blocker.ts
Outdated
|
|
||
| const SOURCES = [ | ||
| 'https://raw.githubusercontent.com/kbinani/adblock-youtube-ads/master/signed.txt', | ||
| // UBlock Origin |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| // UBlock Origin | |
| UBlock Origin |
src/plugins/adblocker/blocker.ts
Outdated
| const SOURCES = [ | ||
| 'https://raw.githubusercontent.com/kbinani/adblock-youtube-ads/master/signed.txt', | ||
| // UBlock Origin | ||
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/filters.txt', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/filters.txt', | |
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/filters.txt', |
src/plugins/adblocker/blocker.ts
Outdated
| 'https://raw.githubusercontent.com/kbinani/adblock-youtube-ads/master/signed.txt', | ||
| // UBlock Origin | ||
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/filters.txt', | ||
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/quick-fixes.txt', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/quick-fixes.txt', | |
| ttps://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/quick-fixes.txt', |
src/plugins/adblocker/blocker.ts
Outdated
| // UBlock Origin | ||
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/filters.txt', | ||
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/quick-fixes.txt', | ||
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/unbreak.txt', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···· with ··
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/unbreak.txt', | |
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/unbreak.txt', |
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/filters.txt', | ||
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/quick-fixes.txt', | ||
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/unbreak.txt', | ||
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/filters-2020.txt', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/filters-2020.txt', | |
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/filters-2020.txt', |
| const cachingOptions = | ||
| cache && additionalBlockLists.length === 0 | ||
| ? { | ||
| path: path.join(cacheDirectory, 'adblocker-engine.bin'), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
| path: path.join(cacheDirectory, 'adblocker-engine.bin'), | |
| path: path.join(cacheDirectory, 'adblocker-engine.bin'), |
| cache && additionalBlockLists.length === 0 | ||
| ? { | ||
| path: path.join(cacheDirectory, 'adblocker-engine.bin'), | ||
| read: promises.readFile, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
| read: promises.readFile, | |
| read: promises.readFile, |
| ? { | ||
| path: path.join(cacheDirectory, 'adblocker-engine.bin'), | ||
| read: promises.readFile, | ||
| write: promises.writeFile, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ··········
| write: promises.writeFile, | |
| write: promises.writeFile, |
| read: promises.readFile, | ||
| write: promises.writeFile, | ||
| } | ||
| : undefined; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
| : undefined; | |
| : undefined; |
| write: promises.writeFile, | ||
| } | ||
| : undefined; | ||
| const lists = [ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| const lists = [ | |
| const lists = [ |
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remaining comments which cannot be posted as a review comment to avoid GitHub Rate Limit
eslint
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ········
| (Array.isArray(disableDefaultLists) && disableDefaultLists.length > 0) |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ············ with ······
| ? [] |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
| : SOURCES), |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ········ with ····
| ...additionalBlockLists, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| ]; |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···· with ··
| try { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ········ with ····
| blocker = await ElectronBlocker.fromLists( |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ············ with ······
| (url: string) => net.fetch(url), |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
| lists, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
| { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ········
| // When generating the engine for caching, do not load network filters |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
| // So that enhancing the session works as expected |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
| // Allowing to define multiple webRequest listeners |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
| loadNetworkFilters: session !== undefined, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
| }, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ············ with ······
| cachingOptions, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| ); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| if (session) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ············ with ······
| blocker.enableBlockingInSession(session); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| } |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| } catch (error) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| console.log('Error loading adBlocker engine', error); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| } |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| if (blocker) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ········ with ····
| blocker.disableBlockingInSession(session); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| } |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ··blocker·!==·undefined·&&·blocker.isBlockingEnabled(session); with blocker·!==·undefined·&&·blocker.isBlockingEnabled(session);⏎
| blocker !== undefined && blocker.isBlockingEnabled(session); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| isBlockerEnabled, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···· with ··
| loadAdBlockerEngine, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| unloadAdBlockerEngine, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| /** |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| * Whether to enable the adblocker. |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| * @default true |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ····· with ···
| */ |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| enabled: boolean; |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| /** |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ····· with ···
| * When enabled, the adblocker will cache the blocklists. |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| * @default true |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| */ |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| cache: boolean; |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| /** |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| * Which adblocker to use. |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| * @default blockers.InPlayer |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ····· with ···
| */ |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| blocker: (typeof blockers)[keyof typeof blockers]; |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···· with ··
| /** |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| * Additional list of filters to use. |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| * @example ["https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt"] |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| * @default [] |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| */ |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···· with ··
| additionalBlockLists: string[]; |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| /** |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| * Disable the default blocklists. |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| * @default false |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| */ |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| disableDefaultLists: boolean; |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| name: () => t('plugins.adblocker.name'), |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···· with ··
| description: () => t('plugins.adblocker.description'), |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| restartNeeded: false, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···· with ··
| config: { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| enabled: true, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| cache: true, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| blocker: blockers.InPlayer, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ········ with ····
| additionalBlockLists: [], |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ········ with ····
| disableDefaultLists: false, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| } as AdblockerConfig, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···· with ··
| menu: async ({ getConfig, setConfig }) => { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ········ with ····
| const config = await getConfig(); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| return [ |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ············ with ······
| { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
| label: t('plugins.adblocker.menu.blocker'), |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ········
| submenu: Object.values(blockers).map((blocker) => ({ |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···················· with ··········
| label: blocker, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···················· with ··········
| type: 'radio', |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···················· with ··········
| checked: (config.blocker || blockers.WithBlocklists) === blocker, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··········
| click() { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ························ with ············
| setConfig({ blocker }); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··········
| }, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
| })), |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ············ with ······
| }, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ········ with ····
| ]; |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···· with ··
| }, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···· with ··
| backend: { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| mainWindow: null as BrowserWindow | null, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| async start({ getConfig, window }) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
| const config = await getConfig(); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ············ with ······
| this.mainWindow = window; |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
| if (config.blocker === blockers.WithBlocklists) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
| await loadAdBlockerEngine( |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···················· with ··········
| window.webContents.session, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··········
| config.cache, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··········
| config.additionalBlockLists, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···················· with ··········
| config.disableDefaultLists, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ········
| ); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
| } |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ········ with ····
| }, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| stop({ window }) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
| if (isBlockerEnabled(window.webContents.session)) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
| unloadAdBlockerEngine(window.webContents.session); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
| } |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ········ with ····
| }, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| async onConfigChange(newConfig) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ············ with ······
| if (this.mainWindow) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ········
| if ( |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···················· with ··········
| newConfig.blocker === blockers.WithBlocklists && |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···················· with ··········
| !isBlockerEnabled(this.mainWindow.webContents.session) |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
pear-desktop/src/plugins/adblocker/index.ts
Line 100 in 240b098
| ) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··········
pear-desktop/src/plugins/adblocker/index.ts
Line 101 in 240b098
| await loadAdBlockerEngine( |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ························ with ············
pear-desktop/src/plugins/adblocker/index.ts
Line 102 in 240b098
| this.mainWindow.webContents.session, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ············
pear-desktop/src/plugins/adblocker/index.ts
Line 103 in 240b098
| newConfig.cache, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ························ with ············
pear-desktop/src/plugins/adblocker/index.ts
Line 104 in 240b098
| newConfig.additionalBlockLists, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ························ with ············
pear-desktop/src/plugins/adblocker/index.ts
Line 105 in 240b098
| newConfig.disableDefaultLists, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··········
pear-desktop/src/plugins/adblocker/index.ts
Line 106 in 240b098
| ); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
pear-desktop/src/plugins/adblocker/index.ts
Line 107 in 240b098
| } |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ············ with ······
pear-desktop/src/plugins/adblocker/index.ts
Line 108 in 240b098
| } |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
pear-desktop/src/plugins/adblocker/index.ts
Line 109 in 240b098
| }, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
pear-desktop/src/plugins/adblocker/index.ts
Line 110 in 240b098
| }, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
pear-desktop/src/plugins/adblocker/index.ts
Line 111 in 240b098
| preload: { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ········script: with ····script:⏎·····
pear-desktop/src/plugins/adblocker/index.ts
Line 112 in 240b098
| script: 'window.JSON.parse = window._proxyJsonParse; window._proxyJsonParse = undefined; window.Response.prototype.json = window._proxyResponseJson; window._proxyResponseJson = undefined; 0', |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
pear-desktop/src/plugins/adblocker/index.ts
Line 113 in 240b098
| async start({ getConfig }) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ············ with ······
pear-desktop/src/plugins/adblocker/index.ts
Line 114 in 240b098
| const config = await getConfig(); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
pear-desktop/src/plugins/adblocker/index.ts
Line 116 in 240b098
| if (config.blocker === blockers.WithBlocklists) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
pear-desktop/src/plugins/adblocker/index.ts
Line 117 in 240b098
| // Preload adblocker to inject scripts/styles |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
pear-desktop/src/plugins/adblocker/index.ts
Line 118 in 240b098
| await injectCliqzPreload(); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
pear-desktop/src/plugins/adblocker/index.ts
Line 119 in 240b098
| } else if (config.blocker === blockers.InPlayer && !isInjected()) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
pear-desktop/src/plugins/adblocker/index.ts
Line 120 in 240b098
| inject(contextBridge); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ········
pear-desktop/src/plugins/adblocker/index.ts
Line 121 in 240b098
| await webFrame.executeJavaScript(this.script); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
pear-desktop/src/plugins/adblocker/index.ts
Line 122 in 240b098
| } |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ········ with ····
pear-desktop/src/plugins/adblocker/index.ts
Line 123 in 240b098
| }, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
pear-desktop/src/plugins/adblocker/index.ts
Line 124 in 240b098
| async onConfigChange(newConfig) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
pear-desktop/src/plugins/adblocker/index.ts
Line 125 in 240b098
| if (newConfig.blocker === blockers.WithBlocklists) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
pear-desktop/src/plugins/adblocker/index.ts
Line 126 in 240b098
| await injectCliqzPreload(); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
pear-desktop/src/plugins/adblocker/index.ts
Line 127 in 240b098
| } else if (newConfig.blocker === blockers.InPlayer && !isInjected()) { |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ········
pear-desktop/src/plugins/adblocker/index.ts
Line 128 in 240b098
| inject(contextBridge); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ········
pear-desktop/src/plugins/adblocker/index.ts
Line 129 in 240b098
| await webFrame.executeJavaScript(this.script); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
pear-desktop/src/plugins/adblocker/index.ts
Line 130 in 240b098
| } |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ········ with ····
pear-desktop/src/plugins/adblocker/index.ts
Line 131 in 240b098
| }, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
pear-desktop/src/plugins/adblocker/index.ts
Line 132 in 240b098
| }, |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Insert ⏎
pear-desktop/src/plugins/adblocker/index.ts
Line 133 in 240b098
| }); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| await import('@ghostery/adblocker-electron-preload'); |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Insert ⏎
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Insert ⏎
| export const isInjected: () => boolean; |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| WithBlocklists: 'With blocklists', |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···· with ··
| InPlayer: 'In player', |
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Insert ⏎
| } as const; |
src/plugins/adblocker/blocker.ts
Outdated
| const SOURCES = [ | ||
| 'https://raw.githubusercontent.com/kbinani/adblock-youtube-ads/master/signed.txt', | ||
| // UBlock Origin | ||
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/filters.txt', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/filters.txt', | |
| ttps://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/filters.txt', |
src/plugins/adblocker/blocker.ts
Outdated
| 'https://raw.githubusercontent.com/kbinani/adblock-youtube-ads/master/signed.txt', | ||
| // UBlock Origin | ||
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/filters.txt', | ||
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/quick-fixes.txt', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/quick-fixes.txt', | |
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/quick-fixes.txt', |
src/plugins/adblocker/blocker.ts
Outdated
| // UBlock Origin | ||
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/filters.txt', | ||
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/quick-fixes.txt', | ||
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/unbreak.txt', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ··
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/unbreak.txt', | |
| ttps://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/unbreak.txt', |
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/filters.txt', | ||
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/quick-fixes.txt', | ||
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/unbreak.txt', | ||
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/filters-2020.txt', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···· with ··
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/filters-2020.txt', | |
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/filters-2020.txt', |
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/quick-fixes.txt', | ||
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/unbreak.txt', | ||
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/filters-2020.txt', | ||
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/filters-2021.txt', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···· with ··
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/filters-2021.txt', | |
| 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets/ublock-origin/filters-2021.txt', |
| ? { | ||
| path: path.join(cacheDirectory, 'adblocker-engine.bin'), | ||
| read: promises.readFile, | ||
| write: promises.writeFile, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ················ with ··········
| write: promises.writeFile, | |
| write: promises.writeFile, |
| path: path.join(cacheDirectory, 'adblocker-engine.bin'), | ||
| read: promises.readFile, | ||
| write: promises.writeFile, | ||
| } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| } | |
| } |
| read: promises.readFile, | ||
| write: promises.writeFile, | ||
| } | ||
| : undefined; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ······
| : undefined; | |
| : undefined; |
| write: promises.writeFile, | ||
| } | ||
| : undefined; | ||
| const lists = [ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ···· with ··
| const lists = [ | |
| const lists = [ |
| } | ||
| : undefined; | ||
| const lists = [ | ||
| ...((disableDefaultLists && !Array.isArray(disableDefaultLists)) || |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Delete ····
| ...((disableDefaultLists && !Array.isArray(disableDefaultLists)) || | |
| ...((disableDefaultLists && !Array.isArray(disableDefaultLists)) || |
|
Been running this for a good few hours now and all seems to be working fine! |
That's right, since I did the PR, I've been using my compiled version and so far nothing has failed me, everything is going well and the transparency works wonderfully. |
|
Works perfectly for me too |
Description
This PR restores and fixes the adblocker plugin functionality, which was experiencing issues in recent versions.
Changes made
src/index.tsto ensure compatibility with transparency changes on Linux.Additional notes
The commits include a specific fix for transparency and window support in Linux environments.