From 99ef0d9f81b8d9c2fb02e43e3e36da6215515414 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 24 Feb 2019 12:28:29 +0200
Subject: [PATCH 01/37] add bdedit

---
 editor/package.json          | 23 +++++++++++++++++++++
 editor/src/Editor.vue        | 12 +++++++++++
 editor/src/index.js          | 22 ++++++++++++++++++++
 editor/src/styles/index.scss |  0
 editor/webpack.config.js     | 39 ++++++++++++++++++++++++++++++++++++
 package-lock.json            | 16 ++++++++++++---
 package.json                 |  3 +++
 7 files changed, 112 insertions(+), 3 deletions(-)
 create mode 100644 editor/package.json
 create mode 100644 editor/src/Editor.vue
 create mode 100644 editor/src/index.js
 create mode 100644 editor/src/styles/index.scss
 create mode 100644 editor/webpack.config.js

diff --git a/editor/package.json b/editor/package.json
new file mode 100644
index 00000000..0e692209
--- /dev/null
+++ b/editor/package.json
@@ -0,0 +1,23 @@
+{
+  "name": "bdeditorwindow",
+  "description": "BetterDiscord editor window",
+  "author": "JsSucks",
+  "version": "0.4.0",
+  "homepage": "https://betterdiscord.net",
+  "license": "MIT",
+  "main": "dist/csseditor.js",
+  "contributors": [
+    "Jiiks",
+    "Pohky"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/JsSucks/BetterDiscordApp.git"
+  },
+  "private": false,
+  "scripts": {
+    "build": "webpack --progress --colors",
+    "watch": "webpack --progress --colors --watch",
+    "release": "webpack --progress --colors --config=webpack.production.config.js"
+  }
+}
diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
new file mode 100644
index 00000000..1406c147
--- /dev/null
+++ b/editor/src/Editor.vue
@@ -0,0 +1,12 @@
+<template>
+    <div class="container"></div>
+</template>
+
+<script>
+
+    import { BDEdit } from 'bdedit';
+
+    export default {
+        components: { BDEdit }
+    }
+</script>
diff --git a/editor/src/index.js b/editor/src/index.js
new file mode 100644
index 00000000..756464cc
--- /dev/null
+++ b/editor/src/index.js
@@ -0,0 +1,22 @@
+// const styles = require('./styles/index.scss');
+
+import Vue from 'vue';
+
+import Editor from './Editor.vue';
+import styles from './styles/index.scss';
+
+const mount = document.createElement('div');
+mount.classList.add('container');
+document.body.appendChild(mount);
+
+const vue = new Vue({
+    el: mount,
+    components: { Editor },
+    template: '<Editor/>'
+});
+
+const style = document.createElement('style');
+style.id = 'bd-main';
+style.type = 'text/css';
+style.appendChild(document.createTextNode(styles));
+document.head.appendChild(style);
diff --git a/editor/src/styles/index.scss b/editor/src/styles/index.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/editor/webpack.config.js b/editor/webpack.config.js
new file mode 100644
index 00000000..5a36e052
--- /dev/null
+++ b/editor/webpack.config.js
@@ -0,0 +1,39 @@
+const path = require('path');
+const webpack = require('webpack');
+
+const vueLoader = {
+    test: /\.(vue)$/,
+    exclude: /node_modules/,
+    loader: 'vue-loader'
+};
+
+const scssLoader = {
+    test: /\.(css|scss)$/,
+    loader: ['css-loader', 'sass-loader']
+};
+
+module.exports = {
+    entry: './src/index.js',
+    output: {
+        path: path.resolve(__dirname, 'dist'),
+        filename: 'editor.js'
+    },
+    module: {
+        loaders: [vueLoader, scssLoader]
+    },
+    externals: {
+        electron: 'window.require("electron")',
+        fs: 'window.require("fs")',
+        util: 'window.require("util")',
+        process: 'require("process")'
+    },
+    resolve: {
+        alias: {
+            vue$: path.resolve('..', 'node_modules', 'vue', 'dist', 'vue.esm.js')
+        },
+        modules: [
+            path.resolve('..', 'node_modules'),
+            path.resolve('..', 'common', 'modules')
+        ]
+    }
+};
diff --git a/package-lock.json b/package-lock.json
index 1a770741..81231f81 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,6 +15,12 @@
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
       "integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg="
     },
+    "ace-builds": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.4.3.tgz",
+      "integrity": "sha512-T+e4DQRQR8ReNPOUryXWdXRX1NBTb9rB1y42IhnH4mmFe0NIIpAQVu8BQ9tgU2K3EGaPFZeG7E87OOjaXDP8PQ==",
+      "dev": true
+    },
     "acorn": {
       "version": "5.7.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz",
@@ -1581,6 +1587,13 @@
         "tweetnacl": "0.14.5"
       }
     },
+    "bdedit": {
+      "version": "github:JsSucks/BDEdit#1ddc18aa4ae980cd0d50618ba4ffa73721a6819e",
+      "dev": true,
+      "requires": {
+        "ace-builds": "1.4.3"
+      }
+    },
     "beeper": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
@@ -2828,9 +2841,6 @@
         "randomfill": "1.0.4"
       }
     },
-    "csp-parse": {
-      "version": "github:macropodhq/csp-parse#db7d5f954b420b527d7fb452a93bb6e2fa302c5a"
-    },
     "css-color-names": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
diff --git a/package.json b/package.json
index dc7329f9..32024844 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "babel-preset-env": "^1.7.0",
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-react": "^6.24.1",
+    "bdedit": "github:JsSucks/BDEdit",
     "codemirror": "^5.39.2",
     "combokeys": "^3.0.0",
     "css-loader": "^0.28.11",
@@ -82,6 +83,8 @@
     "watch_core": "npm run watch --prefix core",
     "build_csseditor": "npm run build --prefix csseditor",
     "watch_csseditor": "npm run watch --prefix csseditor",
+    "build_editor": "npm run build --prefix editor",
+    "watch_editor": "npm run watch --prefix editor",
     "lint": "eslint -f unix client/src core/src csseditor/src common && npm run sasslint",
     "lint_fix": "eslint -f unix client/src core/src csseditor/src common --fix",
     "sasslint": "sass-lint client/src/styles/**/*.scss -v",

From f1f23fa220c52c419722f760d0247d9f06801983 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 24 Feb 2019 13:03:15 +0200
Subject: [PATCH 02/37] Initial BDEdit addition. No logic yet.

---
 core/src/main.js                | 11 ++--
 core/src/modules/editor.js      | 93 +++++++++++++++++++++++++++++++++
 core/src/modules/index.js       |  1 +
 editor/src/Editor.vue           | 22 +++++++-
 editor/src/styles/index.scss    | 20 +++++++
 editor/src/styles/titlebar.scss | 71 +++++++++++++++++++++++++
 editor/src/styles/vars.scss     |  2 +
 package-lock.json               |  2 +-
 package.json                    |  2 +-
 9 files changed, 216 insertions(+), 8 deletions(-)
 create mode 100644 core/src/modules/editor.js
 create mode 100644 editor/src/styles/titlebar.scss
 create mode 100644 editor/src/styles/vars.scss

diff --git a/core/src/main.js b/core/src/main.js
index 29494434..5b4caf58 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -21,7 +21,8 @@ const TEST_ARGS = () => {
         'paths': {
             'client': path.resolve(_basePath, 'client', 'dist'),
             'core': path.resolve(_basePath, 'core', 'dist'),
-            'data': path.resolve(_baseDataPath, 'data')
+            'data': path.resolve(_baseDataPath, 'data'),
+            'editor': path.resolve(_basePath, 'editor', 'dist')
         }
     }
 }
@@ -33,7 +34,7 @@ import deepmerge from 'deepmerge';
 import ContentSecurityPolicy from 'csp-parse';
 import keytar from 'keytar';
 
-import { FileUtils, BDIpc, Config, WindowUtils, CSSEditor, Database } from './modules';
+import { FileUtils, BDIpc, Config, WindowUtils, CSSEditor, Editor, Database } from './modules';
 
 const packageJson = require(path.resolve(__dirname, 'package.json'));
 const sparkplug = path.resolve(__dirname, 'sparkplug.js');
