Merge pull request #156 from MasicoreLord/beta-patch

Fixed devtools warning

bd_shit.js

@@ -24,8 +24,8 @@ module.exports = class BDManager {
  this.observer.observe(document, {childList: true, subtree: true});
 
  //this.currentWindow.webContents.on('did-navigate-in-page', BDManager.onSwitch);
- electron.ipcRenderer.invoke('bd-navigate-page-listener', BDManager.onSwitch);
-
+ try { electron.ipcRenderer.invoke('bd-navigate-page-listener', BDManager.onSwitch); }
+ catch(err) { throw new Error(`Could not add navigate page listener. ${err}\n${err.stack}`); };
 
  fs.readFile(path.join(process.env.injDir, 'bd.css'), (err, text) => {
  if (err) return console.error(err);
@@ -39,7 +39,8 @@ module.exports = class BDManager {
  EDApi.clearCSS('BDManager');
  this.observer.disconnect();
  //this.currentWindow.webContents.removeEventListener('did-navigate-in-page', BDManager.onSwitch);
- electron.ipcRenderer.invoke('remove-bd-navigate-page-listener', BDManager.onSwitch);
+ try { electron.ipcRenderer.invoke('remove-bd-navigate-page-listener', BDManager.onSwitch); }
+ catch(err) { throw new Error(`Could not remove navigate page listener. ${err}\n${err.stack}`); };
  this.jqueryElement.remove();
  Module._extensions['.js'] = originalRequire;
  }

dom_shit.js

@@ -222,6 +222,10 @@ process.once('loaded', async () => {
  EDApi.monkeyPatch(ht, 'showToken', window.fixedShowToken);
  if (!ED.localStorage.getItem('token') && ht.getToken())
  window.fixedShowToken(); // prevent you from being logged out for no reason
+
+ // change the console warning to be more fun
+ electron.ipcRenderer.invoke('custom-devtools-warning');
+
  // expose stuff for devtools
  Object.assign(electron.webFrame.top.context.window, {ED, EDApi, BdApi});
 });

injection.js

@@ -19,14 +19,6 @@ class BrowserWindow extends electron.BrowserWindow {
  originalOptions.webPreferences.preload = path.join(process.env.injDir, 'dom_shit.js');
  originalOptions.webPreferences.transparency = true;
 
- // change the console warning to be more fun
- win.webContents.on('devtools-opened', (event) => {
- console.log('%cHold Up!', 'color: #FF5200; -webkit-text-stroke: 2px black; font-size: 72px; font-weight: bold;');
- console.log('%cIf you\'re reading this, you\'re probably smarter than most Discord developers.', 'font-size: 16px;');
- console.log('%cPasting anything in here could actually improve the Discord client.', 'font-size: 18px; font-weight: bold; color: red;');
- console.log('%cUnless you understand exactly what you\'re doing, keep this window open to browse our bad code.', 'font-size: 16px;');
- console.log('%cIf you don\'t understand exactly what you\'re doing, you should come work with us: https://discordapp.com/jobs', 'font-size: 16px;');
- });
  win = new electron.BrowserWindow(originalOptions);
  win.webContents.__preload = originalPreloadScript;
  return win;

main_process_shit.js

@@ -15,6 +15,20 @@ ipcMain.on('main-process-utils', (event, arg) => {
  }`
 });
 
+ipcMain.handle('custom-devtools-warning', (event, arg) => {
+ let wc = event.sender.getOwnerBrowserWindow().webContents;
+ wc.removeAllListeners('devtools-opened');
+ wc.on('devtools-opened', () => {
+ wc.executeJavaScript(`
+ console.log('%cHold Up!', 'color: #FF5200; -webkit-text-stroke: 2px black; font-size: 72px; font-weight: bold;');
+ console.log("%cIf you're reading this, you're probably smarter than most Discord developers.", 'font-size: 16px;');
+ console.log('%cPasting anything in here could actually improve the Discord client.', 'font-size: 18px; font-weight: bold; color: red;');
+ console.log("%cUnless you understand exactly what you're doing, keep this window open to browse our bad code.", 'font-size: 16px;');
+ console.log("%cIf you don't understand exactly what you\'re doing, you should come work with us: https://discordapp.com/jobs", 'font-size: 16px;');
+ `)
+ });
+});
+
 ipcMain.handle('bd-navigate-page-listener', (event, arg) => {
  event.sender.getOwnerBrowserWindow().webContents.on('did-navigate-in-page', arg);
 })