From 5becc9060d321129370340327b6c38b36e7feff1 Mon Sep 17 00:00:00 2001 From: Flex Date: Wed, 13 Jun 2018 16:25:08 -0600 Subject: [PATCH] . --- app/index.html | 204 ------------- crispr/crispr.js | 22 +- crxpwn.js | 81 ----- epapi/epapi.js | 124 +++----- index.html | 24 +- plugin/customizer.js | 243 ++++++++------- plugin/plugins.js | 110 ------- plugin/settings.js | 706 +++++++++++++++++++------------------------ plugin/system.js | 412 ++++++++++++------------- rapiddom/rapiddom.js | 88 ++++++ 10 files changed, 794 insertions(+), 1220 deletions(-) delete mode 100644 app/index.html delete mode 100644 crxpwn.js delete mode 100644 plugin/plugins.js create mode 100644 rapiddom/rapiddom.js diff --git a/app/index.html b/app/index.html deleted file mode 100644 index 8f2c6e2..0000000 --- a/app/index.html +++ /dev/null @@ -1,204 +0,0 @@ - - - - - - - - - - - - -
Cλnergy
- - - \ No newline at end of file diff --git a/crispr/crispr.js b/crispr/crispr.js index dc7fef4..38a4fdc 100644 --- a/crispr/crispr.js +++ b/crispr/crispr.js @@ -3,16 +3,16 @@ EndPwn CRISPR 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. DO NOT EDIT THIS FILE! Your bootstrap may overwrite changes to it, and you will lose your work! EndPwn3 users: You can prevent this by creating a file in the same directory named DONTUPDATE - + https://github.com/endpwn/ */ @@ -28,10 +28,10 @@ function evaluate(str, exportsR) { // log function function __crprint(str) { - console.log(`%c[CRISPR]%c ` + str, 'font-weight:bold;color:#c8f', ''); + console.log(`%c[CRISPR]%c ` + str, 'font-weight:bold;color:#c080ff', ''); } function __crwarn(str) { - console.warn(`%c[CRISPR]%c ` + str, 'font-weight:bold;color:#c8f', ''); + console.warn(`%c[CRISPR]%c ` + str, 'font-weight:bold;color:#c080ff', ''); } exports.go = (() => { @@ -50,7 +50,7 @@ function evaluate(str, exportsR) { version: { major: 1, minor: 2, - revision: 8, + revision: 7, toString: function () { return `v${this.major}.${this.minor}.${this.revision}`; @@ -101,7 +101,9 @@ function evaluate(str, exportsR) { }); } + } + }, pushHookOld: (x, mod, main) => { @@ -170,11 +172,7 @@ function evaluate(str, exportsR) { } // replacement dictionary - var snippets = [ - // TODO: move these the fuck out of this file after endpwn3.1 - { signature: '#([0-9]{4})', payload: '#(.{1,4})' }, - { signature: 'return t.hasFlag(H.UserFlags.STAFF)', payload: '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)' } - ]; + var snippets = []; // plugin iterator, taken from epapi if (fs.existsSync(data + '/plugins')) { diff --git a/crxpwn.js b/crxpwn.js deleted file mode 100644 index 24e3068..0000000 --- a/crxpwn.js +++ /dev/null @@ -1,81 +0,0 @@ -/* - - EndPwn3 Stage 2 Payload (crxpwn) - - 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. - - DO NOT EDIT THIS FILE! Your bootstrap may overwrite changes to it, and you will lose your work! - EndPwn3 users: You can prevent this by creating a file in the same directory named DONTUPDATE - - https://github.com/endpwn/ - -*/ - -function evaluate(str, exportsR) { - var exports = {}; - var ret = eval(str); - if (exportsR) Object.assign(exportsR, exports); - return ret; -} - -(() => { - - function __crxprint(str) { - console.log(`%c[crxpwn]%c ` + str, 'font-weight:bold;color:#c8f', ''); - } - - if (location.hostname.indexOf('discordapp') == -1) return; - __crxprint('extension loaded successfully, loading CRISPR and EPAPI...'); - - window.BetterDiscord = 'this is a dummy value to trip hasSuspiciousCode()'; - - // use the discord native api to require electron and get electron.remote - var electron = DiscordNative.nativeModules.requireModule('discord_/../electron').remote; - var fs = electron.require('original-fs'); - - // get the data path (where epapi.js should be) - var data = electron.app.getPath('userData').replace(/\\\\/g, "/") + '/'; - - // shakily reimplemented of require() intended for loading plugins and EPAPI itself - function krequire(p) { - var exports = {}; - evaluate(fs.readFileSync(data + p + (p.endsWith('.js') ? '' : '.js'), 'utf8').toString(), exports); - return exports; - } - - // load CRISPR and EPAPI - var crispr = krequire('crispr.js'); - var epapi = krequire('epapi.js'); - - var properties = { - name: "Cλnergy", - version: "Σv3.1.1, λv1", - method: "crxpwn-lambda", - brand:false - }; - - /*{ - name: 'EndPwn3', - version: { - major: 3, - minor: 1, - - toString: function () { - return `v${this.major}.${this.minor}`; - } - }, - method: 'crxpwn', - brand: true - };*/ - - // call their entrypoints - crispr.go(properties); - electron.getCurrentWindow().webContents.on('dom-ready', () => epapi.go(properties)); - -})(); \ No newline at end of file diff --git a/epapi/epapi.js b/epapi/epapi.js index 4ca4a68..9853f15 100644 --- a/epapi/epapi.js +++ b/epapi/epapi.js @@ -29,17 +29,17 @@ function evaluate(str, exportsR) { var internal = { print: function (t) { - console.log(`%c[EPAPI]%c ${t}`, 'font-weight:bold;color:#c8f', ''); + console.log(`%c[EPAPI]%c ${t}`, 'font-weight:bold;color:#0cc', ''); }, warn: function (t, e) { if (typeof (e) == 'undefined') e = ''; else e = ':\n\n' + e; - console.warn(`%c[EPAPI]%c ${t}`, 'font-weight:bold;color:#c8f', '', e); + console.warn(`%c[EPAPI]%c ${t}`, 'font-weight:bold;color:#0cc', '', e); }, error: function (e, t) { if (typeof (t) == 'undefined') t = 'uncaught exception'; - console.error(`%c[EPAPI]%c ${t}:\n\n`, 'font-weight:bold;color:#c8f', '', e); + console.error(`%c[EPAPI]%c ${t}:\n\n`, 'font-weight:bold;color:#0cc', '', e); }, alert: function (b, t) { @@ -116,7 +116,7 @@ function evaluate(str, exportsR) { prepare: async function () { internal.print('loading RapidDOM...'); - evaluate(await (await fetch('https://endpwn.github.io/rapiddom/rapiddom.js?_=' + Date.now())).text()); + require("./rapiddom.js"); // undefine config and settings if running in lite mode and dont deal with require() if (internal.lite) { @@ -124,19 +124,23 @@ function evaluate(str, exportsR) { } else { - // mutant hybrid require() for maximum compatibility, always defined now because some bootstraps have bad implementations - internal.print('defining require...'); - //if (typeof (require) == "undefined") { - var r = DiscordNative.nativeModules.requireModule("discord_/../electron").remote.require; - window.require = m => { - try { - return DiscordNative.nativeModules.requireModule("discord_/../" + m); - } - catch (e) { - return r(m); - } - }; - //} + // only use the (now defunct) directory escape exploit if the bootstrap hasnt declared itself as native + // TODO: once the exploit fix gets pushed out to stable we should probably start assuming native by default + if (!internal.native) { + + // mutant hybrid require() for maximum compatibility, always defined now because some bootstraps have bad implementations + internal.print('defining require...'); + var r = DiscordNative.nativeModules.requireModule("discord_/../electron").remote.require; + window.require = m => { + try { + return DiscordNative.nativeModules.requireModule("discord_/../" + m); + } + catch (e) { + return r(m); + } + }; + + } // here we import and define some stuff that usually gets defined by the bootstrap, just in case internal.print('requiring necessary modules...'); @@ -151,9 +155,10 @@ function evaluate(str, exportsR) { // krequire is a reimplementation of require(), only intended for loading plugins window.krequire = function (p) { - var exports = {}; + /*var exports = {}; evaluate(fs.readFileSync($api.data + '/plugins/' + p + (p.endsWith('.js') ? '' : '.js'), 'utf8').toString(), exports); - return exports; + return exports;*/ + return require($api.data + '/plugins/' + p + (p.endsWith('.js') ? '' : '.js')) } } @@ -292,14 +297,11 @@ function evaluate(str, exportsR) { wc.findFunc("clyde")[0].exports.BOT_AVATARS.EndPwn = "https://cdn.discordapp.com/avatars/350987786037493773/ae0a2f95898cfd867c843c1290e2b917.png"; // dont try loading plugins in lite mode - window.$pluginStore = {}; - - var loadOrder = {}; - if (internal.lite) { } else { + // load styles if (fs.existsSync(exports.data + '/styles')) { fs.readdirSync(exports.data + '/styles').forEach(x => { @@ -315,50 +317,10 @@ function evaluate(str, exportsR) { // load plugins... if (fs.existsSync(exports.data + '/plugins')) { - fs.readdirSync(exports.data + '/plugins').forEach(x => { - if (x.endsWith('.js')) { - var plugin = krequire(x); - $pluginStore[x.replace(".js","")] = plugin.manifest ? plugin.manifest : {name:x.replace(".js",""),description:"Manifest is missing for this plugin.",author:"Unknown"}; - loadOrder[x.replace(".js","")] = loadOrder[x.replace(".js","")] ? loadOrder[x.replace(".js","")] : ((plugin.manifest && plugin.manifest.prioirty) ? plugin.manifest.prioirty : 0); - if(plugin.manifest && plugin.manifest.loadAfter){ - let la = plugin.manifest.loadAfter; - if(Array.isArray(la)){ - internal.print('/plugins/' + x + ' depends on: ' + la.join(", ")); - la.forEach(y=>{loadOrder[y] ? loadOrder[y]=loadOrder[y]+1 : loadOrder[y] = 1}); - }else{ - internal.print('/plugins/' + x + '\'s loadAfter is not an array, ignoring...'); - } - } - } - }); - } - - loadOrder = Object.keys(loadOrder).sort(function(a,b){return -(loadOrder[a] - loadOrder[b])}); - - loadOrder.forEach(x=>{ - try { - var plugin = krequire(x+".js"); - - if (plugin.start !== undefined) { - internal.print('loading /plugins/' + x); - plugin.start(); - } else { - internal.print('/plugins/' + x + ' does not export start(), ignoring...'); - } - } - catch (e) { - internal.error(e, x + ' failed to initialize properly'); - warning++; - } - }); - - /*if (fs.existsSync(exports.data + '/plugins')) { fs.readdirSync(exports.data + '/plugins').forEach(x => { if (x.endsWith('.js')) { try { var plugin = krequire(x); - $pluginStore[x.replace(".js","")] = plugin.manifest ? plugin.manifest : {name:x.replace(".js",""),description:"Manifest is missing for this plugin.",author:"Unknown"}; - if (plugin.start !== undefined) { internal.print('loading /plugins/' + x); plugin.start(); @@ -372,7 +334,7 @@ function evaluate(str, exportsR) { } } }); - }*/ + } // execute autoruns... if (fs.existsSync(exports.data + '/autorun')) { @@ -429,7 +391,7 @@ function evaluate(str, exportsR) { major: 5, minor: 6, - revision: 43, // TODO: find a better way of incrementing/calculating the revision; the current way is fucking ridiculous (manually editing) + revision: 46, // TODO: find a better way of incrementing/calculating the revision; the current way is fucking ridiculous (manually editing) toString: function () { return `v${this.major}.${this.minor}.${this.revision}`; @@ -449,12 +411,12 @@ function evaluate(str, exportsR) { console.log(`EPAPI ${this.version}\nhttps://endpwn.github.io/\nhttps://discord.gg/8k3gEeE`); } else - console.log(`%cCλnergy%c + console.log(`%cΣndPwn%c ${this.bootstrap.name ? this.bootstrap.name : 'unknown'}${this.bootstrap.version ? ` ${this.bootstrap.version}` : ''}${this.bootstrap.method ? ` (${this.bootstrap.method})` : ''} EPAPI ${this.version}${window.crispr ? `, CRISPR ${window.crispr.version}` : ''} https://endpwn.github.io/ -https://discord.gg/8k3gEeE`, - 'background:linear-gradient(to bottom right,#cf8,#c8f);-webkit-background-clip:text;-webkit-text-fill-color:transparent;font-size:48px;font-family:sans-serif', ''); +https://patreon.com/dr1ft`, + 'background:linear-gradient(to bottom right,#0ff,#f0f);-webkit-background-clip:text;-webkit-text-fill-color:transparent;font-size:48px;font-family:sans-serif', ''); }, // get the lite status @@ -463,9 +425,9 @@ https://discord.gg/8k3gEeE`, }, /* - + entrypoint arguments: - + bootstrap (object): bootstrap properties keys: name (string): name of bootstrap @@ -475,19 +437,19 @@ https://discord.gg/8k3gEeE`, silent (bool): dont display about() after initialization brand (bool): enables the sigma wordmark replacement secure (bool): enables security features like permissions - + native (bool): informs epapi that we have access to native require() + all keys are optional, boolean values are assumed false if not provided - + please do not call this method unless you are a bootstrap - + */ - go: async function (bootstrap, silent, brand, lite) { if (location.hostname.indexOf('discordapp') == -1 && location.hostname.indexOf('dr1ft.xyz') == -1) return; try { - internal.print('starting up...') + internal.print('starting up...'); // figure out which calling convention is being used switch (typeof bootstrap) { @@ -498,6 +460,7 @@ https://discord.gg/8k3gEeE`, internal.lite = bootstrap.lite ? true : false; internal.silent = bootstrap.silent ? true : false; internal.brand = bootstrap.brand ? true : false; + internal.native = bootstrap.native ? true : false; break; // older bootstrap @@ -614,7 +577,7 @@ https://discord.gg/8k3gEeE`, wrap: function (target1, callback) { // for security; we're evaluating an untrusted expression in the local scope here - var internal = {}; + //var internal = {}; // get the original function var orig = evaluate(target1); @@ -656,7 +619,7 @@ https://discord.gg/8k3gEeE`, // intercept a function's return value wrapAfter: function (target1, callback) { - var internal = {}; + //var internal = {}; // get the original function var orig = evaluate(target1); @@ -672,8 +635,7 @@ https://discord.gg/8k3gEeE`, return callback(r); } catch (e) { - let err = internal && internal.error ? internal.error : console.error; - err(e, 'A function wrapper threw an exception'); + internal.error(e, 'A function wrapper threw an exception'); // again, dont fuck stuff up if there's a flaw in the wrapper return r; @@ -930,7 +892,7 @@ https://discord.gg/8k3gEeE`, $('.topic').style.display = 'none'; $('.header-toolbar').style.display = 'none'; }, - + showToolbar: function () { $('.topic').style.display = ''; $('.header-toolbar').style.display = ''; @@ -965,4 +927,6 @@ https://discord.gg/8k3gEeE`, } + if (typeof module != 'undefined') module.exports = exports; + })(); \ No newline at end of file diff --git a/index.html b/index.html index 530401f..a54d9cd 100644 --- a/index.html +++ b/index.html @@ -1,17 +1,11 @@ - Cλnergy - - + Lλmbda + + - - - -
Cλnergy
- Copy and paste the following string into your Discord console: + +
Lλmbda
+ Grab the Lambda Patcher
- please wait... +