@@ -63,7 +64,8 @@ class Comms {
         BDIpc.on('bd-sendToDiscord', (event, m) => this.sendToDiscord(m.channel, m.message), true);
 
         // BDIpc.on('bd-openCssEditor', (event, options) => this.bd.csseditor.openEditor(options), true);
-        BDIpc.on('bd-sendToCssEditor', (event, m) => this.sendToCssEditor(m.channel, m.message), true);
+        // BDIpc.on('bd-sendToCssEditor', (event, m) => this.sendToCssEditor(m.channel, m.message), true);
+        BDIpc.on('bd-openCssEditor', (event, options) => this.bd.editor.openEditor(options), true);
 
         BDIpc.on('bd-native-open', (event, options) => {
             dialog.showOpenDialog(OriginalBrowserWindow.fromWebContents(event.ipcEvent.sender), options, filenames => {
@@ -148,7 +150,8 @@ export class BetterDiscord {
     get comms() { return this._comms ? this._comms : (this._commas = new Comms(this)); }
     get database() { return this._db ? this._db : (this._db = new Database(this.config.getPath('data'))); }
     get config() { return this._config ? this._config : (this._config = new Config(this._args)); }
-    get window() {  return this.windowUtils ? this.windowUtils.window : undefined; }
+    get window() { return this.windowUtils ? this.windowUtils.window : undefined; }
+    get editor() { return this._editor ? this._editor : (this._editor = new Editor(this, this.config.getPath('editor'))); }
 
     constructor(args) {
         if (TESTS) args = TEST_ARGS();
diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
new file mode 100644
index 00000000..0f4b46e7
--- /dev/null
+++ b/core/src/modules/editor.js
@@ -0,0 +1,93 @@
+/**
+ * BetterDiscord Editor Module
+ * Copyright (c) 2015-present JsSucks - https://github.com/JsSucks
+ * All rights reserved.
+ * https://github.com/JsSucks - https://betterdiscord.net
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+*/
+
+import path from 'path';
+import { BrowserWindow } from 'electron';
+
+import Module from './modulebase';
+import { WindowUtils } from './utils';
+import BDIpc from './bdipc';
+
+export default class Editor extends Module {
+
+    constructor(bd, path) {
+        super();
+        this.editorPath = path;
+        this.bd = bd;
+    }
+
+    /**
+     * Opens an editor.
+     * @return {Promise}
+     */
+    openEditor(options) {
+        return new Promise((resolve, reject) => {
+            if (this.editor) {
+                if (this.editor.isFocused()) return;
+
+                this.editor.focus();
+                this.editor.flashFrame(true);
+                return resolve(true);
+            }
+
+            options = Object.assign({}, this.options, options);
+
+            this.editor = new BrowserWindow(options);
+            this.editor.loadURL('about:blank');
+            this.editor.setSheetOffset(33);
+            this.editorUtils = new WindowUtils({ window: this.editor });
+
+            this.editor.on('close', () => {
+                this.bd.windowUtils.send('bd-save-csseditor-bounds', this.editor.getBounds());
+                this.editor = null;
+            });
+
+            this.editor.once('ready-to-show', () => {
+                this.editor.show();
+            });
+
+            this.editor.webContents.on('did-finish-load', () => {
+                this.editorUtils.injectScript(path.join(this.editorPath, 'editor.js'));
+                resolve(true);
+            });
+        })
+    }
+
+    /**
+     * Sends data to the editor.
+     * @param {String} channel
+     * @param {Any} data
+     */
+    send(channel, data) {
+        if (!this.editor) throw { message: 'The CSS editor is not open.' };
+        return BDIpc.send(this.editor, channel, data);
+    }
+
+    /**
+     * Sets the CSS editor's always on top flag.
+     */
+    set alwaysOnTop(state) {
+        if (!this.editor) return;
+        this.editor.setAlwaysOnTop(state);
+    }
+
+    /**
+     * Default options to pass to BrowserWindow.
+     */
+    get options() {
+        return {
+            width: 800,
+            height: 600,
+            show: false,
+            frame: false
+        };
+    }
+
+}
diff --git a/core/src/modules/index.js b/core/src/modules/index.js
index 5f922a23..4a56e948 100644
--- a/core/src/modules/index.js
+++ b/core/src/modules/index.js
@@ -2,4 +2,5 @@ export { default as BDIpc } from './bdipc';
 export { Utils, FileUtils, WindowUtils } from './utils';
 export { default as Config } from './config';
 export { default as CSSEditor } from './csseditor';
+export { default as Editor } from './editor';
 export { default as Database } from './database';
diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index 1406c147..e226b8e7 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -1,12 +1,30 @@
 <template>
-    <div class="container"></div>
+    <div class="container">
+        <div class="titlebar">
+            <div class="draggable"></div>
+            <div class="icon">
+                <div class="inner"></div>
+            </div>
+            <div class="title">Content Editor</div>
+            <div class="flex-spacer"></div>
+            <div class="controls">
+                <button :class="{active: alwaysOnTop}" ref="aot" title="Toggle always on top" @click="toggleaot">P</button>
+                <button title="Close CSS Editor" @click="close">X</button>
+            </div>
+        </div>
+        <BDEdit />
+    </div>
 </template>
 
 <script>
 
     import { BDEdit } from 'bdedit';
+    ace.acequire = ace.require;
 
     export default {
-        components: { BDEdit }
+        components: { BDEdit },
+        mounted() {
+            console.log(ace);
+        }
     }
 </script>
diff --git a/editor/src/styles/index.scss b/editor/src/styles/index.scss
index e69de29b..8ec713ef 100644
--- a/editor/src/styles/index.scss
+++ b/editor/src/styles/index.scss
@@ -0,0 +1,20 @@
+@import './vars.scss';
+@import './titlebar.scss';
+
+html, body {
+    margin: 0;
+    padding: 0;
+    display: flex;
+    max-height: 100%;
+    height: 100%;
+    width: 100%;
+    background: #2c383e;
+    min-width: 700px;
+    min-height: 400px;
+}
+
+.container {
+    display: flex;
+    flex-grow: 1;
+    flex-direction: column;
+}
diff --git a/editor/src/styles/titlebar.scss b/editor/src/styles/titlebar.scss
new file mode 100644
index 00000000..b837087a
--- /dev/null
+++ b/editor/src/styles/titlebar.scss
@@ -0,0 +1,71 @@
+.titlebar {
+    display: flex;
+    height: 25px;
+    padding: 4px 5px;
+    background: #292b2f;
+    border-bottom: 1px solid hsla(218,5%,47%,.3);
+    user-select: none;
+    cursor: default;
+
+    .icon {
+        width: 31px;
+        height: 25px;
+
+        .inner {
+            width: 25px;
+            height: 25px;
+            background-image: $bdicon;
+            background-size: 22px 22px;
+            background-repeat: no-repeat;
+            background-position: center;
+        }
+    }
+
+    .title {
+        color: #bac9d2;
+        font-family: Whitney,Helvetica Neue,Helvetica,Arial,sans-serif;
+        line-height: 25px;
+        font-size: 15px;
+    }
+
+    .controls {
+        margin: 0 0 0 2px;
+        font-size: 0;
+
+        button {
+            -webkit-app-region: no-drag;
+            border-radius: 3px;
+            width: 25px;
+            font-size: 12px;
+            font-weight: 600;
+            background: #36393f;
+            color: #bac9d2;
+            font-family: Whitney,Helvetica Neue,Helvetica,Arial,sans-serif;
+            transition: background-color .2s ease, color .2s ease;
+            cursor: default;
+            border: 0;
+            height: 25px;
+            z-index: 900062;
+            padding: 0;
+            margin: 0 0 0 4px;
+
+            &:hover {
+                background: #44474e;
+                color: #FFF;
+            }
+
+            &.active {
+                background: #3a71c1;
+            }
+        }
+    }
+
+    .draggable {
+        top: 0;
+        left: 0;
+        right: 63px;
+        position: absolute;
+        height: 33px;
+        -webkit-app-region: drag;
+    }
+}
diff --git a/editor/src/styles/vars.scss b/editor/src/styles/vars.scss
new file mode 100644
index 00000000..202ab708
--- /dev/null
+++ b/editor/src/styles/vars.scss
@@ -0,0 +1,2 @@
+$logoSmallGw: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkltYWdlIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCIgdmlld0JveD0iMCAwIDUxMiA1MTIiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDUxMiA1MTI7IiB4bWw6c3BhY2U9InByZXNlcnZlIj48c3R5bGUgdHlwZT0idGV4dC9jc3MiPi5zdDB7ZGlzcGxheTpub25lO30uc3Qxe2Rpc3BsYXk6aW5saW5lO2ZpbGw6IzAyMDAzNTtzdHJva2U6IzAwMDAwMDtzdHJva2UtbWl0ZXJsaW1pdDoxMDt9LnN0MntmaWxsOiMzRUNDOUU7fS5zdDN7ZmlsbDojRkZGRkZGO308L3N0eWxlPjxnIGlkPSJMYXllcl8yIiBjbGFzcz0ic3QwIj48cmVjdCB4PSItNjQiIHk9Ii0zMiIgY2xhc3M9InN0MSIgd2lkdGg9IjYxOCIgaGVpZ2h0PSI1NzIiLz48L2c+PGcgaWQ9IkxheWVyXzEiIHhtbG5zOnZlY3Rvcm5hdG9yPSJodHRwOi8vdmVjdG9ybmF0b3IuaW8iPjxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik03MCwxOC44Yy0xMy43LDAtMjcuMywxMy43LTI3LjMsMjcuM3YyMzMuNkM0Mi43LDM5Ny43LDEzNy45LDQ5MywyNTYsNDkzYzI5LjcsMCw1OC02LjEsODMuNi0xN1YzNDEuNWMtMTksMjUuNi00OS4zLDQyLjItODMuNiw0Mi4yYy01Ny42LDAtMTA0LjEtNDYuNS0xMDQuMS0xMDQuMVY0Ni4xYzAtMTMuNy0xMy43LTI3LjMtMjcuMy0yNy4zSDcweiIvPjxwYXRoIGNsYXNzPSJzdDMiIGQ9Ik0zODcuNCwxOC44Yy0xMy43LDAtMjcuMywxMy43LTI3LjMsMjcuM3Y0Ny4zQzMyOS4zLDc2LjIsMjkzLjksNjYuMywyNTYsNjYuM2MtMjkuOCwwLTU3LjksNi4zLTgzLjYsMTcuM3YxMzQuMmMxOS0yNS42LDQ5LjMtNDIuMiw4My42LTQyLjJjNTcuNiwwLDEwNC4xLDQ2LjUsMTA0LjEsMTA0LjF2MTg2LjJjNjUuMi0zNi40LDEwOS4yLTEwNiwxMDkuMi0xODYuMlY0Ni4xYzAtMTguOC0xMy43LTI3LjMtMjcuMy0yNy4zSDM4Ny40eiIvPjwvZz48L3N2Zz4=);
+$bdicon: $logoSmallGw;
diff --git a/package-lock.json b/package-lock.json
index 81231f81..3d4e2421 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1588,7 +1588,7 @@
       }
     },
     "bdedit": {
-      "version": "github:JsSucks/BDEdit#1ddc18aa4ae980cd0d50618ba4ffa73721a6819e",
+      "version": "github:JsSucks/bdedit#1ddc18aa4ae980cd0d50618ba4ffa73721a6819e",
       "dev": true,
       "requires": {
         "ace-builds": "1.4.3"
diff --git a/package.json b/package.json
index 32024844..b137bf70 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
   "dependencies": {
     "asar": "^0.14.6",
     "csp-parse": "github:macropodhq/csp-parse",
+    "bdedit": "github:JsSucks/bdedit",
     "deepmerge": "^2.2.1",
     "fs-extra": "^7.0.0",
     "keytar": "^4.3.0",
@@ -33,7 +34,6 @@
     "babel-preset-env": "^1.7.0",
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-react": "^6.24.1",
-    "bdedit": "github:JsSucks/BDEdit",
     "codemirror": "^5.39.2",
     "combokeys": "^3.0.0",
     "css-loader": "^0.28.11",

From a76938521965df08c26d2132e6328b31c10f9af1 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 24 Feb 2019 16:04:25 +0200
Subject: [PATCH 03/37] Run scripts from editor in Discord window

---
 client/src/modules/csseditor.js |  8 ++++++
 core/src/main.js                | 10 ++++++++
 editor/src/Editor.vue           | 45 +++++++++++++++++++++++++++++++--
 package-lock.json               |  9 ++++---
 package.json                    |  2 +-
 5 files changed, 67 insertions(+), 7 deletions(-)

diff --git a/client/src/modules/csseditor.js b/client/src/modules/csseditor.js
index 6534532b..487c1516 100644
--- a/client/src/modules/csseditor.js
+++ b/client/src/modules/csseditor.js
@@ -38,6 +38,14 @@ export default new class {
         ClientIPC.on('bd-get-scss', () => this.scss, true);
         ClientIPC.on('bd-update-scss', (e, scss) => this.updateScss(scss));
         ClientIPC.on('bd-save-csseditor-bounds', (e, bounds) => this.saveEditorBounds(bounds));
+        ClientIPC.on('bd-runEditorScript', (e, script) => {
+            try {
+                new Function(script)();
+                e.reply('ok');
+            } catch (err) {
+                e.reply({ err: err.stack || err });
+            }
+        });
 
         ClientIPC.on('bd-save-scss', async (e, scss) => {
             await this.updateScss(scss);
diff --git a/core/src/main.js b/core/src/main.js
index 5b4caf58..aeae655d 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -53,10 +53,13 @@ const CSP = {
 class Comms {
     constructor(bd) {
         this.bd = bd;
+        this.editorListeners = this.editorListeners.bind(this);
         this.initListeners();
     }
 
     initListeners() {
+        this.editorListeners();
+
         BDIpc.on('ping', () => 'pong', true);
 
         BDIpc.on('bd-getConfig', () => this.bd.config.config, true);
@@ -93,6 +96,13 @@ class Comms {
         BDIpc.on('bd-keytar-find-credentials', (event, { service }) => keytar.findCredentials(service), true);
     }
 
+    editorListeners() {
+        BDIpc.on('bd-editor-runScript', async (event, script) => {
+            const result = await this.sendToDiscord('bd-runEditorScript', script);
+            event.reply(result);
+        });
+    }
+
     async send(channel, message) {
         BDIpc.send(channel, message);
     }
diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index e226b8e7..ae0500db 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -12,19 +12,60 @@
                 <button title="Close CSS Editor" @click="close">X</button>
             </div>
         </div>
-        <BDEdit />
+        <BDEdit
+            :files="files"
+            :snippets="snippets"
+            :updateContent="updateContent"
+            :runScript="runScript"
+        />
     </div>
 </template>
 
 <script>
 
+    import { ClientIPC } from 'common';
+    import { remote } from 'electron';
+
     import { BDEdit } from 'bdedit';
     ace.acequire = ace.require;
 
     export default {
+        data() {
+            return {
+                files: [{ type: 'file', name: 'custom.scss', content: 'asd', savedContent: 'asd', mode: 'scss', saved: true }],
+                snippets: [],
+                loading: true,
+                alwaysOnTop: false,
+                error: undefined
+            }
+        },
         components: { BDEdit },
+        created() {
+            ClientIPC.on('bd-editor-addFile', (_, file) => this.addFile(file));
+            ClientIPC.on('bd-editor-addSnippet', (_, snippet) => this.addSnippet(snippet));
+        },
         mounted() {
-            console.log(ace);
+        },
+        methods: {
+            addFile(file) { this.files.push(file) },
+            addSnippet(snippet) { this.snippets.push(file) },
+
+            updateContent(item, content) {
+                item.content = content;
+                item.saved = item.content === item.savedContent;
+            },
+
+            async runScript(script) {
+                return ClientIPC.send('editor-runScript', script);
+            },
+
+            toggleaot() {
+                this.alwaysOnTop = !this.alwaysOnTop;
+                remote.getCurrentWindow().setAlwaysOnTop(this.alwaysOnTop);
+            },
+            close() {
+                window.close();
+            }
         }
     }
 </script>
diff --git a/package-lock.json b/package-lock.json
index 3d4e2421..75f8c63f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,8 +18,7 @@
     "ace-builds": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.4.3.tgz",
-      "integrity": "sha512-T+e4DQRQR8ReNPOUryXWdXRX1NBTb9rB1y42IhnH4mmFe0NIIpAQVu8BQ9tgU2K3EGaPFZeG7E87OOjaXDP8PQ==",
-      "dev": true
+      "integrity": "sha512-T+e4DQRQR8ReNPOUryXWdXRX1NBTb9rB1y42IhnH4mmFe0NIIpAQVu8BQ9tgU2K3EGaPFZeG7E87OOjaXDP8PQ=="
     },
     "acorn": {
       "version": "5.7.1",
@@ -1588,8 +1587,7 @@
       }
     },
     "bdedit": {
-      "version": "github:JsSucks/bdedit#1ddc18aa4ae980cd0d50618ba4ffa73721a6819e",
-      "dev": true,
+      "version": "github:JsSucks/bdedit#95cea7f8d55cf97a9e7dff9d0bf82c7af7c38312",
       "requires": {
         "ace-builds": "1.4.3"
       }
@@ -2841,6 +2839,9 @@
         "randomfill": "1.0.4"
       }
     },
+    "csp-parse": {
+      "version": "github:macropodhq/csp-parse#db7d5f954b420b527d7fb452a93bb6e2fa302c5a"
+    },
     "css-color-names": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
diff --git a/package.json b/package.json
index b137bf70..de2c3eee 100644
--- a/package.json
+++ b/package.json
@@ -17,8 +17,8 @@
   "private": false,
   "dependencies": {
     "asar": "^0.14.6",
-    "csp-parse": "github:macropodhq/csp-parse",
     "bdedit": "github:JsSucks/bdedit",
+    "csp-parse": "github:macropodhq/csp-parse",
     "deepmerge": "^2.2.1",
     "fs-extra": "^7.0.0",
     "keytar": "^4.3.0",

From 691c9f378a235c8718145848136635c5c9bbc2a9 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 24 Feb 2019 18:29:00 +0200
Subject: [PATCH 04/37] new file/snippet

---
 editor/src/Editor.vue | 61 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index ae0500db..71430d37 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -17,6 +17,10 @@
             :snippets="snippets"
             :updateContent="updateContent"
             :runScript="runScript"
+            :newFile="newFile"
+            :saveFile="saveFile"
+            :newSnippet="newSnippet"
+            :saveSnippet="saveSnippet"
         />
     </div>
 </template>
@@ -29,6 +33,21 @@
     import { BDEdit } from 'bdedit';
     ace.acequire = ace.require;
 
+    const modes = {
+        'css': 'css',
+        'scss': 'scss',
+        'js': 'js',
+        'txt': 'text',
+        'json': 'json'
+    };
+
+    function resolveMode(fileName) {
+        if (!fileName.includes('.')) return 'text';
+        const ext = fileName.substr(fileName.lastIndexOf('.') + 1);
+        if (modes.hasOwnProperty(ext)) return modes[ext];
+        return 'text';
+    }
+
     export default {
         data() {
             return {
@@ -59,6 +78,48 @@
                 return ClientIPC.send('editor-runScript', script);
             },
 
+            newFile(fileName) {
+                const prefix = fileName;
+                const mode = resolveMode(fileName);
+
+                let newName = prefix;
+                let iter = 0;
+
+                while (this.files.find(file => file.name === newName)) {
+                    newName = `${prefix}_${iter}`;
+                    iter++;
+                }
+
+                const newItem = { type: 'file', name: newName, content: '', mode, saved: false };
+                this.files.push(newItem);
+                return newItem;
+            },
+
+            newSnippet(snippetName) {
+                const prefix = snippetName;
+                const mode = resolveMode(snippetName);
+
+                let newName = prefix;
+                let iter = 0;
+
+                while (this.snippets.find(snippet => snippet.name === newName)) {
+                    newName = `${prefix}_${iter}`;
+                    iter++;
+                }
+
+                const newItem = { type: 'snippet', name: newName, content: '', mode, saved: false };
+                this.snippets.push(newItem);
+                return newItem;
+            },
+
+            saveFile(file) {
+                
+            },
+
+            saveSnippet(snippet) {
+
+            },
+
             toggleaot() {
                 this.alwaysOnTop = !this.alwaysOnTop;
                 remote.getCurrentWindow().setAlwaysOnTop(this.alwaysOnTop);

From 3fc1adc503b6c6a352798afdc850b261a7f5ee4d Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 24 Feb 2019 18:39:28 +0200
Subject: [PATCH 05/37] get files/snippets from core

---
 core/src/main.js      | 12 ++++++++++++
 editor/src/Editor.vue | 34 ++++++++++++++++++++++------------
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/core/src/main.js b/core/src/main.js
index aeae655d..3f2efbac 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -101,6 +101,18 @@ class Comms {
             const result = await this.sendToDiscord('bd-runEditorScript', script);
             event.reply(result);
         });
+
+        BDIpc.on('bd-editor-getFiles', async (event) => {
+            event.reply([
+                { type: 'file', name: 'custom.scss', content: '', savedContent: '', mode: 'scss', saved: true }
+            ]);
+        });
+
+        BDIpc.on('bd-editor-getSnippets', async (event) => {
+            event.reply([
+                { type: 'snippet', name: 'test.js', content: '', savedContent: '', mode: 'javascript', saved: true }
+            ]);
+        });
     }
 
     async send(channel, message) {
diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index 71430d37..140c18c9 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -12,16 +12,17 @@
                 <button title="Close CSS Editor" @click="close">X</button>
             </div>
         </div>
-        <BDEdit
-            :files="files"
-            :snippets="snippets"
-            :updateContent="updateContent"
-            :runScript="runScript"
-            :newFile="newFile"
-            :saveFile="saveFile"
-            :newSnippet="newSnippet"
-            :saveSnippet="saveSnippet"
-        />
+        <div id="spinner" v-if="loading">
+            <div class="valign">Loading Please Wait...</div>
+        </div>
+        <BDEdit v-else :files="files"
+                :snippets="snippets"
+                :updateContent="updateContent"
+                :runScript="runScript"
+                :newFile="newFile"
+                :saveFile="saveFile"
+                :newSnippet="newSnippet"
+                :saveSnippet="saveSnippet" />
     </div>
 </template>
 
@@ -51,7 +52,7 @@
     export default {
         data() {
             return {
-                files: [{ type: 'file', name: 'custom.scss', content: 'asd', savedContent: 'asd', mode: 'scss', saved: true }],
+                files: [],
                 snippets: [],
                 loading: true,
                 alwaysOnTop: false,
@@ -64,9 +65,17 @@
             ClientIPC.on('bd-editor-addSnippet', (_, snippet) => this.addSnippet(snippet));
         },
         mounted() {
+            (async () => {
+                this.files = await ClientIPC.send('bd-editor-getFiles');
+                this.snippets = await ClientIPC.send('bd-editor-getSnippets');
+
+                this.loading = false;
+            })();
         },
         methods: {
-            addFile(file) { this.files.push(file) },
+            addFile(file) {
+                this.files.push(file);
+            },
             addSnippet(snippet) { this.snippets.push(file) },
 
             updateContent(item, content) {
@@ -124,6 +133,7 @@
                 this.alwaysOnTop = !this.alwaysOnTop;
                 remote.getCurrentWindow().setAlwaysOnTop(this.alwaysOnTop);
             },
+
             close() {
                 window.close();
             }

From 8c04e7d2d35b8f1220e372c7cec8167d1fe463a2 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 24 Feb 2019 18:43:58 +0200
Subject: [PATCH 06/37] File/snippet saving signals

---
 core/src/main.js      | 10 ++++++++++
 editor/src/Editor.vue | 10 ++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/core/src/main.js b/core/src/main.js
index 3f2efbac..18aa7bc0 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -113,6 +113,16 @@ class Comms {
                 { type: 'snippet', name: 'test.js', content: '', savedContent: '', mode: 'javascript', saved: true }
             ]);
         });
+
+        BDIpc.on('bd-editor-saveFile', async (event, file) => {
+            console.log(file);
+            event.reply('ok');
+        });
+
+        BDIpc.on('bd-editor-saveSnippet', async (event, snippet) => {
+            console.log(snippet);
+            event.reply('ok');
+        });
     }
 
     async send(channel, message) {
diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index 140c18c9..b79261d2 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -121,12 +121,14 @@
                 return newItem;
             },
 
-            saveFile(file) {
-                
+            async saveFile(file) {
+                const result = await ClientIPC.send('bd-editor-saveFile', file);
+                console.log(result);
             },
 
-            saveSnippet(snippet) {
-
+            async saveSnippet(snippet) {
+                const result = await ClientIPC.send('bd-editor-saveSnippet', snippet);
+                console.log(result);
             },
 
             toggleaot() {

From d1fd5ae881574d10af852fc8e7b8d64e4438cc15 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 24 Feb 2019 19:46:11 +0200
Subject: [PATCH 07/37] imodule and base for new editor module in client

---
 client/src/index.js                       |  4 +--
 client/src/modules/csseditor.js           |  2 +-
 client/src/modules/editor.js              | 40 +++++++++++++++++++++
 client/src/modules/imodule.js             | 44 +++++++++++++++++++++++
 client/src/modules/modules.js             |  1 +
 client/src/ui/components/bd/CssEditor.vue | 18 +++++-----
 core/src/main.js                          |  7 ++--
 7 files changed, 103 insertions(+), 13 deletions(-)
 create mode 100644 client/src/modules/editor.js
 create mode 100644 client/src/modules/imodule.js

diff --git a/client/src/index.js b/client/src/index.js
index c64134a0..5d2e315d 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -10,7 +10,7 @@
 
 import { DOM, BdUI, BdMenu, Modals, Toasts, Notifications, BdContextMenu, DiscordContextMenu } from 'ui';
 import BdCss from './styles/index.scss';
-import { Events, CssEditor, Globals, Settings, Database, Updater, ModuleManager, PluginManager, ThemeManager, ExtModuleManager, Vendor, Patcher, MonkeyPatch, ReactComponents, ReactHelpers, ReactAutoPatcher, DiscordApi, BdWebApi, Connectivity, Cache, Reflection, PackageInstaller } from 'modules';
+import { Events, Globals, Settings, Database, Updater, ModuleManager, PluginManager, ThemeManager, ExtModuleManager, Vendor, Patcher, MonkeyPatch, ReactComponents, ReactHelpers, ReactAutoPatcher, DiscordApi, BdWebApi, Connectivity, Cache, Reflection, PackageInstaller } from 'modules';
 import { ClientLogger as Logger, ClientIPC, Utils } from 'common';
 import { BuiltinManager, EmoteModule, ReactDevtoolsModule, VueDevtoolsModule, TrackingProtection, E2EE } from 'builtin';
 import electron from 'electron';
@@ -30,7 +30,7 @@ class BetterDiscord {
         this._bd = {
             DOM, BdUI, BdMenu, Modals, Reflection, Toasts, Notifications, BdContextMenu, DiscordContextMenu,
 
-            Events, CssEditor, Globals, Settings, Database, Updater,
+            Events, Globals, Settings, Database, Updater,
             ModuleManager, PluginManager, ThemeManager, ExtModuleManager, PackageInstaller,
             Vendor,
 
diff --git a/client/src/modules/csseditor.js b/client/src/modules/csseditor.js
index 487c1516..873a4943 100644
--- a/client/src/modules/csseditor.js
+++ b/client/src/modules/csseditor.js
@@ -38,7 +38,7 @@ export default new class {
         ClientIPC.on('bd-get-scss', () => this.scss, true);
         ClientIPC.on('bd-update-scss', (e, scss) => this.updateScss(scss));
         ClientIPC.on('bd-save-csseditor-bounds', (e, bounds) => this.saveEditorBounds(bounds));
-        ClientIPC.on('bd-runEditorScript', (e, script) => {
+        ClientIPC.on('bd-editor-runScript', (e, script) => {
             try {
                 new Function(script)();
                 e.reply('ok');
diff --git a/client/src/modules/editor.js b/client/src/modules/editor.js
new file mode 100644
index 00000000..b4cea53e
--- /dev/null
+++ b/client/src/modules/editor.js
@@ -0,0 +1,40 @@
+/**
+ * BetterDiscord Editor Module
+ * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
+ * All rights reserved.
+ * https://betterdiscord.net
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+*/
+
+import { FileUtils, ClientLogger as Logger, ClientIPC } from 'common';
+import Module from './imodule';
+
+export default new class extends Module {
+
+    setInitialState(state) {
+        return {
+            editorBounds: undefined
+        };
+    }
+
+    events() {
+        ClientIPC.on('editor-runScript', (e, script) => {
+            try {
+                new Function(script)();
+                e.reply('ok');
+            } catch (err) {
+                e.reply({ err: err.stack || err });
+            }
+        });
+    }
+
+    /**
+     * Show editor, flashes if already visible.
+     */
+    async show() {
+        await ClientIPC.send('editor-open', this.state.editorBounds);
+    }
+
+}
diff --git a/client/src/modules/imodule.js b/client/src/modules/imodule.js
new file mode 100644
index 00000000..0afbad3c
--- /dev/null
+++ b/client/src/modules/imodule.js
@@ -0,0 +1,44 @@
+/**
+ * BetterDiscord Module Base
+ * Copyright (c) 2015-present JsSucks - https://github.com/JsSucks
+ * All rights reserved.
+ * https://github.com/JsSucks - https://betterdiscord.net
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+*/
+
+/**
+ * Base Module that every non-static module should extend
+ */
+export default class Module {
+
+    constructor(args) {
+        this.__ = {
+            state: args || {},
+            args
+        };
+        this.setState = this.setState.bind(this);
+        this.initialize();
+    }
+
+    initialize() {
+        if (this.bindings) this.bindings();
+        if (this.setInitialState) this.setState(this.setInitialState(this.state));
+        if (this.events) this.events();
+        if (this.init) this.init();
+    }
+
+    setState(newState) {
+        const oldState = this.state;
+        Object.assign(this.state, newState);
+        if (this.stateChanged) this.stateChanged(oldState, newState);
+    }
+
+    set args(t) { }
+    get args() { return this.__.args; }
+
+    set state(state) { return this.__.state = state; }
+    get state() { return this.__.state; }
+
+}
diff --git a/client/src/modules/modules.js b/client/src/modules/modules.js
index 239e89f8..437f54fc 100644
--- a/client/src/modules/modules.js
+++ b/client/src/modules/modules.js
@@ -1,5 +1,6 @@
 export { default as Events } from './events';
 export { default as CssEditor } from './csseditor';
+export { default as Editor } from './editor';
 export { default as Globals } from './globals';
 export { default as Settings } from './settings';
 export { default as Database } from './database';
diff --git a/client/src/ui/components/bd/CssEditor.vue b/client/src/ui/components/bd/CssEditor.vue
index 18a39f57..a5639641 100644
--- a/client/src/ui/components/bd/CssEditor.vue
+++ b/client/src/ui/components/bd/CssEditor.vue
@@ -8,6 +8,8 @@
  * LICENSE file in the root directory of this source tree.
 */
 
+// TODO this should be remade as editor instead of css editor
+
 <template>
     <SettingsWrapper headertext="CSS Editor">
         <div class="bd-cssEditor">
@@ -49,7 +51,7 @@
 
 <script>
     // Imports
-    import { Settings, CssEditor } from 'modules';
+    import { Settings, Editor } from 'modules';
     import { SettingsWrapper } from './';
     import { FormButton } from '../common';
     import SettingsPanel from './SettingsPanel.vue';
@@ -64,18 +66,18 @@
         },
         data() {
             return {
-                CssEditor
+                Editor
             };
         },
         computed: {
             error() {
-                return this.CssEditor.error;
+                return this.Editor.error;
             },
             compiling() {
-                return this.CssEditor.compiling;
+                return this.Editor.compiling;
             },
             systemEditorPath() {
-                return this.CssEditor.filePath;
+                return this.Editor.filePath;
             },
             liveUpdateSetting() {
                 return Settings.getSetting('css', 'default', 'live-update');
@@ -92,13 +94,13 @@
         },
         methods: {
             openInternalEditor() {
-                this.CssEditor.show();
+                this.Editor.show();
             },
             openSystemEditor() {
-                this.CssEditor.openSystemEditor();
+                // this.Editor.openSystemEditor();
             },
             recompile() {
-                this.CssEditor.recompile();
+                // this.Editor.recompile();
             }
         }
     }
diff --git a/core/src/main.js b/core/src/main.js
index 18aa7bc0..1b07067f 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -68,7 +68,7 @@ class Comms {
 
         // BDIpc.on('bd-openCssEditor', (event, options) => this.bd.csseditor.openEditor(options), true);
         // BDIpc.on('bd-sendToCssEditor', (event, m) => this.sendToCssEditor(m.channel, m.message), true);
-        BDIpc.on('bd-openCssEditor', (event, options) => this.bd.editor.openEditor(options), true);
+        // BDIpc.on('bd-openCssEditor', (event, options) => this.bd.editor.openEditor(options), true);
 
         BDIpc.on('bd-native-open', (event, options) => {
             dialog.showOpenDialog(OriginalBrowserWindow.fromWebContents(event.ipcEvent.sender), options, filenames => {
@@ -97,8 +97,11 @@ class Comms {
     }
 
     editorListeners() {
+        BDIpc.on('bd-openCssEditor', (event, options) => this.bd.editor.openEditor(options), true);
+        BDIpc.on('bd-editor-open', (event, options) => this.bd.editor.openEditor(options), true);
+
         BDIpc.on('bd-editor-runScript', async (event, script) => {
-            const result = await this.sendToDiscord('bd-runEditorScript', script);
+            const result = await this.sendToDiscord('bd-editor-runScript', script);
             event.reply(result);
         });
 

From da1fc0a2f012e9dd336fed7f4b1349aac81b8b48 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 24 Feb 2019 19:57:46 +0200
Subject: [PATCH 08/37] Smol things

---
 client/src/modules/editor.js        | 10 +++++----
 client/src/modules/imodule.js       | 35 ++++++++++++++++++++++++++---
 client/src/modules/modulemanager.js |  3 +--
 3 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/client/src/modules/editor.js b/client/src/modules/editor.js
index b4cea53e..2f5a8e10 100644
--- a/client/src/modules/editor.js
+++ b/client/src/modules/editor.js
@@ -8,19 +8,21 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import { FileUtils, ClientLogger as Logger, ClientIPC } from 'common';
 import Module from './imodule';
 
 export default new class extends Module {
 
+    get name() { return 'Editor' }
+    get delay() { return false; }
+
     setInitialState(state) {
         return {
             editorBounds: undefined
         };
     }
 
-    events() {
-        ClientIPC.on('editor-runScript', (e, script) => {
+    events(ipc) {
+        ipc.on('editor-runScript', (e, script) => {
             try {
                 new Function(script)();
                 e.reply('ok');
@@ -34,7 +36,7 @@ export default new class extends Module {
      * Show editor, flashes if already visible.
      */
     async show() {
-        await ClientIPC.send('editor-open', this.state.editorBounds);
+        await this.send('editor-open', this.state.editorBounds);
     }
 
 }
diff --git a/client/src/modules/imodule.js b/client/src/modules/imodule.js
index 0afbad3c..88742d08 100644
--- a/client/src/modules/imodule.js
+++ b/client/src/modules/imodule.js
@@ -11,6 +11,9 @@
 /**
  * Base Module that every non-static module should extend
  */
+
+import { ClientLogger as Logger, ClientIPC } from 'common';
+
 export default class Module {
 
     constructor(args) {
@@ -19,14 +22,20 @@ export default class Module {
             args
         };
         this.setState = this.setState.bind(this);
-        this.initialize();
+        
+        if (this.delay) { // If delay is set then module is set to load delayed from modulemanager
+            this.initialize = this.initialize.bind(this);
+            this.init = this.initialize;
+        } else {
+            this.initialize();
+            this.init = () => { };
+        }
     }
 
     initialize() {
         if (this.bindings) this.bindings();
         if (this.setInitialState) this.setState(this.setInitialState(this.state));
-        if (this.events) this.events();
-        if (this.init) this.init();
+        if (this.events) this.events(ClientIPC);
     }
 
     setState(newState) {
@@ -41,4 +50,24 @@ export default class Module {
     set state(state) { return this.__.state = state; }
     get state() { return this.__.state; }
 
+    async send(channel, message) {
+        return ClientIPC.send(channel, message);
+    }
+
+    log(msg) {
+        Logger.log(this.name, msg);
+    }
+
+    warn(msg) {
+        Logger.log(this.name, msg);
+    }
+
+    err(msg) {
+        Logger.log(this.name, msg);
+    }
+
+    info(msg) {
+        Logger.log(this.name, msg);
+    }
+
 }
diff --git a/client/src/modules/modulemanager.js b/client/src/modules/modulemanager.js
index 962b7e93..13b94871 100644
--- a/client/src/modules/modulemanager.js
+++ b/client/src/modules/modulemanager.js
@@ -9,7 +9,7 @@
 */
 
 import { ClientLogger as Logger } from 'common';
-import { SocketProxy, EventHook, CssEditor } from 'modules';
+import { SocketProxy, EventHook } from 'modules';
 import { ProfileBadges, ClassNormaliser } from 'ui';
 import Updater from './updater';
 
@@ -27,7 +27,6 @@ export default class {
             new ClassNormaliser(),
             new SocketProxy(),
             new EventHook(),
-            CssEditor,
             Updater
         ]);
     }

From 1a26e77dd9de056582cee5c95a876d6fd06c9638 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 24 Feb 2019 21:24:37 +0200
Subject: [PATCH 09/37] Move editor events to editor

---
 client/src/index.js        |  2 +-
 core/src/main.js           | 35 +----------------------------------
 core/src/modules/editor.js | 37 +++++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/client/src/index.js b/client/src/index.js
index 5d2e315d..de27de87 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -18,7 +18,7 @@ import path from 'path';
 import { setTimeout } from 'timers';
 
 const tests = typeof PRODUCTION === 'undefined';
-const ignoreExternal = false;
+const ignoreExternal = true;
 
 class BetterDiscord {
 
diff --git a/core/src/main.js b/core/src/main.js
index 1b07067f..a9f2c642 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -58,8 +58,6 @@ class Comms {
     }
 
     initListeners() {
-        this.editorListeners();
-
         BDIpc.on('ping', () => 'pong', true);
 
         BDIpc.on('bd-getConfig', () => this.bd.config.config, true);
@@ -96,38 +94,6 @@ class Comms {
         BDIpc.on('bd-keytar-find-credentials', (event, { service }) => keytar.findCredentials(service), true);
     }
 
-    editorListeners() {
-        BDIpc.on('bd-openCssEditor', (event, options) => this.bd.editor.openEditor(options), true);
-        BDIpc.on('bd-editor-open', (event, options) => this.bd.editor.openEditor(options), true);
-
-        BDIpc.on('bd-editor-runScript', async (event, script) => {
-            const result = await this.sendToDiscord('bd-editor-runScript', script);
-            event.reply(result);
-        });
-
-        BDIpc.on('bd-editor-getFiles', async (event) => {
-            event.reply([
-                { type: 'file', name: 'custom.scss', content: '', savedContent: '', mode: 'scss', saved: true }
-            ]);
-        });
-
-        BDIpc.on('bd-editor-getSnippets', async (event) => {
-            event.reply([
-                { type: 'snippet', name: 'test.js', content: '', savedContent: '', mode: 'javascript', saved: true }
-            ]);
-        });
-
-        BDIpc.on('bd-editor-saveFile', async (event, file) => {
-            console.log(file);
-            event.reply('ok');
-        });
-
-        BDIpc.on('bd-editor-saveSnippet', async (event, snippet) => {
-            console.log(snippet);
-            event.reply('ok');
-        });
-    }
-
     async send(channel, message) {
         BDIpc.send(channel, message);
     }
@@ -207,6 +173,7 @@ export class BetterDiscord {
 
         configProxy = () => this.config;
         const autoInitComms = this.comms;
+        const autoInitEditor = this.editor;
         this.init();
     }
 
diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
index 0f4b46e7..5f4737b8 100644
--- a/core/src/modules/editor.js
+++ b/core/src/modules/editor.js
@@ -21,6 +21,39 @@ export default class Editor extends Module {
         super();
         this.editorPath = path;
         this.bd = bd;
+        this.initListeners();
+    }
+
+    initListeners() {
+        BDIpc.on('bd-openCssEditor', (event, options) => this.openEditor(options), true);
+        BDIpc.on('bd-editor-open', (event, options) => this.openEditor(options), true);
+
+        BDIpc.on('bd-editor-runScript', async (event, script) => {
+            const result = await this.sendToDiscord('bd-editor-runScript', script);
+            event.reply(result);
+        });
+
+        BDIpc.on('bd-editor-getFiles', async (event) => {
+            event.reply([
+                { type: 'file', name: 'custom.scss', content: '', savedContent: '', mode: 'scss', saved: true }
+            ]);
+        });
+
+        BDIpc.on('bd-editor-getSnippets', async (event) => {
+            event.reply([
+                { type: 'snippet', name: 'test.js', content: '', savedContent: '', mode: 'javascript', saved: true }
+            ]);
+        });
+
+        BDIpc.on('bd-editor-saveFile', async (event, file) => {
+            console.log(file);
+            event.reply('ok');
+        });
+
+        BDIpc.on('bd-editor-saveSnippet', async (event, snippet) => {
+            console.log(snippet);
+            event.reply('ok');
+        });
     }
 
     /**
@@ -70,6 +103,10 @@ export default class Editor extends Module {
         return BDIpc.send(this.editor, channel, data);
     }
 
+    async sendToDiscord(channel, message) {
+        return this.bd.windowUtils.send(channel, message);
+    }
+
     /**
      * Sets the CSS editor's always on top flag.
      */

From 3436bbe52b673cbed0f499c55588d22ecdb9b65b Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 24 Feb 2019 21:26:52 +0200
Subject: [PATCH 10/37] add editor test flag

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

diff --git a/core/src/main.js b/core/src/main.js
index a9f2c642..021dba70 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -26,6 +26,7 @@ const TEST_ARGS = () => {
         }
     }
 }
+const TEST_EDITOR = true;
 
 import path from 'path';
 import sass from 'node-sass';
@@ -53,7 +54,6 @@ const CSP = {
 class Comms {
     constructor(bd) {
         this.bd = bd;
-        this.editorListeners = this.editorListeners.bind(this);
         this.initListeners();
     }
 
@@ -199,6 +199,7 @@ export class BetterDiscord {
 
         setTimeout(() => {
             this.injectScripts();
+            if (TEST_EDITOR) this.editor.openEditor({});
         }, 500);
     }
 

From b14bf93ef95dd43548ec794166c709956475ee53 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 24 Feb 2019 21:27:05 +0200
Subject: [PATCH 11/37] remove todo

---
 core/src/main.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/core/src/main.js b/core/src/main.js
index 021dba70..b5da0969 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -188,9 +188,6 @@ export class BetterDiscord {
         await this.waitForWindowUtils();
         await this.ensureDirectories();
 
-        // TODO
-        // this.csseditor = new CSSEditor(this, this.config.getPath('csseditor'));
-
         this.windowUtils.on('did-finish-load', () => this.injectScripts(true));
 
         this.windowUtils.on('did-navigate-in-page', (event, url, isMainFrame) => {

From ed7abe357120ab88358635a78ef352b3598a42bc Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 24 Feb 2019 21:29:54 +0200
Subject: [PATCH 12/37] Don't need all these prefixes since they're automated

---
 core/src/modules/editor.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
index 5f4737b8..9168feef 100644
--- a/core/src/modules/editor.js
+++ b/core/src/modules/editor.js
@@ -25,32 +25,32 @@ export default class Editor extends Module {
     }
 
     initListeners() {
-        BDIpc.on('bd-openCssEditor', (event, options) => this.openEditor(options), true);
-        BDIpc.on('bd-editor-open', (event, options) => this.openEditor(options), true);
+        BDIpc.on('openCssEditor', (event, options) => this.openEditor(options), true);
+        BDIpc.on('editor-open', (event, options) => this.openEditor(options), true);
 
-        BDIpc.on('bd-editor-runScript', async (event, script) => {
-            const result = await this.sendToDiscord('bd-editor-runScript', script);
+        BDIpc.on('editor-runScript', async (event, script) => {
+            const result = await this.sendToDiscord('editor-runScript', script);
             event.reply(result);
         });
 
-        BDIpc.on('bd-editor-getFiles', async (event) => {
+        BDIpc.on('editor-getFiles', async (event) => {
             event.reply([
                 { type: 'file', name: 'custom.scss', content: '', savedContent: '', mode: 'scss', saved: true }
             ]);
         });
 
-        BDIpc.on('bd-editor-getSnippets', async (event) => {
+        BDIpc.on('editor-getSnippets', async (event) => {
             event.reply([
                 { type: 'snippet', name: 'test.js', content: '', savedContent: '', mode: 'javascript', saved: true }
             ]);
         });
 
-        BDIpc.on('bd-editor-saveFile', async (event, file) => {
+        BDIpc.on('editor-saveFile', async (event, file) => {
             console.log(file);
             event.reply('ok');
         });
 
-        BDIpc.on('bd-editor-saveSnippet', async (event, snippet) => {
+        BDIpc.on('editor-saveSnippet', async (event, snippet) => {
             console.log(snippet);
             event.reply('ok');
         });

From 5454950838f21fcc97ed8ce5f5d68529c0d6750f Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 24 Feb 2019 21:36:04 +0200
Subject: [PATCH 13/37] add writefile

---
 core/src/modules/utils.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/core/src/modules/utils.js b/core/src/modules/utils.js
index d7e6262b..4dd062e2 100644
--- a/core/src/modules/utils.js
+++ b/core/src/modules/utils.js
@@ -99,6 +99,15 @@ export class FileUtils {
         }
     }
 
+    static async writeFile(path, data, options = {}) {
+        return new Promise((resolve, reject) => {
+            fs.writeFile(path, data, options, err => {
+                if (err) return reject(err);
+                resolve();
+            });
+        });
+    }
+
     static async listDirectory(path) {
         try {
             await this.directoryExists(path);

From cf1da34e16577e6df01c4aa6fce50d249712126d Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 24 Feb 2019 21:38:33 +0200
Subject: [PATCH 14/37] add editor file writing

---
 core/src/modules/editor.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
index 9168feef..afc43fff 100644
--- a/core/src/modules/editor.js
+++ b/core/src/modules/editor.js
@@ -12,7 +12,7 @@ import path from 'path';
 import { BrowserWindow } from 'electron';
 
 import Module from './modulebase';
-import { WindowUtils } from './utils';
+import { WindowUtils, FileUtils } from './utils';
 import BDIpc from './bdipc';
 
 export default class Editor extends Module {
@@ -46,11 +46,16 @@ export default class Editor extends Module {
         });
 
         BDIpc.on('editor-saveFile', async (event, file) => {
-            console.log(file);
-            event.reply('ok');
+            try {
+                await FileUtils.writeFile(path.resolve(this.bd.config.getPath('data'), file.name), file.content);
+                event.reply('ok');
+            } catch (err) {
+                event.reply({ err });
+            }
         });
 
         BDIpc.on('editor-saveSnippet', async (event, snippet) => {
+            // TODO not sure how to store snippets yet
             console.log(snippet);
             event.reply('ok');
         });

From a3724d739bf1e1cc2b9e8f6d638ca569a864fa56 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 24 Feb 2019 21:56:46 +0200
Subject: [PATCH 15/37] Read files on load at least for now

---
 core/src/modules/editor.js | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
index afc43fff..bb938494 100644
--- a/core/src/modules/editor.js
+++ b/core/src/modules/editor.js
@@ -34,9 +34,18 @@ export default class Editor extends Module {
         });
 
         BDIpc.on('editor-getFiles', async (event) => {
-            event.reply([
-                { type: 'file', name: 'custom.scss', content: '', savedContent: '', mode: 'scss', saved: true }
-            ]);
+            const exclude = ['db.json', 'emotes.json', 'storage', 'user.settings.json', 'window.json'];
+            const listFiles = await FileUtils.listDirectory(this.bd.config.getPath('data'));
+            const files = listFiles.filter(file => !exclude.includes(file));
+
+            const constructFiles = files.map(async file => {
+                const content = await FileUtils.readFile(path.resolve(this.bd.config.getPath('data'), file));
+                return { name: file, saved: true, mode: this.resolveMode(file), content, savedContent: content };
+            });
+
+            const awaitFiles = await Promise.all(constructFiles);
+
+            event.reply(awaitFiles);
         });
 
         BDIpc.on('editor-getSnippets', async (event) => {
@@ -61,6 +70,23 @@ export default class Editor extends Module {
         });
     }
 
+    resolveMode(fileName) {
+        if (!fileName.includes('.')) return 'text';
+        const ext = fileName.substr(fileName.lastIndexOf('.') + 1);
+        if (this.modes.hasOwnProperty(ext)) return this.modes[ext];
+        return 'text';
+    }
+
+    get modes() {
+        return {
+            'css': 'css',
+            'scss': 'scss',
+            'js': 'js',
+            'txt': 'text',
+            'json': 'json'
+        };
+    }
+
     /**
      * Opens an editor.
      * @return {Promise}

From 20561e2938e24db2748640c1e3dbebadd83c0d68 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Mon, 25 Feb 2019 12:10:00 +0200
Subject: [PATCH 16/37] Set type

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

diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
index bb938494..8f3615f5 100644
--- a/core/src/modules/editor.js
+++ b/core/src/modules/editor.js
@@ -40,7 +40,7 @@ export default class Editor extends Module {
 
             const constructFiles = files.map(async file => {
                 const content = await FileUtils.readFile(path.resolve(this.bd.config.getPath('data'), file));
-                return { name: file, saved: true, mode: this.resolveMode(file), content, savedContent: content };
+                return { type: 'file', name: file, saved: true, mode: this.resolveMode(file), content, savedContent: content };
             });
 
             const awaitFiles = await Promise.all(constructFiles);

From d02f894d4a5a0db24c955014e65be176be832616 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Mon, 25 Feb 2019 12:41:22 +0200
Subject: [PATCH 17/37] Style inject

---
 client/src/modules/editor.js |  6 ++++++
 core/src/modules/editor.js   | 16 ++++++++++++++++
 editor/src/Editor.vue        |  8 +++++++-
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/client/src/modules/editor.js b/client/src/modules/editor.js
index 2f5a8e10..c4113215 100644
--- a/client/src/modules/editor.js
+++ b/client/src/modules/editor.js
@@ -9,6 +9,7 @@
 */
 
 import Module from './imodule';
+import { DOM } from 'ui';
 
 export default new class extends Module {
 
@@ -30,6 +31,11 @@ export default new class extends Module {
                 e.reply({ err: err.stack || err });
             }
         });
+
+        ipc.on('editor-injectStyle', (e, { id, style }) => {
+            DOM.injectStyle(style, `userstyle-${id}`);
+            e.reply('ok');
+        });
     }
 
     /**
diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
index 8f3615f5..0588e93d 100644
--- a/core/src/modules/editor.js
+++ b/core/src/modules/editor.js
@@ -14,6 +14,7 @@ import { BrowserWindow } from 'electron';
 import Module from './modulebase';
 import { WindowUtils, FileUtils } from './utils';
 import BDIpc from './bdipc';
+import sass from 'node-sass';
 
 export default class Editor extends Module {
 
@@ -68,6 +69,21 @@ export default class Editor extends Module {
             console.log(snippet);
             event.reply('ok');
         });
+
+        BDIpc.on('editor-injectStyle', async (event, { id, style }) => {
+            sass.render({ data: style }, (err, result) => {
+                if (err) {
+                    console.log(err);
+                    event.reply({ err });
+                    return;
+                }
+                const { css } = result;
+                (async () => {
+                    await this.sendToDiscord('editor-injectStyle', { id, style: css.toString() });
+                    event.reply('ok');
+                })();
+            });
+        });
     }
 
     resolveMode(fileName) {
diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index b79261d2..f35313fc 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -22,7 +22,8 @@
                 :newFile="newFile"
                 :saveFile="saveFile"
                 :newSnippet="newSnippet"
-                :saveSnippet="saveSnippet" />
+                :saveSnippet="saveSnippet"
+                :injectStyle="injectStyle"/>
     </div>
 </template>
 
@@ -131,6 +132,11 @@
                 console.log(result);
             },
 
+            async injectStyle(item) {
+                const result = await ClientIPC.send('bd-editor-injectStyle', { id: item.name.split('.')[0], style: item.content });
+                return result;
+            },
+
             toggleaot() {
                 this.alwaysOnTop = !this.alwaysOnTop;
                 remote.getCurrentWindow().setAlwaysOnTop(this.alwaysOnTop);

From 1b6f3005f5fe9fe272161cbc6d777bb2056d6619 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Mon, 25 Feb 2019 13:01:46 +0200
Subject: [PATCH 18/37] No need to compile if not scss

---
 core/src/modules/editor.js | 8 +++++++-
 editor/src/Editor.vue      | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
index 0588e93d..fa3a0cf0 100644
--- a/core/src/modules/editor.js
+++ b/core/src/modules/editor.js
@@ -70,7 +70,13 @@ export default class Editor extends Module {
             event.reply('ok');
         });
 
-        BDIpc.on('editor-injectStyle', async (event, { id, style }) => {
+        BDIpc.on('editor-injectStyle', async (event, { id, style, mode }) => {
+            if (mode !== 'scss') {
+                await this.sendToDiscord('editor-injectStyle', { id, style });
+                event.reply('ok');
+                return;
+            }
+
             sass.render({ data: style }, (err, result) => {
                 if (err) {
                     console.log(err);
diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index f35313fc..6dd8f359 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -133,7 +133,7 @@
             },
 
             async injectStyle(item) {
-                const result = await ClientIPC.send('bd-editor-injectStyle', { id: item.name.split('.')[0], style: item.content });
+                const result = await ClientIPC.send('bd-editor-injectStyle', { id: item.name.split('.')[0], style: item.content, mode: item.mode });
                 return result;
             },
 

From 109eb31aa5a32ca57aaec23afedb5c0e1ad4ef61 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Mon, 25 Feb 2019 17:56:56 +0200
Subject: [PATCH 19/37] custom css inject and file saved state

---
 client/src/modules/editor.js | 20 +++++++++++++++++++-
 core/src/main.js             |  5 +++++
 editor/src/Editor.vue        |  9 +++++++--
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/client/src/modules/editor.js b/client/src/modules/editor.js
index c4113215..34f9fdf3 100644
--- a/client/src/modules/editor.js
+++ b/client/src/modules/editor.js
@@ -22,6 +22,20 @@ export default new class extends Module {
         };
     }
 
+    initialize() {
+        super.initialize();
+        (async () => {
+            try {
+                // TODO this is temporary
+                const userScss = await this.send('readDataFile', 'user.scss');
+                const compiled = await this.send('compileSass', { data: userScss });
+                this.injectStyle('customcss', compiled.css.toString());
+            } catch (err) {
+                console.warn('SCSS Compilation error', err);
+            }
+        })();
+    }
+
     events(ipc) {
         ipc.on('editor-runScript', (e, script) => {
             try {
@@ -33,11 +47,15 @@ export default new class extends Module {
         });
 
         ipc.on('editor-injectStyle', (e, { id, style }) => {
-            DOM.injectStyle(style, `userstyle-${id}`);
+            this.injectStyle(id, style);
             e.reply('ok');
         });
     }
 
+    injectStyle(id, style) {
+        return DOM.injectStyle(style, `userstyle-${id}`);
+    }
+
     /**
      * Show editor, flashes if already visible.
      */
diff --git a/core/src/main.js b/core/src/main.js
index b5da0969..a74d3fa4 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -92,6 +92,11 @@ class Comms {
         BDIpc.on('bd-keytar-set', (event, { service, account, password }) => keytar.setPassword(service, account, password), true);
         BDIpc.on('bd-keytar-delete', (event, { service, account }) => keytar.deletePassword(service, account), true);
         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));
+            event.reply(rf);
+        });
     }
 
     async send(channel, message) {
diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index 6dd8f359..c4342b29 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -123,8 +123,13 @@
             },
 
             async saveFile(file) {
-                const result = await ClientIPC.send('bd-editor-saveFile', file);
-                console.log(result);
+                try {
+                    const result = await ClientIPC.send('bd-editor-saveFile', file);
+                    file.savedContent = file.content;
+                    file.saved = true;
+                } catch (err) {
+                    console.log(err);
+                }
             },
 
             async saveSnippet(snippet) {

From 5e977e8dc4b7a148c3b292a5129675c208601130 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Mon, 25 Feb 2019 18:05:51 +0200
Subject: [PATCH 20/37] Hoist user.scss

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

diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
index fa3a0cf0..56392579 100644
--- a/core/src/modules/editor.js
+++ b/core/src/modules/editor.js
@@ -41,7 +41,7 @@ export default class Editor extends Module {
 
             const constructFiles = files.map(async file => {
                 const content = await FileUtils.readFile(path.resolve(this.bd.config.getPath('data'), file));
-                return { type: 'file', name: file, saved: true, mode: this.resolveMode(file), content, savedContent: content };
+                return { type: 'file', name: file, saved: true, mode: this.resolveMode(file), content, savedContent: content, hoisted: file === 'user.scss' };
             });
 
             const awaitFiles = await Promise.all(constructFiles);

From 72b278de6efec118ef5769cc34772956537ffa26 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Tue, 26 Feb 2019 16:33:14 +0200
Subject: [PATCH 21/37] js should be javascript

---
 editor/src/Editor.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index c4342b29..6f5dde82 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -38,7 +38,7 @@
     const modes = {
         'css': 'css',
         'scss': 'scss',
-        'js': 'js',
+        'js': 'javascript',
         'txt': 'text',
         'json': 'json'
     };

From 145d61fe5ef947bdaced61ad9b41f16fd36eb5e2 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Tue, 26 Feb 2019 18:32:06 +0200
Subject: [PATCH 22/37] Enable importing other files

---
 core/src/modules/editor.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
index 56392579..f01b69ec 100644
--- a/core/src/modules/editor.js
+++ b/core/src/modules/editor.js
@@ -77,6 +77,12 @@ export default class Editor extends Module {
                 return;
             }
 
+            style = style.split('\n').map(line => {
+                if (!line.startsWith('@import')) return line;
+                const filename = line.split(' ')[1].replace(/'|"|;/g, '');
+                return `@import '${path.resolve(this.bd.config.getPath('data'), filename).replace(/\\/g, '/')}';`;
+            }).join('\n');
+
             sass.render({ data: style }, (err, result) => {
                 if (err) {
                     console.log(err);
@@ -103,7 +109,7 @@ export default class Editor extends Module {
         return {
             'css': 'css',
             'scss': 'scss',
-            'js': 'js',
+            'js': 'javascript',
             'txt': 'text',
             'json': 'json'
         };

From 7e10de32cb19f5ecb50fda2865368049ded792d5 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Tue, 26 Feb 2019 19:54:13 +0200
Subject: [PATCH 23/37] add new paths and enable snippet import

---
 core/src/main.js           | 31 ++++++++++------
 core/src/modules/editor.js | 76 ++++++++++++++++++++++++++++----------
 2 files changed, 76 insertions(+), 31 deletions(-)

diff --git a/core/src/main.js b/core/src/main.js
index a74d3fa4..340e1e4d 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -207,10 +207,13 @@ export class BetterDiscord {
 
     async ensureDirectories() {
         await FileUtils.ensureDirectory(this.config.getPath('ext'));
+        await FileUtils.ensureDirectory(this.config.getPath('user'));
         await Promise.all([
             FileUtils.ensureDirectory(this.config.getPath('plugins')),
             FileUtils.ensureDirectory(this.config.getPath('themes')),
-            FileUtils.ensureDirectory(this.config.getPath('modules'))
+            FileUtils.ensureDirectory(this.config.getPath('modules')),
+            FileUtils.ensureDirectory(this.config.getPath('userfiles')),
+            FileUtils.ensureDirectory(this.config.getPath('snippets'))
         ]);
     }
 
@@ -253,17 +256,23 @@ export class BetterDiscord {
      * Add extra paths to config
      */
     extraPaths() {
-        const baseDataPath = path.resolve(this.config.getPath('data'), '..');
-        const extPath = path.resolve(baseDataPath, 'ext');
-        const pluginPath = path.resolve(extPath, 'plugins');
-        const themePath = path.resolve(extPath, 'themes');
-        const modulePath = path.resolve(extPath, 'modules');
+        const base = path.resolve(this.config.getPath('data'), '..');
+        const ext = path.resolve(base, 'ext');
+        const plugins = path.resolve(ext, 'plugins');
+        const themes = path.resolve(ext, 'themes');
+        const modules = path.resolve(ext, 'modules');
+        const user = path.resolve(this.config.getPath('data'), 'user');
+        const userfiles = path.resolve(user, 'files');
+        const snippets = path.resolve(user, 'snippets');
 
-        this.config.addPath('base', baseDataPath);
-        this.config.addPath('ext', extPath);
-        this.config.addPath('plugins', pluginPath);
-        this.config.addPath('themes', themePath);
-        this.config.addPath('modules', modulePath);
+        this.config.addPath('base', base);
+        this.config.addPath('ext', ext);
+        this.config.addPath('plugins', plugins);
+        this.config.addPath('themes', themes);
+        this.config.addPath('modules', modules);
+        this.config.addPath('user', user);
+        this.config.addPath('userfiles', userfiles);
+        this.config.addPath('snippets', snippets);
     }
 
     /**
diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
index f01b69ec..32ab658a 100644
--- a/core/src/modules/editor.js
+++ b/core/src/modules/editor.js
@@ -35,39 +35,59 @@ export default class Editor extends Module {
         });
 
         BDIpc.on('editor-getFiles', async (event) => {
-            const exclude = ['db.json', 'emotes.json', 'storage', 'user.settings.json', 'window.json'];
-            const listFiles = await FileUtils.listDirectory(this.bd.config.getPath('data'));
-            const files = listFiles.filter(file => !exclude.includes(file));
+            try {
+                const files = await FileUtils.listDirectory(this.bd.config.getPath('userfiles'));
 
-            const constructFiles = files.map(async file => {
-                const content = await FileUtils.readFile(path.resolve(this.bd.config.getPath('data'), file));
-                return { type: 'file', name: file, saved: true, mode: this.resolveMode(file), content, savedContent: content, hoisted: file === 'user.scss' };
-            });
+                const constructFiles = files.map(async file => {
+                    const content = await FileUtils.readFile(path.resolve(this.bd.config.getPath('userfiles'), file));
+                    return { type: 'file', name: file, saved: true, mode: this.resolveMode(file), content, savedContent: content, hoisted: file === 'user.scss' };
+                });
 
-            const awaitFiles = await Promise.all(constructFiles);
+                const awaitFiles = await Promise.all(constructFiles);
 
-            event.reply(awaitFiles);
+                event.reply(awaitFiles);
+            } catch (err) {
+                console.log(err);
+                event.reject({ err });
+            }
         });
 
         BDIpc.on('editor-getSnippets', async (event) => {
-            event.reply([
-                { type: 'snippet', name: 'test.js', content: '', savedContent: '', mode: 'javascript', saved: true }
-            ]);
+            try {
+                const files = await FileUtils.listDirectory(this.bd.config.getPath('snippets'));
+
+                const constructFiles = files.map(async file => {
+                    const content = await FileUtils.readFile(path.resolve(this.bd.config.getPath('snippets'), file));
+                    return { type: 'snippet', name: file, saved: true, mode: this.resolveMode(file), content, savedContent: content };
+                });
+
+                const awaitFiles = await Promise.all(constructFiles);
+
+                event.reply(awaitFiles);
+            } catch (err) {
+                console.log(err);
+                event.reject({ err });
+            }
         });
 
         BDIpc.on('editor-saveFile', async (event, file) => {
             try {
-                await FileUtils.writeFile(path.resolve(this.bd.config.getPath('data'), file.name), file.content);
+                await FileUtils.writeFile(path.resolve(this.bd.config.getPath('userfiles'), file.name), file.content);
                 event.reply('ok');
             } catch (err) {
-                event.reply({ err });
+                console.log(err);
+                event.reject({ err });
             }
         });
 
         BDIpc.on('editor-saveSnippet', async (event, snippet) => {
-            // TODO not sure how to store snippets yet
-            console.log(snippet);
-            event.reply('ok');
+            try {
+                await FileUtils.writeFile(path.resolve(this.bd.config.getPath('snippets'), snippet.name), snippet.content);
+                event.reply('ok');
+            } catch (err) {
+                console.log(err);
+                event.reject({ err });
+            }
         });
 
         BDIpc.on('editor-injectStyle', async (event, { id, style, mode }) => {
@@ -77,11 +97,27 @@ export default class Editor extends Module {
                 return;
             }
 
-            style = style.split('\n').map(line => {
+            style = await Promise.all(style.split('\n').map(async(line) => {
                 if (!line.startsWith('@import')) return line;
                 const filename = line.split(' ')[1].replace(/'|"|;/g, '');
-                return `@import '${path.resolve(this.bd.config.getPath('data'), filename).replace(/\\/g, '/')}';`;
-            }).join('\n');
+                let filePath = path.resolve(this.bd.config.getPath('userfiles'), filename).replace(/\\/g, '/');
+
+                try {
+                    await FileUtils.fileExists(filePath);
+                } catch (err) {
+                    filePath = path.resolve(this.bd.config.getPath('snippets'), filename).replace(/\\/g, '/');
+                }
+
+                try {
+                    await FileUtils.fileExists(filePath);
+                } catch (err) {
+                    return `/*${filename}*/`;
+                }
+
+                return `@import '${filePath}';`;
+            }));
+
+            style = style.join('\n');
 
             sass.render({ data: style }, (err, result) => {
                 if (err) {

From c0765120e852371fd2e020255c1160fb0db67275 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Tue, 26 Feb 2019 20:18:33 +0200
Subject: [PATCH 24/37] Juggle paths and keep user.scss in data

---
 core/src/main.js           | 10 +++++-----
 core/src/modules/editor.js | 35 ++++++++++++++++++++++++-----------
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/core/src/main.js b/core/src/main.js
index 340e1e4d..034a591d 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -207,7 +207,7 @@ export class BetterDiscord {
 
     async ensureDirectories() {
         await FileUtils.ensureDirectory(this.config.getPath('ext'));
-        await FileUtils.ensureDirectory(this.config.getPath('user'));
+        await FileUtils.ensureDirectory(this.config.getPath('userdata'));
         await Promise.all([
             FileUtils.ensureDirectory(this.config.getPath('plugins')),
             FileUtils.ensureDirectory(this.config.getPath('themes')),
@@ -257,20 +257,20 @@ export class BetterDiscord {
      */
     extraPaths() {
         const base = path.resolve(this.config.getPath('data'), '..');
+        const userdata = path.resolve(base, 'userdata');
         const ext = path.resolve(base, 'ext');
         const plugins = path.resolve(ext, 'plugins');
         const themes = path.resolve(ext, 'themes');
         const modules = path.resolve(ext, 'modules');
-        const user = path.resolve(this.config.getPath('data'), 'user');
-        const userfiles = path.resolve(user, 'files');
-        const snippets = path.resolve(user, 'snippets');
+        const userfiles = path.resolve(userdata, 'files');
+        const snippets = path.resolve(userdata, 'snippets');
 
         this.config.addPath('base', base);
         this.config.addPath('ext', ext);
         this.config.addPath('plugins', plugins);
         this.config.addPath('themes', themes);
         this.config.addPath('modules', modules);
-        this.config.addPath('user', user);
+        this.config.addPath('userdata', userdata);
         this.config.addPath('userfiles', userfiles);
         this.config.addPath('snippets', snippets);
     }
diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
index 32ab658a..d2dcc6f0 100644
--- a/core/src/modules/editor.js
+++ b/core/src/modules/editor.js
@@ -38,14 +38,25 @@ export default class Editor extends Module {
             try {
                 const files = await FileUtils.listDirectory(this.bd.config.getPath('userfiles'));
 
-                const constructFiles = files.map(async file => {
+                const constructFiles = await Promise.all(files.map(async file => {
                     const content = await FileUtils.readFile(path.resolve(this.bd.config.getPath('userfiles'), file));
-                    return { type: 'file', name: file, saved: true, mode: this.resolveMode(file), content, savedContent: content, hoisted: file === 'user.scss' };
+                    return { type: 'file', name: file, saved: true, mode: this.resolveMode(file), content, savedContent: content };
+                }));
+
+                const userscssPath = path.resolve(this.bd.config.getPath('data'), 'user.scss');
+                const userscss = await FileUtils.readFile(userscssPath);
+                constructFiles.push({
+                    caption: 'user',
+                    type: 'file',
+                    name: 'user.scss',
+                    saved: true,
+                    mode: 'scss',
+                    content: userscss,
+                    savedContent: userscss,
+                    hoisted: true
                 });
 
-                const awaitFiles = await Promise.all(constructFiles);
-
-                event.reply(awaitFiles);
+                event.reply(constructFiles);
             } catch (err) {
                 console.log(err);
                 event.reject({ err });
@@ -56,14 +67,12 @@ export default class Editor extends Module {
             try {
                 const files = await FileUtils.listDirectory(this.bd.config.getPath('snippets'));
 
-                const constructFiles = files.map(async file => {
+                const constructFiles = await Promise.all(files.map(async file => {
                     const content = await FileUtils.readFile(path.resolve(this.bd.config.getPath('snippets'), file));
                     return { type: 'snippet', name: file, saved: true, mode: this.resolveMode(file), content, savedContent: content };
-                });
+                }));
 
-                const awaitFiles = await Promise.all(constructFiles);
-
-                event.reply(awaitFiles);
+                event.reply(constructFiles);
             } catch (err) {
                 console.log(err);
                 event.reject({ err });
@@ -71,8 +80,12 @@ export default class Editor extends Module {
         });
 
         BDIpc.on('editor-saveFile', async (event, file) => {
+            const filePath = (file.hoisted && file.name === 'user.scss') ?
+                path.resolve(this.bd.config.getPath('data'), 'user.scss') :
+                path.resolve(this.bd.config.getPath('userfiles'), file.name);
+
             try {
-                await FileUtils.writeFile(path.resolve(this.bd.config.getPath('userfiles'), file.name), file.content);
+                await FileUtils.writeFile(filePath, file.content);
                 event.reply('ok');
             } catch (err) {
                 console.log(err);

From 7e1c379fd3e003e8634cdb3aa1f521f648153ad0 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Tue, 26 Feb 2019 20:19:57 +0200
Subject: [PATCH 25/37] Set user.scss caption

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

diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
index d2dcc6f0..be690bf1 100644
--- a/core/src/modules/editor.js
+++ b/core/src/modules/editor.js
@@ -46,7 +46,7 @@ export default class Editor extends Module {
                 const userscssPath = path.resolve(this.bd.config.getPath('data'), 'user.scss');
                 const userscss = await FileUtils.readFile(userscssPath);
                 constructFiles.push({
-                    caption: 'user',
+                    caption: 'userstyle',
                     type: 'file',
                     name: 'user.scss',
                     saved: true,

From 7489fd0aaf642aa8c37bfed9aff2761d319b8a56 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Tue, 26 Feb 2019 20:30:07 +0200
Subject: [PATCH 26/37] Titlebar buttons fix

---
 .gitignore                      | 1 +
 editor/src/styles/titlebar.scss | 9 +++++++--
 editor/src/styles/vars.scss     | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index b7f2ac85..0a886e03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ user.config.json
 /.vs
 /npm-debug.log
 /tests/ext/extensions
+/tests/userdata
diff --git a/editor/src/styles/titlebar.scss b/editor/src/styles/titlebar.scss
index b837087a..c1bbaa6d 100644
--- a/editor/src/styles/titlebar.scss
+++ b/editor/src/styles/titlebar.scss
@@ -28,12 +28,17 @@
         font-size: 15px;
     }
 
+    .flex-spacer {
+        flex-grow: 1;
+    }
+
     .controls {
         margin: 0 0 0 2px;
         font-size: 0;
 
         button {
             -webkit-app-region: no-drag;
+            outline: none !important;
             border-radius: 3px;
             width: 25px;
             font-size: 12px;
@@ -50,12 +55,12 @@
             margin: 0 0 0 4px;
 
             &:hover {
-                background: #44474e;
+                background: $bdGreen;
                 color: #FFF;
             }
 
             &.active {
-                background: #3a71c1;
+                background: $bdGreen;
             }
         }
     }
diff --git a/editor/src/styles/vars.scss b/editor/src/styles/vars.scss
index 202ab708..b08506d0 100644
--- a/editor/src/styles/vars.scss
+++ b/editor/src/styles/vars.scss
@@ -1,2 +1,3 @@
 $logoSmallGw: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkltYWdlIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCIgdmlld0JveD0iMCAwIDUxMiA1MTIiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDUxMiA1MTI7IiB4bWw6c3BhY2U9InByZXNlcnZlIj48c3R5bGUgdHlwZT0idGV4dC9jc3MiPi5zdDB7ZGlzcGxheTpub25lO30uc3Qxe2Rpc3BsYXk6aW5saW5lO2ZpbGw6IzAyMDAzNTtzdHJva2U6IzAwMDAwMDtzdHJva2UtbWl0ZXJsaW1pdDoxMDt9LnN0MntmaWxsOiMzRUNDOUU7fS5zdDN7ZmlsbDojRkZGRkZGO308L3N0eWxlPjxnIGlkPSJMYXllcl8yIiBjbGFzcz0ic3QwIj48cmVjdCB4PSItNjQiIHk9Ii0zMiIgY2xhc3M9InN0MSIgd2lkdGg9IjYxOCIgaGVpZ2h0PSI1NzIiLz48L2c+PGcgaWQ9IkxheWVyXzEiIHhtbG5zOnZlY3Rvcm5hdG9yPSJodHRwOi8vdmVjdG9ybmF0b3IuaW8iPjxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik03MCwxOC44Yy0xMy43LDAtMjcuMywxMy43LTI3LjMsMjcuM3YyMzMuNkM0Mi43LDM5Ny43LDEzNy45LDQ5MywyNTYsNDkzYzI5LjcsMCw1OC02LjEsODMuNi0xN1YzNDEuNWMtMTksMjUuNi00OS4zLDQyLjItODMuNiw0Mi4yYy01Ny42LDAtMTA0LjEtNDYuNS0xMDQuMS0xMDQuMVY0Ni4xYzAtMTMuNy0xMy43LTI3LjMtMjcuMy0yNy4zSDcweiIvPjxwYXRoIGNsYXNzPSJzdDMiIGQ9Ik0zODcuNCwxOC44Yy0xMy43LDAtMjcuMywxMy43LTI3LjMsMjcuM3Y0Ny4zQzMyOS4zLDc2LjIsMjkzLjksNjYuMywyNTYsNjYuM2MtMjkuOCwwLTU3LjksNi4zLTgzLjYsMTcuM3YxMzQuMmMxOS0yNS42LDQ5LjMtNDIuMiw4My42LTQyLjJjNTcuNiwwLDEwNC4xLDQ2LjUsMTA0LjEsMTA0LjF2MTg2LjJjNjUuMi0zNi40LDEwOS4yLTEwNiwxMDkuMi0xODYuMlY0Ni4xYzAtMTguOC0xMy43LTI3LjMtMjcuMy0yNy4zSDM4Ny40eiIvPjwvZz48L3N2Zz4=);
 $bdicon: $logoSmallGw;
+$bdGreen: #3ecc9c;

From 9f6389845af2f10e387bf75bdafd1d33f9beb690 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Tue, 26 Feb 2019 22:24:05 +0200
Subject: [PATCH 27/37] add live update 5 seconds after last change

---
 core/src/modules/editor.js |  3 ++-
 editor/src/Editor.vue      | 17 ++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
index be690bf1..66e7ec03 100644
--- a/core/src/modules/editor.js
+++ b/core/src/modules/editor.js
@@ -53,7 +53,8 @@ export default class Editor extends Module {
                     mode: 'scss',
                     content: userscss,
                     savedContent: userscss,
-                    hoisted: true
+                    hoisted: true,
+                    liveUpdate: true
                 });
 
                 event.reply(constructFiles);
diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index 6f5dde82..0617bb74 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -23,7 +23,8 @@
                 :saveFile="saveFile"
                 :newSnippet="newSnippet"
                 :saveSnippet="saveSnippet"
-                :injectStyle="injectStyle"/>
+                :injectStyle="injectStyle"
+                :toggleLiveUpdate="toggleLiveUpdate"/>
     </div>
 </template>
 
@@ -71,6 +72,7 @@
                 this.snippets = await ClientIPC.send('bd-editor-getSnippets');
 
                 this.loading = false;
+                this.liveUpdateInternal = setInterval(this.liveUpdate, 1000);
             })();
         },
         methods: {
@@ -82,6 +84,13 @@
             updateContent(item, content) {
                 item.content = content;
                 item.saved = item.content === item.savedContent;
+
+                if (this.liveUpdateTimeout) clearTimeout(this.liveUpdateTimeout);
+                if (item.liveUpdateEnabled) {
+                    this.liveUpdateTimeout = setTimeout(() => {
+                        this.injectStyle(item);
+                    }, 5000);
+                }
             },
 
             async runScript(script) {
@@ -138,10 +147,16 @@
             },
 
             async injectStyle(item) {
+                if (item.content === '') return;
                 const result = await ClientIPC.send('bd-editor-injectStyle', { id: item.name.split('.')[0], style: item.content, mode: item.mode });
                 return result;
             },
 
+            toggleLiveUpdate(item) {
+                item.liveUpdateEnabled = !item.liveUpdateEnabled;
+                return item;
+            },
+
             toggleaot() {
                 this.alwaysOnTop = !this.alwaysOnTop;
                 remote.getCurrentWindow().setAlwaysOnTop(this.alwaysOnTop);

From 2b86f2d7410d27a3d697e6515f607cec034fddf7 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Wed, 27 Feb 2019 01:33:23 +0200
Subject: [PATCH 28/37] File watchers

---
 core/src/modules/editor.js | 49 ++++++++++++++++++++++++++++++++++++++
 editor/src/Editor.vue      | 19 +++++++++++++--
 2 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
index 66e7ec03..02243d4a 100644
--- a/core/src/modules/editor.js
+++ b/core/src/modules/editor.js
@@ -15,6 +15,7 @@ import Module from './modulebase';
 import { WindowUtils, FileUtils } from './utils';
 import BDIpc from './bdipc';
 import sass from 'node-sass';
+import chokidar from 'chokidar';
 
 export default class Editor extends Module {
 
@@ -23,6 +24,7 @@ export default class Editor extends Module {
         this.editorPath = path;
         this.bd = bd;
         this.initListeners();
+        this.initWatchers();
     }
 
     initListeners() {
@@ -148,6 +150,53 @@ export default class Editor extends Module {
         });
     }
 
+    initWatchers() {
+        this.fileWatcher = chokidar.watch(this.bd.config.getPath('userfiles'));
+        this.snippetWatcher = chokidar.watch(this.bd.config.getPath('snippets'));
+
+        this.fileWatcher.on('add', file => {
+            const fileName = path.basename(file);
+            try {
+                this.send('editor-addFile', {
+                    type: 'file',
+                    name: fileName,
+                    saved: true,
+                    mode: this.resolveMode(fileName),
+                    content: '',
+                    savedContent: ''
+                });
+            } catch (err) {}
+        });
+
+        this.fileWatcher.on('unlink', file => {
+            const fileName = path.basename(file);
+            try {
+                this.send('editor-remFile', { name: fileName });
+            } catch (err) {}
+        });
+
+        this.snippetWatcher.on('add', file => {
+            const fileName = path.basename(file);
+            try {
+                this.send('editor-addSnippet', {
+                    type: 'snippet',
+                    name: fileName,
+                    saved: true,
+                    mode: this.resolveMode(fileName),
+                    content: '',
+                    savedContent: ''
+                });
+            } catch (err) { }
+        });
+
+        this.snippetWatcher.on('unlink', file => {
+            const fileName = path.basename(file);
+            try {
+                this.send('editor-remSnippet', { name: fileName });
+            } catch (err) { }
+        });
+    }
+
     resolveMode(fileName) {
         if (!fileName.includes('.')) return 'text';
         const ext = fileName.substr(fileName.lastIndexOf('.') + 1);
diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index 0617bb74..b4731030 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -63,8 +63,23 @@
         },
         components: { BDEdit },
         created() {
-            ClientIPC.on('bd-editor-addFile', (_, file) => this.addFile(file));
-            ClientIPC.on('bd-editor-addSnippet', (_, snippet) => this.addSnippet(snippet));
+            ClientIPC.on('bd-editor-addFile', (_, file) => {
+                if (this.files.find(f => f.name === file.name)) return;
+                this.addFile(file);
+            });
+
+            ClientIPC.on('bd-editor-remFile', (_, file) => {
+                this.files = this.files.filter(f => f.name !== file.name);
+            });
+
+            ClientIPC.on('bd-editor-addSnippet', (_, snippet) => {
+                if (this.snippets.find(s => s.name === snippet.name)) return;
+                this.addSnippet(snippet);
+            });
+
+            ClientIPC.on('bd-editor-remSnippet', (_, snippet) => {
+                this.snippets = this.snippets.filter(s => s.name !== snippet.name);
+            });
         },
         mounted() {
             (async () => {

From c3283c47f6ea45208bdbbe2e871207c771219b76 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Wed, 27 Feb 2019 08:10:04 +0200
Subject: [PATCH 29/37] Tons of smol things

---
 core/src/main.js           |  2 +-
 core/src/modules/editor.js | 50 +++++++++++++-------------------------
 editor/src/Editor.vue      | 45 ++++++++++++++++++++++++++++------
 3 files changed, 55 insertions(+), 42 deletions(-)

diff --git a/core/src/main.js b/core/src/main.js
index 034a591d..109a0fba 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -263,7 +263,7 @@ export class BetterDiscord {
         const themes = path.resolve(ext, 'themes');
         const modules = path.resolve(ext, 'modules');
         const userfiles = path.resolve(userdata, 'files');
-        const snippets = path.resolve(userdata, 'snippets');
+        const snippets = path.resolve(userdata, 'snippets.json');
 
         this.config.addPath('base', base);
         this.config.addPath('ext', ext);
diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
index 02243d4a..b08912ea 100644
--- a/core/src/modules/editor.js
+++ b/core/src/modules/editor.js
@@ -41,8 +41,8 @@ export default class Editor extends Module {
                 const files = await FileUtils.listDirectory(this.bd.config.getPath('userfiles'));
 
                 const constructFiles = await Promise.all(files.map(async file => {
-                    const content = await FileUtils.readFile(path.resolve(this.bd.config.getPath('userfiles'), file));
-                    return { type: 'file', name: file, saved: true, mode: this.resolveMode(file), content, savedContent: content };
+                    // const content = await FileUtils.readFile(path.resolve(this.bd.config.getPath('userfiles'), file));
+                    return { type: 'file', name: file, saved: true, mode: this.resolveMode(file), content: '', savedContent: '', read: false, changed: false };
                 }));
 
                 const userscssPath = path.resolve(this.bd.config.getPath('data'), 'user.scss');
@@ -56,7 +56,9 @@ export default class Editor extends Module {
                     content: userscss,
                     savedContent: userscss,
                     hoisted: true,
-                    liveUpdate: true
+                    liveUpdate: true,
+                    read: true,
+                    changed: false
                 });
 
                 event.reply(constructFiles);
@@ -68,17 +70,12 @@ export default class Editor extends Module {
 
         BDIpc.on('editor-getSnippets', async (event) => {
             try {
-                const files = await FileUtils.listDirectory(this.bd.config.getPath('snippets'));
-
-                const constructFiles = await Promise.all(files.map(async file => {
-                    const content = await FileUtils.readFile(path.resolve(this.bd.config.getPath('snippets'), file));
-                    return { type: 'snippet', name: file, saved: true, mode: this.resolveMode(file), content, savedContent: content };
-                }));
-
-                event.reply(constructFiles);
+                const snippets = await FileUtils.readJsonFromFile(this.bd.config.getPath('snippets'));
+                event.reply(snippets);
             } catch (err) {
                 console.log(err);
-                event.reject({ err });
+                event.reply([]);
+                return;
             }
         });
 
@@ -98,7 +95,7 @@ export default class Editor extends Module {
 
         BDIpc.on('editor-saveSnippet', async (event, snippet) => {
             try {
-                await FileUtils.writeFile(path.resolve(this.bd.config.getPath('snippets'), snippet.name), snippet.content);
+                await FileUtils.writeFile(this.bd.config.getPath('snippets'), JSON.stringify(snippet));
                 event.reply('ok');
             } catch (err) {
                 console.log(err);
@@ -148,11 +145,15 @@ export default class Editor extends Module {
                 })();
             });
         });
+
+        BDIpc.on('editor-readFile', async (event, file) => {
+            const content = await FileUtils.readFile(path.resolve(this.bd.config.getPath('userfiles'), file.name));
+            event.reply(content);
+        });
     }
 
     initWatchers() {
         this.fileWatcher = chokidar.watch(this.bd.config.getPath('userfiles'));
-        this.snippetWatcher = chokidar.watch(this.bd.config.getPath('snippets'));
 
         this.fileWatcher.on('add', file => {
             const fileName = path.basename(file);
@@ -175,25 +176,8 @@ export default class Editor extends Module {
             } catch (err) {}
         });
 
-        this.snippetWatcher.on('add', file => {
-            const fileName = path.basename(file);
-            try {
-                this.send('editor-addSnippet', {
-                    type: 'snippet',
-                    name: fileName,
-                    saved: true,
-                    mode: this.resolveMode(fileName),
-                    content: '',
-                    savedContent: ''
-                });
-            } catch (err) { }
-        });
-
-        this.snippetWatcher.on('unlink', file => {
-            const fileName = path.basename(file);
-            try {
-                this.send('editor-remSnippet', { name: fileName });
-            } catch (err) { }
+        this.fileWatcher.on('change', file => {
+            this.send('editor-fileChange', { name: path.basename(file) });
         });
     }
 
diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index b4731030..b74b5ea9 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -23,6 +23,8 @@
                 :saveFile="saveFile"
                 :newSnippet="newSnippet"
                 :saveSnippet="saveSnippet"
+                :readFile="readFile"
+                :readSnippet="readSnippet"
                 :injectStyle="injectStyle"
                 :toggleLiveUpdate="toggleLiveUpdate"/>
     </div>
@@ -34,6 +36,7 @@
     import { remote } from 'electron';
 
     import { BDEdit } from 'bdedit';
+import { FileUtils } from '../../core/src/modules/utils';
     ace.acequire = ace.require;
 
     const modes = {
@@ -58,7 +61,8 @@
                 snippets: [],
                 loading: true,
                 alwaysOnTop: false,
-                error: undefined
+                error: undefined,
+                lastSaved: undefined
             }
         },
         components: { BDEdit },
@@ -80,20 +84,29 @@
             ClientIPC.on('bd-editor-remSnippet', (_, snippet) => {
                 this.snippets = this.snippets.filter(s => s.name !== snippet.name);
             });
+
+            ClientIPC.on('bd-editor-fileChange', (_, file) => {
+                if (this.lastSaved && this.lastSaved.name === file.name) { // If we saved in our editor then don't trigger
+                    this.lastSaved = undefined;
+                    return;
+                }
+
+                const f = this.files.find(f => f.name === file.name);
+                if (f) f.changed = true;
+            });
         },
         mounted() {
             (async () => {
                 this.files = await ClientIPC.send('bd-editor-getFiles');
                 this.snippets = await ClientIPC.send('bd-editor-getSnippets');
-
                 this.loading = false;
-                this.liveUpdateInternal = setInterval(this.liveUpdate, 1000);
             })();
         },
         methods: {
             addFile(file) {
                 this.files.push(file);
             },
+
             addSnippet(snippet) { this.snippets.push(file) },
 
             updateContent(item, content) {
@@ -120,11 +133,11 @@
                 let iter = 0;
 
                 while (this.files.find(file => file.name === newName)) {
-                    newName = `${prefix}_${iter}`;
+                    newName = `${prefix.split('.')[0]}_${iter}.${prefix.split('.')[1]}`;
                     iter++;
                 }
 
-                const newItem = { type: 'file', name: newName, content: '', mode, saved: false };
+                const newItem = { type: 'file', name: newName, content: '', mode, saved: false, read: true };
                 this.files.push(newItem);
                 return newItem;
             },
@@ -141,13 +154,14 @@
                     iter++;
                 }
 
-                const newItem = { type: 'snippet', name: newName, content: '', mode, saved: false };
+                const newItem = { type: 'snippet', name: newName, content: '', savedContent: '', mode, saved: false, read: true };
                 this.snippets.push(newItem);
                 return newItem;
             },
 
             async saveFile(file) {
                 try {
+                    this.lastSaved = file;
                     const result = await ClientIPC.send('bd-editor-saveFile', file);
                     file.savedContent = file.content;
                     file.saved = true;
@@ -157,8 +171,23 @@
             },
 
             async saveSnippet(snippet) {
-                const result = await ClientIPC.send('bd-editor-saveSnippet', snippet);
-                console.log(result);
+                // TODO only saved snippets should save not all when one is saved.
+                snippet.saved = true;
+                const result = await ClientIPC.send('bd-editor-saveSnippet', this.snippets);
+            },
+
+            async readFile(file) {
+                const content = await ClientIPC.send('editor-readFile', file);
+                file.read = true;
+                file.changed = false;
+                file.content = file.savedContent = content;
+                return content;
+            },
+
+            async readSnippet(snippet) {
+                const content = await ClientIPC.send('editor-readSnippet', snippet);
+                snippet.read = true;
+                return content;
             },
 
             async injectStyle(item) {

From d8f977b57abd8f7d7f3a0b948e7c887fdd355e09 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Wed, 27 Feb 2019 16:43:13 +0200
Subject: [PATCH 30/37] Not a dir anymore

---
 core/src/main.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/src/main.js b/core/src/main.js
index 109a0fba..f0e69aab 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -212,8 +212,7 @@ export class BetterDiscord {
             FileUtils.ensureDirectory(this.config.getPath('plugins')),
             FileUtils.ensureDirectory(this.config.getPath('themes')),
             FileUtils.ensureDirectory(this.config.getPath('modules')),
-            FileUtils.ensureDirectory(this.config.getPath('userfiles')),
-            FileUtils.ensureDirectory(this.config.getPath('snippets'))
+            FileUtils.ensureDirectory(this.config.getPath('userfiles'))
         ]);
     }
 

From ac9e16632d894f01c2c04071e015d3a4305240b5 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Wed, 27 Feb 2019 20:34:11 +0200
Subject: [PATCH 31/37] Snippet save/load

---
 core/src/modules/editor.js | 22 +++++++++++++---------
 editor/src/Editor.vue      |  9 ++++++++-
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
index b08912ea..df7837ab 100644
--- a/core/src/modules/editor.js
+++ b/core/src/modules/editor.js
@@ -71,7 +71,17 @@ export default class Editor extends Module {
         BDIpc.on('editor-getSnippets', async (event) => {
             try {
                 const snippets = await FileUtils.readJsonFromFile(this.bd.config.getPath('snippets'));
-                event.reply(snippets);
+                event.reply(snippets.map(snippet => {
+                    return {
+                        type: 'snippet',
+                        name: snippet.name,
+                        mode: this.resolveMode(snippet.name),
+                        content: snippet.content,
+                        savedContent: snippet.content,
+                        read: true,
+                        saved: true
+                    }
+                }));
             } catch (err) {
                 console.log(err);
                 event.reply([]);
@@ -113,18 +123,12 @@ export default class Editor extends Module {
             style = await Promise.all(style.split('\n').map(async(line) => {
                 if (!line.startsWith('@import')) return line;
                 const filename = line.split(' ')[1].replace(/'|"|;/g, '');
-                let filePath = path.resolve(this.bd.config.getPath('userfiles'), filename).replace(/\\/g, '/');
+                const filePath = path.resolve(this.bd.config.getPath('userfiles'), filename).replace(/\\/g, '/');
 
                 try {
                     await FileUtils.fileExists(filePath);
                 } catch (err) {
-                    filePath = path.resolve(this.bd.config.getPath('snippets'), filename).replace(/\\/g, '/');
-                }
-
-                try {
-                    await FileUtils.fileExists(filePath);
-                } catch (err) {
-                    return `/*${filename}*/`;
+                    `/*${filename}*/`;
                 }
 
                 return `@import '${filePath}';`;
diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index b74b5ea9..04f82ae4 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -173,7 +173,14 @@ import { FileUtils } from '../../core/src/modules/utils';
             async saveSnippet(snippet) {
                 // TODO only saved snippets should save not all when one is saved.
                 snippet.saved = true;
-                const result = await ClientIPC.send('bd-editor-saveSnippet', this.snippets);
+                snippet.savedContent = snippet.content;
+                const result = await ClientIPC.send('bd-editor-saveSnippet', this.snippets.map(snippet => {
+                    return {
+                        name: snippet.name,
+                        content: snippet.savedContent
+                    }
+                }));
+                console.log(result);
             },
 
             async readFile(file) {

From b1e8b591ba84e666296195ac34916740cf7d7efd Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Wed, 27 Feb 2019 20:34:31 +0200
Subject: [PATCH 32/37] Remove todo

---
 editor/src/Editor.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index 04f82ae4..5d1b1c11 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -171,7 +171,6 @@ import { FileUtils } from '../../core/src/modules/utils';
             },
 
             async saveSnippet(snippet) {
-                // TODO only saved snippets should save not all when one is saved.
                 snippet.saved = true;
                 snippet.savedContent = snippet.content;
                 const result = await ClientIPC.send('bd-editor-saveSnippet', this.snippets.map(snippet => {
@@ -180,7 +179,6 @@ import { FileUtils } from '../../core/src/modules/utils';
                         content: snippet.savedContent
                     }
                 }));
-                console.log(result);
             },
 
             async readFile(file) {

From 99ec82795ca43618ffedd25cb1ab002cca230820 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Thu, 28 Feb 2019 06:05:54 +0200
Subject: [PATCH 33/37] reveal, copy and copypath handlers

---
 core/src/main.js      | 17 ++++++++++++++++-
 editor/src/Editor.vue | 41 ++++++++++++++++++++++++++++-------------
 2 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/core/src/main.js b/core/src/main.js
index f0e69aab..204255ec 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -30,7 +30,7 @@ const TEST_EDITOR = true;
 
 import path from 'path';
 import sass from 'node-sass';
-import { BrowserWindow as OriginalBrowserWindow, dialog, session } from 'electron';
+import { BrowserWindow as OriginalBrowserWindow, dialog, session, shell } from 'electron';
 import deepmerge from 'deepmerge';
 import ContentSecurityPolicy from 'csp-parse';
 import keytar from 'keytar';
@@ -97,6 +97,21 @@ class Comms {
             const rf = await FileUtils.readFile(path.resolve(configProxy().getPath('data'), fileName));
             event.reply(rf);
         });
+
+        BDIpc.on('bd-explorer', (_, _path) => {
+            if (_path.static) _path = this.bd.config.getPath(_path.static);
+            else if (_path.full) _path = _path.full;
+            else if (_path.sub) _path = path.resolve(this.bd.config.getPath(_path.sub.base), [..._path.sub.subs]);
+            try {
+                shell.openItem(_path);
+            } catch (err) {
+                console.log(err);
+            }
+        });
+
+        BDIpc.on('bd-getPath', (event, paths) => {
+            event.reply(path.resolve(this.bd.config.getPath(paths[0]), ...paths.splice(1)));
+        });
     }
 
     async send(channel, message) {
diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index 5d1b1c11..f8d325ad 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -12,10 +12,8 @@
                 <button title="Close CSS Editor" @click="close">X</button>
             </div>
         </div>
-        <div id="spinner" v-if="loading">
-            <div class="valign">Loading Please Wait...</div>
-        </div>
-        <BDEdit v-else :files="files"
+        <BDEdit :files="files"
+                :parentLoading="loading"
                 :snippets="snippets"
                 :updateContent="updateContent"
                 :runScript="runScript"
@@ -26,17 +24,18 @@
                 :readFile="readFile"
                 :readSnippet="readSnippet"
                 :injectStyle="injectStyle"
-                :toggleLiveUpdate="toggleLiveUpdate"/>
+                :toggleLiveUpdate="toggleLiveUpdate"
+                :ctxAction="ctxAction"/>
     </div>
 </template>
 
 <script>
-
     import { ClientIPC } from 'common';
     import { remote } from 'electron';
 
     import { BDEdit } from 'bdedit';
-import { FileUtils } from '../../core/src/modules/utils';
+    import { FileUtils } from '../../core/src/modules/utils';
+    import { setTimeout } from 'timers';
     ace.acequire = ace.require;
 
     const modes = {
@@ -95,12 +94,10 @@ import { FileUtils } from '../../core/src/modules/utils';
                 if (f) f.changed = true;
             });
         },
-        mounted() {
-            (async () => {
-                this.files = await ClientIPC.send('bd-editor-getFiles');
-                this.snippets = await ClientIPC.send('bd-editor-getSnippets');
-                this.loading = false;
-            })();
+        async mounted() {
+            this.files = await ClientIPC.send('bd-editor-getFiles');
+            this.snippets = await ClientIPC.send('bd-editor-getSnippets');
+            this.loading = false;
         },
         methods: {
             addFile(file) {
@@ -201,6 +198,24 @@ import { FileUtils } from '../../core/src/modules/utils';
                 return result;
             },
 
+            async ctxAction(action, item) {
+                if (action === 'reveal') {
+                    ClientIPC.send('explorer', { 'static': 'userfiles' });
+                    return;
+                }
+
+                if (action === 'copy') {
+                    remote.clipboard.writeText(item.content);
+                    return;
+                }
+
+                if (action === 'copyPath') {
+                    const fullPath = await ClientIPC.send('getPath', ['userfiles', item.name]);
+                    remote.clipboard.writeText(fullPath);
+                    return;
+                }
+            },
+
             toggleLiveUpdate(item) {
                 item.liveUpdateEnabled = !item.liveUpdateEnabled;
                 return item;

From 6030a78b919153671075dd3dd05ac82e0d18d717 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Thu, 28 Feb 2019 06:40:33 +0200
Subject: [PATCH 34/37] Delete and rename handlers

---
 core/src/main.js          | 22 ++++++++++++++++++++++
 core/src/modules/utils.js | 22 ++++++++++++++++++++++
 editor/src/Editor.vue     | 27 +++++++++++++++++++++++++++
 3 files changed, 71 insertions(+)

diff --git a/core/src/main.js b/core/src/main.js
index 204255ec..6a6eab7d 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -112,6 +112,28 @@ class Comms {
         BDIpc.on('bd-getPath', (event, paths) => {
             event.reply(path.resolve(this.bd.config.getPath(paths[0]), ...paths.splice(1)));
         });
+
+        BDIpc.on('bd-rmFile', async (event, paths) => {
+            const fullPath = path.resolve(this.bd.config.getPath(paths[0]), ...paths.splice(1));
+            try {
+                await FileUtils.rm(fullPath);
+                event.reply('ok');
+            } catch (err) {
+                event.reject(err);
+            }
+        });
+
+        BDIpc.on('bd-rnFile', async (event, paths) => {
+            const oldPath = path.resolve(this.bd.config.getPath(paths.oldName[0]), ...paths.oldName.splice(1));
+            const newPath = path.resolve(this.bd.config.getPath(paths.newName[0]), ...paths.newName.splice(1));
+
+            try {
+                await FileUtils.rn(oldPath, newPath);
+                event.reply('ok');
+            } catch (err) {
+                event.reject(err);
+            }
+        });
     }
 
     async send(channel, message) {
diff --git a/core/src/modules/utils.js b/core/src/modules/utils.js
index 4dd062e2..66586e7f 100644
--- a/core/src/modules/utils.js
+++ b/core/src/modules/utils.js
@@ -11,6 +11,7 @@
 // TODO Use common
 
 import fs from 'fs';
+import rimraf from 'rimraf';
 
 import Module from './modulebase';
 import BDIpc from './bdipc';
@@ -164,6 +165,27 @@ export class FileUtils {
             }
         }
     }
+
+    static async rm(path) {
+        return new Promise((resolve, reject) => {
+            rimraf(path, err => {
+                if (err) {
+                    console.log(err);
+                    reject(err);
+                }
+                resolve();
+            });
+        });
+    }
+
+    static async rn(oldPath, newPath) {
+        return new Promise((resolve, reject) => {
+            fs.rename(oldPath, newPath, err => {
+                if (err) return reject(err);
+                resolve();
+            });
+        });
+    }
 }
 
 export class WindowUtils extends Module {
diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index f8d325ad..54b7d05f 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -214,6 +214,33 @@
                     remote.clipboard.writeText(fullPath);
                     return;
                 }
+
+                if (action === 'rename') { // TODO select correct file after
+                    this.loading = true;
+                    const { oldName, newName } = item;
+
+                    try {
+                        await ClientIPC.send('rnFile', { oldName: ['userfiles', oldName], newName: ['userfiles', newName] });
+                    } catch (err) {
+                        console.log(err);
+                    } finally {
+                        this.loading = false;
+                    }
+
+                    return;
+                }
+
+                if (action === 'delete') {
+                    this.loading = true;
+                    try {
+                        await ClientIPC.send('rmFile', ['userfiles', item.name]);
+                    } catch (err) {
+                        console.log(err);
+                    } finally {
+                        this.loading = false;
+                    }
+                    return;
+                }
             },
 
             toggleLiveUpdate(item) {

From db89e3a1a0f2b863b618ed3a7f2a91f6d02f2009 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Thu, 28 Feb 2019 09:45:06 +0200
Subject: [PATCH 35/37] sass doesn't like empty

---
 editor/src/Editor.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index 54b7d05f..c33635a7 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -193,8 +193,8 @@
             },
 
             async injectStyle(item) {
-                if (item.content === '') return;
-                const result = await ClientIPC.send('bd-editor-injectStyle', { id: item.name.split('.')[0], style: item.content, mode: item.mode });
+                const style = item.content.length <= 0 ? ' ' : item.content;
+                const result = await ClientIPC.send('bd-editor-injectStyle', { id: item.name.split('.')[0], style, mode: item.mode });
                 return result;
             },
 

From 806ca5028a7ace9259418f201a62521707578ff7 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Thu, 28 Feb 2019 09:46:24 +0200
Subject: [PATCH 36/37] auto imports

---
 editor/src/Editor.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index c33635a7..68336b18 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -34,8 +34,7 @@
     import { remote } from 'electron';
 
     import { BDEdit } from 'bdedit';
-    import { FileUtils } from '../../core/src/modules/utils';
-    import { setTimeout } from 'timers';
+
     ace.acequire = ace.require;
 
     const modes = {

From 97519b2307d21277151a1276e64d41476a894525 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Thu, 28 Feb 2019 09:48:45 +0200
Subject: [PATCH 37/37] lint

---
 client/src/modules/imodule.js | 2 +-
 package.json                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/modules/imodule.js b/client/src/modules/imodule.js
index 88742d08..b16b9ee8 100644
--- a/client/src/modules/imodule.js
+++ b/client/src/modules/imodule.js
@@ -22,7 +22,7 @@ export default class Module {
             args
         };
         this.setState = this.setState.bind(this);
-        
+
         if (this.delay) { // If delay is set then module is set to load delayed from modulemanager
             this.initialize = this.initialize.bind(this);
             this.init = this.initialize;
diff --git a/package.json b/package.json
index de2c3eee..8443563d 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
     "watch_csseditor": "npm run watch --prefix csseditor",
     "build_editor": "npm run build --prefix editor",
     "watch_editor": "npm run watch --prefix editor",
-    "lint": "eslint -f unix client/src core/src csseditor/src common && npm run sasslint",
+    "lint": "eslint -f unix client/src core/src editor/src common && npm run sasslint",
     "lint_fix": "eslint -f unix client/src core/src csseditor/src common --fix",
     "sasslint": "sass-lint client/src/styles/**/*.scss -v",
     "test": "npm run build && npm run lint",