Merge pull request #203 from JsSucks/devtools

React and Vue devtool modules
This commit is contained in:
Alexei Stukov 2018-08-07 16:12:04 +03:00 committed by GitHub
commit c3df892f1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 206 additions and 1 deletions

1
.gitignore vendored
View File

@ -11,3 +11,4 @@ tests/data
user.config.json
/.vs
/npm-debug.log
/tests/ext/extensions

View File

@ -0,0 +1,36 @@
/**
* BetterDiscord Builtin Module Base
* Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
* All rights reserved.
* https://betterdiscord.net
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
import { Settings } from 'modules';
export default class BuiltinModule {
constructor() {
this._settingUpdated = this._settingUpdated.bind(this);
if (this.enabled) this.enabled = this.enabled.bind(this);
if (this.disabled) this.disabled = this.disabled.bind(this);
}
init() {
this.setting.on('setting-updated', this._settingUpdated);
if (this.setting.value && this.enabled) this.enabled();
}
get setting() {
return Settings.getSetting(...this.settingPath);
}
_settingUpdated(e) {
const { value } = e;
if (value === true && this.enabled) this.enabled(e);
if (value === false && this.disabled) this.disabled(e);
}
}

View File

@ -0,0 +1,53 @@
/**
* BetterDiscord React Devtools Module
* Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
* All rights reserved.
* https://betterdiscord.net
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
import electron from 'electron';
import path from 'path';
import BuiltinModule from './BuiltinModule';
import { Globals } from 'modules';
import { Toasts } from 'ui';
export default new class ReactDevtoolsModule extends BuiltinModule {
constructor() {
super();
this.devToolsOpened = this.devToolsOpened.bind(this);
}
get settingPath() {
return ['core', 'advanced', 'react-devtools'];
}
enabled(e) {
electron.remote.BrowserWindow.getAllWindows()[0].webContents.on('devtools-opened', this.devToolsOpened);
}
disabled(e) {
electron.remote.BrowserWindow.removeDevToolsExtension('React Developer Tools');
electron.remote.BrowserWindow.getAllWindows()[0].webContents.removeListener('devtools-opened', this.devToolsOpened);
}
devToolsOpened() {
electron.remote.BrowserWindow.removeDevToolsExtension('React Developer Tools');
electron.webFrame.registerURLSchemeAsPrivileged('chrome-extension');
try {
const res = electron.remote.BrowserWindow.addDevToolsExtension(path.join(Globals.getPath('ext'), 'extensions', 'rdt'));
if (res !== undefined) {
Toasts.success(res + ' Installed');
return;
}
Toasts.error('React Developer Tools install failed');
} catch (err) {
Toasts.error('React Developer Tools install failed');
}
}
}

View File

@ -0,0 +1,53 @@
/**
* BetterDiscord Vue Devtools Module
* Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
* All rights reserved.
* https://betterdiscord.net
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
import electron from 'electron';
import path from 'path';
import BuiltinModule from './BuiltinModule';
import { Globals } from 'modules';
import { Toasts } from 'ui';
export default new class VueDevtoolsModule extends BuiltinModule {
constructor() {
super();
this.devToolsOpened = this.devToolsOpened.bind(this);
}
get settingPath() {
return ['core', 'advanced', 'vue-devtools'];
}
enabled(e) {
electron.remote.BrowserWindow.getAllWindows()[0].webContents.on('devtools-opened', this.devToolsOpened);
}
disabled(e) {
electron.remote.BrowserWindow.removeDevToolsExtension('Vue.js devtools');
electron.remote.BrowserWindow.getAllWindows()[0].webContents.removeListener('devtools-opened', this.devToolsOpened);
}
devToolsOpened() {
electron.remote.BrowserWindow.removeDevToolsExtension('Vue.js devtools');
electron.webFrame.registerURLSchemeAsPrivileged('chrome-extension');
try {
const res = electron.remote.BrowserWindow.addDevToolsExtension(path.join(Globals.getPath('ext'), 'extensions', 'vdt'));
if (res !== undefined) {
Toasts.success(res + ' Installed');
return;
}
Toasts.error('Vue.js devtools install failed');
} catch (err) {
Toasts.error('Vue.js devtools install failed');
}
}
}

View File

@ -1 +1,3 @@
export { default as EmoteModule } from './EmoteModule';
export { default as ReactDevtoolsModule } from './ReactDevtoolsModule';
export { default as VueDevtoolsModule } from './VueDevToolsModule';

View File

@ -63,6 +63,20 @@
"text": "Ignore content manager errors",
"hint": "Only when starting Discord. It gets annoying when you're reloading Discord often and have plugins that are meant to fail.",
"value": false
},
{
"id": "react-devtools",
"type": "bool",
"text": "React Developer Tools",
"hint": "Place extension in ext/extensions/rdt",
"value": false
},
{
"id": "vue-devtools",
"type": "bool",
"text": "Vue Developer Tools",
"hint": "Place extension in ext/extensions/vdt",
"value": false
}
]
},

View File

@ -12,7 +12,7 @@ import { DOM, BdUI, BdMenu, Modals, Reflection, Toasts } from 'ui';
import BdCss from './styles/index.scss';
import { Events, CssEditor, Globals, Settings, Database, Updater, ModuleManager, PluginManager, ThemeManager, ExtModuleManager, Vendor, WebpackModules, Patcher, MonkeyPatch, ReactComponents, ReactHelpers, ReactAutoPatcher, DiscordApi, BdWebApi, Connectivity } from 'modules';
import { ClientLogger as Logger, ClientIPC, Utils } from 'common';
import { EmoteModule } from 'builtin';
import { EmoteModule, ReactDevtoolsModule, VueDevtoolsModule } from 'builtin';
import electron from 'electron';
import path from 'path';
@ -73,6 +73,8 @@ class BetterDiscord {
async init() {
try {
ReactDevtoolsModule.init();
VueDevtoolsModule.init();
await Database.init();
await Settings.loadSettings();
await ModuleManager.initModules();

View File

@ -0,0 +1,17 @@
{
"info": {
"id": "doubleclick-edit",
"name": "Doubleclick Edit",
"authors": [
{
"name": "Jiiks",
"discord_id": "81388395867156480",
"github_username": "Jiiks",
"twitter_username": "Jiiksi"
}
],
"version": 1.0,
"description": "Edit messages by double clicking them. This is a v1 fix"
},
"main": "index.js"
}

View File

@ -0,0 +1,27 @@
module.exports = (Plugin, Api, Vendor) => {
return class extends Plugin {
onStart() {
document.addEventListener('dblclick', this.handler);
return true;
}
onStop() {
document.removeEventListener('dblclick', this.handler);
return true;
}
handler(e) {
const message = e.target.closest('[class^=messageCozy]') || e.target.closest('[class^=messageCompact]');
if (!message) return;
const btn = message.querySelector('[class^=buttonContainer] [class^=button-]');
if (!btn) return;
btn.click();
const popup = document.querySelector('[class^=container][role=menu]');
if (!popup) return;
const rii = popup[Object.keys(popup).find(k => k.startsWith('__reactInternal'))];
if (!rii || !rii.memoizedProps || !rii.memoizedProps.children || !rii.memoizedProps.children[1] || !rii.memoizedProps.children[1].props || !rii.memoizedProps.children[1].props.onClick) return;
rii.memoizedProps.children[1].props.onClick();
}
}
}