-
+
+
diff --git a/client/src/ui/contextmenus.js b/client/src/ui/contextmenus.js
index 0c53af8f..de811791 100644
--- a/client/src/ui/contextmenus.js
+++ b/client/src/ui/contextmenus.js
@@ -84,7 +84,7 @@ export class DiscordContextMenu {
}
static renderCm(component, args, retVal, res) {
- if (!retVal.props || !res.props) return;
+ if (!retVal.props || !retVal.props.style || !res.props) return;
const { target } = component.props;
const { top, left } = retVal.props.style;
if (!target || !top || !left) return;
diff --git a/client/webpack.production.config.js b/client/webpack.production.config.js
index 620a1b53..597c1fa7 100644
--- a/client/webpack.production.config.js
+++ b/client/webpack.production.config.js
@@ -17,7 +17,7 @@ const config = {
})
],
externals: {
- sparkplug: 'require("./sparkplug")'
+ sparkplug: 'require("../core/sparkplug")'
}
};
diff --git a/core/src/main.js b/core/src/main.js
index 85c6dd1a..b123c98c 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -37,7 +37,6 @@ const TEST_ARGS = () => {
'data': path.resolve(_baseDataPath, 'data'),
'editor': path.resolve(_basePath, 'editor', 'dist'),
// tmp: path.join(_basePath, 'tmp')
- tmp: path.join(os.tmpdir(), 'betterdiscord', `${process.getuid()}`)
}
}
}
@@ -83,6 +82,12 @@ class Comms {
});
});
+ BDIpc.on('bd-native-save', (event, options) => {
+ dialog.showSaveDialog(OriginalBrowserWindow.fromWebContents(event.ipcEvent.sender), options, filename => {
+ event.reply(filename);
+ });
+ });
+
BDIpc.on('bd-compileSass', (event, options) => {
if (typeof options.path === 'string' && typeof options.data === 'string') {
options.data = `${options.data} @import '${options.path.replace(/\\/g, '\\\\').replace(/'/g, '\\\'')}';`;
@@ -103,7 +108,7 @@ class Comms {
BDIpc.on('bd-keytar-find-credentials', (event, { service }) => keytar.findCredentials(service), true);
BDIpc.on('bd-readDataFile', async (event, fileName) => {
- const rf = await FileUtils.readFile(path.resolve(configProxy().getPath('data'), fileName));
+ const rf = await FileUtils.readFile(path.resolve(this.bd.config.getPath('data'), fileName));
event.reply(rf);
});
@@ -197,6 +202,11 @@ class BrowserWindow extends OriginalBrowserWindow {
}
}
+// Some Electron APIs depend on browserWindow.constructor being BrowserWindow
+Object.defineProperty(BrowserWindow.prototype, 'constructor', {
+ value: OriginalBrowserWindow
+});
+
export class BetterDiscord {
get comms() { return this._comms ? this._comms : (this._commas = new Comms(this)); }
@@ -207,9 +217,13 @@ export class BetterDiscord {
get updater() { return this._updater ? this._updater : (this._updater = new Updater(this)); }
get sendToDiscord() { return this.windowUtils.send; }
- constructor(args) {
- if (TESTS) args = TEST_ARGS();
+ constructor(...args) {
+ if (TESTS) args.unshift(TEST_ARGS());
+
+ args = deepmerge.all(args);
+
console.log('[BetterDiscord|args] ', JSON.stringify(args, null, 4));
+
if (BetterDiscord.loaded) {
console.log('[BetterDiscord] Creating two BetterDiscord objects???');
return null;
@@ -337,6 +351,10 @@ export class BetterDiscord {
this.config.addPath('userfiles', userfiles);
this.config.addPath('snippets', snippets);
if (!this.config.getPath('editor')) this.config.addPath('editor', path.resolve(base, 'editor'));
+
+ if (!this.config.getPath('tmp')) this.config.addPath('tmp', process.platform !== 'win32' ?
+ path.join(os.tmpdir(), 'betterdiscord', `${process.getuid()}`) :
+ path.join(os.tmpdir(), 'betterdiscord'));
}
/**
diff --git a/core/src/modules/config.js b/core/src/modules/config.js
index 43559729..f9dc8269 100644
--- a/core/src/modules/config.js
+++ b/core/src/modules/config.js
@@ -9,6 +9,8 @@
*/
import Module from './modulebase';
+import path from 'path';
+import os from 'os';
export default class Config extends Module {
@@ -72,6 +74,9 @@ export default class Config extends Module {
// Compatibility with old client code and new installer args
compatibility() {
- this.args.paths = Object.entries(this.args.paths).map(([id, path]) => ({ id, path }));
+ this.args.paths = Object.entries(this.args.paths).map(([id, _path]) => ({
+ id, path: path.resolve(os.homedir(), _path)
+ }));
}
+
}
diff --git a/core/src/modules/updater.js b/core/src/modules/updater.js
index 786583d1..3e46b53d 100644
--- a/core/src/modules/updater.js
+++ b/core/src/modules/updater.js
@@ -14,6 +14,7 @@ import semver from 'semver';
import Axi from './axi';
import zlib from 'zlib';
import tarfs from 'tar-fs';
+import path from 'path';
const TEST_UPDATE = [
{
@@ -91,7 +92,8 @@ export default class Updater extends Module {
async updateBd(update) {
try {
console.log('[BetterDiscord:Updater] Updating', update.id);
- await this.downloadTarGz(`https://github.com/JsSucks/BetterDiscordApp${update.remote}`, this.bd.config.getPath('base'));
+ await this.downloadTarGz(`https://github.com/JsSucks/BetterDiscordApp${update.remote}`, this.bd.config.getPath('tmp'));
+ await FileUtils.rn(path.join(this.bd.config.getPath('tmp'), update.id), this.bd.config.getPath(update.id));
this.updateFinished(update);
// Cleanup
await FileUtils.rm(`${this.bd.config.getPath(update.id)}_old`);
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index 1f1c3332..17259e55 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -84,14 +84,7 @@ gulp.task('client-pkg', function() {
]);
});
-gulp.task('client-sparkplug', function() {
- return pump([
- gulp.src('core/dist/sparkplug.js'),
- gulp.dest('release/client')
- ]);
-});
-
-gulp.task('client-release', gulp.parallel('client-main', 'client-pkg', 'client-sparkplug'));
+gulp.task('client-release', gulp.parallel('client-main', 'client-pkg'));
// Editor
diff --git a/installer/README.MD b/installer/README.md
similarity index 100%
rename from installer/README.MD
rename to installer/README.md
diff --git a/installer/stub.js b/installer/stub.js
index 42dd30f8..c2c9e4ae 100644
--- a/installer/stub.js
+++ b/installer/stub.js
@@ -1,16 +1,21 @@
-const bdinfo = require('./bd.json');
+const bdinfo = require('./bd');
const { app } = require('electron');
const path = require('path');
-const fs = require('fs');
+const os = require('os');
const Module = require('module');
-const packagePath = path.join(__dirname, '..', 'app.asar');
+const packagePath = path.resolve(__dirname, '..', 'app.asar');
app.getAppPath = () => packagePath;
function loadBd() {
- const { paths } = bdinfo;
- const { BetterDiscord } = require(paths.core);
- const instance = new BetterDiscord(bdinfo);
+ const userconfig = (() => {
+ try {
+ return require(path.resolve(os.homedir(), bdinfo.paths.userconfig));
+ } catch (err) {}
+ })() || {};
+
+ const { BetterDiscord } = require(path.resolve(os.homedir(), (userconfig.paths || {}).core || bdinfo.paths.core));
+ const instance = new BetterDiscord(bdinfo, userconfig);
}
app.on('ready', loadBd);
diff --git a/scripts/inject.js b/scripts/inject.js
index b7c6c165..feb0091e 100644
--- a/scripts/inject.js
+++ b/scripts/inject.js
@@ -1,7 +1,9 @@
-const args = process.argv;
+const process = require('process');
const fs = require('fs');
const path = require('path');
+const args = process.argv;
+
const useBdRelease = args[2] && args[2].toLowerCase() === 'release';
const releaseInput = useBdRelease ? args[3] && args[3].toLowerCase() : args[2] && args[2].toLowerCase();
const release = releaseInput === 'canary' ? 'Discord Canary' : releaseInput === 'ptb' ? 'Discord PTB' : 'Discord';
@@ -16,7 +18,7 @@ const discordPath = (function() {
} else if (process.platform === 'darwin') {
const appPath = releaseInput === 'canary' ? path.join('/Applications', 'Discord Canary.app')
: releaseInput === 'ptb' ? path.join('/Applications', 'Discord PTB.app')
- : useBdRelease && args[3] ? args[3] ? args[2] : args[2]
+ : useBdRelease && args[3] ? args[3] : !useBdRelease && args[2] ? args[2]
: path.join('/Applications', 'Discord.app');
return path.join(appPath, 'Contents', 'Resources');
@@ -31,30 +33,53 @@ console.log(`Found ${release} in ${discordPath}`);
const appPath = path.join(discordPath, 'app');
const packageJson = path.join(appPath, 'package.json');
const indexJs = path.join(appPath, 'index.js');
+const bdJson = path.join(appPath, 'bd.json');
if (!fs.existsSync(appPath)) fs.mkdirSync(appPath);
if (fs.existsSync(packageJson)) fs.unlinkSync(packageJson);
if (fs.existsSync(indexJs)) fs.unlinkSync(indexJs);
-
-const bdPath = useBdRelease ? path.resolve(__dirname, '..', 'release') : path.resolve(__dirname, '..');
+if (fs.existsSync(bdJson)) fs.unlinkSync(bdJson);
console.log(`Writing package.json`);
-fs.writeFileSync(packageJson, JSON.stringify({
+fs.writeFileSync(path.join(appPath, 'package.json'), JSON.stringify({
name: 'betterdiscord',
description: 'BetterDiscord',
main: 'index.js',
private: true
}, null, 4));
-console.log(`Writing index.js`);
-fs.writeFileSync(indexJs, `const path = require('path');
-const fs = require('fs');
-const Module = require('module');
-const electron = require('electron');
-const basePath = path.join(__dirname, '..', 'app.asar');
-electron.app.getAppPath = () => basePath;
-Module._load(basePath, null, true);
-electron.app.on('ready', () => new (require('${bdPath.replace(/\\/g, '\\\\').replace(/'/g, '\\\'')}').BetterDiscord)());
-`);
+if (useBdRelease) {
+ console.log(`Writing index.js`);
+ fs.writeFileSync(path.join(appPath, 'index.js'), fs.readFileSync(path.resolve(__dirname, '..', 'installer', 'stub.js')));
+
+ console.log(`Writing bd.json`);
+ fs.writeFileSync(path.join(appPath, 'bd.json'), JSON.stringify({
+ options: {
+ autoInject: true,
+ commonCore: true,
+ commonData: true
+ },
+ paths: {
+ core: path.resolve(__dirname, '..', 'release', 'core'),
+ client: path.resolve(__dirname, '..', 'release', 'client'),
+ editor: path.resolve(__dirname, '..', 'release', 'editor'),
+ data: path.resolve(__dirname, '..', 'release', 'data'),
+ // tmp: path.resolve(os.tmpdir(), 'betterdiscord', `${process.getuid()}`)
+ }
+ }, null, 4));
+} else {
+ const bdPath = path.resolve(__dirname, '..');
+
+ console.log(`Writing index.js`);
+ fs.writeFileSync(path.join(appPath, 'index.js'), `const path = require('path');
+ const fs = require('fs');
+ const Module = require('module');
+ const electron = require('electron');
+ const basePath = path.join(__dirname, '..', 'app.asar');
+ electron.app.getAppPath = () => basePath;
+ Module._load(basePath, null, true);
+ electron.app.on('ready', () => new (require('${bdPath.replace(/\\/g, '\\\\').replace(/'/g, '\\\'')}').BetterDiscord)());
+ `);
+}
console.log(`Injection successful, please restart ${release}.`);
diff --git a/tests/ext/plugins/Render Example/index.js b/tests/ext/plugins/Render Example/index.js
index e7c298b7..a6e003ba 100644
--- a/tests/ext/plugins/Render Example/index.js
+++ b/tests/ext/plugins/Render Example/index.js
@@ -101,15 +101,15 @@ module.exports = (Plugin, Api, Vendor) => {
if (!returnValue.props.children instanceof Array) returnValue.props.children = [returnValue.props.children];
// Add a generic Button component provided by BD
returnValue.props.children.push(Api.Components.ButtonGroup({
- classes: [ 'exampleBtnGroup' ], // Additional classes for button group
+ class: [ 'exampleBtnGroup' ], // Additional classes for button group
buttons: [
{
- classes: ['exampleBtn'], // Additional classes for button
+ class: ['exampleBtn'], // Additional classes for button
text: 'Hello World!', // Text for button
onClick: e => Logger.log('Hello World!') // Button click handler
},
{
- classes: ['exampleBtn'],
+ class: ['exampleBtn'],
text: 'Button',
onClick: e => Logger.log('Button!')
}