From 8667f153c55d2d63cdd3c0067f0ff80149da553f Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Wed, 13 Mar 2019 19:29:13 +0000
Subject: [PATCH 01/30] Fix dropdowns

---
 client/src/ui/components/common/Dropdown.vue | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/client/src/ui/components/common/Dropdown.vue b/client/src/ui/components/common/Dropdown.vue
index 0a4181cd..4afb19c3 100644
--- a/client/src/ui/components/common/Dropdown.vue
+++ b/client/src/ui/components/common/Dropdown.vue
@@ -10,13 +10,13 @@
 
 <template>
     <div class="bd-dropdown" :class="{'bd-active': active, 'bd-disabled': disabled}">
-        <div class="bd-dropdownCurrent" @click="() => active = !active && !disabled">
-            <span class="bd-dropdownText">{{ getSelectedText() }}</span>
+        <div class="bd-dropdownCurrent" @click.stop="() => active = !active && !disabled">
+            <span class="bd-dropdownText">{{ selectedText }}</span>
             <span class="bd-dropdownArrowWrap">
                 <span class="bd-dropdownArrow"></span>
             </span>
         </div>
-        <div class="bd-dropdownOptions bd-flex bd-flexCol" ref="options" v-if="active">
+        <div class="bd-dropdownOptions bd-flex bd-flexCol" ref="options" v-if="active && !disabled">
             <div class="bd-dropdownOption" v-for="option in options" :class="{'bd-dropdownOptionSelected': value === option.value}" @click="select(option)">{{ option.text }}</div>
         </div>
     </div>
@@ -31,11 +31,15 @@
                 clickHandler: null
             };
         },
