From a7aa1fa5ec187e23ca82d77e08c29f984981e9eb Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Wed, 4 Apr 2018 20:34:54 +0100
Subject: [PATCH 01/13] Fix up/down at the end of the list when the list has
 less than 10 emotes

---
 client/src/ui/components/common/Autocomplete.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/ui/components/common/Autocomplete.vue b/client/src/ui/components/common/Autocomplete.vue
index 26323803..4b831fa6 100644
--- a/client/src/ui/components/common/Autocomplete.vue
+++ b/client/src/ui/components/common/Autocomplete.vue
@@ -113,11 +113,11 @@
             traverse(e) {
                 if (!this.open) return;
                 if (e.key === 'ArrowUp') {
-                    this.selectedIndex = (this.selectedIndex - 1) < 0 ? 9 : this.selectedIndex - 1;
+                    this.selectedIndex = (this.selectedIndex - 1) < 0 ? Math.min(this.emotes.length, 10) - 1 : this.selectedIndex - 1;
                     return;
                 }
                 if (e.key === 'ArrowDown') {
-                    this.selectedIndex = (this.selectedIndex + 1) >= 10 ? 0 : this.selectedIndex + 1;
+                    this.selectedIndex = (this.selectedIndex + 1) >= Math.min(this.emotes.length, 10) ? 0 : this.selectedIndex + 1;
                     return;
                 }
                 return;

From a96f3b1eb7eb56bd427b6b7fd8d43a11ad6e6602 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Wed, 4 Apr 2018 20:36:11 +0100
Subject: [PATCH 02/13] Fix border radius of the message input field

---
 client/src/styles/partials/generic/autocomplete.scss | 5 +++++
 client/src/ui/automanip.js                           | 2 +-
 client/src/ui/components/common/Autocomplete.vue     | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/client/src/styles/partials/generic/autocomplete.scss b/client/src/styles/partials/generic/autocomplete.scss
index 75312e1e..0ee51fac 100644
--- a/client/src/styles/partials/generic/autocomplete.scss
+++ b/client/src/styles/partials/generic/autocomplete.scss
@@ -77,4 +77,9 @@
             }
         }
     }
+
+    &.bd-active + [class*="inner"] {
+        border-top-left-radius: 0;
+        border-top-right-radius: 0;
+    }
 }
