kittyfangs
/
fchat-rising
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaner adblock fix

This commit is contained in:
Mr. Stallion 2020-10-31 16:25:28 -05:00
parent dec595b907
commit 35d4d3494a
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chat/preview/CharacterPreview.vue
View File

@ -133,7 +133,7 @@ export default class CharacterPreview extends Vue {
}
this.statusMessage = this.onlineCharacter.statusText;
this.statusClasses = getStatusClasses(this.onlineCharacter, undefined, true, true, false);
this.statusClasses = getStatusClasses(this.onlineCharacter, undefined, true, false, false);
}

22
electron/main.ts
View File

@ -236,11 +236,13 @@ function createWindow(): Electron.BrowserWindow | undefined {
blocker.enableBlockingInSession(electron.session.defaultSession);
// Temp fix -- manually override adblocker's preload script 1) to point to CJS; 2) to use absolute path
const originPath = require.resolve('@cliqz/adblocker-electron-preload');
const preloadScript = path.resolve(path.dirname(originPath), 'preload.cjs.js');
// Temp fix -- manually override adblocker's preload script
// to point to CJS that has been copied over with config in webpack.config.js
const preloadScript = './preview/assets/adblocker/preload.cjs.js'; // require.resolve('@cliqz/adblocker-electron-preload');
log.debug('adblock.preload.path', { finalPath: preloadScript, originPath });
// const originPath = require.resolve('@cliqz/adblocker-electron-preload');
// const preloadScript = path.resolve(path.dirname(originPath), 'preload.cjs.js');
log.debug('adblock.preload.path', { finalPath: preloadScript /*, originPath */ });
electron.session.defaultSession.setPreloads(
_.concat(
@ -252,28 +254,28 @@ function createWindow(): Electron.BrowserWindow | undefined {
)
);
log.debug('adblock.preloaders', { loaders: electron.session.defaultSession.getPreloads() })
log.debug('adblock.preloaders', { loaders: electron.session.defaultSession.getPreloads() });
blocker.on('request-blocked', (request: Request) => {
log.debug('adblock.request.blocked', { url: request.url });
});
blocker.on('request-redirected', (request: Request) => {
log.debug('adblock.request.redirected', { url: request.url });
});
blocker.on('request-whitelisted', (request: Request) => {
log.debug('adblock.request.whitelisted', { url: request.url });
});
blocker.on('csp-injected', (request: Request) => {
log.debug('adblock.inject.csp', { url: request.url });
});
blocker.on('script-injected', (script: string, url: string) => {
log.debug('adblock.inject.script', { length: script.length, url });
});
blocker.on('style-injected', (style: string, url: string) => {
log.debug('adblock.inject.style', { length: style.length, url });
});

5
electron/webpack.config.js
View File

@ -121,6 +121,11 @@ const mainConfig = {
from: path.resolve(__dirname, '..', 'chat', 'preview', 'assets', '**', '*').replace(/\\/g, '/'),
to: path.join('preview', 'assets'),
context: path.resolve(__dirname, '..', 'chat', 'preview', 'assets')
},
{
from: path.resolve(__dirname, '..', 'node_modules', '@cliqz', 'adblocker-electron-preload', 'dist', 'preload.cjs.js').replace(/\\/g, '/'),
to: path.join('preview', 'assets', 'adblocker'),
context: path.resolve(__dirname, '..', 'node_modules', '@cliqz', 'adblocker-electron-preload', 'dist')
}
]
}