diff --git a/client/src/dev/serveremu.js b/client/src/dev/serveremu.js index fb71edfd..5e8b5eb2 100644 --- a/client/src/dev/serveremu.js +++ b/client/src/dev/serveremu.js @@ -147,7 +147,7 @@ export default class ServerEmu { activeUsers: Math.floor(Math.random() * 1000) + 1000, rated: Math.random() > .5, version: this.randomVersion(), - repository: this.dummyRepo, + repository: this.dummyThemeRepo, files: this.dummyFiles, author: this.dummyAuthor, description: '' @@ -176,7 +176,7 @@ export default class ServerEmu { activeUsers: Math.floor(Math.random() * 1000) + 1000, rated: Math.random() > .5, version: this.randomVersion(), - repository: this.dummyRepo, + repository: this.dummyPluginRepo, files: this.dummyFiles, author: this.dummyAuthor, description: '' @@ -186,11 +186,21 @@ export default class ServerEmu { return docs; } - static get dummyRepo() { + static get dummyThemeRepo() { return { name: 'ExampleRepository', baseUri: 'https://github.com/Jiiks/ExampleRepository', - rawUri: 'https://github.com/Jiiks/ExampleRepository/raw/master' + rawUri: 'https://github.com/Jiiks/ExampleRepository/raw/master', + assetUri: 'https://api.github.com/repos/Jiiks/ExampleRepository/releases/assets/10023264' + } + } + + static get dummyPluginRepo() { + return { + name: 'ExampleRepository', + baseUri: 'https://github.com/Jiiks/ExampleRepository', + rawUri: 'https://github.com/Jiiks/ExampleRepository/raw/master', + assetUri: 'https://api.github.com/repos/Jiiks/ExampleRepository/releases/assets/10023265' } } diff --git a/client/src/index.js b/client/src/index.js index 7cfe6483..c64134a0 100644 --- a/client/src/index.js +++ b/client/src/index.js @@ -10,7 +10,7 @@ import { DOM, BdUI, BdMenu, Modals, Toasts, Notifications, BdContextMenu, DiscordContextMenu } from 'ui'; import BdCss from './styles/index.scss'; -import { Events, CssEditor, Globals, Settings, Database, Updater, ModuleManager, PluginManager, ThemeManager, ExtModuleManager, Vendor, Patcher, MonkeyPatch, ReactComponents, ReactHelpers, ReactAutoPatcher, DiscordApi, BdWebApi, Connectivity, Cache, Reflection } from 'modules'; +import { Events, CssEditor, Globals, Settings, Database, Updater, ModuleManager, PluginManager, ThemeManager, ExtModuleManager, Vendor, Patcher, MonkeyPatch, ReactComponents, ReactHelpers, ReactAutoPatcher, DiscordApi, BdWebApi, Connectivity, Cache, Reflection, PackageInstaller } from 'modules'; import { ClientLogger as Logger, ClientIPC, Utils } from 'common'; import { BuiltinManager, EmoteModule, ReactDevtoolsModule, VueDevtoolsModule, TrackingProtection, E2EE } from 'builtin'; import electron from 'electron'; @@ -31,7 +31,7 @@ class BetterDiscord { DOM, BdUI, BdMenu, Modals, Reflection, Toasts, Notifications, BdContextMenu, DiscordContextMenu, Events, CssEditor, Globals, Settings, Database, Updater, - ModuleManager, PluginManager, ThemeManager, ExtModuleManager, + ModuleManager, PluginManager, ThemeManager, ExtModuleManager, PackageInstaller, Vendor, Patcher, MonkeyPatch, ReactComponents, ReactHelpers, ReactAutoPatcher, DiscordApi, diff --git a/client/src/modules/packageinstaller.js b/client/src/modules/packageinstaller.js index f870c4d8..9a19e7a3 100644 --- a/client/src/modules/packageinstaller.js +++ b/client/src/modules/packageinstaller.js @@ -103,7 +103,7 @@ export default class PackageInstaller { } /** - * Install package from remote location. Only github/bdapi is supoorted. + * Install package from remote location. Only github/bdapi is supported. * @param {String} remoteLocation Remote resource location */ static async installRemotePackage(remoteLocation) { @@ -113,6 +113,7 @@ export default class PackageInstaller { const options = { uri: remoteLocation, + encoding: null, headers: { 'User-Agent': 'BetterDiscordClient', 'Accept': 'application/octet-stream' @@ -122,9 +123,10 @@ export default class PackageInstaller { const response = await request.get(options); const outputPath = path.join(Globals.getPath('tmp'), Security.hash('sha256', response, 'hex')); fs.writeFileSync(outputPath, response); + console.log('response', response); + console.log('output', outputPath); await this.dragAndDropHandler(outputPath); - rimraf(outputPath, err => { if (err) console.log(err); }); diff --git a/client/src/ui/components/bd/RemoteCard.vue b/client/src/ui/components/bd/RemoteCard.vue index a65ab609..bd000e21 100644 --- a/client/src/ui/components/bd/RemoteCard.vue +++ b/client/src/ui/components/bd/RemoteCard.vue @@ -31,7 +31,7 @@
-
Install
+
Install
Preview
Source
@@ -40,7 +40,7 @@