From fb2829aed519f285646b2b196fb2a7a074ba43b7 Mon Sep 17 00:00:00 2001 From: BlockBuilder57 Date: Mon, 30 Apr 2018 19:59:40 -0500 Subject: [PATCH] Final EndPwn2 build I might update if it needs updating, but for now, we're done here. --- css/avatars.css | 14 +++++------ css/titlebar.css | 2 +- endpwn.js | 63 ++++++++++++++++++++++++------------------------ main.js | 21 ++++++---------- 4 files changed, 46 insertions(+), 54 deletions(-) diff --git a/css/avatars.css b/css/avatars.css index 79af94c..ac759a8 100644 --- a/css/avatars.css +++ b/css/avatars.css @@ -35,13 +35,13 @@ div[class^="footer-"] { /* Profile Roles */ -.role-3rahR_ { +[class*="role-"] { position:relative; border-radius:0%; padding-right:10px; } -.roleCircle-3-vPZq { +[class*="roleCircle-"] { border-radius:0%; position:absolute; width:100%; @@ -52,11 +52,11 @@ div[class^="footer-"] { margin-left:-4px; } -.roleName-DUQZ9m { +[class*="roleName-"] { z-index:2; } -.roleRemoveIcon-2iu0iE { +[class*="roleRemoveIcon-"] { display: block; margin: 6px 2px 6px 0; right: 0; @@ -64,13 +64,11 @@ div[class^="footer-"] { position: absolute; } -.roleRemoveIcon-2iu0iE .fill { +[class*="roleRemoveIcon-"] .fill { z-index:5; - fill: #FFF; - filter: brightness(0); } -.addButton-3RuTE0 { +[class*="addButton-"] { z-index:3; padding-right: 4px; } \ No newline at end of file diff --git a/css/titlebar.css b/css/titlebar.css index 21203b2..1027d21 100644 --- a/css/titlebar.css +++ b/css/titlebar.css @@ -2,7 +2,7 @@ ** Title Bar */ -header[class^="header-"]:not(.header-2Lg0Oe) { +header[class^="header-"]:not(.header-QKLPzZ) { padding: 10px; height: 30px; padding-top: 11px; diff --git a/endpwn.js b/endpwn.js index 9d78a5f..421195c 100644 --- a/endpwn.js +++ b/endpwn.js @@ -6,7 +6,7 @@ * Memework(tm) - Discord datamining */ -var epver = 2.016; +var epver = 2.018; var silent = false; var browser = false; @@ -223,49 +223,48 @@ var dropfiles = function () { // bootstrap var pl = `var fs=require("original-fs");exports.x=function(win){win.webContents.executeJavaScript('${ec}var _epver=${epver};${rs};${cc};${ct};if(window.location.hostname.includes("discordapp.com")){require(_epdata + "/main")}');}`; // end i.js cyst + +/*var fs=require("original-fs"); +exports.x=function(win) { + win.webContents.executeJavaScript('var fs=require("original-fs"); + var el=require("electron").remote; + var win=el.getCurrentWindow(); + var app=el.app; + var _epdata="C:/Users/Christian/AppData/Roaming/discordcanary/endpwn/"; + var _epver=2.018; + var _ep_restart=function(){app.relaunch();app.quit()}; + var _ep_clean=function(){el.getCurrentWindow().webContents.session.clearCache(function(){})}; + var _ep_continue=function(){win.loadURL("https://canary.discordapp.com/channels/@me")}; + if(window.location.hostname.includes("discordapp.com")){require(_epdata + "/main")}'); +}*/ _fs.writeFileSync(data() + '/endpwn/i.js', pl); _fs.writeFileSync(data() + '/endpwn/p.js'); - try - { + try { _fs.readFileSync(data() + '/endpwn/autoexec.js'); } - catch(e) - { - _fs.writeFileSync(data() + '/endpwn/autoexec.js', 'setupCSS(_epdata + "/styles/style.css");\nconsole.log("Hello, world!");'); + catch(e) { + _fs.writeFileSync(data() + '/endpwn/autoexec.js', 'setupCSS(_epdata + "/styles/style.css");\nconsole.log("Hello, world!");'); } - var eclient = new XMLHttpRequest(); - //eclient.open('GET', 'https://block57.net/discord/epapi.js'); - eclient.open('GET', 'https://endpwn.github.io/epapi.js'); - eclient.onreadystatechange = function() { - if (eclient.readyState === 4) { - _fs.writeFileSync(data() + '/endpwn/epapi.js', eclient.responseText); - } - } - eclient.send(); + fetch('https://endpwn.github.io/epapi/epapi.js?_=' + Date.now()) + .then(r => r.text()) + .then(f => { fs.writeFileSync(data() + '/endpwn/epapi.js', f); }); - var mclient = new XMLHttpRequest(); - mclient.open('GET', 'https://block57.net/discord/main.js'); - mclient.onreadystatechange = function() { - _fs.writeFileSync(data() + '/endpwn/main.js', mclient.responseText); - } - mclient.send(); + fetch('https://block57.net/discord/main.js?_=' + Date.now()) + .then(r => r.text()) + .then(f => { fs.writeFileSync(data() + '/endpwn/main.js', f); }); - var oclient = new XMLHttpRequest(); - oclient.open('GET', 'https://block57.net/discord/offline.html'); - oclient.onreadystatechange = function() { - _fs.writeFileSync(data() + '/endpwn/app', oclient.responseText); - } - oclient.send(); + fetch('https://block57.net/discord/offline.html?_=' + Date.now()) + .then(r => r.text()) + .then(f => { fs.writeFileSync(data() + '/endpwn/app', f); }); _fs.writeFileSync(data() + '/endpwn/legal.txt', license); - try{ - _fs.readFileSync(data() + '/endpwn/styles/style.css'); - }catch(e){ - _fs.writeFileSync(data() + '/endpwn/styles/style.css', "/*@import url('https://block57.net/discord/css/all.css');*/\n@import url('https://block57.net/discord/css/animations.css');\n@import url('https://block57.net/discord/css/avatars.css');\n@import url('https://block57.net/discord/css/background.css');\n@import url('https://block57.net/discord/css/channels.css');\n@import url('https://block57.net/discord/css/emoji.css');\n@import url('https://block57.net/discord/css/guilds.css');\n@import url('https://block57.net/discord/css/misc.css');\n@import url('https://block57.net/discord/css/titlebar.css');\n@import url('https://block57.net/discord/css/typinginput.css');\n@import url('https://block57.net/discord/css/variables.css');\n\n/* This file contains the custom CSS edits for EndPwn. If you want to\nchange the way these look, copy in the 'variables.css' file and edit the\nvalues in it. Also, you can select what kinds of edits you want applied\nusing the lines above. Comment out the ones you don't want, or leave them\nall in by uncommenting the 'all.css' file and removing the others. */"); - } + + if (!_fs.existsSync(data() + '/endpwn/styles/style.css')) { + _fs.writeFileSync(data() + '/endpwn/styles/style.css', "/*@import url('https://block57.net/discord/css/all.css');*/\n@import url('https://block57.net/discord/css/animations.css');\n@import url('https://block57.net/discord/css/avatars.css');\n@import url('https://block57.net/discord/css/background.css');\n@import url('https://block57.net/discord/css/channels.css');\n@import url('https://block57.net/discord/css/emoji.css');\n@import url('https://block57.net/discord/css/guilds.css');\n@import url('https://block57.net/discord/css/misc.css');\n@import url('https://block57.net/discord/css/titlebar.css');\n@import url('https://block57.net/discord/css/typinginput.css');\n@import url('https://block57.net/discord/css/variables.css');\n\n/* This file contains the custom CSS edits for EndPwn. If you want to\nchange the way these look, copy in the 'variables.css' file and edit the\nvalues in it. Also, you can select what kinds of edits you want applied\nusing the lines above. Comment out the ones you don't want, or leave them\nall in by uncommenting the 'all.css' file and removing the others. */"); + } } var crash = function () { diff --git a/main.js b/main.js index d8ed278..85cfadf 100644 --- a/main.js +++ b/main.js @@ -1,7 +1,10 @@ -// load epapi.js -window._epapi = require(_epdata + "epapi"); -// start the api -$api.go('asarpwn',false,'EndPwn'); +function __krequire(path) { + return eval('(()=>{var exports={};' + fs.readFileSync(_epdata + path, 'utf8').toString() + ';return exports})()'); +} +//get that epapi +var _epapi = __krequire('epapi.js'); +//start it up, brand as endpwn +_epapi.go('asarpwn',false,'EndPwn',false); $api.data += "endpwn/"; $api.discord.toggleDeveloper = function() { @@ -35,20 +38,12 @@ $api.ui.createMsg = function (text) { return msg; } -// some epapi shorthand methods, moved here because early accessibility -window.$listen = function (e, c) { - return document.addEventListener(e, c); -} -window.$dispatch = function (e) { - return document.dispatchEvent(e); -} - // beautifuldiscord, used to load css styles // credit to leovoel bdwatcher=null,bdtag=null,setupCSS=function(n){var e=fs.readFileSync(n,"utf-8");null===bdtag&&(bdtag=document.createElement("style"),document.head.appendChild(bdtag)),bdtag.innerHTML=e,null===bdwatcher&&(bdwatcher=fs.watch(n,{encoding:"utf-8"},function(e,w){if("change"===e){var i=fs.readFileSync(n,"utf-8");bdtag.innerHTML=i}}))}; // SELF_XSS warning disable (dr1ft) -var results=wc.findFunc("SELF_XSS_HEADER");wc.get(results[results.length-1].i).consoleWarning=function(e){}; +$api.util.findFuncExports('consoleWarning').consoleWarning = e => { }; // blend the linq.js methods into the array prototype for implicit Enumerable.from() if (!typeof (Enumerable) == 'undefined')