diff --git a/client/src/styles/partials/discordoverrides.scss b/client/src/styles/partials/discordoverrides.scss index aa767145..1d1dc08a 100644 --- a/client/src/styles/partials/discordoverrides.scss +++ b/client/src/styles/partials/discordoverrides.scss @@ -1,13 +1,13 @@ // sass-lint:disable-all body:not(.bd-hideButton) { - [class*='guildsWrapper-'] { + [class*='layer-'] > * > [class*='wrapper-'] { padding-top: 49px !important; } - .platform-osx [class*='guildsWrapper-'] { + .platform-osx [class*='layer-'] > * > [class*='wrapper-'] { margin-top: 26px; } - [class*='guildsWrapper-'] + [class*='flex'] { + [class*='layer-'] > * > [class*='wrapper-'] + [class*='flex'] { border-radius: 0 0 0 5px; } diff --git a/client/src/styles/partials/sidebarview/settingswrap.scss b/client/src/styles/partials/sidebarview/settingswrap.scss index b7141d45..e11cdcff 100644 --- a/client/src/styles/partials/sidebarview/settingswrap.scss +++ b/client/src/styles/partials/sidebarview/settingswrap.scss @@ -22,12 +22,12 @@ > .bd-scroller { overflow-y: scroll; + } + } - .bd-settings & { - .platform-darwin & { // sass-lint:disable-line class-name-format - padding-top: 22px; - } - } + .bd-settings & { + .platform-darwin & { // sass-lint:disable-line class-name-format + padding-top: 22px; } } diff --git a/client/src/ui/components/BdSettings.vue b/client/src/ui/components/BdSettings.vue index ec1daae0..2186275d 100644 --- a/client/src/ui/components/BdSettings.vue +++ b/client/src/ui/components/BdSettings.vue @@ -20,7 +20,6 @@ -
@@ -38,8 +37,7 @@ - -
+
@@ -80,15 +78,13 @@ items: BdMenuItems.items, Settings, SettingsWrapper, - openMenuHandler: null, - superSecretMenu: false, - superSecretMenuActive: false + openMenuHandler: null }; }, props: ['active'], components: { SidebarView, Sidebar, SidebarItem, ContentColumn, - SettingsWrapper, SettingsPanel, CssEditorView, PluginsView, ThemesView, UpdaterView, ConnectivityView, SuperSecretView, + SettingsWrapper, SettingsPanel, CssEditorView, PluginsView, ThemesView, UpdaterView, ConnectivityView, MiGithubCircle, MiWeb, MiClose, MiTwitterCircle }, computed: { @@ -107,12 +103,6 @@ }, methods: { itemOnClick(id) { - if (id === 'superSecretMenu') { - this.item = 'supersecretmenu'; - this.superSecretMenuActive = true; - return; - } - this.superSecretMenuActive = false; this.item = this.items.find(item => item.id === id); }, closeContent() { @@ -136,9 +126,12 @@ }, created() { Events.on('bd-open-menu', this.openMenuHandler = item => item && this.itemOnClick(this.items.find(i => i === item || i.id === item || i.contentid === item || i.set === item).id)); + try { const currentUser = Reflection.module.byName('UserStore').getCurrentUser(); - this.superSecretMenu = ['81388395867156480', '98003542823944192', '249746236008169473', '284056145272766465', '478559353516064769'].includes(currentUser.id) + if (['81388395867156480', '98003542823944192', '249746236008169473', '284056145272766465', '478559353516064769'].includes(currentUser.id)) { + BdMenuItems.addVueComponent('BD Devs', 'Super Secret', SuperSecretView); + } } catch (err) {} }, destroyed() { diff --git a/core/src/main.js b/core/src/main.js index 18cd626a..721bf0a7 100644 --- a/core/src/main.js +++ b/core/src/main.js @@ -50,7 +50,6 @@ import keytar from 'keytar'; import { FileUtils, BDIpc, Config, WindowUtils, Updater, Editor, Database } from './modules'; -const packageJson = require(path.resolve(__dirname, 'package.json')); const sparkplug = path.resolve(__dirname, 'sparkplug.js'); let configProxy; @@ -221,7 +220,6 @@ export class BetterDiscord { this.parseClientPackage(); this.parseEditorPackage(); this.parseCorePackage(); - this.database.init(); configProxy = () => this.config; const autoInitComms = this.comms; diff --git a/other/keytar/keytar.node/README.md b/other/keytar/keytar.node/README.md index 0dd23983..d883f86c 100644 --- a/other/keytar/keytar.node/README.md +++ b/other/keytar/keytar.node/README.md @@ -1,6 +1,3 @@ ### node-keytar bindings Copy this directory to `node_modules/keytar/build/Release/keytar.node` to use. - -keytar-4.3.0/linux-x64-64.node - poweredge-t30.fancy.org.uk -All others - https://github.com/atom/node-keytar/releases diff --git a/other/keytar/keytar.node/index.js b/other/keytar/keytar.node/index.js index 351a3b6d..32df2e13 100644 --- a/other/keytar/keytar.node/index.js +++ b/other/keytar/keytar.node/index.js @@ -1,4 +1,3 @@ const keytar_version = require('keytar/package').version; -// module.exports = require('./keytar-' + process.platform + '-' + process.versions.modules + '-' + process.arch + '.node'); module.exports = require(`./keytar-${keytar_version}/${process.platform}-${process.arch}-${process.versions.modules}.node`); diff --git a/other/keytar/keytar.node/keytar-4.4.1/darwin-x64-64.node b/other/keytar/keytar.node/keytar-4.4.1/darwin-x64-64.node new file mode 100755 index 00000000..62d0730c Binary files /dev/null and b/other/keytar/keytar.node/keytar-4.4.1/darwin-x64-64.node differ diff --git a/other/keytar/keytar.node/keytar-4.4.1/darwin-x64-69.node b/other/keytar/keytar.node/keytar-4.4.1/darwin-x64-69.node new file mode 100755 index 00000000..07b71019 Binary files /dev/null and b/other/keytar/keytar.node/keytar-4.4.1/darwin-x64-69.node differ diff --git a/other/keytar/keytar.node/keytar-4.4.1/linux-x64-64.node b/other/keytar/keytar.node/keytar-4.4.1/linux-x64-64.node new file mode 100755 index 00000000..a3db4dbb Binary files /dev/null and b/other/keytar/keytar.node/keytar-4.4.1/linux-x64-64.node differ diff --git a/other/keytar/keytar.node/keytar-4.4.1/linux-x64-69.node b/other/keytar/keytar.node/keytar-4.4.1/linux-x64-69.node new file mode 100755 index 00000000..203e99e7 Binary files /dev/null and b/other/keytar/keytar.node/keytar-4.4.1/linux-x64-69.node differ diff --git a/other/node_sass_bindings/darwin-x64-69/binding.node b/other/node_sass_bindings/darwin-x64-69/binding.node new file mode 100755 index 00000000..ead70f1c Binary files /dev/null and b/other/node_sass_bindings/darwin-x64-69/binding.node differ diff --git a/other/node_sass_bindings/linux-x64-69/binding.node b/other/node_sass_bindings/linux-x64-69/binding.node new file mode 100755 index 00000000..0da12b44 Binary files /dev/null and b/other/node_sass_bindings/linux-x64-69/binding.node differ diff --git a/package.json b/package.json index f16a6191..50550131 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "csp-parse": "github:macropodhq/csp-parse", "deepmerge": "^3.2.0", "fs-extra": "^7.0.1", - "keytar": "^4.4.1", + "keytar": "4.4.1", "nedb": "^1.8.0", "node-sass": "^4.11.0", "original-fs": "^1.0.0", diff --git a/scripts/build-keytar-darwin.sh b/scripts/build-keytar-darwin.sh old mode 100644 new mode 100755 index 954e2de0..b91e3f17 --- a/scripts/build-keytar-darwin.sh +++ b/scripts/build-keytar-darwin.sh @@ -3,12 +3,12 @@ PLATFORM="darwin" ARCH="x64" -NODE_API_VERSION="53" -ELECTRON_VERSION="1.6.15" - -scripts/build-keytar.sh $PLATFORM $ARCH $NODE_API_VERSION $ELECTRON_VERSION - NODE_API_VERSION="64" -ELECTRON_VERSION="4.0.0-beta.7" +ELECTRON_VERSION="4.0.0-beta.11" + +scripts/build-keytar.sh $PLATFORM $ARCH $NODE_API_VERSION $ELECTRON_VERSION + +NODE_API_VERSION="69" +ELECTRON_VERSION="4.0.8" scripts/build-keytar.sh $PLATFORM $ARCH $NODE_API_VERSION $ELECTRON_VERSION diff --git a/scripts/build-keytar-linux.sh b/scripts/build-keytar-linux.sh index fe97eb64..91ea72db 100755 --- a/scripts/build-keytar-linux.sh +++ b/scripts/build-keytar-linux.sh @@ -3,12 +3,12 @@ PLATFORM="linux" ARCH="x64" -NODE_API_VERSION="53" -ELECTRON_VERSION="1.6.15" - -scripts/build-keytar.sh $PLATFORM $ARCH $NODE_API_VERSION $ELECTRON_VERSION - NODE_API_VERSION="64" -ELECTRON_VERSION="4.0.0-beta.7" +ELECTRON_VERSION="4.0.0-beta.11" + +scripts/build-keytar.sh $PLATFORM $ARCH $NODE_API_VERSION $ELECTRON_VERSION + +NODE_API_VERSION="69" +ELECTRON_VERSION="4.0.8" scripts/build-keytar.sh $PLATFORM $ARCH $NODE_API_VERSION $ELECTRON_VERSION diff --git a/scripts/build-keytar.sh b/scripts/build-keytar.sh index 779a02d9..701586a6 100755 --- a/scripts/build-keytar.sh +++ b/scripts/build-keytar.sh @@ -4,9 +4,10 @@ PLATFORM="$1" ARCH="$2" NODE_API_VERSION="$3" ELECTRON_VERSION="$4" +KEYTAR_VERSION="`node -p 'require("keytar/package").version'`" ELECTRON_URL="https://atom.io/download/electron" -DIRECTORY="release-tmp/keytar.node/keytar-4.3.0" +DIRECTORY="release-tmp/keytar.node/keytar-$KEYTAR_VERSION" FILENAME="$PLATFORM-$ARCH-$NODE_API_VERSION.node" if [ `node -p 'process.platform'` != "$PLATFORM" ]; then diff --git a/scripts/build-node-sass-darwin.sh b/scripts/build-node-sass-darwin.sh index f6c9ba17..45308bcb 100755 --- a/scripts/build-node-sass-darwin.sh +++ b/scripts/build-node-sass-darwin.sh @@ -3,12 +3,12 @@ PLATFORM="darwin" ARCH="x64" -NODE_API_VERSION="53" -ELECTRON_VERSION="1.6.15" - -scripts/build-node-sass.sh $PLATFORM $ARCH $NODE_API_VERSION $ELECTRON_VERSION - NODE_API_VERSION="64" -ELECTRON_VERSION="4.0.0-beta.7" +ELECTRON_VERSION="4.0.0-beta.11" + +scripts/build-node-sass.sh $PLATFORM $ARCH $NODE_API_VERSION $ELECTRON_VERSION + +NODE_API_VERSION="69" +ELECTRON_VERSION="4.0.8" scripts/build-node-sass.sh $PLATFORM $ARCH $NODE_API_VERSION $ELECTRON_VERSION diff --git a/scripts/build-node-sass-linux.sh b/scripts/build-node-sass-linux.sh index 9e45082d..e106f281 100755 --- a/scripts/build-node-sass-linux.sh +++ b/scripts/build-node-sass-linux.sh @@ -3,12 +3,12 @@ PLATFORM="linux" ARCH="x64" -NODE_API_VERSION="53" -ELECTRON_VERSION="1.6.15" - -scripts/build-node-sass.sh $PLATFORM $ARCH $NODE_API_VERSION $ELECTRON_VERSION - NODE_API_VERSION="64" -ELECTRON_VERSION="4.0.0-beta.7" +ELECTRON_VERSION="4.0.0-beta.11" + +scripts/build-node-sass.sh $PLATFORM $ARCH $NODE_API_VERSION $ELECTRON_VERSION + +NODE_API_VERSION="69" +ELECTRON_VERSION="4.0.8" scripts/build-node-sass.sh $PLATFORM $ARCH $NODE_API_VERSION $ELECTRON_VERSION diff --git a/scripts/build-node-sass-win32.bat b/scripts/build-node-sass-win32.bat index c4a599fc..632a284a 100644 --- a/scripts/build-node-sass-win32.bat +++ b/scripts/build-node-sass-win32.bat @@ -1,13 +1,13 @@ set "PLATFORM=win32" -set "NODE_API_VERSION=53" -set "ELECTRON_VERSION=1.6.15" - -call ./scripts/build-node-sass.bat %PLATFORM% ia32 %NODE_API_VERSION% %ELECTRON_VERSION% -call ./scripts/build-node-sass.bat %PLATFORM% x64 %NODE_API_VERSION% %ELECTRON_VERSION% - set "NODE_API_VERSION=64" -set "ELECTRON_VERSION=4.0.0-beta.7" +set "ELECTRON_VERSION=4.0.0-beta.11" + +call ./scripts/build-node-sass.bat %PLATFORM% ia32 %NODE_API_VERSION% %ELECTRON_VERSION% +call ./scripts/build-node-sass.bat %PLATFORM% x64 %NODE_API_VERSION% %ELECTRON_VERSION% + +set "NODE_API_VERSION=69" +set "ELECTRON_VERSION=4.0.8" call ./scripts/build-node-sass.bat %PLATFORM% ia32 %NODE_API_VERSION% %ELECTRON_VERSION% call ./scripts/build-node-sass.bat %PLATFORM% x64 %NODE_API_VERSION% %ELECTRON_VERSION%