a lot of stuff

app/index.html

@@ -100,20 +100,14 @@
                 // dont update EPAPI/CRISPR if DONTUPDATE exists
                 if (!fs.existsSync(data + '/DONTUPDATE')) {
 
-                    var crxpwn = await (await fetch(approot + '/crxpwn.js?_=' + Date.now())).text();
+                    // get files 
-                    fs.writeFileSync(data + '/crxpwn/payload.js', crxpwn);
+                    fs.writeFileSync(data + '/crxpwn/payload.js', await (await fetch(approot + '/crxpwn.js?_=' + Date.now())).text());
-
+                    fs.writeFileSync(data + '/epapi.js', await (await fetch('https://endpwn.github.io/epapi/epapi.js?_=' + Date.now())).text());
-                    var epapi = await (await fetch('https://endpwn.github.io/epapi/epapi.js?_=' + Date.now())).text();
+                    fs.writeFileSync(data + '/crispr.js', await (await fetch('https://endpwn.github.io/crispr/crispr.js?_=' + Date.now())).text());
-                    fs.writeFileSync(data + '/epapi.js', epapi);
+                    fs.writeFileSync(data + '/plugins/system.js', await (await fetch(approot + '/plugin/system.js?_=' + Date.now())).text());
-
+                    fs.writeFileSync(data + '/plugins/customizer.js', await (await fetch(approot + '/plugin/customizer.js?_=' + Date.now())).text());
-                    var crispr = await (await fetch('https://endpwn.github.io/crispr/crispr.js?_=' + Date.now())).text();
+                    fs.writeFileSync(data + '/plugins/settings.js', await (await fetch(approot + '/plugin/settings.js?_=' + Date.now())).text());
-                    fs.writeFileSync(data + '/crispr.js', crispr);
+                    fs.writeFileSync(data + '/styles/system.css', await (await fetch(approot + '/plugin/system.css?_=' + Date.now())).text());
-
-                    var plugin = await (await fetch(approot + '/plugin.js?_=' + Date.now())).text();
-                    fs.writeFileSync(data + '/plugins/system.js', plugin);
-
-                    var style = await (await fetch(approot + '/helper.css?_=' + Date.now())).text();
-                    fs.writeFileSync(data + '/styles/system.css', style);
 
                     setTimeout(load, 1000);
 

plugin/customizer.js

@@ -0,0 +1,112 @@
+/*
+
+    EndPwn3 System (EndPwn Customizer)
+    
+    Copyright 2018 EndPwn Project
+    
+    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+    
+    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+    
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    https://github.com/endpwn/
+
+*/
+
+var internal = {
+
+    print: function (str) {
+        console.log(`%c[Customizer]%c ` + str, 'font-weight:bold;color:#0cc', '');
+    }
+
+}
+
+exports = {
+
+    replacements: {
+
+        // fix for custom discrims breaking search
+        //'#([0-9]{4})': 
+        //'#(.{1,4})',
+
+        // endpwn dev badges
+        //'return t.hasFlag(H.UserFlags.STAFF)': 
+        //'return t.hasFlag(4096)&&r.push({tooltip:"EndPwn Developer",onClick:function(){return window.open("https://endpwn.github.io/","_blank")},class:"endpwn"}),t.hasFlag(H.UserFlags.STAFF)'
+
+    },
+
+    // fallback data
+    data: {
+        guilds: [],
+        devs: [],
+        bots: [],
+        users: {}
+    },
+
+    get me() {
+        return {
+            bot: exports.data.bots.indexOf($me()) != -1,
+            discrim: exports.data.users[$me()]
+        }
+    },
+
+    update: function () {
+        // fetch goodies.json
+        internal.print('fetching data from server...');
+        fetch('https://endpwn.cathoderay.tube/goodies.json?_=' + Date.now())
+            .then(x => x.json())
+            .then(r => endpwn.customizer.data = r);
+    },
+
+    init: function () {
+
+        // prevent doublecalling
+        endpwn.customizer.init = undefined;
+
+        // apply custom discrims/bot tags/badges/server verif from EndPwn Customizer (endpwn.cathoderay.tube)
+        internal.print('initializing...');
+
+        // refetch customizer stuff every half hour
+        setInterval(endpwn.customizer.update, 1800000);
+        endpwn.customizer.update();
+
+        // add the endpwn dev badge to the class obfuscation table
+        wc.findFunc('profileBadges:"profileBadges')[0].exports['profileBadgeEndpwn'] = 'profileBadgeEndPwn';
+
+        // hook getUser() so we can apply custom discrims/bot tags/badges
+        $api.util.wrapAfter(
+            "wc.findCache('getUser')[0].exports.getUser",
+
+            x => {
+
+                if (x === undefined || x === null) return;
+
+                if (endpwn.customizer.data.bots.contains(x.id)) x.bot = true;
+                if (endpwn.customizer.data.users[x.id] !== undefined) x.discriminator = endpwn.customizer.data.users[x.id];
+                if (endpwn.customizer.data.devs.contains(x.id)) x.flags += x.flags & 4096 ? 0 : 4096;
+
+                return x;
+            }
+        );
+
+        // make sure devs' badges actually render
+        $api.events.hook('USER_PROFILE_MODAL_FETCH_SUCCESS', x => { if (endpwn.customizer.data.devs.contains(x.user.id)) x.user.flags += x.user.flags & 4096 ? 0 : 4096; })
+
+        // hook getGuild() so we can verify servers
+        $api.util.wrapAfter(
+            "wc.findCache('getGuild')[0].exports.getGuild",
+
+            x => {
+
+                if (x === undefined || x === null) return;
+
+                if (endpwn.customizer.data.guilds.contains(x.id)) x.features.add('VERIFIED');
+
+                return x;
+            }
+        );
+
+    }
+
+}

plugin/settings.js

@@ -0,0 +1,292 @@
+/*
+
+    EndPwn3 System (settings UI)
+    
+    Copyright 2018 EndPwn Project
+    
+    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+    
+    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+    
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    https://github.com/endpwn/
+
+*/
+
+exports = {
+
+    replacements: {
+        '{section:H.SectionTypes.DIVIDER},{section:"logout",': '{section:H.SectionTypes.DIVIDER},{section:"ENDPWN",label:"ΣndPwn Settings",element:window.BlankSettingsElement,color:"#0cc"},{section:H.SectionTypes.DIVIDER},{section:"logout",'
+    },
+
+    init: function () {
+
+        var currentSection = '';
+
+        $api.events.listen('ENDPWN_PSEUDO_IPC', msg => {
+            $api.localStorage.set('customizer_signature', JSON.parse(msg.data).signature);
+            console.log(currentSection);
+            renderSettings(currentSection);
+        });
+
+        window.BlankSettingsElement = $api.util.findConstructor('FormSection', 'FormSection').FormSection;
+
+        var buttons = $api.util.findFuncExports('button-', 'colorBlack');
+        var checkboxes = $api.util.findFuncExports('checkboxEnabled');
+        var misc = $api.util.findFuncExports('statusRed-', 'inputDefault');
+        var misc2 = $api.util.findFuncExports('multiInputField');
+        var headers = $api.util.findFuncExports('h5-', 'h5');
+
+        var panels = wc.findFunc('flexChild-')[0].exports;
+        var panels2 = $api.util.findFuncExports('errorMessage-', 'inputWrapper');
+
+        function createVerticalPanel() {
+            return createElement("div")
+                .withClass(panels2.vertical, 'epButtonPanel')
+        }
+
+        function createHorizontalPanel() {
+            return createElement("div")
+                .withClass(panels.horizontal, 'epButtonPanel')
+        }
+
+        function createButton(name) {
+            return createElement('button')
+                .withContents(name)
+                .withClass(
+                    buttons.button,
+                    buttons.lookFilled,
+                    buttons.colorBrand,
+                    buttons.sizeSmall,
+                    buttons.grow,
+                    'epMargin'
+                );
+        }
+
+        function createWarnButton(name) {
+            return createElement('button')
+                .withContents(name)
+                .withClass(
+                    buttons.button,
+                    buttons.lookOutlined,
+                    buttons.colorYellow,
+                    buttons.sizeSmall,
+                    buttons.grow,
+                    'epMargin'
+                );
+        }
+
+        function createDangerButton(name) {
+            return createElement('button')
+                .withContents(name)
+                .withClass(
+                    buttons.button,
+                    buttons.lookOutlined,
+                    buttons.colorRed,
+                    buttons.sizeSmall,
+                    buttons.grow,
+                    'epMargin'
+                );
+        }
+
+        function createH2(text) {
+            //h2-2gWE-o title-3sZWYQ size16-14cGz5 height20-mO2eIN weightSemiBold-NJexzi defaultColor-1_ajX0 defaultMarginh2-2LTaUL marginBottom20-32qID7
+            return createElement("h2")
+                .withClass(
+                    headers.h2,
+                    headers.title,
+                    headers.size16,
+                    headers.height20,
+                    headers.weightSemiBold,
+                    headers.defaultColor,
+                    'epMargin'
+                )
+                .withText(text);
+        }
+
+        function createH5(text) {
+            return createElement("h5")
+                .withClass(
+                    headers.h5,
+                    headers.title,
+                    headers.size12,
+                    headers.height16,
+                    headers.weightSemiBold
+                )
+                .withText(text);
+        }
+
+        function createInput(v) {
+            return createElement("input")
+                .withClass(
+                    misc.inputDefault,
+                    misc.input,
+                    misc.size16,
+                    'epMargin'
+                )
+                .modify(x => x.value = v)
+        }
+
+        //<input class="checkboxEnabled-CtinEn checkbox-2tyjJg" type="checkbox">
+        //switchEnabled-V2WDBB switch-3wwwcV valueUnchecked-2lU_20 value-2hFrkk sizeDefault-2YlOZr size-3rFEHg themeDefault-24hCdX
+        //switchEnabled-V2WDBB switch-3wwwcV valueChecked-m-4IJZ value-2hFrkk sizeDefault-2YlOZr size-3rFEHg themeDefault-24hCdX
+        function updateSwitch(s, w) {
+            if (s.checked) {
+                w.classList.remove(checkboxes.valueUnchecked.split(' ')[0]);
+                w.classList.add(checkboxes.valueChecked.split(' ')[0])
+            }
+            else {
+                w.classList.remove(checkboxes.valueChecked.split(' ')[0]);
+                w.classList.add(checkboxes.valueUnchecked.split(' ')[0])
+            }
+        }
+        function createSwitch(c, i) {
+            if (c === undefined) c = () => { };
+            if (i === undefined) i = false;
+            var s, w = createElement('div')
+                .withClass(
+                    checkboxes.switch,
+                    checkboxes.switchEnabled,
+                    checkboxes.size,
+                    checkboxes.sizeDefault,
+                    checkboxes.themeDefault
+                )
+                .withChildren(
+                    s = createElement("input")
+                        .withClass(
+                            checkboxes.checkbox,
+                            checkboxes.checkboxEnabled
+                        )
+                        .modify(x => x.type = 'checkbox')
+                        .modify(x => x.checked = i)
+                        .modify(x => x.onchange = () => {
+                            updateSwitch(s, w);
+                            c(s.checked);
+                        })
+                )
+            updateSwitch(s, w);
+            return w;
+        }
+
+        function authorizeCustomizer() {
+            var endpoint = $api.internal.constants.API_HOST;
+            var url = `https://${endpoint}/oauth2/authorize?client_id=436715820970803203&redirect_uri=https%3A%2F%2Fendpwn.cathoderay.tube%2Fauth%2Fdiscord%2Fintegratedcallback&response_type=code&scope=identify`;
+
+            var win = new window.electron.BrowserWindow({
+                width: 420,
+                height: 500,
+                transparent: false,
+                frame: false,
+                resizable: true,
+                nodeIntegration: true
+            });
+            win.loadURL(url);
+        }
+
+        function submitCustomizer(d, b) {
+
+            fetch('https://endpwn.cathoderay.tube/set', {
+                headers: {
+                    'Content-type': 'application/json'
+                },
+                method: 'POST',
+                body: JSON.stringify({
+                    id: $me(),
+                    signature: $api.localStorage.get('customizer_signature'),
+                    discriminator: d,
+                    bot: b
+                })
+            }).then(r => {
+
+                r.text().then(k => {
+                    $api.ui.showDialog({
+                        title:'Server Response',
+                        body: k
+                    });
+                });
+
+                endpwn.customizer.update();
+
+            });
+
+        }
+
+        function renderSettings(e) {
+
+            currentSection = e;
+            if ($("#ep_settings")) $("#ep_settings").remove();
+
+            if (e.section == "ENDPWN") {
+
+                var pane = $(".content-column.default");
+                if (!pane) return;
+
+                var needAuth = !$api.localStorage.get('customizer_signature');
+
+                var content = createElement('div')
+                    .withId('ep_settings')
+                    .withClass('flex-vertical')
+                    .withChildren(
+                        createElement("div")
+                            .withClass('epSettingsHeader')
+                            .withText('ΣndPwn Settings'),
+                )
+                    .appendTo(pane);
+
+                if (!$api.localStorage.get('customizer_signature')) {
+
+                    createHorizontalPanel()
+                        .withChildren(
+                            createButton("Authorize EndPwn Customizer")
+                                .modify(x => x.onclick = authorizeCustomizer)
+                        )
+                        .appendTo(content);
+
+                }
+                else {
+
+                    var discrim, bot;
+
+                    createVerticalPanel()
+                        .withChildren(
+                            createH5('Discriminator'),
+                            createHorizontalPanel()
+                                .withChildren(
+                                    discrim = createInput(endpwn.customizer.me.discrim ? endpwn.customizer.me.discrim : '')
+                                        .withClass('epDiscrimField')
+                                        .modify(x => x.maxLength = 4),
+                                    createVerticalPanel()
+                                        .withChildren(
+                                            createH5('Bot?'),
+                                            bot = createSwitch(() => { }, endpwn.customizer.me.bot)
+                                        ),
+                                    createButton("Submit")
+                                        .modify(x => x.onclick = () => submitCustomizer(discrim.value, bot.children[0].checked))
+                                )
+
+                        )
+                        .appendTo(content);
+
+                }
+
+                createElement("div")
+                    .withClass(panels.horizontal, 'epButtonPanel')
+                    .withChildren(
+                        createButton("Open Data Folder")
+                            .modify(x => x.onclick = () => { electron.shell.openExternal($api.data) }),
+                        createWarnButton("Restart in safe mode")
+                            .modify(x => x.onclick = endpwn.safemode),
+                        createDangerButton("Uninstall EndPwn")
+                            .modify(x => x.onclick = endpwn.uninstall)
+                    )
+                    .appendTo(content);
+
+            }
+
+        }
+
+        $api.events.hook("USER_SETTINGS_MODAL_SET_SECTION", renderSettings);
+    }
+
+}

plugin/system.css

@@ -15,6 +15,7 @@
 */
 
 /* style declaration for EndPwn developer badge */
+
 .profileBadgeEndPwn {
     background-image: url(https://dr1ft.xyz/sigma_solid.svg);
     background-position: center;
@@ -25,7 +26,33 @@
 }
 
 /* fix for poor formatting on modified crash screen */
+
 [class*="text-"] [class*="note"] {
     line-height: normal !important;
     text-align: left !important
 }
+
+/* settings page stuff */
+
+.epSettingsHeader {
+    background: linear-gradient(to bottom right, #0ff, #f0f);
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
+    font-size: 36px;
+    padding-bottom: 8px;
+}
+
+.epButtonPanel {
+    flex: 1 1 auto;
+    margin-bottom: 8px;
+}
+
+.epMargin {
+    margin-right: 8px;
+    margin-bottom: 8px;
+}
+
+.epDiscrimField {
+    width: 100px;
+    text-align: left;
+}

plugin/system.js

@@ -1,6 +1,6 @@
 /*
 
-    EndPwn3 System (script component)
+    EndPwn3 System (bootstrap)
     
     Copyright 2018 EndPwn Project
     
@@ -29,6 +29,22 @@ exports = {
         window.reload = () => { app.relaunch(); app.exit(); };
         window.endpwn = {
 
+            // safemode
+            safemode: function () {
+                $api.ui.showDialog({
+                    title: 'EndPwn: safe mode',
+                    body: 'This will restart your client in a state without plugin support.',
+                    confirmText: 'Yes', cancelText: 'No',
+
+                    onConfirm: () => {
+
+                        $api.localStorage.set('safemode', 1);
+                        window.electron.getCurrentWindow().reload();
+
+                    }
+                });
+            },
+
             // uninstaller
             uninstall: function () {
                 $api.ui.showDialog({
@@ -45,81 +61,27 @@ exports = {
 
                         reload();
 
-                    },
+                    }
-                    onCancel: () => console.log('<3')
                 });
             },
 
-            // endpwn customizer supporting code
+            // endpwn customizer
-            customizer: {
+            customizer: krequire('customizer'),
 
-                // fallback data
+            // settings page stuff
-                data: {
+            settings: krequire('settings'),
-                    guilds: [],
+
-                    devs: [],
+            // wrapper function for dispatch()
-                    bots: [],
+            // intended to simplify using executeJavaScript() from other windows as a bad IPC method
-                    users: {}
+            // we do this since afaik we cant use electron.ipc in a useful way (maybe im wrong? if i am ill make this better later on lol)
+            pseudoipc: function (e) {
+                $api.events.dispatch({
+                    type: 'ENDPWN_PSEUDO_IPC',
+                    data: e
+                });
             },
 
-                update: function () {
+            __eval: e => eval(e)
-                    // fetch goodies.json
-                    internal.print('fetching EndPwn Customizer data from server...');
-                    fetch('https://endpwn.cathoderay.tube/goodies.json?_=' + Date.now())
-                        .then(x => x.json())
-                        .then(r => endpwn.customizer.data = r);
-                },
-
-                init: function () {
-
-                    // prevent doublecalling
-                    endpwn.customizer.init = undefined;
-
-                    // apply custom discrims/bot tags/badges/server verif from EndPwn Customizer (endpwn.cathoderay.tube)
-                    internal.print('initializing EndPwn Customizer...');
-
-                    // refetch customizer stuff every half hour
-                    setInterval(endpwn.customizer.update, 1800000);
-                    endpwn.customizer.update();
-
-                    // add the endpwn dev badge to the class obfuscation table
-                    wc.findFunc('profileBadges:"profileBadges')[0].exports['profileBadgeEndpwn'] = 'profileBadgeEndPwn';
-
-                    // hook getUser() so we can apply custom discrims/bot tags/badges
-                    $api.util.wrapAfter(
-                        "wc.findCache('getUser')[0].exports.getUser",
-
-                        x => {
-
-                            if (x === undefined || x === null) return;
-
-                            if (endpwn.customizer.data.bots.contains(x.id)) x.bot = true;
-                            if (endpwn.customizer.data.users[x.id] !== undefined) x.discriminator = endpwn.customizer.data.users[x.id];
-                            if (endpwn.customizer.data.devs.contains(x.id)) x.flags += x.flags & 4096 ? 0 : 4096;
-
-                            return x;
-                        }
-                    );
-
-                    // make sure devs' badges actually render
-                    $api.events.hook('USER_PROFILE_MODAL_FETCH_SUCCESS', x => { if (endpwn.customizer.data.devs.contains(x.user.id)) x.user.flags += x.user.flags & 4096 ? 0 : 4096; })
-
-                    // hook getGuild() so we can verify servers
-                    $api.util.wrapAfter(
-                        "wc.findCache('getGuild')[0].exports.getGuild",
-
-                        x => {
-
-                            if (x === undefined || x === null) return;
-
-                            if (endpwn.customizer.data.guilds.contains(x.id)) x.features.add('VERIFIED');
-
-                            return x;
-                        }
-                    );
-
-                }
-
-            }
 
         };
 
@@ -154,14 +116,6 @@ exports = {
 
     replacements: {
 
-        // fix for custom discrims breaking search
-        //'#([0-9]{4})': 
-            //'#(.{1,4})',
-
-        // endpwn dev badges
-        //'return t.hasFlag(H.UserFlags.STAFF)': 
-            //'return t.hasFlag(4096)&&r.push({tooltip:"EndPwn Developer",onClick:function(){return window.open("https://endpwn.github.io/","_blank")},class:"endpwn"}),t.hasFlag(H.UserFlags.STAFF)'
-
         // changelog injection
         'key:"changeLog",get:function(){return E}':
             'key:"changeLog",get:function(){if(!E.injected){E.injected=1;E.date=E.date<=window.endpwn.changelog.date?window.endpwn.changelog.date:E.date;E.body=window.endpwn.changelog.body+"\\n\\n"+E.body}return E}',
@@ -182,7 +136,9 @@ exports = {
         internal.print('enabling experiments menu...');
         $api.util.findFuncExports('isDeveloper').__defineGetter__('isDeveloper', () => true);
 
+        // if we used start() in the other files, it would create a different instance -- we dont want that
         endpwn.customizer.init();
+        endpwn.settings.init();
 
         // check for epapi updates
         if ($api.lite || !fs.existsSync($api.data + '/DONTUPDATE'))
@@ -231,3 +187,10 @@ exports = {
     }
 
 }
+
+/*
+    Now all this crazy drama
+    All up in my face
+    All I really wanted
+    Was to be alone in space
+*/