diff --git a/client/src/ui/automanip.js b/client/src/ui/automanip.js
index 5c8e72dd..b24e6784 100644
--- a/client/src/ui/automanip.js
+++ b/client/src/ui/automanip.js
@@ -185,7 +185,7 @@ export default class extends EventListener {
         const root = document.createElement('span');
         const parent = document.querySelector('[class*="channelTextArea"] > [class*="inner"]');
         if (!parent) return;
-        parent.append(root);
+        parent.parentElement.insertBefore(root, parent);
         VueInjector.inject(root, {
             components: { Autocomplete },
             data: { initial: e.target.value },
diff --git a/client/src/ui/components/common/Autocomplete.vue b/client/src/ui/components/common/Autocomplete.vue
index 4b831fa6..987d2f53 100644
--- a/client/src/ui/components/common/Autocomplete.vue
+++ b/client/src/ui/components/common/Autocomplete.vue
@@ -9,7 +9,7 @@
 */
 
 <template>
-    <div class="bd-autocomplete">
+    <div class="bd-autocomplete" :class="{'bd-active': emotes && emotes.length}">
         <div v-if="emotes && emotes.length" class="bd-autocomplete-inner">
             <div class="bd-autocomplete-row">
                 <div class="bd-autocomplete-selector">

From de8601ded484fedf3aef9cacb6a20116d1bc2c3e Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Wed, 4 Apr 2018 20:51:25 +0100
Subject: [PATCH 03/13] Show favourite emotes in autocomplete

---
 client/src/builtin/EmoteModule.js             |  2 ++
 client/src/styles/partials/emotes.scss        | 16 +++++++++++
 .../src/ui/components/common/Autocomplete.vue | 27 ++++++++++++++-----
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/client/src/builtin/EmoteModule.js b/client/src/builtin/EmoteModule.js
index 4b80d718..4a7642d9 100644
--- a/client/src/builtin/EmoteModule.js
+++ b/client/src/builtin/EmoteModule.js
@@ -61,6 +61,7 @@ export default new class EmoteModule {
      * @return {Promise}
      */
     setFavourite(emote, favourite, save = true) {
+        emote = emote.id || emote;
         if (favourite && !this.favourite_emotes.includes(emote)) this.favourite_emotes.push(emote);
         if (!favourite) Utils.removeFromArray(this.favourite_emotes, emote);
         if (save) return Settings.saveSettings();
@@ -75,6 +76,7 @@ export default new class EmoteModule {
     }
 
     isFavourite(emote) {
+        emote = emote.id || emote;
         return this.favourite_emotes.includes(emote);
     }
 
diff --git a/client/src/styles/partials/emotes.scss b/client/src/styles/partials/emotes.scss
index 778e4cee..1bfe491e 100644
--- a/client/src/styles/partials/emotes.scss
+++ b/client/src/styles/partials/emotes.scss
@@ -21,7 +21,10 @@
         vertical-align: -.4em;
         max-height: 32px;
     }
+}
 
+.bd-emotewrapper,
+.bd-autocomplete-selector {
     .bd-emote-favourite-button {
         display: none;
         width: 16px;
@@ -46,7 +49,20 @@
         }
     }
 
+    &.bd-selected .bd-emote-favourite-button,
     &:hover .bd-emote-favourite-button {
         display: block;
     }
 }
+
+.bd-autocomplete-selector {
+    .bd-emote-favourite-button {
+        margin-left: 8px;
+        margin-right: 0;
+        opacity: .5;
+
+        &.bd-active {
+            display: block;
+        }
+    }
+}
diff --git a/client/src/ui/components/common/Autocomplete.vue b/client/src/ui/components/common/Autocomplete.vue
index 987d2f53..edb08a54 100644
--- a/client/src/ui/components/common/Autocomplete.vue
+++ b/client/src/ui/components/common/Autocomplete.vue
@@ -20,10 +20,13 @@
                 </div>
             </div>
             <div v-for="(emote, index) in emotes" class="bd-autocomplete-row" :key="index">
-                <div class="bd-autocomplete-selector bd-selectable" :class="{'bd-selected': index === selectedIndex}" @mouseover="() => { selected = emote.id }" @click="() => inject(emote)">
+                <div class="bd-autocomplete-selector bd-selectable" :class="{'bd-selected': index === selectedIndex, 'bd-emote-favourite': isFavourite(emote)}" @mouseover="selected = emote.id" @click="inject(emote)">
                     <div class="bd-autocomplete-field">
-                        <img :src="getEmoteSrc(emote)"/>
-                        <div>{{emote.id}}</div>
+                        <img :src="emote.src" :alt="emote.name" />
+                        <div class="bd-flex-grow">{{emote.id}}</div>
+                        <div class="bd-emote-favourite-button" :class="{'bd-active': isFavourite(emote)}" @click.stop="toggleFavourite(emote)">
+                            <MiStar :size="16" />
+                        </div>
                     </div>
                 </div>
             </div>
@@ -35,10 +38,15 @@
     import { EmoteModule } from 'builtin';
     import { Events } from 'modules';
     import { DOM } from 'ui';
+    import { MiStar } from './MaterialIcon';
 
     export default {
+        components: {
+            MiStar
+        },
         data() {
             return {
+                EmoteModule,
                 emotes: [],
                 title: '',
                 selIndex: 0,
@@ -70,8 +78,9 @@
         methods: {
             prevents(e) {
                 if (!this.open) return;
-                if (e.key !== 'ArrowDown' && e.key !== 'ArrowUp' && e.key !== 'Tab' && e.key !== 'Enter') return;
-                this.traverse(e);
+                if (e.which === 27) this.reset();
+                else if (e.key === 'ArrowDown' || e.key === 'ArrowUp') this.traverse(e);
+                else if (e.key !== 'Tab' && e.key !== 'Enter') return;
                 e.stopPropagation();
                 e.preventDefault();
             },
@@ -84,8 +93,14 @@
                 const uri = emote.type === 2 ? 'https://cdn.betterttv.net/emote/:id/1x' : emote.type === 1 ? 'https://cdn.frankerfacez.com/emoticon/:id/1' : 'https://static-cdn.jtvnw.net/emoticons/v1/:id/1.0';
                 return uri.replace(':id', value);
             },
+            isFavourite(emote) {
+                return EmoteModule.isFavourite(emote);
+            },
+            toggleFavourite(emote) {
+                return EmoteModule.setFavourite(emote, !this.isFavourite(emote));
+            },
             searchEmotes(e) {
-                if (e.key === 'ArrowDown' || e.key === 'ArrowUp') return;
+                if (e.which === 27 || e.key === 'ArrowDown' || e.key === 'ArrowUp') return;
                 if (e.key === 'Tab' || e.key === 'Enter' && this.open) {
                     const selected = this.emotes[this.selectedIndex];
                     if (!selected) return;

From 256db71aa41586c6c0605a0fe2503ee1070a77cc Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Wed, 4 Apr 2018 21:05:30 +0100
Subject: [PATCH 04/13] Hide emote autocomplete when emotes are disabled

---
 .../src/ui/components/common/Autocomplete.vue | 35 +++++++++++++------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/client/src/ui/components/common/Autocomplete.vue b/client/src/ui/components/common/Autocomplete.vue
index edb08a54..06fb02fa 100644
--- a/client/src/ui/components/common/Autocomplete.vue
+++ b/client/src/ui/components/common/Autocomplete.vue
@@ -36,7 +36,7 @@
 
 <script>
     import { EmoteModule } from 'builtin';
-    import { Events } from 'modules';
+    import { Events, Settings } from 'modules';
     import { DOM } from 'ui';
     import { MiStar } from './MaterialIcon';
 
@@ -62,20 +62,33 @@
             // this.open = this.emotes.length;
         },
         created() {
-            window.addEventListener('keydown', this.prevents);
-            const ta = document.querySelector('.chat textarea');
-            if(!ta) return;
-            ta.addEventListener('keydown', this.setCaret);
-            ta.addEventListener('keyup', this.searchEmotes);
+            const enabled = Settings.getSetting('emotes', 'default', 'enable');
+            enabled.on('setting-updated', event => {
+                if (event.value) return this.addEventListeners();
+                this.removeEventListeners();
+                this.reset();
+            });
+
+            if (enabled.value) this.addEventListeners();
         },
         destroyed() {
-            window.removeEventListener('keydown', this.prevents);
-            const ta = document.querySelector('.chat textarea');
-            if (!ta) return;
-            ta.removeEventListener('keydown', this.setCaret);
-            ta.removeEventListener('keyup', this.searchEmotes);
+            this.removeEventListeners();
         },
         methods: {
+            addEventListeners() {
+                window.addEventListener('keydown', this.prevents);
+                const ta = document.querySelector('.chat textarea');
+                if (!ta) return;
+                ta.addEventListener('keydown', this.setCaret);
+                ta.addEventListener('keyup', this.searchEmotes);
+            },
+            removeEventListeners() {
+                window.removeEventListener('keydown', this.prevents);
+                const ta = document.querySelector('.chat textarea');
+                if (!ta) return;
+                ta.removeEventListener('keydown', this.setCaret);
+                ta.removeEventListener('keyup', this.searchEmotes);
+            },
             prevents(e) {
                 if (!this.open) return;
                 if (e.which === 27) this.reset();

From cf319a2604b5da21158cdc158340d4d2f7912851 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Wed, 4 Apr 2018 21:38:56 +0100
Subject: [PATCH 05/13] Separate load

---
 client/src/builtin/EmoteModule.js | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/client/src/builtin/EmoteModule.js b/client/src/builtin/EmoteModule.js
index 4a7642d9..db6bd0d8 100644
--- a/client/src/builtin/EmoteModule.js
+++ b/client/src/builtin/EmoteModule.js
@@ -34,13 +34,7 @@ export default new class EmoteModule {
 
         const dataPath = Globals.getPath('data');
         try {
-            const emotes = await FileUtils.readJsonFromFile(path.join(dataPath, 'emotes.json'));
-            for (let emote of emotes) {
-                const uri = emote.type === 2 ? 'https://cdn.betterttv.net/emote/:id/1x' : emote.type === 1 ? 'https://cdn.frankerfacez.com/emoticon/:id/1' : 'https://static-cdn.jtvnw.net/emoticons/v1/:id/1.0';
-                emote.name = emote.id;
-                emote.src = uri.replace(':id', emote.value.id || emote.value);
-                this.emotes.set(emote.id, emote);
-            }
+            await this.load(path.join(dataPath));
         } catch (err) {
             Logger.err('EmoteModule', [`Failed to load emote data. Make sure you've downloaded the emote data and placed it in ${dataPath}:`, err]);
             return;
@@ -53,6 +47,20 @@ export default new class EmoteModule {
         }
     }
 
+    async load(dataPath) {
+        const emotes = await FileUtils.readJsonFromFile(path.join(dataPath, 'emotes.json'));
+        for (let [index, emote] of emotes.entries()) {
+            // Pause every 10000 emotes so the window doesn't freeze
+            if ((index % 10000) === 0)
+                await new Promise(r => setTimeout(r, 0));
+
+            const uri = emote.type === 2 ? 'https://cdn.betterttv.net/emote/:id/1x' : emote.type === 1 ? 'https://cdn.frankerfacez.com/emoticon/:id/1' : 'https://static-cdn.jtvnw.net/emoticons/v1/:id/1.0';
+            emote.name = emote.id;
+            emote.src = uri.replace(':id', emote.value.id || emote.value);
+            this.emotes.set(emote.id, emote);
+        }
+    }
+
     /**
      * Sets an emote as favourite.
      * @param {String} emote The name of the emote

From d4962bb2ab6cb25c6a30a395f1165e18921e037c Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Wed, 4 Apr 2018 21:39:55 +0100
Subject: [PATCH 06/13] Fix settings being partially saved while loading

---
 client/src/modules/settings.js             | 10 +++++++---
 client/src/structs/events/event.js         |  7 +++++++
 client/src/structs/settings/settingsset.js |  3 ++-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/client/src/modules/settings.js b/client/src/modules/settings.js
index dc0e2e33..bb3486ad 100644
--- a/client/src/modules/settings.js
+++ b/client/src/modules/settings.js
@@ -30,8 +30,8 @@ export default new class Settings {
                 Events.emit(`setting-updated-${set.id}_${category.id}_${setting.id}`, event);
             });
 
-            set.on('settings-updated', async (event) => {
-                await this.saveSettings();
+            set.on('settings-updated', async event => {
+                if (!event.data || !event.data.dont_save) await this.saveSettings();
                 Events.emit('settings-updated', event);
             });
 
@@ -43,6 +43,8 @@ export default new class Settings {
      * Loads BetterDiscord's settings.
      */
     async loadSettings() {
+        Logger.log('Settings', ['Loading settings']);
+
         try {
             await FileUtils.ensureDirectory(this.dataPath);
 
@@ -53,7 +55,7 @@ export default new class Settings {
             for (let set of this.settings) {
                 const newSet = settings.find(s => s.id === set.id);
                 if (!newSet) continue;
-                await set.merge(newSet);
+                await set.merge(newSet, {dont_save: true});
                 set.setSaved();
             }
 
@@ -71,6 +73,8 @@ export default new class Settings {
      * Saves BetterDiscord's settings including CSS editor data.
      */
     async saveSettings() {
+        Logger.log('Settings', ['Saving settings']);
+
         try {
             await FileUtils.ensureDirectory(this.dataPath);
 
diff --git a/client/src/structs/events/event.js b/client/src/structs/events/event.js
index cb26edf6..b2e5ebe4 100644
--- a/client/src/structs/events/event.js
+++ b/client/src/structs/events/event.js
@@ -24,6 +24,13 @@ export default class Event {
         return this.__eventInfo;
     }
 
+    /**
+     * Extra data associated with this event.
+     */
+    get data() {
+        return this.args.data;
+    }
+
     /**
      * The first argument that was passed to the constructor, which contains information about the event.
      */
diff --git a/client/src/structs/settings/settingsset.js b/client/src/structs/settings/settingsset.js
index e0ed5065..fce98e9c 100644
--- a/client/src/structs/settings/settingsset.js
+++ b/client/src/structs/settings/settingsset.js
@@ -412,7 +412,8 @@ export default class SettingsSet extends AsyncEventEmitter {
 
         if (emit_multi)
             await this.emit('settings-updated', new SettingsUpdatedEvent({
-                updatedSettings
+                updatedSettings,
+                data: typeof emit_multi !== 'boolean' ? emit_multi : undefined
             }));
 
         return updatedSettings;

From 4d0631ba38f496f2c16063a2df85548947caea67 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Wed, 4 Apr 2018 21:53:02 +0100
Subject: [PATCH 07/13] Add wait util

---
 client/src/builtin/EmoteModule.js | 6 +++---
 client/src/modules/pluginapi.js   | 1 +
 common/modules/utils.js           | 6 +++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/client/src/builtin/EmoteModule.js b/client/src/builtin/EmoteModule.js
index db6bd0d8..82f188ed 100644
--- a/client/src/builtin/EmoteModule.js
+++ b/client/src/builtin/EmoteModule.js
@@ -34,7 +34,7 @@ export default new class EmoteModule {
 
         const dataPath = Globals.getPath('data');
         try {
-            await this.load(path.join(dataPath));
+            await this.load(path.join(dataPath, 'emotes.json'));
         } catch (err) {
             Logger.err('EmoteModule', [`Failed to load emote data. Make sure you've downloaded the emote data and placed it in ${dataPath}:`, err]);
             return;
@@ -48,11 +48,11 @@ export default new class EmoteModule {
     }
 
     async load(dataPath) {
-        const emotes = await FileUtils.readJsonFromFile(path.join(dataPath, 'emotes.json'));
+        const emotes = await FileUtils.readJsonFromFile(dataPath);
         for (let [index, emote] of emotes.entries()) {
             // Pause every 10000 emotes so the window doesn't freeze
             if ((index % 10000) === 0)
-                await new Promise(r => setTimeout(r, 0));
+                await Utils.wait();
 
             const uri = emote.type === 2 ? 'https://cdn.betterttv.net/emote/:id/1x' : emote.type === 1 ? 'https://cdn.frankerfacez.com/emoticon/:id/1' : 'https://static-cdn.jtvnw.net/emoticons/v1/:id/1.0';
             emote.name = emote.id;
diff --git a/client/src/modules/pluginapi.js b/client/src/modules/pluginapi.js
index 1b09342f..f72ceab5 100644
--- a/client/src/modules/pluginapi.js
+++ b/client/src/modules/pluginapi.js
@@ -88,6 +88,7 @@ export default class PluginApi {
             deepfreeze: (...args) => Utils.deepfreeze.apply(Utils, args),
             removeFromArray: (...args) => Utils.removeFromArray.apply(Utils, args),
             defineSoftGetter: (...args) => Utils.defineSoftGetter.apply(Utils, args),
+            wait: (...args) => Utils.wait.apply(Utils, args),
             until: (...args) => Utils.until.apply(Utils, args)
         };
     }
diff --git a/common/modules/utils.js b/common/modules/utils.js
index 15e8666c..05175937 100644
--- a/common/modules/utils.js
+++ b/common/modules/utils.js
@@ -32,7 +32,7 @@ export class Utils {
             return JSON.parse(jsonString);
         } catch (err) {
             throw ({
-                'message': 'Failed to parse json',
+                message: 'Failed to parse json',
                 err
             });
         }
@@ -160,6 +160,10 @@ export class Utils {
         });
     }
 
+    static wait(time = 0) {
+        return new Promise(resolve => setTimeout(resolve, time));
+    }
+
     static async until(check, time = 0) {
         let value, i;
         do {

From 5c755bc12124b1a3eedfede16b6d7f0f37a48f46 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Sat, 7 Apr 2018 16:42:16 +0100
Subject: [PATCH 08/13] Update pump

Fixes release dependencies not being copied properly
---
 gulpfile.js       |  2 +-
 package-lock.json | 39 +++++++++++++++++++++++++++++++++++----
 package.json      |  2 +-
 3 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index 42b2e812..c056deac 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -78,5 +78,5 @@ const node_sass_bindings = function() {
 };
 
 gulp.task('release', function () {
-    del(['./release/**/*']).then(() => merge(releasepkg(), client(), core(), sparkplug(), core_modules(), index(), cssEditor(), deps(), node_sass_bindings()));
+    return del(['./release/**/*']).then(() => merge(releasepkg(), client(), core(), sparkplug(), core_modules(), index(), cssEditor(), deps(), node_sass_bindings()));
 });
diff --git a/package-lock.json b/package-lock.json
index 1ce9b485..f3b3a2ec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7852,6 +7852,16 @@
           "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
           "dev": true
         },
+        "pump": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+          "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+          "dev": true,
+          "requires": {
+            "end-of-stream": "1.4.1",
+            "once": "1.4.0"
+          }
+        },
         "readable-stream": {
           "version": "2.3.5",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
@@ -9872,9 +9882,9 @@
       }
     },
     "pump": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-      "integrity": "sha1-Ejma3W5M91Jtlzy8i1zi4pCLOQk=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
       "dev": true,
       "requires": {
         "end-of-stream": "1.4.1",
@@ -9884,7 +9894,7 @@
         "end-of-stream": {
           "version": "1.4.1",
           "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
-          "integrity": "sha1-7SljTRm6ukY7bOa4CjchPqtx7EM=",
+          "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
           "dev": true,
           "requires": {
             "once": "1.4.0"
@@ -9901,6 +9911,27 @@
         "duplexify": "3.5.4",
         "inherits": "2.0.3",
         "pump": "2.0.1"
+      },
+      "dependencies": {
+        "end-of-stream": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
+          "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
+          "dev": true,
+          "requires": {
+            "once": "1.4.0"
+          }
+        },
+        "pump": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+          "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+          "dev": true,
+          "requires": {
+            "end-of-stream": "1.4.1",
+            "once": "1.4.0"
+          }
+        }
       }
     },
     "punycode": {
diff --git a/package.json b/package.json
index df59798e..11fd3d24 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "lodash": "^4.17.4",
     "mkdirp": "^0.5.1",
     "node-gyp": "^3.6.2",
-    "pump": "^2.0.0",
+    "pump": "^3.0.0",
     "sass-loader": "^6.0.6",
     "uglifyjs-webpack-plugin": "^1.2.4",
     "v-tooltip": "^2.0.0-rc.30",

From f0a337e0ed441629ca06606b6251f1754aeabd11 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Sun, 8 Apr 2018 00:07:23 +0100
Subject: [PATCH 09/13] Fix custom CSS file not being used if the custom editor
 CSS is empty

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

diff --git a/client/src/modules/csseditor.js b/client/src/modules/csseditor.js
index ac3fdbc4..812b894c 100644
--- a/client/src/modules/csseditor.js
+++ b/client/src/modules/csseditor.js
@@ -75,7 +75,7 @@ export default new class {
         if (sendSource)
             this.sendToEditor('set-scss', scss);
 
-        if (!scss) {
+        if (!scss && !await this.fileExists()) {
             this._scss = this.css = '';
             this.sendToEditor('scss-error', null);
             return;

From b62727b0461afb3aeb6cc97421e5b7a11f20e2d7 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Sun, 8 Apr 2018 01:37:05 +0100
Subject: [PATCH 10/13] Fix channel members not always being rerendered to show
 badges

---
 client/src/ui/profilebadges.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/client/src/ui/profilebadges.js b/client/src/ui/profilebadges.js
index da50b68d..6a1d95b0 100644
--- a/client/src/ui/profilebadges.js
+++ b/client/src/ui/profilebadges.js
@@ -89,6 +89,13 @@ export default class extends Module {
             const nameTag = retVal.props.children.props.children[1].props.children[0];
             nameTag.type = this.PatchedNameTag || nameTag.type;
         });
+
+        // Rerender all channel members
+        if (this.PatchedNameTag) {
+            for (const channelMember of document.querySelectorAll('.member-2FrNV0')) {
+                Reflection(channelMember).forceUpdate();
+            }
+        }
     }
 
     /**
@@ -135,8 +142,10 @@ export default class extends Module {
         };
 
         // Rerender all channel members
-        for (const channelMember of document.querySelectorAll('.member-2FrNV0')) {
-            Reflection(channelMember).forceUpdate();
+        if (this.unpatchChannelMemberRender) {
+            for (const channelMember of document.querySelectorAll('.member-2FrNV0')) {
+                Reflection(channelMember).forceUpdate();
+            }
         }
 
         return this.PatchedNameTag;

From d2f7e6142f629b7212dcf632427535867afcfe79 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Sun, 8 Apr 2018 17:00:26 +0100
Subject: [PATCH 11/13] Fix dropdowns not showing the selected option

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

diff --git a/client/src/ui/components/common/Dropdown.vue b/client/src/ui/components/common/Dropdown.vue
index 64b74b24..bcaad311 100644
--- a/client/src/ui/components/common/Dropdown.vue
+++ b/client/src/ui/components/common/Dropdown.vue
@@ -17,7 +17,7 @@
             </span>
         </div>
         <div class="bd-dropdown-options bd-flex bd-flex-col" ref="options" v-if="active">
-            <div class="bd-dropdown-option" v-for="option in options" :class="{'bd-dropdown-option-selected': selected === option.value}" @click="select(option)">{{ option.text }}</div>
+            <div class="bd-dropdown-option" v-for="option in options" :class="{'bd-dropdown-option-selected': value === option.value}" @click="select(option)">{{ option.text }}</div>
         </div>
     </div>
 </template>
@@ -32,8 +32,8 @@
         },
         methods: {
             getSelectedText() {
-                const selected_option = this.options.find(option => option.value === this.selected);
-                return selected_option ? selected_option.text : this.selected;
+                const selected_option = this.options.find(option => option.value === this.value);
+                return selected_option ? selected_option.text : this.value;
             },
             select(option) {
                 this.$emit('input', option.value);

From 7adf63dfa846258d1db4f1f7b47e88b765f1b5c3 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Sun, 8 Apr 2018 19:54:48 +0100
Subject: [PATCH 12/13] Prevent escape closing Discord and BetterDiscord
 menus/modals at the same time

---
 client/src/ui/components/BdSettingsWrapper.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/client/src/ui/components/BdSettingsWrapper.vue b/client/src/ui/components/BdSettingsWrapper.vue
index 323acdfc..1b636769 100644
--- a/client/src/ui/components/BdSettingsWrapper.vue
+++ b/client/src/ui/components/BdSettingsWrapper.vue
@@ -45,6 +45,10 @@
                 if (this.$refs.settings.activeIndex !== -1) this.$refs.settings.closeContent();
                 else this.active = false;
                 e.stopImmediatePropagation();
+            },
+            prevent(e) {
+                if (this.active && e.which === 27)
+                    e.stopImmediatePropagation();
             }
         },
         watch: {
@@ -68,12 +72,14 @@
             Events.on('update-check-end', e => this.updating = 1);
             Events.on('updates-available', e => this.updating = 2);
             window.addEventListener('keyup', this.keyupListener);
+            window.addEventListener('keydown', this.prevent, true);
 
             const menuKeybind = Settings.getSetting('core', 'default', 'menu-keybind');
             menuKeybind.on('keybind-activated', () => this.active = !this.active);
         },
         destroyed() {
             window.removeEventListener('keyup', this.keyupListener);
+            window.removeEventListener('keydown', this.prevent);
         }
     }
 </script>

From 7fb8337095b38b1aeb6bf6c4f6764e7e9a1da5d7 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Mon, 9 Apr 2018 21:12:53 +0100
Subject: [PATCH 13/13] Fix for plain CSS themes

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

diff --git a/client/src/modules/theme.js b/client/src/modules/theme.js
index bbabc810..ec961d2e 100644
--- a/client/src/modules/theme.js
+++ b/client/src/modules/theme.js
@@ -148,6 +148,8 @@ export default class Theme extends Content {
      * @param {Array} files Files to watch
      */
     set watchfiles(files) {
+        if (!files) files = [];
+
         for (let file of files) {
             if (!this.watchfiles.includes(file)) {
                 this.filewatcher.add(file);