-        methods: {
-            getSelectedText() {
-                const selected_option = this.options.find(option => option.value === this.value);
-                return selected_option ? selected_option.text : this.value;
+        computed: {
+            selectedOption() {
+                return this.options.find(option => option.value === this.value);
             },
+            selectedText() {
+                return this.selectedOption ? this.selectedOption.text : this.value;
+            }
+        },
+        methods: {
             select(option) {
                 this.$emit('input', option.value);
                 this.active = false;

From 7765d447871690d75704638221e06d62951574c6 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Thu, 14 Mar 2019 11:40:44 +0000
Subject: [PATCH 02/30] Update online plugin/theme views to match local content
 views

---
 client/src/modules/reactcomponents.js         |  2 +-
 .../src/styles/partials/bdsettings/card.scss  |  1 -
 .../partials/bdsettings/contentview.scss      | 22 +++++-------
 .../partials/bdsettings/remotecard.scss       |  2 +-
 .../styles/partials/generic/scrollable.scss   |  1 +
 .../partials/sidebarview/settingswrap.scss    | 15 +++-----
 client/src/ui/components/bd/PluginsView.vue   | 35 +++++++++++--------
 client/src/ui/components/bd/RemoteCard.vue    |  4 +--
 .../src/ui/components/bd/SettingsWrapper.vue  |  8 ++---
 client/src/ui/components/bd/ThemesView.vue    | 33 +++++++++--------
 .../src/ui/components/common/ScrollerWrap.vue |  5 ++-
 11 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/client/src/modules/reactcomponents.js b/client/src/modules/reactcomponents.js
index 202adaf1..a594c107 100644
--- a/client/src/modules/reactcomponents.js
+++ b/client/src/modules/reactcomponents.js
@@ -262,7 +262,7 @@ export class ReactComponents {
                 }
 
                 if (!component && filter) {
-                    Logger.log('ReactComponents', ['Found elements matching the query selector but no components passed the filter']);
+                    Logger.log('ReactComponents', ['Found elements matching the query selector but no components passed the filter', name, important, filter]);
                     return;
                 }
 
diff --git a/client/src/styles/partials/bdsettings/card.scss b/client/src/styles/partials/bdsettings/card.scss
index e313b4c7..f2e9bf9e 100644
--- a/client/src/styles/partials/bdsettings/card.scss
+++ b/client/src/styles/partials/bdsettings/card.scss
@@ -1,7 +1,6 @@
 .bd-card {
     display: flex;
     flex-direction: column;
-    flex-grow: 1;
     background: transparent;
     border-bottom: 1px solid rgba(114, 118, 126, .3);
     min-height: 150px;
diff --git a/client/src/styles/partials/bdsettings/contentview.scss b/client/src/styles/partials/bdsettings/contentview.scss
index 9f5a084f..310d466e 100644
--- a/client/src/styles/partials/bdsettings/contentview.scss
+++ b/client/src/styles/partials/bdsettings/contentview.scss
@@ -1,16 +1,17 @@
 .bd-pluginsview,
 .bd-themesview {
-    .bd-localPh {
-        .bd-scroller {
-            padding: 0 20px 0 0;
-        }
-    }
+    flex-grow: 1;
 
     .bd-onlinePh,
     .bd-localPh {
         display: flex;
         flex-direction: column;
-        margin: 10px 0;
+        flex-grow: 1;
+
+        > .bd-scrollerWrap > .bd-scroller {
+            padding: 0 20px 0 0;
+            overflow-y: scroll;
+        }
 
         .bd-spinnerContainer {
             display: flex;
@@ -19,8 +20,9 @@
 
         .bd-onlinePhHeader {
             display: flex;
-            padding: 0 20px 0 10px;
+            padding: 0 20px 0 0;
             min-height: 80px;
+            margin-top: 20px;
 
             .bd-flexRow {
                 min-height: 40px;
@@ -81,16 +83,10 @@
         }
 
         .bd-onlinePhBody {
-            margin-top: 10px;
-
             .bd-spinnerContainer {
                 min-height: 40px;
                 padding: 0;
             }
-
-            .bd-scroller {
-                padding: 0 20px 0 0;
-            }
         }
 
         h3 {
diff --git a/client/src/styles/partials/bdsettings/remotecard.scss b/client/src/styles/partials/bdsettings/remotecard.scss
index 7c62e121..0ef0a596 100644
--- a/client/src/styles/partials/bdsettings/remotecard.scss
+++ b/client/src/styles/partials/bdsettings/remotecard.scss
@@ -1,7 +1,7 @@
 .bd-remoteCard {
     flex-direction: column;
     margin-top: 10px;
-    padding: 10px;
+    padding: 10px 0;
     border-radius: 0;
     border-bottom: 1px solid rgba(114, 118, 126, .3);
 
diff --git a/client/src/styles/partials/generic/scrollable.scss b/client/src/styles/partials/generic/scrollable.scss
index 8eceb202..4262997a 100644
--- a/client/src/styles/partials/generic/scrollable.scss
+++ b/client/src/styles/partials/generic/scrollable.scss
@@ -1,6 +1,7 @@
 .bd-scrollerWrap {
     display: flex;
     width: 100%;
+    flex-grow: 1;
 
     .bd-scroller {
         @include scrollbar;
diff --git a/client/src/styles/partials/sidebarview/settingswrap.scss b/client/src/styles/partials/sidebarview/settingswrap.scss
index e11cdcff..f45aef86 100644
--- a/client/src/styles/partials/sidebarview/settingswrap.scss
+++ b/client/src/styles/partials/sidebarview/settingswrap.scss
@@ -17,18 +17,13 @@
         flex-direction: column;
         flex-grow: 1;
 
-        > .bd-scrollerWrap {
-            flex-grow: 1;
-
-            > .bd-scroller {
-                overflow-y: scroll;
-            }
+        > .bd-scrollerWrap > .bd-scroller {
+            overflow-y: scroll;
         }
 
-        .bd-settings & {
-            .platform-darwin & { // sass-lint:disable-line class-name-format
-                padding-top: 22px;
-            }
+        .platform-darwin .bd-settings &.bd-settingswrapNoscroller, // sass-lint:disable-line class-name-format
+        .platform-darwin .bd-settings & > .bd-scrollerWrap > .bd-scroller { // sass-lint:disable-line class-name-format
+            padding-top: 22px;
         }
 
         .bd-settingswrapHeader {
diff --git a/client/src/ui/components/bd/PluginsView.vue b/client/src/ui/components/bd/PluginsView.vue
index 92758bc8..467fa248 100644
--- a/client/src/ui/components/bd/PluginsView.vue
+++ b/client/src/ui/components/bd/PluginsView.vue
@@ -34,9 +34,11 @@
                             <div class="bd-spinner7" />
                         </div>
                         <div class="bd-searchHint">{{searchHint}}</div>
-                        <div class="bd-fancySearch" :class="{'bd-disabled': loadingOnline, 'bd-active': loadingOnline || (onlinePlugins && onlinePlugins.docs)}">
-                            <input type="text" class="bd-textInput" placeholder="Search" @keydown.enter="searchInput" @keyup.stop :value="onlinePlugins.filters.sterm" />
-                        </div>
+                        <form @submit.prevent="refreshOnline">
+                            <div class="bd-fancySearch" :class="{'bd-disabled': loadingOnline, 'bd-active': loadingOnline || (onlinePlugins && onlinePlugins.docs)}">
+                                <input type="text" class="bd-textInput" placeholder="Search" v-model="onlinePlugins.filters.sterm" :disabled="loadingOnline" @input="search" @keyup.stop/>
+                            </div>
+                        </form>
                     </div>
                     <div class="bd-flex bd-flexRow" v-if="onlinePlugins && onlinePlugins.docs && onlinePlugins.docs.length">
                         <div class="bd-searchSort bd-flex bd-flexGrow">
@@ -49,11 +51,13 @@
                         </div>
                     </div>
                 </div>
-                <ScrollerWrap class="bd-onlinePhBody" v-if="!loadingOnline && onlinePlugins" :scrollend="scrollend">
-                    <RemoteCard v-if="onlinePlugins && onlinePlugins.docs" v-for="plugin in onlinePlugins.docs" :key="onlinePlugins.id" :item="plugin" :tagClicked="searchByTag" />
-                    <div class="bd-spinnerContainer">
-                        <div v-if="loadingMore" class="bd-spinner7" />
-                    </div>
+                <ScrollerWrap class="bd-onlinePhBody" @scrollend="scrollend">
+                    <template v-if="!loadingOnline && onlinePlugins">
+                        <RemoteCard v-if="onlinePlugins && onlinePlugins.docs" v-for="plugin in onlinePlugins.docs" :key="onlinePlugins.id" :item="plugin" @tagclicked="searchByTag" />
+                        <div class="bd-spinnerContainer">
+                            <div v-if="loadingMore" class="bd-spinner7" />
+                        </div>
+                    </template>
                 </ScrollerWrap>
             </div>
         </div>
@@ -94,7 +98,8 @@
                 },
                 loadingOnline: false,
                 loadingMore: false,
-                searchHint: ''
+                searchHint: '',
+                searchTimeout: null
             };
         },
         components: {
@@ -107,8 +112,9 @@
             showLocal() {
                 this.local = true;
             },
-            showOnline() {
+            async showOnline() {
                 this.local = false;
+                if (!this.onlinePlugins.pagination.total) await this.refreshOnline();
             },
             async refreshLocal() {
                 await this.PluginManager.refreshPlugins();
@@ -156,11 +162,6 @@
                     dont_clone
                 });
             },
-            searchInput(e) {
-                if (this.loadingOnline || this.loadingMore) return;
-                this.onlinePlugins.filters.sterm = e.target.value;
-                this.refreshOnline();
-            },
             async scrollend(e) {
                 if (this.onlinePlugins.pagination.page >= this.onlinePlugins.pagination.pages) return;
                 if (this.loadingOnline || this.loadingMore) return;
@@ -193,6 +194,10 @@
                 }
                 this.refreshOnline();
             },
+            async search() {
+                clearTimeout(this.searchTimeout);
+                this.searchTimeout = setTimeout(this.refreshOnline, 1000);
+            },
             async searchByTag(tag) {
                 if (this.loadingOnline || this.loadingMore) return;
                 this.onlinePlugins.filters.sterm = tag;
diff --git a/client/src/ui/components/bd/RemoteCard.vue b/client/src/ui/components/bd/RemoteCard.vue
index bd000e21..4fc73e52 100644
--- a/client/src/ui/components/bd/RemoteCard.vue
+++ b/client/src/ui/components/bd/RemoteCard.vue
@@ -27,7 +27,7 @@
         <div class="bd-flexRow bd-flex bd-flexGrow">
             <div class="bd-flexGrow bd-remoteCardTags">
                 <div v-for="(tag, index) in item.tags" class="bd-remoteCardTag">
-                    <div @click="tagClicked(tag)">{{tag}}</div><span v-if="index + 1 < item.tags.length">, </span>
+                    <div @click="$emit('tagclicked', tag)">{{tag}}</div><span v-if="index + 1 < item.tags.length">, </span>
                 </div>
             </div>
             <div class="bd-buttonGroup">
@@ -44,7 +44,7 @@
     import { shell } from 'electron';
 
     export default {
-        props: ['item', 'tagClicked'],
+        props: ['item'],
         data() {
             return {}
         },
diff --git a/client/src/ui/components/bd/SettingsWrapper.vue b/client/src/ui/components/bd/SettingsWrapper.vue
index 3728a942..36c34e9e 100644
--- a/client/src/ui/components/bd/SettingsWrapper.vue
+++ b/client/src/ui/components/bd/SettingsWrapper.vue
@@ -9,8 +9,8 @@
 */
 
 <template>
-    <div class="bd-settingswrap">
-        <div v-if="noscroller" class="bd-flex bd-flexCol">
+    <div class="bd-settingswrap" :class="{'bd-settingswrapNoscroller': noscroller}">
+        <div v-if="noscroller" class="bd-flex bd-flexCol bd-flexGrow">
             <div class="bd-settingswrapHeader">
                 <span class="bd-settingswrapHeaderText">{{ headertext }}</span>
                 <slot name="header" />
@@ -19,7 +19,7 @@
                 <slot />
             </div>
         </div>
-        <ScrollerWrap v-else :scrollend="scrollend">
+        <ScrollerWrap v-else @scrollend="$emit('scrollend', $event)">
             <div class="bd-settingswrapHeader">
                 <span class="bd-settingswrapHeaderText">{{ headertext }}</span>
                 <slot name="header" />
@@ -36,7 +36,7 @@
     import { ScrollerWrap } from '../common';
 
     export default {
-        props: ['headertext', 'scrollend', 'noscroller'],
+        props: ['headertext', 'noscroller'],
         components: {
             ScrollerWrap
         }
diff --git a/client/src/ui/components/bd/ThemesView.vue b/client/src/ui/components/bd/ThemesView.vue
index 1083cee1..73fd6f29 100644
--- a/client/src/ui/components/bd/ThemesView.vue
+++ b/client/src/ui/components/bd/ThemesView.vue
@@ -34,9 +34,11 @@
                             <div class="bd-spinner7" />
                         </div>
                         <div class="bd-searchHint">{{searchHint}}</div>
-                        <div class="bd-fancySearch" :class="{'bd-disabled': loadingOnline, 'bd-active': loadingOnline || (onlineThemes && onlineThemes.docs)}">
-                            <input type="text" class="bd-textInput" placeholder="Search" @keydown.enter="searchInput" @keyup.stop :value="onlineThemes.filters.sterm"/>
-                        </div>
+                        <form @submit.prevent="refreshOnline">
+                            <div class="bd-fancySearch" :class="{'bd-disabled': loadingOnline, 'bd-active': loadingOnline || (onlineThemes && onlineThemes.docs)}">
+                                <input type="text" class="bd-textInput" placeholder="Search" v-model="onlineThemes.filters.sterm" :disabled="loadingOnline" @input="search" @keyup.stop/>
+                            </div>
+                        </form>
                     </div>
                     <div class="bd-flex bd-flexRow" v-if="onlineThemes && onlineThemes.docs && onlineThemes.docs.length">
                         <div class="bd-searchSort bd-flex bd-flexGrow">
@@ -48,11 +50,13 @@
                         </div>
                     </div>
                 </div>
-                <ScrollerWrap class="bd-onlinePhBody" v-if="!loadingOnline && onlineThemes" :scrollend="scrollend">
-                    <RemoteCard v-if="onlineThemes && onlineThemes.docs" v-for="theme in onlineThemes.docs" :key="theme.id" :item="theme" :tagClicked="searchByTag"/>
-                    <div class="bd-spinnerContainer">
-                        <div v-if="loadingMore" class="bd-spinner7"/>
-                    </div>
+                <ScrollerWrap class="bd-onlinePhBody" @scrollend="scrollend">
+                    <template v-if="!loadingOnline && onlineThemes">
+                        <RemoteCard v-if="onlineThemes && onlineThemes.docs" v-for="theme in onlineThemes.docs" :key="theme.id" :item="theme" @tagclicked="searchByTag"/>
+                        <div class="bd-spinnerContainer">
+                            <div v-if="loadingMore" class="bd-spinner7"/>
+                        </div>
+                    </template>
                 </ScrollerWrap>
             </div>
         </div>
@@ -93,7 +97,8 @@
                 },
                 loadingOnline: false,
                 loadingMore: false,
-                searchHint: ''
+                searchHint: '',
+                searchTimeout: null
             };
         },
         components: {
@@ -108,6 +113,7 @@
             },
             async showOnline() {
                 this.local = false;
+                if (!this.onlineThemes.pagination.total) await this.refreshOnline();
             },
             async refreshLocal() {
                 await this.ThemeManager.refreshThemes();
@@ -154,11 +160,6 @@
                     dont_clone
                 });
             },
-            searchInput(e) {
-                if (this.loadingOnline || this.loadingMore) return;
-                this.onlineThemes.filters.sterm = e.target.value;
-                this.refreshOnline();
-            },
             async scrollend(e) {
                 if (this.onlineThemes.pagination.page >= this.onlineThemes.pagination.pages) return;
                 if (this.loadingOnline || this.loadingMore) return;
@@ -191,6 +192,10 @@
                 }
                 this.refreshOnline();
             },
+            async search() {
+                clearTimeout(this.searchTimeout);
+                this.searchTimeout = setTimeout(this.refreshOnline, 1000);
+            },
             async searchByTag(tag) {
                 if (this.loadingOnline || this.loadingMore) return;
                 this.onlineThemes.filters.sterm = tag;
diff --git a/client/src/ui/components/common/ScrollerWrap.vue b/client/src/ui/components/common/ScrollerWrap.vue
index a031e635..ef7fc08c 100644
--- a/client/src/ui/components/common/ScrollerWrap.vue
+++ b/client/src/ui/components/common/ScrollerWrap.vue
@@ -18,12 +18,11 @@
 
 <script>
     export default {
-        props: ['dark', 'scrollend'],
+        props: ['dark'],
         methods: {
             onscroll(e) {
-                if (!this.scrollend) return;
                 const { offsetHeight, scrollTop, scrollHeight } = e.target;
-                if (offsetHeight + scrollTop >= scrollHeight) this.scrollend(e);
+                if (offsetHeight + scrollTop >= scrollHeight) this.$emit('scrollend', e);
             }
         }
     }

From 4925c969dd620ac16d2c76dab806b37d5c41053d Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Thu, 14 Mar 2019 13:12:30 +0000
Subject: [PATCH 03/30] Hide the edit button for packed plugins/themes

---
 client/src/data/user.settings.default.json       |  2 +-
 client/src/ui/components/bd/ConnectivityView.vue |  2 +-
 client/src/ui/components/bd/PluginCard.vue       | 11 ++++++++---
 client/src/ui/components/bd/ThemeCard.vue        | 11 ++++++++---
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/client/src/data/user.settings.default.json b/client/src/data/user.settings.default.json
index 7acf30aa..30129731 100644
--- a/client/src/data/user.settings.default.json
+++ b/client/src/data/user.settings.default.json
@@ -31,7 +31,7 @@
                         "id": "developer-mode",
                         "type": "bool",
                         "text": "Developer mode",
-                        "hint": "Adds some of BetterDiscord's internal modules to `global._bd`.",
+                        "hint": "Adds some of BetterDiscord's internal modules to `global._bd` and enable additional options in plugin and theme settings.",
                         "value": false
                     },
                     {
diff --git a/client/src/ui/components/bd/ConnectivityView.vue b/client/src/ui/components/bd/ConnectivityView.vue
index 48552517..c683fafe 100644
--- a/client/src/ui/components/bd/ConnectivityView.vue
+++ b/client/src/ui/components/bd/ConnectivityView.vue
@@ -62,7 +62,7 @@
             SettingsWrapper
         },
         methods: {
-            showConnectWindow() { 
+            showConnectWindow() {
                 if (this.connecting) return;
                 this.connecting = true;
                 const x = (window.screenX + window.outerWidth / 2) - 520 / 2;
diff --git a/client/src/ui/components/bd/PluginCard.vue b/client/src/ui/components/bd/PluginCard.vue
index 3a485936..a1f60f86 100644
--- a/client/src/ui/components/bd/PluginCard.vue
+++ b/client/src/ui/components/bd/PluginCard.vue
@@ -15,7 +15,7 @@
             <Button v-if="devmode && !plugin.packed" v-tooltip="'Package Plugin'" @click="package"><MiBoxDownload size="18"/></Button>
             <Button v-tooltip="'Settings (shift + click to open settings without cloning the set)'" v-if="plugin.hasSettings" @click="$emit('show-settings', $event.shiftKey)"><MiSettings size="18" /></Button>
             <Button v-tooltip="'Reload'" @click="$emit('reload-plugin')"><MiRefresh size="18" /></Button>
-            <Button v-tooltip="'Edit'" @click="editPlugin"><MiPencil size="18" /></Button>
+            <Button v-if="devmode && !plugin.packed" v-tooltip="'Edit'" @click="editPlugin"><MiPencil size="18" /></Button>
             <Button v-tooltip="'Uninstall (shift + click to unload)'" @click="$emit('delete-plugin', $event.shiftKey)" type="err"><MiDelete size="18" /></Button>
         </ButtonGroup>
     </Card>
@@ -33,14 +33,19 @@
     export default {
         data() {
             return {
-                devmode: Settings.getSetting('core', 'advanced', 'developer-mode').value
-            }
+                devmodeSetting: Settings.getSetting('core', 'advanced', 'developer-mode')
+            };
         },
         props: ['plugin'],
         components: {
             Card, Button, ButtonGroup, SettingSwitch,
             MiSettings, MiRefresh, MiPencil, MiDelete, MiExtension, MiBoxDownload
         },
+        computed: {
+            devmode() {
+                return this.devmodeSetting.value;
+            }
+        },
         methods: {
             async package() {
                 try {
diff --git a/client/src/ui/components/bd/ThemeCard.vue b/client/src/ui/components/bd/ThemeCard.vue
index 686aa581..69a64a60 100644
--- a/client/src/ui/components/bd/ThemeCard.vue
+++ b/client/src/ui/components/bd/ThemeCard.vue
@@ -15,7 +15,7 @@
             <Button v-if="devmode && !theme.packed" v-tooltip="'Package Theme'" @click="package"><MiBoxDownload size="18" /></Button>
             <Button v-tooltip="'Settings (shift + click to open settings without cloning the set)'" v-if="theme.hasSettings" @click="$emit('show-settings', $event.shiftKey)"><MiSettings size="18" /></Button>
             <Button v-tooltip="'Recompile (shift + click to reload)'" @click="$emit('reload-theme', $event.shiftKey)"><MiRefresh size="18" /></Button>
-            <Button v-tooltip="'Edit'" @click="editTheme"><MiPencil size="18" /></Button>
+            <Button v-if="devmode && !theme.packed" v-tooltip="'Edit'" @click="editTheme"><MiPencil size="18" /></Button>
             <Button v-tooltip="'Uninstall (shift + click to unload)'" @click="$emit('delete-theme', $event.shiftKey)" type="err"><MiDelete size="18" /></Button>
         </ButtonGroup>
     </Card>
@@ -33,14 +33,19 @@
     export default {
         data() {
             return {
-                devmode: Settings.getSetting('core', 'advanced', 'developer-mode').value
-            }
+                devmodeSetting: Settings.getSetting('core', 'advanced', 'developer-mode')
+            };
         },
         props: ['theme', 'online'],
         components: {
             Card, Button, ButtonGroup, SettingSwitch,
             MiSettings, MiRefresh, MiPencil, MiDelete, MiExtension, MiBoxDownload
         },
+        computed: {
+            devmode() {
+                return this.devmodeSetting.value;
+            }
+        },
         methods: {
             async package() {
                 try {

From 4f2d4fcd8ab30a1d512c84efc78bba2725280cda Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Thu, 14 Mar 2019 14:14:16 +0000
Subject: [PATCH 04/30] Vue events

---
 client/src/ui/components/bd/UpdaterToggle.vue    | 4 ++--
 client/src/ui/components/bd/UpdaterView.vue      | 2 +-
 client/src/ui/components/contextmenu/Toggle.vue  | 2 +-
 client/src/ui/components/generic/Button.vue      | 4 ++--
 client/src/ui/components/generic/ButtonGroup.vue | 6 +++---
 tests/ext/plugins/Render Example/index.js        | 6 +++---
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/client/src/ui/components/bd/UpdaterToggle.vue b/client/src/ui/components/bd/UpdaterToggle.vue
index 43f016fd..cdbf3918 100644
--- a/client/src/ui/components/bd/UpdaterToggle.vue
+++ b/client/src/ui/components/bd/UpdaterToggle.vue
@@ -12,7 +12,7 @@
     <div class="bd-settingSwitch">
         <div class="bd-title">
             <h3>{{item.text}}</h3>
-            <div class="bd-switchWrapper" @click="() => toggle(item)">
+            <div class="bd-switchWrapper" @click="$emit('toggle', item)">
                 <input type="checkbox" class="bd-switchCheckbox" />
                 <div class="bd-switch" :class="{'bd-checked': item.status.update}" />
             </div>
@@ -23,6 +23,6 @@
 
 <script>
     export default {
-        props: ['item', 'toggle']
+        props: ['item']
     }
 </script>
diff --git a/client/src/ui/components/bd/UpdaterView.vue b/client/src/ui/components/bd/UpdaterView.vue
index e9457d9a..ee8b9ae5 100644
--- a/client/src/ui/components/bd/UpdaterView.vue
+++ b/client/src/ui/components/bd/UpdaterView.vue
@@ -19,7 +19,7 @@
                     <div class="bd-formDivider"></div>
                     <div v-for="update in bdUpdates">
                         <UpdaterStatus :item="update" v-if="update.status.updating" />
-                        <UpdaterToggle :item="update" :toggle="() => updater.toggleUpdate(update)" v-else />
+                        <UpdaterToggle :item="update" @toggle="updater.toggleUpdate(update)" v-else />
                         <div class="bd-formDivider"></div>
                     </div>
                 </div>
diff --git a/client/src/ui/components/contextmenu/Toggle.vue b/client/src/ui/components/contextmenu/Toggle.vue
index 3e22d258..10d0c5d6 100644
--- a/client/src/ui/components/contextmenu/Toggle.vue
+++ b/client/src/ui/components/contextmenu/Toggle.vue
@@ -22,6 +22,6 @@
 
 <script>
     export default {
-        props: ['item', 'onClick', 'checked']
+        props: ['item', 'checked']
     }
 </script>
diff --git a/client/src/ui/components/generic/Button.vue b/client/src/ui/components/generic/Button.vue
index 190d5507..a053f30c 100644
--- a/client/src/ui/components/generic/Button.vue
+++ b/client/src/ui/components/generic/Button.vue
@@ -9,13 +9,13 @@
 */
 
 <template>
-    <div class="bd-button" :class="classes" @click="onClick">
+    <div class="bd-button" @click="$emit('click')">
         {{text}}
     </div>
 </template>
 
 <script>
     export default {
-        props: ['classes', 'text', 'onClick']
+        props: ['text']
     }
 </script>
diff --git a/client/src/ui/components/generic/ButtonGroup.vue b/client/src/ui/components/generic/ButtonGroup.vue
index d57011cd..7ff6bc4d 100644
--- a/client/src/ui/components/generic/ButtonGroup.vue
+++ b/client/src/ui/components/generic/ButtonGroup.vue
@@ -9,15 +9,15 @@
 */
 
 <template>
-    <div class="bd-buttonGroup" :class="classes">
-        <Button v-for="(button, index) in buttons" :text="button.text" :classes="button.classes" :onClick="button.onClick" :key="index"/>
+    <div class="bd-buttonGroup">
+        <Button v-for="(button, index) in buttons" :text="button.text" :classes="button.class" @click="button.onClick" :key="index"/>
     </div>
 </template>
 
 <script>
     import Button from './Button.vue';
     export default {
-        props: ['buttons', 'classes'],
+        props: ['buttons'],
         components: { Button }
     }
 </script>
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!')
                     }

From c5cfed6902cb53d013f7f6df5e107c6af2d80825 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Sat, 16 Mar 2019 18:10:10 +0000
Subject: [PATCH 05/30] Remove debug logs

---
 client/src/builtin/Emotes/EmoteModule.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/client/src/builtin/Emotes/EmoteModule.js b/client/src/builtin/Emotes/EmoteModule.js
index 09ca3e15..82f287fd 100644
--- a/client/src/builtin/Emotes/EmoteModule.js
+++ b/client/src/builtin/Emotes/EmoteModule.js
@@ -279,8 +279,6 @@ export default new class EmoteModule extends BuiltinModule {
         const { content } = args[1];
         if (!content) return orig(...args);
 
-        Logger.log('EmoteModule', ['Sending message', MessageActions, args, orig]);
-
         const emoteAsImage = Settings.getSetting('emotes', 'default', 'emoteasimage').value &&
             (DiscordApi.currentChannel.type === 'DM' || DiscordApi.currentChannel.type === 'GROUP_DM' || DiscordApi.currentChannel.checkPermissions(DiscordApi.modules.DiscordPermissions.ATTACH_FILES));
 

From 0c361ce33f2126e8f2f231a2abad2ed79d808517 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Sat, 16 Mar 2019 18:23:50 +0000
Subject: [PATCH 06/30] Fix plugins not starting when manually loading all
 content

---
 client/src/modules/contentmanager.js | 2 ++
 client/src/modules/thememanager.js   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/src/modules/contentmanager.js b/client/src/modules/contentmanager.js
index d0e981f2..df250415 100644
--- a/client/src/modules/contentmanager.js
+++ b/client/src/modules/contentmanager.js
@@ -148,6 +148,8 @@ export default class {
      * @param {bool} suppressErrors Suppress any errors that occur during loading of content
      */
     static async refreshContent(suppressErrors = false) {
+        this.loaded = true;
+
         if (!this.localContent.length) return this.loadAllContent();
 
         try {
diff --git a/client/src/modules/thememanager.js b/client/src/modules/thememanager.js
index f97e4778..b02f2ec9 100644
--- a/client/src/modules/thememanager.js
+++ b/client/src/modules/thememanager.js
@@ -40,7 +40,7 @@ export default class ThemeManager extends ContentManager {
             });
             if (instance.enabled) {
                 instance.userConfig.enabled = false;
-                instance.enable();
+                instance.enable(false);
             }
             return instance;
         } catch (err) {

From 5681cf2045c7fbf6a679d265d28cf7ff8cf81381 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Sun, 17 Mar 2019 12:59:58 +0000
Subject: [PATCH 07/30] Update inject script for new release format

---
 core/src/main.js  |  2 +-
 scripts/inject.js | 53 ++++++++++++++++++++++++++++++++++-------------
 2 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/core/src/main.js b/core/src/main.js
index 85c6dd1a..a024f43e 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()}`)
         }
     }
 }
@@ -337,6 +336,7 @@ 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', path.join(os.tmpdir(), 'betterdiscord', `${process.getuid()}`));
     }
 
     /**
diff --git a/scripts/inject.js b/scripts/inject.js
index b7c6c165..2375c79b 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';
@@ -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}.`);

From b531acfaafe18f3883762137fc2d4039962674fe Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Sun, 17 Mar 2019 13:00:38 +0000
Subject: [PATCH 08/30] Use correct path to sparkplug

---
 client/webpack.production.config.js | 2 +-
 gulpfile.babel.js                   | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

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/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
 

From 685bf5d10b53fa4d3e9eca25171505e15353b5bb Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Sun, 17 Mar 2019 13:11:24 +0000
Subject: [PATCH 09/30] Move the client log file outside the client directory

---
 client/src/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/index.js b/client/src/index.js
index 6e69ce45..c008be88 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -22,7 +22,7 @@ const ignoreExternal = tests && true;
 class BetterDiscord {
 
     constructor() {
-        Logger.file = tests ? path.resolve(__dirname, '..', '..', 'tests', 'log.txt') : path.join(__dirname, 'log.txt');
+        Logger.file = tests ? path.resolve(__dirname, '..', '..', 'tests', 'log.txt') : `${__dirname}-log.txt`;
         Logger.trimLogFile();
         Logger.log('main', 'BetterDiscord starting');
 

From c479a5169cf6d9eef323bae47f8a3f7072aecd3e Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Sun, 17 Mar 2019 13:34:47 +0000
Subject: [PATCH 10/30] Fix using a custom path to Discord.app on macOS

---
 scripts/inject.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/inject.js b/scripts/inject.js
index 2375c79b..feb0091e 100644
--- a/scripts/inject.js
+++ b/scripts/inject.js
@@ -18,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');

From 2c0909d7d7c2de8e800587a34a8bd783f354fe3f Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Sun, 17 Mar 2019 22:53:27 +0000
Subject: [PATCH 11/30] Fix development build on Windows

---
 core/src/main.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/src/main.js b/core/src/main.js
index a024f43e..1b3b3564 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -336,7 +336,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', path.join(os.tmpdir(), 'betterdiscord', `${process.getuid()}`));
+
+        if (!this.config.getPath('tmp')) this.config.addPath('tmp', process.platform !== 'win32' ?
+            path.join(os.tmpdir(), 'betterdiscord', `${process.getuid()}`) :
+            path.join(os.tmpdir(), 'betterdiscord'));
     }
 
     /**

From eb83f8ce3c547204187cbe49317a77ac1b0e106a Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Mon, 18 Mar 2019 17:57:29 +0000
Subject: [PATCH 12/30] Fix reloading packed content

---
 client/src/modules/contentmanager.js | 29 ++++++++++++----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/client/src/modules/contentmanager.js b/client/src/modules/contentmanager.js
index df250415..646655f6 100644
--- a/client/src/modules/contentmanager.js
+++ b/client/src/modules/contentmanager.js
@@ -104,13 +104,8 @@ export default class {
             const directories = await FileUtils.listDirectory(this.contentPath);
 
             for (const dir of directories) {
-                const packed = dir.endsWith('.bd');
-
-                if (!packed) {
-                    try {
-                        await FileUtils.directoryExists(path.join(this.contentPath, dir));
-                    } catch (err) { continue; }
-                }
+                const stat = await FileUtils.stat(path.join(this.contentPath, dir));
+                const packed = stat.isFile();
 
                 try {
                     if (packed) {
@@ -157,18 +152,18 @@ export default class {
             const directories = await FileUtils.listDirectory(this.contentPath);
 
             for (const dir of directories) {
-                const packed = dir.endsWith('.bd');
-
                 // If content is already loaded this should resolve
                 if (this.getContentByDirName(dir)) continue;
 
-                try {
-                    await FileUtils.directoryExists(path.join(this.contentPath, dir));
-                } catch (err) { continue; }
+                const stat = await FileUtils.stat(path.join(this.contentPath, dir));
+                const packed = stat.isFile();
 
                 try {
-                    // Load if not
-                    await this.preloadContent(dir);
+                    if (packed) {
+                        await this.preloadPackedContent(dir);
+                    } else {
+                        await this.preloadContent(dir);
+                    }
                 } catch (err) {
                     // We don't want every plugin/theme to fail loading when one does
                     this.errors.push(new ErrorEvent({
@@ -219,7 +214,7 @@ export default class {
             await FileUtils.fileExists(packagePath);
 
             const config = JSON.parse(asar.extractFile(packagePath, 'config.json').toString());
-            const unpackedPath = path.join(Globals.getPath('tmp'), packageName);
+            const unpackedPath = path.join(Globals.getPath('tmp'), this.pathId, packageName);
 
             asar.extractAll(packagePath, unpackedPath);
 
@@ -350,7 +345,7 @@ export default class {
                 await unload;
 
             await FileUtils.recursiveDeleteDirectory(content.paths.contentPath);
-            if (content.packed) await FileUtils.recursiveDeleteDirectory(content.packagePath);
+            if (content.packed) await FileUtils.deleteFile(content.packagePath);
             return true;
         } catch (err) {
             Logger.err(this.moduleName, err);
@@ -382,7 +377,7 @@ export default class {
 
             if (this.unloadContentHook) this.unloadContentHook(content);
 
-            if (reload) return content.packed ? this.preloadPackedContent(content.packagePath, true, index) : this.preloadContent(content.dirName, true, index);
+            if (reload) return content.packed ? this.preloadPackedContent(content.dirName.pkg, true, index) : this.preloadContent(content.dirName, true, index);
 
             this.localContent.splice(index, 1);
         } catch (err) {

From e3b7880f8f0a729d3502af72e0712677f3e03496 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Mon, 18 Mar 2019 20:12:10 +0000
Subject: [PATCH 13/30] Allow multiple users to use BetterDiscord on macOS and
 Linux

---
 core/src/main.js                   | 10 +++++++---
 core/src/modules/config.js         |  7 ++++++-
 installer/{README.MD => README.md} |  0
 installer/stub.js                  | 17 +++++++++++------
 4 files changed, 24 insertions(+), 10 deletions(-)
 rename installer/{README.MD => README.md} (100%)

diff --git a/core/src/main.js b/core/src/main.js
index 1b3b3564..8dc89aec 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -102,7 +102,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);
         });
 
@@ -206,9 +206,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;
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/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);

From 1f1fe1c2330428c11c926300735ce685e7a715e3 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Mon, 18 Mar 2019 20:19:05 +0000
Subject: [PATCH 14/30] Fix selecting user avatars in activity

---
 client/src/styles/partials/discordoverrides.scss | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/src/styles/partials/discordoverrides.scss b/client/src/styles/partials/discordoverrides.scss
index 591dc9c3..bc154b03 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*='layer-'] > * > [class*='wrapper-'] {
+    [class*='layers-'] > [class*='layer-'] > * > [class*='wrapper-'] {
         padding-top: 49px !important;
     }
-    .platform-osx [class*='layer-'] > * > [class*='wrapper-'] {
+    .platform-osx [class*='layers-'] > [class*='layer-'] > * > [class*='wrapper-'] {
         margin-top: 26px;
     }
 
-    [class*='layer-'] > * > [class*='wrapper-'] + [class*='flex'] {
+    [class*='layers-'] > [class*='layer-'] > * > [class*='wrapper-'] + [class*='flex'] {
         border-radius: 0 0 0 5px;
     }
 

From 854262e79a1899f27ca48a5e70bcebd606c4298b Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Mon, 18 Mar 2019 20:31:14 +0000
Subject: [PATCH 15/30] Fix reloading packed content

---
 client/src/modules/contentmanager.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/src/modules/contentmanager.js b/client/src/modules/contentmanager.js
index 646655f6..7a4552aa 100644
--- a/client/src/modules/contentmanager.js
+++ b/client/src/modules/contentmanager.js
@@ -214,7 +214,8 @@ export default class {
             await FileUtils.fileExists(packagePath);
 
             const config = JSON.parse(asar.extractFile(packagePath, 'config.json').toString());
-            const unpackedPath = path.join(Globals.getPath('tmp'), this.pathId, packageName);
+            const id = config.info.id || config.info.name.toLowerCase().replace(/[^a-zA-Z0-9-]/g, '-').replace(/--/g, '-');
+            const unpackedPath = path.join(Globals.getPath('tmp'), this.pathId, id);
 
             asar.extractAll(packagePath, unpackedPath);
 
@@ -430,7 +431,7 @@ export default class {
 
     static getContentIndex(content) { return this.localContent.findIndex(c => c === content) }
     static getContentById(id) { return this.localContent.find(c => c.id === id) }
-    static getContentByDirName(dirName) { return this.localContent.find(c => c.dirName === dirName) }
+    static getContentByDirName(dirName) { return this.localContent.find(c => !c.packed ? c.dirName === dirName : c.dirName.pkg === dirName) }
     static getContentByPath(path) { return this.localContent.find(c => c.contentPath === path) }
     static getContentByName(name) { return this.localContent.find(c => c.name === name) }
 

From 92334e9a02fc6eb2a312984ec6207d75118a39c4 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Mon, 18 Mar 2019 20:44:49 +0000
Subject: [PATCH 16/30] Stop watching theme files when unloading themes

---
 client/src/modules/content.js        |  2 +-
 client/src/modules/contentmanager.js | 10 +++++++++-
 client/src/modules/theme.js          | 16 +++++++++++++---
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/client/src/modules/content.js b/client/src/modules/content.js
index cfe584dd..d56dc236 100644
--- a/client/src/modules/content.js
+++ b/client/src/modules/content.js
@@ -118,7 +118,7 @@ export default class Content extends AsyncEventEmitter {
      * @return {Promise}
      */
     async enable(save = true) {
-        if (this.enabled) return;
+        if (this.enabled || this.unloaded) return;
         await this.emit('enable');
         await this.emit('start');
 
diff --git a/client/src/modules/contentmanager.js b/client/src/modules/contentmanager.js
index 7a4552aa..bf31d540 100644
--- a/client/src/modules/contentmanager.js
+++ b/client/src/modules/contentmanager.js
@@ -366,6 +366,8 @@ export default class {
         if (!content) throw {message: `Could not find a ${this.contentType} from ${content}.`};
 
         try {
+            Object.defineProperty(content, 'unloaded', {configurable: true, value: true});
+
             const disablePromise = content.disable(false);
             const unloadPromise = content.emit('unload', reload);
 
@@ -378,8 +380,14 @@ export default class {
 
             if (this.unloadContentHook) this.unloadContentHook(content);
 
-            if (reload) return content.packed ? this.preloadPackedContent(content.dirName.pkg, true, index) : this.preloadContent(content.dirName, true, index);
+            if (reload) {
+                const newcontent = content.packed ? this.preloadPackedContent(content.dirName.pkg, true, index) :
+                    this.preloadContent(content.dirName, true, index);
+                Object.defineProperty(content, 'unloaded', {value: newcontent});
+                return newcontent;
+            }
 
+            Object.defineProperty(content, 'unloaded', {value: true});
             this.localContent.splice(index, 1);
         } catch (err) {
             Logger.err(this.moduleName, err);
diff --git a/client/src/modules/theme.js b/client/src/modules/theme.js
index edd45406..11a1d681 100644
--- a/client/src/modules/theme.js
+++ b/client/src/modules/theme.js
@@ -22,10 +22,20 @@ export default class Theme extends Content {
 
         const watchfiles = Settings.getSetting('css', 'default', 'watch-files');
         if (watchfiles.value) this.watchfiles = this.files;
-        watchfiles.on('setting-updated', event => {
+
+        watchfiles.on('setting-updated', this.__watchFilesSettingUpdated = event => {
             if (event.value) this.watchfiles = this.files;
             else this.watchfiles = [];
         });
+
+        this.on('unload', () => {
+            watchfiles.off('setting-updated', this.__watchFilesSettingUpdated);
+
+            if (this._filewatcher) {
+                this._filewatcher.removeAll();
+                delete this._filewatcher;
+            }
+        });
     }
 
     get type() { return 'theme' }
@@ -61,7 +71,7 @@ export default class Theme extends Content {
     async compile() {
         Logger.log(this.name, 'Compiling CSS');
 
-        if (this.info.type === 'sass') {
+        if (this.info.type === 'sass' || this.info.type === 'scss') {
             const config = await ThemeManager.getConfigAsSCSS(this.settings);
 
             const result = await ClientIPC.send('bd-compileSass', {
@@ -147,7 +157,7 @@ export default class Theme extends Content {
      * @param {Array} files Files to watch
      */
     set watchfiles(files) {
-        if (this.packed) {
+        if (this.unloaded || this.packed) {
             // Don't watch files for packed themes
             return;
         }

From 586ed0168821ddb22147a0b2a739bbacdbeb5ca1 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Mon, 18 Mar 2019 22:04:45 +0000
Subject: [PATCH 17/30] Move updates to the correct location

---
 core/src/modules/updater.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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`);

From 13ac7ae0fff47fa7450f061ab0d0b383436c928e Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Fri, 22 Mar 2019 18:47:58 +0000
Subject: [PATCH 18/30] Remove duplicate collection styles

---
 .../partials/bdsettings/collection.scss       | 59 -------------------
 .../src/styles/partials/bdsettings/index.scss |  1 -
 2 files changed, 60 deletions(-)
 delete mode 100644 client/src/styles/partials/bdsettings/collection.scss

diff --git a/client/src/styles/partials/bdsettings/collection.scss b/client/src/styles/partials/bdsettings/collection.scss
deleted file mode 100644
index d8e5bfbd..00000000
--- a/client/src/styles/partials/bdsettings/collection.scss
+++ /dev/null
@@ -1,59 +0,0 @@
-.bd-formCollection {
-    display: flex;
-    flex-direction: column;
-
-    div {
-        &:first-child {
-            flex: 1 1 auto;
-        }
-    }
-
-    .bd-collectionItem {
-        display: flex;
-        flex-grow: 1;
-        margin-top: 5px;
-
-        .bd-removeCollectionItem {
-            width: 20px;
-            flex: 0 1 auto;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            cursor: pointer;
-            margin-bottom: 30px;
-
-            &:hover {
-                svg {
-                    fill: #fff;
-                }
-            }
-
-            svg {
-                width: 16px;
-                height: 16px;
-                fill: #ccc;
-            }
-        }
-    }
-
-    .bd-newCollectionItem {
-        display: flex;
-        cursor: pointer;
-        align-self: flex-end;
-        justify-content: center;
-        align-items: center;
-        margin-right: 2px;
-
-        svg {
-            width: 16px;
-            height: 16px;
-            fill: #ccc;
-        }
-
-        &:hover {
-            svg {
-                fill: #fff;
-            }
-        }
-    }
-}
diff --git a/client/src/styles/partials/bdsettings/index.scss b/client/src/styles/partials/bdsettings/index.scss
index 0fbda29f..2973b4f1 100644
--- a/client/src/styles/partials/bdsettings/index.scss
+++ b/client/src/styles/partials/bdsettings/index.scss
@@ -8,6 +8,5 @@
 @import './updater';
 @import './window-preferences';
 @import './kvp';
-@import './collection';
 @import './e2ee';
 @import './devview';

From aa5507232356aea26e5af8f22658504145392120 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Thu, 28 Mar 2019 11:30:43 +0000
Subject: [PATCH 19/30] Fix removing items from file settings

---
 client/src/ui/components/bd/setting/File.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/ui/components/bd/setting/File.vue b/client/src/ui/components/bd/setting/File.vue
index 1ba7bdd3..8f7a5858 100644
--- a/client/src/ui/components/bd/setting/File.vue
+++ b/client/src/ui/components/bd/setting/File.vue
@@ -51,7 +51,7 @@
             },
             removeItem(file_path) {
                 if (this.setting.disabled) return;
-                this.setting.value = Utils.removeFromArray(this.setting.value, file_path);
+                this.setting.value = this.setting.value.filter(f => f !== file_path);
             }
         }
     }

From 3eb9105daa8fc1c6cc06f0058ebdd86d4dcbc73b Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Thu, 28 Mar 2019 12:32:13 +0000
Subject: [PATCH 20/30] Fix native open dialogs and attach the save packed
 content window as a modal

---
 client/src/modules/contentmanager.js | 34 ++++++++++++++--------------
 core/src/main.js                     | 11 +++++++++
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/client/src/modules/contentmanager.js b/client/src/modules/contentmanager.js
index bf31d540..08c2abb4 100644
--- a/client/src/modules/contentmanager.js
+++ b/client/src/modules/contentmanager.js
@@ -16,7 +16,7 @@ import { remote } from 'electron';
 import Content from './content';
 import Globals from './globals';
 import Database from './database';
-import { Utils, FileUtils, ClientLogger as Logger } from 'common';
+import { Utils, FileUtils, ClientLogger as Logger, ClientIPC } from 'common';
 import { SettingsSet, ErrorEvent } from 'structs';
 import { Modals } from 'ui';
 import Combokeys from 'combokeys';
@@ -73,23 +73,23 @@ export default class {
     }
 
     static async packContent(path, contentPath) {
-        return new Promise((resolve, reject) => {
-            remote.dialog.showSaveDialog({
-                title: 'Save Package',
-                defaultPath: path,
-                filters: [
-                    {
-                        name: 'BetterDiscord Package',
-                        extensions: ['bd']
-                    }
-                ]
-            }, filepath => {
-                if (!filepath) return;
+        const filepath = await ClientIPC.send('bd-native-save', {
+            title: 'Save Package',
+            defaultPath: path,
+            filters: [
+                {
+                    name: 'BetterDiscord Package',
+                    extensions: ['bd']
+                }
+            ]
+        });
 
-                asar.uncache(filepath);
-                asar.createPackage(contentPath, filepath, () => {
-                    resolve(filepath);
-                });
+        if (!filepath) return;
+
+        return new Promise((resolve, reject) => {
+            asar.uncache(filepath);
+            asar.createPackage(contentPath, filepath, () => {
+                resolve(filepath);
             });
         });
     }
diff --git a/core/src/main.js b/core/src/main.js
index 8dc89aec..b123c98c 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -82,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, '\\\'')}';`;
@@ -196,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)); }

From 2b0d3eb268c7cd708ae29df2916957210fcf72c3 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Fri, 19 Apr 2019 22:10:16 +0100
Subject: [PATCH 21/30] Patch DOMTokenList methods to use the correct (not
 normalised) classes

rauenzi/BetterDiscordApp#159, rauenzi/BetterDiscordApp#161
---
 client/src/ui/classnormaliser.js | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/client/src/ui/classnormaliser.js b/client/src/ui/classnormaliser.js
index 6764e084..02fab968 100644
--- a/client/src/ui/classnormaliser.js
+++ b/client/src/ui/classnormaliser.js
@@ -12,12 +12,14 @@ import { Module, Reflection } from 'modules';
 
 const normalizedPrefix = 'da';
 const randClass = new RegExp(`^(?!${normalizedPrefix}-)((?:[A-Za-z]|[0-9]|-)+)-(?:[A-Za-z]|[0-9]|-|_){6}$`);
+const normalisedClass = /^(([a-zA-Z0-9]+)-[^\s]{6}) da-([a-zA-Z0-9]+)$/;
 
 export default class ClassNormaliser extends Module {
 
     init() {
         this.patchClassModules(Reflection.module.getModule(this.moduleFilter.bind(this), false));
         this.normalizeElement(document.querySelector('#app-mount'));
+        this.patchDOMMethods();
     }
 
     patchClassModules(modules) {
@@ -26,6 +28,36 @@ export default class ClassNormaliser extends Module {
         }
     }
 
+    patchDOMMethods() {
+        const add = DOMTokenList.prototype.add;
+
+        DOMTokenList.prototype.add = function(...tokens) {
+            for (const token of tokens) {
+                let match;
+                if (typeof token === 'string' && (match = token.match(normalisedClass)) && match[2] === match[3]) return add.call(this, match[1]);
+                return add.call(this, token);
+            }
+        };
+
+        const remove = DOMTokenList.prototype.remove;
+
+        DOMTokenList.prototype.remove = function(...tokens) {
+            for (const token of tokens) {
+                let match;
+                if (typeof token === 'string' && (match = token.match(normalisedClass)) && match[2] === match[3]) return remove.call(this, match[1]);
+                return remove.call(this, token);
+            }
+        };
+
+        const contains = DOMTokenList.prototype.contains;
+
+        DOMTokenList.prototype.contains = function(token) {
+            let match;
+            if (typeof token === 'string' && (match = token.match(normalisedClass)) && match[2] === match[3]) return contains.call(this, match[1]);
+            return contains.call(this, token);
+        };
+    }
+
     shouldIgnore(value) {
         if (!isNaN(value)) return true;
         if (value.endsWith('px') || value.endsWith('ch') || value.endsWith('em') || value.endsWith('ms')) return true;

From 04fdb7a70483e68753d6cb8519dcc1b3a5b1a8ee Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Sat, 20 Apr 2019 02:42:38 +0100
Subject: [PATCH 22/30] Discord Canary fixes

---
 client/src/styles/partials/discordoverrides.scss   | 4 ++++
 client/src/styles/partials/generic/scrollable.scss | 1 +
 2 files changed, 5 insertions(+)

diff --git a/client/src/styles/partials/discordoverrides.scss b/client/src/styles/partials/discordoverrides.scss
index bc154b03..854022bf 100644
--- a/client/src/styles/partials/discordoverrides.scss
+++ b/client/src/styles/partials/discordoverrides.scss
@@ -7,6 +7,10 @@ body:not(.bd-hideButton) {
         margin-top: 26px;
     }
 
+    .platform-osx [class*='layers-'] > [class*='layer-'] > * > [class*='wrapper-'] [class*='listItem-']:first-child {
+        margin-top: 12px;
+    }
+
     [class*='layers-'] > [class*='layer-'] > * > [class*='wrapper-'] + [class*='flex'] {
         border-radius: 0 0 0 5px;
     }
diff --git a/client/src/styles/partials/generic/scrollable.scss b/client/src/styles/partials/generic/scrollable.scss
index 4262997a..be1b85fd 100644
--- a/client/src/styles/partials/generic/scrollable.scss
+++ b/client/src/styles/partials/generic/scrollable.scss
@@ -1,6 +1,7 @@
 .bd-scrollerWrap {
     display: flex;
     width: 100%;
+    height: 100%;
     flex-grow: 1;
 
     .bd-scroller {

From f2c461d16eeeda48ab2246805ccbeff3acc03ace Mon Sep 17 00:00:00 2001
From: Maks-s <karlmaks-s@protonmail.com>
Date: Fri, 19 Apr 2019 22:13:43 +0200
Subject: [PATCH 23/30] Fix context menu console error

---
 client/src/ui/contextmenus.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;

From 9c4653ffd4f87925c9e5d6cda86ade24fac70aa5 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Thu, 2 May 2019 18:02:29 +0100
Subject: [PATCH 24/30] Fix checking unknown components

Hopefully fixes the lag switching channels when Discord has been open for a while.

https://discordapp.com/channels/400734824740028417/423193907736870920/573535069764059157
---
 client/src/modules/reactcomponents.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/client/src/modules/reactcomponents.js b/client/src/modules/reactcomponents.js
index a594c107..51bbfb5e 100644
--- a/client/src/modules/reactcomponents.js
+++ b/client/src/modules/reactcomponents.js
@@ -322,7 +322,6 @@ export class ReactComponents {
     }
 
     static processUnknown(component, retVal) {
-        const have = this.unknownComponents.find(c => c.component === component);
         for (const [fi, filter] of this.nameSetters.entries()) {
             if (filter.filter.filter(component)) {
                 Logger.log('ReactComponents', 'Filter match!');
@@ -331,9 +330,8 @@ export class ReactComponents {
                 return this.push(component, retVal);
             }
         }
-        if (have) return have;
-        this.unknownComponents.push(component);
-        return component;
+
+        if (!this.unknownComponents.includes(component)) this.unknownComponents.push(component);
     }
 }
 

From cc1be3426327d1021ee50907909326758a26c9e8 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Thu, 2 May 2019 18:10:39 +0100
Subject: [PATCH 25/30] Comments and fix recording selectors for some
 components (and add one for VueComponent)

---
 client/src/modules/reactcomponents.js | 41 +++++++++++++++++++++++----
 client/src/ui/vueinjector.js          | 31 +++++++++++++-------
 2 files changed, 55 insertions(+), 17 deletions(-)

diff --git a/client/src/modules/reactcomponents.js b/client/src/modules/reactcomponents.js
index 51bbfb5e..001c5f60 100644
--- a/client/src/modules/reactcomponents.js
+++ b/client/src/modules/reactcomponents.js
@@ -190,15 +190,34 @@ class ReactComponent {
     }
 }
 
+ReactComponent.important = Symbol('BD.ReactComponent.important');
+
 export class ReactComponents {
+    /** @type {ReactComponent[]} */
     static get components() { return this._components || (this._components = []) }
+
+    /** @type {Reflection.modules.React.Component[]} */
     static get unknownComponents() { return this._unknownComponents || (this._unknownComponents = []) }
+
+    /** @type {{id: string, listeners: function[]}[]} */
     static get listeners() { return this._listeners || (this._listeners = []) }
+
+    /** @type {<{name: string, filter: function}[]>} */
     static get nameSetters() { return this._nameSetters || (this._nameSetters = []) }
-    static get componentAliases() { return this._componentAliases || (this._componentAliases = []) }
+
+    /** @type {Object.<string, string>} */
+    static get componentAliases() { return this._componentAliases || (this._componentAliases = {}) }
 
     static get ReactComponent() { return ReactComponent }
 
+    /**
+     * Processes a React component.
+     * @param {Reflection.modules.React.Component} component The React component class
+     * @param {object} retVal
+     * @param {object} important
+     * @param {string} important.selector A query selector the component will render elements matching (used to select all component instances to force them to rerender)
+     * @return {ReactComponent}
+     */
     static push(component, retVal, important) {
         if (!(component instanceof Function)) return null;
         const { displayName } = component;
@@ -212,6 +231,8 @@ export class ReactComponents {
             return component;
         }
 
+        if (!important) important = component[ReactComponent.important];
+
         const c = new ReactComponent(displayName, component, retVal, important);
         this.components.push(c);
 
@@ -226,16 +247,19 @@ export class ReactComponents {
 
     /**
      * Finds a component from the components array or by waiting for it to be mounted.
-     * @param {String} name The component's name
-     * @param {Object} important An object containing a selector to look for
-     * @param {Function} filter A function to filter components if a single element is rendered by multiple components
-     * @return {Promise => ReactComponent}
+     * @param {string} name The component's name
+     * @param {object} important An object containing a selector to look for
+     * @param {function} filter A function to filter components if a single element is rendered by multiple components
+     * @return {Promise<ReactComponent>}
      */
     static async getComponent(name, important, filter) {
         name = this.getComponentName(name);
 
         const have = this.components.find(c => c.id === name);
-        if (have) return have;
+        if (have) {
+            if (!have.important) have.important = important;
+            return have;
+        }
 
         if (important) {
             const callback = () => {
@@ -321,6 +345,11 @@ export class ReactComponents {
         return this.nameSetters.push({ name, filter });
     }
 
+    /**
+     * Processes a React component that isn't known.
+     * @param {Reflection.modules.React.Component} component
+     * @param {} retVal
+     */
     static processUnknown(component, retVal) {
         for (const [fi, filter] of this.nameSetters.entries()) {
             if (filter.filter.filter(component)) {
diff --git a/client/src/ui/vueinjector.js b/client/src/ui/vueinjector.js
index 4a94b541..3d54c202 100644
--- a/client/src/ui/vueinjector.js
+++ b/client/src/ui/vueinjector.js
@@ -8,7 +8,7 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import { Reflection } from 'modules';
+import { Reflection, ReactComponents } from 'modules';
 import Vue from 'vue';
 
 export default class {
@@ -16,12 +16,12 @@ export default class {
     /**
      * Creates a new Vue object and mounts it in the passed element.
      * @param {HTMLElement} root The element to mount the new Vue object at
-     * @param {Object} options Options to pass to Vue
+     * @param {Object} options Options to pass to Vue (see https://vuejs.org/v2/api/#Options-Data)
      * @param {BdNode} bdnode The element to append
      * @return {Vue}
      */
     static inject(root, options, bdnode) {
-        if(bdnode) bdnode.appendTo(root);
+        if (bdnode) bdnode.appendTo(root);
 
         const vue = new Vue(options);
 
@@ -37,18 +37,18 @@ export default class {
      * @return {React.Element}
      */
     static createReactElement(component, props, mountAtTop) {
-        const { React } = Reflection.modules;
-        return React.createElement(this.ReactCompatibility, {component, mountAtTop, props});
+        return Reflection.modules.React.createElement(this.ReactCompatibility, {component, mountAtTop, props});
     }
 
     static get ReactCompatibility() {
-        if (this._ReactCompatibility) return this._ReactCompatibility;
+        const { React, ReactDOM } = Reflection.modules;
 
-        const { React, ReactDOM} = Reflection.modules;
-
-        return this._ReactCompatibility = class VueComponent extends React.Component {
+        /**
+         * A React component that renders a Vue component.
+         */
+        const ReactCompatibility = class VueComponent extends React.Component {
             render() {
-                return React.createElement('span');
+                return React.createElement('span', {className: 'bd-reactVueComponent'});
             }
 
             componentDidMount() {
@@ -89,7 +89,13 @@ export default class {
                     }
                 }));
             }
-        }
+        };
+
+        // Add a name for ReactComponents
+        ReactCompatibility.displayName = 'BD.VueComponent';
+        ReactCompatibility[ReactComponents.ReactComponent.important] = {selector: '.bd-reactVueComponent'};
+
+        return Object.defineProperty(this, 'ReactCompatibility', {value: ReactCompatibility}).ReactCompatibility;
     }
 
     static install(Vue) {
@@ -98,6 +104,9 @@ export default class {
 
 }
 
+/**
+ * A Vue component that renders a React component.
+ */
 export const ReactComponent = {
     props: ['component', 'component-props', 'component-children', 'react-element'],
     render(createElement) {

From 4be9c8b29a79c7b668bf1d67268b299f84e1a8a8 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Thu, 30 May 2019 08:40:17 +0100
Subject: [PATCH 26/30] Fix member list badges

---
 client/src/modules/reactcomponents.js |  2 +-
 client/src/ui/profilebadges.js        | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/client/src/modules/reactcomponents.js b/client/src/modules/reactcomponents.js
index 001c5f60..857a8506 100644
--- a/client/src/modules/reactcomponents.js
+++ b/client/src/modules/reactcomponents.js
@@ -468,7 +468,7 @@ export class ReactAutoPatcher {
     }
 
     static async patchNameTag() {
-        const { selector } = Reflection.resolve('nameTag', 'username', 'discriminator', 'ownerIcon');
+        const { selector } = Reflection.resolve('nameTag', 'username', 'discriminator', 'discriminatorWithMobileIndicator');
         this.NameTag = await ReactComponents.getComponent('NameTag', {selector});
     }
 
diff --git a/client/src/ui/profilebadges.js b/client/src/ui/profilebadges.js
index 900b96db..015bfc0b 100644
--- a/client/src/ui/profilebadges.js
+++ b/client/src/ui/profilebadges.js
@@ -71,7 +71,8 @@ export default class extends Module {
             const c = contributors.find(c => c.id === user.id);
             if (!c) return;
 
-            const nameTag = retVal.props.children.props.children[1].props.children[0];
+            const flex = retVal.props.children.props.children[1].props.children[0];
+            const nameTag = flex.props.children[0];
             nameTag.type = this.PatchedNameTag || nameTag.type;
         });
 
@@ -91,14 +92,14 @@ export default class extends Module {
 
         this.PatchedNameTag = class extends NameTag.component {
             render() {
-                const retVal = NameTag.component.prototype.render.call(this, arguments);
+                const retVal = NameTag.component.prototype.render.apply(this, arguments);
                 try {
-                    if (!retVal.props || !retVal.props.children) return;
+                    if (!retVal.props || !retVal.props.children) return retVal;
 
                     const user = ReactHelpers.findProp(this, 'user');
-                    if (!user) return;
+                    if (!user) return retVal;
                     const contributor = contributors.find(c => c.id === user.id);
-                    if (!contributor) return;
+                    if (!contributor) return retVal;
 
                     retVal.props.children.splice(1, 0, VueInjector.createReactElement(BdBadge, {
                         contributor,

From 3022646579d823858d174c4c4085c4e0e76cb36a Mon Sep 17 00:00:00 2001
From: Maks-s <karlmaks-s@protonmail.com>
Date: Tue, 30 Jul 2019 17:47:24 +0200
Subject: [PATCH 27/30] Fix ProfileBadge console error

---
 client/src/ui/profilebadges.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/src/ui/profilebadges.js b/client/src/ui/profilebadges.js
index 015bfc0b..31831371 100644
--- a/client/src/ui/profilebadges.js
+++ b/client/src/ui/profilebadges.js
@@ -71,8 +71,7 @@ export default class extends Module {
             const c = contributors.find(c => c.id === user.id);
             if (!c) return;
 
-            const flex = retVal.props.children.props.children[1].props.children[0];
-            const nameTag = flex.props.children[0];
+            const nameTag = retVal.props.children[1].props.children[0].props.children[0];
             nameTag.type = this.PatchedNameTag || nameTag.type;
         });
 

From 50ae555c21d309c9beb72d2daaf4679d1fbf54cb Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Sat, 24 Aug 2019 21:51:37 +0100
Subject: [PATCH 28/30] Fix member list profile badges

---
 client/src/modules/reactcomponents.js |  2 +-
 client/src/ui/profilebadges.js        | 32 +++++++++++++--------------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/client/src/modules/reactcomponents.js b/client/src/modules/reactcomponents.js
index 857a8506..a4181af4 100644
--- a/client/src/modules/reactcomponents.js
+++ b/client/src/modules/reactcomponents.js
@@ -468,7 +468,7 @@ export class ReactAutoPatcher {
     }
 
     static async patchNameTag() {
-        const { selector } = Reflection.resolve('nameTag', 'username', 'discriminator', 'discriminatorWithMobileIndicator');
+        const { selector } = Reflection.resolve('nameTag', 'username', 'discriminator', 'bot');
         this.NameTag = await ReactComponents.getComponent('NameTag', {selector});
     }
 
diff --git a/client/src/ui/profilebadges.js b/client/src/ui/profilebadges.js
index 31831371..a7cc6647 100644
--- a/client/src/ui/profilebadges.js
+++ b/client/src/ui/profilebadges.js
@@ -89,26 +89,24 @@ export default class extends Module {
 
         const NameTag = await ReactComponents.getComponent('NameTag');
 
-        this.PatchedNameTag = class extends NameTag.component {
-            render() {
-                const retVal = NameTag.component.prototype.render.apply(this, arguments);
-                try {
-                    if (!retVal.props || !retVal.props.children) return retVal;
+        this.PatchedNameTag = function (props) {
+            const retVal = NameTag.component.apply(this, arguments);
+            try {
+                if (!retVal.props || !retVal.props.children) return retVal;
 
-                    const user = ReactHelpers.findProp(this, 'user');
-                    if (!user) return retVal;
-                    const contributor = contributors.find(c => c.id === user.id);
-                    if (!contributor) return retVal;
+                const user = ReactHelpers.findProp(props, 'user');
+                if (!user) return retVal;
+                const contributor = contributors.find(c => c.id === user.id);
+                if (!contributor) return retVal;
 
-                    retVal.props.children.splice(1, 0, VueInjector.createReactElement(BdBadge, {
-                        contributor,
-                        type: 'nametag'
-                    }));
-                } catch (err) {
-                    Logger.err('ProfileBadges', ['Error thrown while rendering a NameTag', err]);
-                }
-                return retVal;
+                retVal.props.children.splice(1, 0, VueInjector.createReactElement(BdBadge, {
+                    contributor,
+                    type: 'nametag'
+                }));
+            } catch (err) {
+                Logger.err('ProfileBadges', ['Error thrown while rendering a NameTag', err]);
             }
+            return retVal;
         };
 
         // Rerender all channel members

From 3359835effa397d86ac38cc79d5ae90ad0659094 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Sat, 24 Aug 2019 22:22:54 +0100
Subject: [PATCH 29/30] Fix voice channel component filter

---
 client/src/modules/reactcomponents.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/modules/reactcomponents.js b/client/src/modules/reactcomponents.js
index a4181af4..eac2a7de 100644
--- a/client/src/modules/reactcomponents.js
+++ b/client/src/modules/reactcomponents.js
@@ -532,7 +532,7 @@ export class ReactAutoPatcher {
         ReactComponents.componentAliases.GuildVoiceChannel = 'VoiceChannel';
 
         const { selector } = Reflection.resolve('containerDefault', 'actionIcon');
-        this.GuildVoiceChannel = await ReactComponents.getComponent('GuildVoiceChannel', {selector}, c => c.prototype.handleVoiceConnect);
+        this.GuildVoiceChannel = await ReactComponents.getComponent('GuildVoiceChannel', {selector}, c => c.prototype.renderVoiceUsers);
 
         this.unpatchGuildVoiceChannel = MonkeyPatch('BD:ReactComponents', this.GuildVoiceChannel.component.prototype).after('render', this._afterChannelRender);
 

From e49df8952fb14fe5023949af3cf69f9aaa9c02ec Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Sat, 24 Aug 2019 22:53:32 +0100
Subject: [PATCH 30/30] Fix guild component selector

---
 client/src/modules/reactcomponents.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/modules/reactcomponents.js b/client/src/modules/reactcomponents.js
index eac2a7de..dab5db7f 100644
--- a/client/src/modules/reactcomponents.js
+++ b/client/src/modules/reactcomponents.js
@@ -473,8 +473,8 @@ export class ReactAutoPatcher {
     }
 
     static async patchGuild() {
-        const selector = `div.${Reflection.resolve('container', 'guildIcon', 'selected', 'unread').className}:not(:first-child)`;
-        this.Guild = await ReactComponents.getComponent('Guild', {selector}, m => m.prototype.renderBadge);
+        const { selector } = Reflection.resolve('listItem', 'guildSeparator', 'selected', 'friendsOnline');
+        this.Guild = await ReactComponents.getComponent('Guild', {selector}, m => m.displayName === 'Guild');
 
         this.unpatchGuild = MonkeyPatch('BD:ReactComponents', this.Guild.component.prototype).after('render', (component, args, retVal) => {
             const { guild } = component.props;