Lambda does not have any Discord internal injection methods anymore.


-
- This is a fork of the unstable, staging branch of EndPwn3. Use at your own risk or use the - stable EP3 branch instead. + This is a fork of EndPwn3. \ No newline at end of file diff --git a/plugin/customizer.js b/plugin/customizer.js index 17cf927..b9011d5 100644 --- a/plugin/customizer.js +++ b/plugin/customizer.js @@ -1,115 +1,128 @@ -/* - - 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. - - DO NOT EDIT THIS FILE! Your bootstrap may overwrite changes to it, and you will lose your work! - EndPwn3 users: You can prevent this by creating a file in the same directory named DONTUPDATE - - https://github.com/endpwn/ - -*/ - -var internal = { - - print: function (str) { - console.log(`%c[Customizer]%c ` + str, 'font-weight:bold;color:#c8f', ''); - } - -} - -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 - delete endpwn.customizer.init; - - // 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.includes(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.includes(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.includes(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.includes(x.id)) x.features.add('VERIFIED'); - - return x; - } - ); - - } - -} \ No newline at end of file +/* + + 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. + + DO NOT EDIT THIS FILE! Your bootstrap may overwrite changes to it, and you will lose your work! + EndPwn3 users: You can prevent this by creating a file in the same directory named DONTUPDATE + + https://github.com/endpwn/ + +*/ + +var internal = { + + print: function (str) { + console.log(`%c[Customizer]%c ` + str, 'font-weight:bold;color:#0cc', ''); + } + +} + +if (window.$api === undefined && typeof $api != 'undefined') { + console.warn('$api is defined, but window.$api is not! assuming we are running under epapi6 and exporting an empty object...'); + exports = {}; +} +else + exports = { + + manifest: { + replacements: [ + + // fix for custom discrims breaking search + { + signature: '#([0-9]{4})', + payload: '#(.{1,4})' + }, + + // endpwn dev badges + { + //signature: 'return t.hasFlag(H.UserFlags.STAFF)', + signature: /return (\w)\.hasFlag\((\w)\.UserFlags\.STAFF\)&&(\w)\.push/g, + //payload: '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)' + payload: 'return $1.hasFlag(4096)&&$3.push({tooltip:"EndPwn Developer",onClick:function(){return window.open("https://endpwn.github.io/","_blank")},class:"endpwn"}),t.hasFlag($2.UserFlags.STAFF)&&r.push' + } + + ], + }, + + // 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 + delete endpwn.customizer.init; + + // 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.includes(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.includes(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.includes(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.includes(x.id)) x.features.add('VERIFIED'); + + return x; + } + ); + + } + + } diff --git a/plugin/plugins.js b/plugin/plugins.js deleted file mode 100644 index 32f6c48..0000000 --- a/plugin/plugins.js +++ /dev/null @@ -1,110 +0,0 @@ -exports = { - manifest: { - author: "Cynosphere", - name: "Plugins Page", - description: "Shows what plugins you have", - loadAfter:["settings"] - }, - - start:function(){ - let em = $settingsapi.elements; - let int = em.internal; - - var createPlugin = function(id,data){ - var info = {}; - info.name = data.name ? data.name : (id ? id : ""); - info.description = data.description ? data.description : "Manifest is missing for this plugin."; - info.author = data.author ? data.author : "Unknown"; - info.loadAfter = data.loadAfter ? data.loadAfter : []; - info.priority = data.priority ? data.priority : 0; - info.replacements = data.replacements ? data.replacements : []; - - var cont = em.createVerticalPanel(); - - var head = em.createHorizontalPanel() - .appendTo(cont); - - var title = createElement("h3") - .withClass( - int.headers.h3, - int.headers.title, - int.headers.size16, - int.headers.height20, - int.headers.defaultColor - ) - .withText(info.name) - .appendTo(head); - - em.createH5('By '+info.author) - .appendTo(title); - - em.createSwitch(() => { }, true) - .appendTo(head); - - createElement("div") - .withClass( - int.misc3.description, - int.misc3.formText, - int.misc3.modeDefault - ) - .withText(info.description) - .appendTo(cont); - - var body = em.createHorizontalPanel() - .appendTo(cont); - - createElement("div") - .withClass( - int.misc3.description, - int.misc3.formText, - int.misc3.modeDefault - ) - .withText(`Replacements: ${info.replacements.length}`) - .appendTo(body); - - createElement("div") - .withClass( - int.misc3.description, - int.misc3.formText, - int.misc3.modeDefault - ) - .modify(x=>x.style.marginLeft = "8px") - .withText(`Priority: ${info.priority}`) - .appendTo(body); - - createElement("div") - .withClass( - int.misc3.description, - int.misc3.formText, - int.misc3.modeDefault - ) - .modify(x=>x.style.marginLeft = "8px") - .withText(info.loadAfter.length > 0 ? `Depends on: ${info.loadAfter.join(", ")}` : "No dependencies") - .appendTo(body); - - createElement("div") - .withClass(em.internal.dividers.divider) - .appendTo(cont); - - return cont; - } - - $settingsapi.addSection("Plugins","Plugins",null,function(pnl){ - em.createH2("Plugins") - .appendTo(pnl); - - let plugins = {} - - Object.keys($pluginStore).forEach(x=>{ - console.log(x); - plugins[x] = {id:x,data:$pluginStore[x]}; - }); - - Object.keys(plugins).forEach(x=>{ - let d = plugins[x]; - createPlugin(d.id,d.data) - .appendTo(pnl); - }); - }); - } -} \ No newline at end of file diff --git a/plugin/settings.js b/plugin/settings.js index e9b0819..b0d3335 100644 --- a/plugin/settings.js +++ b/plugin/settings.js @@ -1,398 +1,308 @@ -/* - - 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. - - DO NOT EDIT THIS FILE! Your bootstrap may overwrite changes to it, and you will lose your work! - EndPwn3 users: You can prevent this by creating a file in the same directory named DONTUPDATE - - https://github.com/endpwn/ - -*/ - -exports = { - - manifest: { - author: "Cynosphere, dr1ft", - name: "Settings Page + Settings API", - description: "Hijacking the settings pages.", - replacements: [ - { - signature:/section:"logout",onClick:function\(\){(.)\.default\.push\(function\((.)\){return (.)\.createElement\((.)\.default,(.)\((.+),(.)\),(.)\((.)\.default,{size:(.)\.default\.Sizes\.MEDIUM,color:(.)\.default\.Colors\.PRIMARY},void 0,((.)\.default\.Messages\.USER_SETTINGS_CONFIRM_LOGOUT)\)\)}\)}/, - payload:'section:"logout",onClick:window.__fancyDialog=function(data=$6,txt=$12){$1.default.push(function($2){return $3.createElement($4.default,$5(data,$7),$8($9.default,{size:$10.default.Sizes.MEDIUM,color:$11.default.Colors.PRIMARY},void 0,txt))})}' - }, - {signature:'/function (.)\\(\\){return\\[{(.+)}]}/',payload:'window.$settingsapi={sections:[{$2}]};function $1(){return window.$settingsapi.sections;}'} - ], - loadAfter: ["system"] - }, - - init: function () { - - delete endpwn.settings.init; - - 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 misc3 = $api.util.findFuncExports('formText-','formText'); - var headers = $api.util.findFuncExports('h5-', 'h5'); - var dividers = wc.findFunc('divider-')[0].exports; - - var panels = wc.findFunc('flexChild-')[0].exports; - var panels2 = $api.util.findFuncExports('errorMessage-', 'inputWrapper'); - - let sections = window.$settingsapi.sections; - let dialog = window.__fancyDialog; - - delete window.__fancyDialog; - - window.$settingsapi = { - sections: sections, - ourSections: [], - _callbacks: {}, - _panels: {}, - addSection: function(name,label,color=null,callback,pos=null){ - let data = {}; - - data.section = name || `SAPI_${Math.floor(Math.random()*10000)}`; - data.label = label; - data.color = color; - data.element = $api.util.findConstructor('FormSection', 'FormSection').FormSection; - - $settingsapi.ourSections.push(data); - $settingsapi.sections.splice(pos ? pos : $settingsapi.sections.length-4,0,data); - $settingsapi._callbacks[name] = callback; - }, - addDivider: function(){ - $settingsapi.ourSections.push({section:"DIVIDER"}); - $settingsapi.sections.splice($settingsapi.sections.length-4,0,{section:"DIVIDER"}); - }, - addHeader: function(label){ - $settingsapi.ourSections.push({section:"HEADER",label:label}); - $settingsapi.sections.splice($settingsapi.sections.length-4,0,{section:"HEADER",label:label}); - }, - fancyDialog: dialog, - //All of these allow us to use Discord's elements. - elements: { - createVerticalPanel: function() { - return createElement("div") - .withClass(panels2.vertical, 'epButtonPanel') - }, - createHorizontalPanel: function() { - return createElement("div") - .withClass(panels.horizontal, 'epButtonPanel') - }, - createButton: function(name) { - return createElement('button') - .withContents(name) - .withClass( - buttons.button, - buttons.lookFilled, - buttons.colorBrand, - buttons.sizeSmall, - buttons.grow, - 'epMargin' - ); - }, - createWarnButton: function(name) { - return createElement('button') - .withContents(name) - .withClass( - buttons.button, - buttons.lookOutlined, - buttons.colorYellow, - buttons.sizeSmall, - buttons.grow, - 'epMargin' - ); - }, - createDangerButton: function(name) { - return createElement('button') - .withContents(name) - .withClass( - buttons.button, - buttons.lookOutlined, - buttons.colorRed, - buttons.sizeSmall, - buttons.grow, - 'epMargin' - ); - }, - createH2: function(text) { - return createElement("h2") - .withClass( - headers.h2, - headers.title, - headers.size16, - headers.height20, - headers.weightSemiBold, - headers.defaultColor, - 'epMargin' - ) - .withText(text); - }, - createH5: function(text) { - return createElement("h5") - .withClass( - headers.h5, - headers.title, - headers.size12, - headers.height16, - headers.weightSemiBold - ) - .withText(text); - }, - createInput: function(v, p) { - return createElement("input") - .withClass( - misc.inputDefault, - misc.input, - misc.size16, - 'epMargin' - ) - .modify(x => x.value = v ? v : "") - .modify(x => x.placeholder = p ? p : "") - }, - updateSwitch: function(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]) - } - }, - createSwitch: function(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 = () => { - $settingsapi.elements.updateSwitch(s, w); - c(s.checked); - }) - ) - $settingsapi.elements.updateSwitch(s, w); - return w; - }, - internal:{ - panels:panels, - panels2:panels2, - buttons:buttons, - checkboxes:checkboxes, - misc:misc, - misc2:misc2, - misc3:misc3, - headers:headers, - dividers:dividers - } - } - } - - //Example settings tab - /*$settingsapi.addDivider(); - $settingsapi.addHeader("Element Testing"); - $settingsapi.addSection("TESTING","Element Test Page",null,function(pnl){ - let em = $settingsapi.elements; - em.createH2("Hello World! Heading 2").appendTo(pnl); - em.createH5("Hello World! Heading 5").appendTo(pnl); - em.createButton("Button!").appendTo(pnl); - em.createWarnButton("Warning Button!").appendTo(pnl); - em.createDangerButton("Danger Button!").appendTo(pnl); - em.createInput("","Input Box!").appendTo(pnl); - em.createSwitch().appendTo(pnl); - - let v = em.createVerticalPanel().appendTo(pnl); - let h = em.createHorizontalPanel().appendTo(pnl); - - em.createH2("Vertical Panel!").appendTo(v); - em.createButton("Beep Boop").appendTo(v); - - em.createH2("Horizontal Panel!").appendTo(h); - em.createButton("Boop Beep").appendTo(h); - });*/ - - function setupSettings(e){ - for(let i in $settingsapi._panels){ - $settingsapi._panels[i].remove(); - } - - for(let i in $settingsapi.ourSections){ - let data = $settingsapi.ourSections[i]; - if(e.section == data.section){ - var pane = $(".content-column.default"); - if (!pane) return; - - $settingsapi._panels[data.section] = createElement('div') - .withClass('flex-vertical') - .appendTo(pane); - - $settingsapi._callbacks[data.section]($settingsapi._panels[data.section]); - } - } - } - - $api.events.hook("USER_SETTINGS_MODAL_SET_SECTION",setupSettings); - $api.events.hook("USER_SETTINGS_MODAL_INIT",e=>setTimeout(_=>setupSettings(e),200)); - - $api.events.listen('ENDPWN_PSEUDO_IPC', msg => { - $api.localStorage.set('customizer_signature', JSON.parse(msg.data).signature); - console.log(currentSection); - renderSettings(currentSection); - }); - - 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(pane) { - var em = $settingsapi.elements; - var needAuth = !$api.localStorage.get('customizer_signature'); - - var content = createElement('div') - .withId('ep_settings') - .withClass('flex-vertical') - .withChildren( - createElement("div") - .withClass('epSettingsHeader') - .withText('Cλnergy Settings'), - ) - .appendTo(pane); - - em.createH2("Basic Settings") - .modify(x=>x.className = x.className.replace("epMargin","margin-bottom-20")) - .appendTo(content); - createElement("div") - .withClass(em.internal.panels.horizontal, 'epButtonPanel') - .withChildren( - em.createButton("Open Data Folder") - .modify(x => x.onclick = () => { electron.shell.openExternal($api.data) }), - em.createWarnButton("Restart in safe mode") - .modify(x => x.onclick = endpwn.safemode), - em.createDangerButton("Uninstall EndPwn") - .modify(x => x.onclick = function () { - $settingsapi.fancyDialog({ - header: 'EndPwn: confirm uninstallation', - confirmText: 'Yes', cancelText: 'No', - - onConfirm: () => { - - var data = $api.data; - - $api.settings.set('WEBAPP_ENDPOINT'); - $api.settings.set('WEBAPP_PATH'); - - reload(); - - } - },'Are you sure you want to remove EndPwn from your client? You can reinstall it at any time.'); - }) - ) - .appendTo(content); - - createElement("div") - .withClass(em.internal.dividers.divider,"margin-bottom-40","margin-top-40") - .appendTo(content); - - em.createH2("Customizer") - .modify(x=>x.className = x.className.replace("epMargin","margin-bottom-20")) - .appendTo(content); - if (!$api.localStorage.get('customizer_signature')) { - em.createHorizontalPanel() - .withChildren( - em.createButton("Authorize EndPwn Customizer") - .modify(x => x.onclick = authorizeCustomizer) - ) - .appendTo(content); - } - else { - var discrim, bot; - - em.createVerticalPanel() - .withChildren( - em.createH5('Discriminator'), - em.createHorizontalPanel() - .withChildren( - discrim = em.createInput(endpwn.customizer.me.discrim ? endpwn.customizer.me.discrim : '') - .withClass('epDiscrimField') - .modify(x => x.maxLength = 4), - em.createVerticalPanel() - .withChildren( - em.createH5('Bot?'), - bot = em.createSwitch(() => { }, endpwn.customizer.me.bot) - ), - em.createButton("Submit") - .modify(x => x.onclick = () => submitCustomizer(discrim.value, bot.children[0].checked)) - ) - ) - .appendTo(content); - } - } - - $settingsapi.addDivider(); - $settingsapi.addHeader("Cynergy"); - $settingsapi.addSection("ENDPWN","Cλnergy Settings","#c8f",renderSettings); - } - -} \ No newline at end of file +/* + + 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. + + DO NOT EDIT THIS FILE! Your bootstrap may overwrite changes to it, and you will lose your work! + EndPwn3 users: You can prevent this by creating a file in the same directory named DONTUPDATE + + https://github.com/endpwn/ + +*/ + +if (window.$api === undefined && typeof $api != 'undefined') { + console.warn('$api is defined, but window.$api is not! assuming we are running under epapi6 and exporting an empty object...'); + exports = {}; +} +else + exports = { + + manifest: { + replacements: [ + { + signature: /{section:(\w)\.SectionTypes\.DIVIDER},{section:"logout",/g, + payload: '{section:$1.SectionTypes.DIVIDER},{section:"ENDPWN",label:"ΣndPwn Settings",element:window.BlankSettingsElement,color:"#0cc"},{section:$1.SectionTypes.DIVIDER},{section:"logout",' + } + ], + }, + + init: function () { + + delete endpwn.settings.init; + + 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) + } + + // + //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); + $api.events.hook("USER_SETTINGS_MODAL_INIT", e => setTimeout(_ => renderSettings(e), 200)); + } + + } diff --git a/plugin/system.js b/plugin/system.js index 90ea2d8..5deb2cc 100644 --- a/plugin/system.js +++ b/plugin/system.js @@ -1,204 +1,208 @@ -/* - - EndPwn3 System (bootstrap) - - 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. - - DO NOT EDIT THIS FILE! Your bootstrap may overwrite changes to it, and you will lose your work! - EndPwn3 users: You can prevent this by creating a file in the same directory named DONTUPDATE - - https://github.com/endpwn/ - -*/ - -var internal = { - - print: function (str) { - console.log(`%c[EndPwn3]%c ` + str, 'font-weight:bold;color:#c8f', ''); - } - -} - -exports = { - - preload: function () { - - 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({ - title: 'EndPwn: confirm uninstallation', - body: 'Are you sure you want to remove EndPwn from your client? You can reinstall it at any time.', - confirmText: 'Yes', cancelText: 'No', - - onConfirm: () => { - - var data = $api.data; - - $api.settings.set('WEBAPP_ENDPOINT'); - $api.settings.set('WEBAPP_PATH'); - - reload(); - - } - }); - }, - - // endpwn customizer - customizer: krequire('customizer'), - - // settings page stuff - settings: krequire('settings'), - - // wrapper function for dispatch() - // intended to simplify using executeJavaScript() from other windows as a bad IPC method - // 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 - }); - }, - - __eval: e => eval(e) - - }; - - // fetch the changelog - internal.print('retrieving changelog...'); - fetch('https://lambda.cynfoxwell.cf/changelog.md?_=' + Date.now()).then(r => r.text()).then(l => { - var data = l.split(';;'); - window.endpwn.changelog = { - date: data[0], - body: data[1] - }; - }); - - // early init payload - document.addEventListener('ep-prepared', () => { - - // disable that obnoxious warning about not pasting shit in the console - internal.print('disabling self xss warning...'); - $api.util.findFuncExports('consoleWarning').consoleWarning = e => { }; - - // fuck sentry - internal.print('fucking sentry...'); - var sentry = wc.findCache('_originalConsoleMethods')[0].exports; - window.console = Object.assign(window.console, sentry._originalConsoleMethods); // console - sentry._wrappedBuiltIns.forEach(x => x[0][x[1]] = x[2]); // other stuff - sentry._breadcrumbEventHandler = () => () => { }; // break most event logging - sentry.captureBreadcrumb = () => { }; // disable breadcrumb logging - - }); - - }, - - manifest: { - replacements: [ - // changelog injection - { - signature:'key:"changeLog",get:function(){return E}', - payload:'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}' - }, - - // crash screen hijack - { - signature:'var e=o("div",{},void 0,o("p",{},void 0,a.default.Messages.ERRORS_UNEXPECTED_CRASH),o("p",{},void 0,a.default.Messages.ERRORS_ACTION_TO_TAKE)),t=o(c.default,{size:l.ButtonSizes.LARGE,onClick:this._handleSubmitReport},void 0,a.default.Messages.ERRORS_RELOAD);return o(u.default,{theme:this.props.theme,title:a.default.Messages.UNSUPPORTED_BROWSER_TITLE,', - payload:`var e=o("div",{},void 0,o("p",{},void 0,"Something has gone very, very wrong, and Discord has crashed."),o("p",{},void 0,"If this is the first time you've seen this error screen, reload and hope for the best. If this screen appears again, follow these steps:"),o("p",{},void 0,"Try removing any new plugins and restarting again. If this solves the problem there may be a bug in a plugin or a conflict."),o("p",{},void 0,"If problems continue, it's likely that there is a bug in EndPwn or Discord."),o("p",{},void 0,"If you need help, join the EndPwn Discord server (https://discord.gg/wXdPNf2)"),o("p",{},void 0,"Details may be available in the console (Ctrl+Shift+I), but at this level of crash we can't be certain.")),t=o("div",{},void 0,o(c.default,{size:l.ButtonSizes.LARGE,onClick:()=>window.electron.getCurrentWindow().reload()},void 0,"Reload"),o(c.default,{size:l.ButtonSizes.LARGE,onClick:()=>{window.$api.localStorage.set('safemode',1);window.electron.getCurrentWindow().reload()}},void 0,"Reload in safe mode"));return o(u.default,{theme:this.props.theme,title:"Discord: Fatal Error",` - } - ], - priority: 9999 - }, - - start: function () { - - // disable analytics - internal.print('disabling analytics...'); - $api.util.findFuncExports("AnalyticEventConfigs").default.track = () => { }; - - // enable experiments - 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')) - (function () { - - internal.print('checking for EPAPI updates...'); - - // fetch the latest build of epapi - fetch('https://lambda.cynfoxwell.cf/epapi/epapi.js?_=' + Date.now()).then(x => x.text()).then(x => { - - // check the version - if (kparse(x).version > $api.version) { - - // if the version on the server is newer, pester the user - $api.ui.showDialog({ - - title: 'EndPwn3: EPAPI Update Available', - body: 'An update to EPAPI has been released. It is recommended that you restart your client in order to gain access to new features and maintain compatibility.', - confirmText: 'Restart Now', cancelText: 'Later', - - // user pressed "Restart Now" - onConfirm: () => { - - // refresh the page if we're running in a browser, reboot the app if we're running outside of lite mode - reload(); - - }, - - // they pressed "Later", for some reason - onCancel: () => { - - // bother them again in 6 hrs (* 60 min * 60 sec * 1000 ms) - setTimeout(arguments.callee, 6 * 60 * 60 * 1000); - - } - - }); - - } - else setTimeout(arguments.callee, 6 * 60 * 60 * 1000); - - }); - - })(); - - } - -} - -/* - Now all this crazy drama - All up in my face - All I really wanted - Was to be alone in space -*/ \ No newline at end of file +/* + + EndPwn3 System (bootstrap) + + 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. + + DO NOT EDIT THIS FILE! Your bootstrap may overwrite changes to it, and you will lose your work! + EndPwn3 users: You can prevent this by creating a file in the same directory named DONTUPDATE + + https://github.com/endpwn/ + +*/ + +var internal = { + + print: function (str) { + console.log(`%c[EndPwn3]%c ` + str, 'font-weight:bold;color:#0cc', ''); + }, + warn: function (str) { + console.warn(`%c[EndPwn3]%c ` + str, 'font-weight:bold;color:#0cc', ''); + } + +} + +if (window.$api === undefined && typeof $api != 'undefined') { + console.warn('$api is defined, but window.$api is not! assuming we are running under epapi6 and exporting an empty object...'); + exports = {}; +} +else + exports = { + + manifest: { + + replacements: [ + + // changelog injection + { + signature: /key:"changeLog",get:function\(\){return (\w)}/g, + payload: 'key:"changeLog",get:function(){if(!$1.injected){$1.injected=1;$1.date=$1.date<=window.endpwn.changelog.date?window.endpwn.changelog.date:$1.date;$1.body=window.endpwn.changelog.body+"\\n\\n"+$1.body}return $1}' + }, + + // crash screen hijack + { + signature: /var (\w)=(\w)\("div",{},void 0,\w\("p",{},void 0,(\w)\.default\.Messages\.ERRORS_UNEXPECTED_CRASH\),\w\("p",{},void 0,\w\.default\.Messages\.ERRORS_ACTION_TO_TAKE\)\),(\w)=\w\((\w)\.default,{size:(\w)\.ButtonSizes\.LARGE,onClick:this\._handleSubmitReport},void 0,a\.default\.Messages\.ERRORS_RELOAD\);return o\(u\.default,{theme:this\.props.theme,title:a\.default\.Messages\.UNSUPPORTED_BROWSER_TITLE,/g, + payload: `var $1=$2("div",{},void 0,$2("p",{},void 0,"Something has gone very, very wrong, and Discord has crashed."),$2("p",{},void 0,"If this is the first time you've seen this error screen, reload and hope for the best. If this screen appears again, follow these steps:"),$2("p",{},void 0,"Try removing any new plugins and restarting again. If this solves the problem there may be a bug in a plugin or a conflict."),$2("p",{},void 0,"If problems continue, it's likely that there is a bug in EndPwn or Discord."),$2("p",{},void 0,"If you need help, join the EndPwn Discord server (https://discord.gg/wXdPNf2)"),$2("p",{},void 0,"Details may be available in the console (Ctrl+Shift+I), but at this level of crash we can't be certain.")),$4=$2("div",{},void 0,$2($5.default,{size:$6.ButtonSizes.LARGE,onClick:()=>window.electron.getCurrentWindow().reload()},void 0,"Reload"),$2($5.default,{size:$6.ButtonSizes.LARGE,onClick:()=>{window.$api.localStorage.set('safemode',1);window.electron.getCurrentWindow().reload()}},void 0,"Reload in safe mode"));return $2(u.default,{theme:this.props.theme,title:"Discord: Fatal Error",` + } + + ], + }, + + preload: function () { + + 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({ + title: 'EndPwn: confirm uninstallation', + body: 'Are you sure you want to remove EndPwn from your client? You can reinstall it at any time.', + confirmText: 'Yes', cancelText: 'No', + + onConfirm: () => { + + var data = $api.data; + + $api.settings.set('WEBAPP_ENDPOINT'); + $api.settings.set('WEBAPP_PATH'); + $api.settings.set('UPDATE_ENDPOINT'); + + reload(); + + } + }); + }, + + // endpwn customizer + customizer: krequire('customizer'), + + // settings page stuff + settings: krequire('settings'), + + // wrapper function for dispatch() + // intended to simplify using executeJavaScript() from other windows as a bad IPC method + // 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 + }); + }, + + __eval: e => eval(e) + + }; + + // fetch the changelog + internal.print('retrieving changelog...'); + fetch('https://dr1ft.xyz/ep/changelog.txt?_=' + Date.now()).then(r => r.text()).then(l => { + var data = l.split(';;'); + window.endpwn.changelog = { + date: data[0], + body: data[1] + }; + }); + + // early init payload + document.addEventListener('ep-prepared', () => { + + // disable that obnoxious warning about not pasting shit in the console + internal.print('disabling self xss warning...'); + $api.util.findFuncExports('consoleWarning').consoleWarning = e => { }; + + // fuck sentry + internal.print('fucking sentry...'); + var sentry = wc.findCache('_originalConsoleMethods')[0].exports; + window.console = Object.assign(window.console, sentry._originalConsoleMethods); // console + sentry._wrappedBuiltIns.forEach(x => x[0][x[1]] = x[2]); // other stuff + sentry._breadcrumbEventHandler = () => () => { }; // break most event logging + sentry.captureBreadcrumb = () => { }; // disable breadcrumb logging + + }); + + }, + + start: function () { + + // disable analytics + internal.print('disabling analytics...'); + $api.util.findFuncExports("AnalyticEventConfigs").default.track = () => { }; + + // enable experiments + 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')) + (function () { + + internal.print('checking for EPAPI updates...'); + + // fetch the latest build of epapi + fetch('https://dr1ft.xyz/ep/epapi.js?_=' + Date.now()).then(x => x.text()).then(x => { + + // check the version + if (kparse(x).version > $api.version) { + + // if the version on the server is newer, pester the user + $api.ui.showDialog({ + + title: 'EndPwn3: EPAPI Update Available', + body: 'An update to EPAPI has been released. It is recommended that you restart your client in order to gain access to new features and maintain compatibility.', + confirmText: 'Restart Now', cancelText: 'Later', + + // user pressed "Restart Now" + onConfirm: () => { + + // refresh the page if we're running in a browser, reboot the app if we're running outside of lite mode + reload(); + + }, + + // they pressed "Later", for some reason + onCancel: () => { + + // bother them again in 6 hrs (* 60 min * 60 sec * 1000 ms) + setTimeout(arguments.callee, 6 * 60 * 60 * 1000); + + } + + }); + + } + else setTimeout(arguments.callee, 6 * 60 * 60 * 1000); + + }); + + })(); + + } + + } \ No newline at end of file diff --git a/rapiddom/rapiddom.js b/rapiddom/rapiddom.js new file mode 100644 index 0000000..58b1e59 --- /dev/null +++ b/rapiddom/rapiddom.js @@ -0,0 +1,88 @@ +/* + + RapidDOM + + Copyright 2018 dr1ft + + 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/strdr1ft/RapidDOM + +*/ + +(() => { + + // shorthand stuff + window.$ = s => document.querySelector(s); + window.$$ = s => document.querySelectorAll(s); + window.createElement = t => document.createElement(t); + + // get HTMLElement's prototype so that we can work with it + var element = HTMLElement.prototype; + + element.modify = function (c) { + c(this); + return this; + }; + + // set the id + element.withId = function (id) { + this.id = id; + return this; + }; + + // add classes to an element + element.withClass = function (...classes) { + + // iterate over the arguments and add them all to the classlist + for (var i = 0; i < classes.length; i++) { + var subclasses = classes[i].split(' '); + for (var j = 0; j < subclasses.length; j++) { + this.classList.add(subclasses[j]); + } + } + + return this; + + }; + + element.withAttribute = function (name, value) { + this.setAttribute(name, value); + return this; + } + + // set the text + element.withText = function (text) { + this.innerText = text; + return this; + }; + + // set the html !!! NOT SAFE !!! + element.withContents = function (text) { + this.innerHTML = text; + return this; + }; + + element.withChildren = function (...children) { + for (var i = 0; i < children.length; i++) { + this.appendChild(children[i]); + } + return this; + }; + + element.appendTo = function (parent) { + parent.appendChild(this); + return this; + }; + + // wipe the innerHTML of an element + element.purge = function () { + this.innerHTML = ''; + return this; + }; + +})(); \ No newline at end of file