Updated separated files
This commit is contained in:
Jiiks
parent
659dc085fd
commit
3821077eaf
31
js/bdapi.js
31
js/bdapi.js
|
|
@ -20,7 +20,7 @@ BdApi.joinServer = function(code) {
|
|||
//id = id of element
|
||||
//css = custom css
|
||||
BdApi.injectCSS = function (id, css) {
|
||||
$("head").append('<style id="'+id+'"></style>')
|
||||
$("head").append('<style id="' + id + '"></style>');
|
||||
$("#" + id).html(css);
|
||||
};
|
||||
|
||||
|
|
@ -81,3 +81,32 @@ BdApi.getUserNameById = function(id) {
|
|||
}
|
||||
return null;
|
||||
};
|
||||
|
||||
//Set current game
|
||||
//game = game
|
||||
BdApi.setPlaying = function (game) {
|
||||
bdws.send({
|
||||
"op": 3,
|
||||
"d": {
|
||||
"idle_since": null,
|
||||
"game": {
|
||||
"name": game
|
||||
}
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
//Set current status
|
||||
//idle_since = date
|
||||
//status = status
|
||||
BdApi.setStatus = function (idle_since, status) {
|
||||
bdws.send({
|
||||
"op": 3,
|
||||
"d": {
|
||||
"idle_since": idle_since,
|
||||
"game": {
|
||||
"name": status
|
||||
}
|
||||
}
|
||||
});
|
||||
};
|
||||
234
js/core.js
234
js/core.js
|
|
@ -1,15 +1,13 @@
|
|||
/* BetterDiscordApp Core JavaScript
|
||||
* Version: 1.52
|
||||
* Version: 1.53
|
||||
* Author: Jiiks | http://jiiks.net
|
||||
* Date: 27/08/2015 - 16:36
|
||||
* Last Update: 24/010/2015 - 17:27
|
||||
* Last Update: 02/04/2016
|
||||
* https://github.com/Jiiks/BetterDiscordApp
|
||||
*/
|
||||
|
||||
|
||||
var settingsPanel, emoteModule, utils, quickEmoteMenu, opublicServers, voiceMode, pluginModule, themeModule;
|
||||
var jsVersion = 1.54;
|
||||
var supportedVersion = "0.2.3";
|
||||
var settingsPanel, emoteModule, utils, quickEmoteMenu, opublicServers, voiceMode, pluginModule, themeModule, customCssEditor;
|
||||
var jsVersion = 1.63;
|
||||
var supportedVersion = "0.2.5";
|
||||
|
||||
var mainObserver;
|
||||
|
||||
|
|
@ -23,20 +21,27 @@ var bttvEmoteUrlEnd = "/1x";
|
|||
var mainCore;
|
||||
|
||||
var settings = {
|
||||
"Save logs locally": { "id": "bda-gs-0", "info": "Saves chat logs locally", "implemented": false },
|
||||
"Public Servers": { "id": "bda-gs-1", "info": "Display public servers button", "implemented": true },
|
||||
"Minimal Mode": { "id": "bda-gs-2", "info": "Hide elements and reduce the size of elements.", "implemented": true },
|
||||
"Voice Mode": { "id": "bda-gs-4", "info": "Only show voice chat", "implemented": true },
|
||||
"Hide Channels": { "id": "bda-gs-3", "info": "Hide channels in minimal mode", "implemented": true },
|
||||
"Quick Emote Menu": { "id": "bda-es-0", "info": "Show quick emote menu for adding emotes", "implemented": true },
|
||||
"Show Emotes": { "id": "bda-es-7", "info": "Show any emotes", "implemented": true },
|
||||
"FrankerFaceZ Emotes": { "id": "bda-es-1", "info": "Show FrankerFaceZ Emotes", "implemented": true },
|
||||
"BetterTTV Emotes": { "id": "bda-es-2", "info": "Show BetterTTV Emotes", "implemented": true },
|
||||
"Emote Autocomplete": { "id": "bda-es-3", "info": "Autocomplete emote commands", "implemented": false },
|
||||
"Emote Auto Capitalization": { "id": "bda-es-4", "info": "Autocapitalize emote commands", "implemented": true },
|
||||
"Override Default Emotes": { "id": "bda-es-5", "info": "Override default emotes", "implemented": false },
|
||||
"Show Names": { "id": "bda-es-6", "info": "Show emote names on hover", "implemented": true }
|
||||
}
|
||||
"Save logs locally": { "id": "bda-gs-0", "info": "Saves chat logs locally", "implemented": false, "hidden": false, "cat": "core"},
|
||||
"Public Servers": { "id": "bda-gs-1", "info": "Display public servers button", "implemented": true, "hidden": false, "cat": "core"},
|
||||
"Minimal Mode": { "id": "bda-gs-2", "info": "Hide elements and reduce the size of elements.", "implemented": true, "hidden": false, "cat": "core"},
|
||||
"Voice Mode": { "id": "bda-gs-4", "info": "Only show voice chat", "implemented": true, "hidden": false, "cat": "core"},
|
||||
"Hide Channels": { "id": "bda-gs-3", "info": "Hide channels in minimal mode", "implemented": true, "hidden": false, "cat": "core"},
|
||||
"Dark Mode": { "id": "bda-gs-5", "info": "Make certain elements dark by default(wip)", "implemented": true, "hidden": false, "cat": "core"},
|
||||
"Override Default Emotes": { "id": "bda-es-5", "info": "Override default emotes", "implemented": false, "hidden": false, "cat": "core"},
|
||||
"Voice Disconnect": { "id": "bda-dc-0", "info": "Disconnect from voice server when closing Discord", "implemented": true, "hidden": false, "cat": "core"},
|
||||
"Custom css live update": { "id": "bda-css-0", "info": "", "implemented": true, "hidden": true , "cat": "core"},
|
||||
"Custom css auto udpate": { "id": "bda-css-1", "info": "", "implemented": true, "hidden": true , "cat": "core"},
|
||||
|
||||
"Show Emotes": { "id": "bda-es-7", "info": "Show any emotes", "implemented": true, "hidden": false, "cat": "emote"},
|
||||
"FrankerFaceZ Emotes": { "id": "bda-es-1", "info": "Show FrankerFaceZ Emotes", "implemented": true, "hidden": false, "cat": "emote"},
|
||||
"BetterTTV Emotes": { "id": "bda-es-2", "info": "Show BetterTTV Emotes", "implemented": true, "hidden": false, "cat": "emote"},
|
||||
"Emote Menu": { "id": "bda-es-0", "info": "Show Twitch/Favourite emotes in emote menu", "implemented": true, "hidden": false, "cat": "emote"},
|
||||
"Emoji Menu": { "id": "bda-es-9", "info": "Show Discord emoji menu", "implemented": true, "hidden": false, "cat": "emote"},
|
||||
"Emote Autocomplete": { "id": "bda-es-3", "info": "Autocomplete emote commands", "implemented": false, "hidden": false, "cat": "emote"},
|
||||
"Emote Auto Capitalization": { "id": "bda-es-4", "info": "Autocapitalize emote commands", "implemented": true, "hidden": false, "cat": "emote"},
|
||||
"Show Names": { "id": "bda-es-6", "info": "Show emote names on hover", "implemented": true, "hidden": false, "cat": "emote"},
|
||||
"Show emote modifiers": { "id": "bda-es-8", "info": "Enable emote mods", "implemented": true, "hidden": false, "cat": "emote"},
|
||||
};
|
||||
|
||||
var links = {
|
||||
"Jiiks.net": { "text": "Jiiks.net", "href": "http://jiiks.net", "target": "_blank" },
|
||||
|
|
@ -51,86 +56,81 @@ var defaultCookie = {
|
|||
"bda-gs-2": false,
|
||||
"bda-gs-3": false,
|
||||
"bda-gs-4": false,
|
||||
"bda-gs-5": true,
|
||||
"bda-es-0": true,
|
||||
"bda-es-1": false,
|
||||
"bda-es-2": false,
|
||||
"bda-es-1": true,
|
||||
"bda-es-2": true,
|
||||
"bda-es-3": false,
|
||||
"bda-es-4": false,
|
||||
"bda-es-5": true,
|
||||
"bda-es-6": true,
|
||||
"bda-es-7": true,
|
||||
"bda-jd": true
|
||||
"bda-es-8": true,
|
||||
"bda-jd": true,
|
||||
"bda-es-8": true,
|
||||
"bda-dc-0": false,
|
||||
"bda-css-0": false,
|
||||
"bda-css-1": false,
|
||||
"bda-es-9": true
|
||||
};
|
||||
|
||||
var bdchangelog = {
|
||||
"changes": {
|
||||
"favemotes": {
|
||||
"title": "Favorite Emotes!",
|
||||
"text": "You can now favorite emotes and have them listed in the quick emote menu!",
|
||||
"darkmode": {
|
||||
"title": "v1.63 : Dark Mode",
|
||||
"text": "Dark mode makes certain elements dark by default(currently only applies to emote menu)",
|
||||
"img": ""
|
||||
},
|
||||
"plugins": {
|
||||
"title": "Plugins!",
|
||||
"text": "Combined with Core 0.2.3, you can now write JavaScript plugins for Discord!",
|
||||
"emotemenu": {
|
||||
"title": "v1.62 : Brand new emote menu that fits in Discord emoji menu!",
|
||||
"text": "The emote menu has been replaced by a new one that injects itself in the Discord emoji menu!",
|
||||
"img": ""
|
||||
},
|
||||
"settingsmenu": {
|
||||
"title": "Settings Menu!",
|
||||
"text": "New and improved settings menu!",
|
||||
"cccss": {
|
||||
"title": "v1.61 : New custom CSS editor",
|
||||
"text": "The custom CSS editor now has options and can be detached!",
|
||||
"img": ""
|
||||
},
|
||||
"csseditor": {
|
||||
"title": "New CSS Editor!",
|
||||
"text": "New CSS Editor powered by <a href='http://codemirror.net' target='_blank'>CodeMirror!</a>",
|
||||
"vdc": {
|
||||
"title": "v1.61 : Voice Disconnect",
|
||||
"text": "Disconnect from voice server when closing Discord!",
|
||||
"img": ""
|
||||
},
|
||||
"minimalmode": {
|
||||
"title": "Minimal mode makeover!",
|
||||
"text": "New and improved minimal mode!",
|
||||
"pslist": {
|
||||
"title": "v1.60 : New public server list!",
|
||||
"text": 'New and shiny public server list powered by <a href="https://www.discordservers.com/" target="_blank">DiscordServers.com</a>!',
|
||||
"img": ""
|
||||
},
|
||||
"api": {
|
||||
"title": "v1.59 : New plugin api callback",
|
||||
"text": "Use the `observer(e)` callback instead of creating your own MutationObserver",
|
||||
"img": ""
|
||||
},
|
||||
"emotemods": {
|
||||
"title": "v1.59 : New emote mods!",
|
||||
"text": "The following emote mods have been added: :shake2, :shake3, :flap",
|
||||
"img": ""
|
||||
},
|
||||
"minmode": {
|
||||
"title": "v1.59: Minimal mode",
|
||||
"text": "Minimal mode embed fixed size has been removed",
|
||||
"img": ""
|
||||
}
|
||||
},
|
||||
"fixes": {
|
||||
"reload": {
|
||||
"title": "Reload Fix!",
|
||||
"text": "Fixed an issue that caused Discord to crash on reload!",
|
||||
"modal": {
|
||||
"title": "v1.62 : Fixed modals",
|
||||
"text": "Fixed broken modal introduced by 0.0.287",
|
||||
"imt": ""
|
||||
},
|
||||
"emotes": {
|
||||
"title": "v1.59 : Native sub emote mods",
|
||||
"text": "Emote mods now work with native sub emotes!",
|
||||
"img": ""
|
||||
},
|
||||
"eemotes": {
|
||||
"title": "Edit Emotes!",
|
||||
"text": "Edited messages now display emotes properly!",
|
||||
"img": ""
|
||||
},
|
||||
"pservers": {
|
||||
"title": "Public Servers",
|
||||
"text": "Public servers have been fixed!",
|
||||
"img": ""
|
||||
},
|
||||
"other": {
|
||||
"title": "Bugfixes!",
|
||||
"text": "Several smaller bugs fixed!",
|
||||
"img": ""
|
||||
}
|
||||
},
|
||||
"upcoming": {
|
||||
"ignore": {
|
||||
"title": "Ignore User!",
|
||||
"text": "Ignore users you don't like!",
|
||||
"img": ""
|
||||
},
|
||||
"themes": {
|
||||
"title": "Custom themes!",
|
||||
"text": "Write your own or download custom themes!",
|
||||
"img": ""
|
||||
},
|
||||
"favemotes": {
|
||||
"title": "Favorite emotes!",
|
||||
"text": "Add your favorite emote(s) to the quick emote menu!",
|
||||
"img": ""
|
||||
},
|
||||
"more": {
|
||||
"title": "More Things!",
|
||||
"text": "More things but probably not in the next version!",
|
||||
"emotes2": {
|
||||
"title": "v1.59 : Emote mods and custom emotes",
|
||||
"text": "Emote mods will no longer interfere with custom emotes using :",
|
||||
"img": ""
|
||||
}
|
||||
}
|
||||
|
|
@ -141,15 +141,16 @@ var settingsCookie = {};
|
|||
function Core() {}
|
||||
|
||||
Core.prototype.init = function () {
|
||||
|
||||
var self = this;
|
||||
|
||||
if (version < supportedVersion) {
|
||||
alert("BetterDiscord v" + version + "(your version)" + " is not supported by the latest js("+jsVersion+"). Please download the latest version from betterdiscord.net");
|
||||
this.alert("Not Supported", "BetterDiscord v" + version + "(your version)" + " is not supported by the latest js(" + jsVersion + ").<br><br> Please download the latest version from <a href='https://betterdiscord.net' target='_blank'>BetterDiscord.net</a>");
|
||||
return;
|
||||
}
|
||||
|
||||
utils = new Utils();
|
||||
var sock = new BdWSocket();
|
||||
sock.start();
|
||||
utils.getHash();
|
||||
emoteModule = new EmoteModule();
|
||||
quickEmoteMenu = new QuickEmoteMenu();
|
||||
|
|
@ -167,8 +168,6 @@ Core.prototype.init = function() {
|
|||
console.log(new Date().getTime() + " Defer Loaded");
|
||||
var guilds = $(".guilds>li:first-child");
|
||||
|
||||
guilds.after($("<li></li>", { id: "bd-pub-li", css: { "height": "20px", "display": settingsCookie["bda-gs-1"] == true ? "" : "none" } }).append($("<div/>", { class: "guild-inner", css: { "height": "20px", "border-radius": "4px" } }).append($("<a/>").append($("<div/>", { css: { "line-height": "20px", "font-size": "12px" }, text: "public", id: "bd-pub-button" })))));
|
||||
|
||||
var showChannelsButton = $("<button/>", {
|
||||
class: "btn",
|
||||
id: "bd-show-channels",
|
||||
|
|
@ -186,7 +185,7 @@ Core.prototype.init = function() {
|
|||
$(".guilds-wrapper").prepend(showChannelsButton);
|
||||
|
||||
opublicServers = new PublicServers();
|
||||
|
||||
customCssEditor = new CustomCssEditor();
|
||||
pluginModule = new PluginModule();
|
||||
pluginModule.loadPlugins();
|
||||
if (typeof (themesupport2) !== "undefined") {
|
||||
|
|
@ -199,16 +198,20 @@ Core.prototype.init = function() {
|
|||
|
||||
quickEmoteMenu.init(false);
|
||||
|
||||
$("#tc-settings-button").on("click", function() { settingsPanel.show(); });
|
||||
$("#bd-pub-button").on("click", function() { opublicServers.show(); });
|
||||
$("#tc-settings-button").on("click", function () {
|
||||
settingsPanel.show();
|
||||
});
|
||||
|
||||
window.addEventListener("beforeunload", function(){
|
||||
if(settingsCookie["bda-dc-0"]){
|
||||
$('.btn.btn-disconnect').click();
|
||||
}
|
||||
});
|
||||
|
||||
opublicServers.init();
|
||||
|
||||
emoteModule.autoCapitalize();
|
||||
|
||||
|
||||
|
||||
|
||||
/*Display new features in BetterDiscord*/
|
||||
if (settingsCookie["version"] < jsVersion) {
|
||||
var cl = self.constructChangelog();
|
||||
|
|
@ -216,12 +219,9 @@ Core.prototype.init = function() {
|
|||
settingsCookie["version"] = jsVersion;
|
||||
self.saveSettings();
|
||||
}
|
||||
$("head").append('<script>Date.now||(Date.now=function(){return(new Date).getTime()}),function(){"use strict";for(var t=["webkit","moz"],e=0;e<t.length&&!window.requestAnimationFrame;++e){var i=t[e];window.requestAnimationFrame=window[i+"RequestAnimationFrame"],window.cancelAnimationFrame=window[i+"CancelAnimationFrame"]||window[i+"CancelRequestAnimationFrame"]}if(/iP(ad|hone|od).*OS 6/.test(window.navigator.userAgent)||!window.requestAnimationFrame||!window.cancelAnimationFrame){var s=0;window.requestAnimationFrame=function(t){var e=Date.now(),i=Math.max(s+16,e);return setTimeout(function(){t(s=i)},i-e)},window.cancelAnimationFrame=clearTimeout}}(),function(t){t.snowfall=function(e,i){function s(s,n,a,o){this.x=s,this.y=n,this.size=a,this.speed=o,this.step=0,this.stepSize=h(1,10)/100,i.collection&&(this.target=m[h(0,m.length-1)]);var r=null;i.image?(r=document.createElement("img"),r.src=i.image):(r=document.createElement("div"),t(r).css({background:i.flakeColor})),t(r).attr({"class":"snowfall-flakes"}).css({width:this.size,height:this.size,position:i.flakePosition,top:this.y,left:this.x,fontSize:0,zIndex:i.flakeIndex}),t(e).get(0).tagName===t(document).get(0).tagName?(t("body").append(t(r)),e=t("body")):t(e).append(t(r)),this.element=r,this.update=function(){if(this.y+=this.speed,this.y>l-(this.size+6)&&this.reset(),this.element.style.top=this.y+"px",this.element.style.left=this.x+"px",this.step+=this.stepSize,this.x+=y===!1?Math.cos(this.step):y+Math.cos(this.step),i.collection&&this.x>this.target.x&&this.x<this.target.width+this.target.x&&this.y>this.target.y&&this.y<this.target.height+this.target.y){var t=this.target.element.getContext("2d"),e=this.x-this.target.x,s=this.y-this.target.y,n=this.target.colData;if(void 0!==n[parseInt(e)][parseInt(s+this.speed+this.size)]||s+this.speed+this.size>this.target.height)if(s+this.speed+this.size>this.target.height){for(;s+this.speed+this.size>this.target.height&&this.speed>0;)this.speed*=.5;t.fillStyle="#fff",void 0==n[parseInt(e)][parseInt(s+this.speed+this.size)]?(n[parseInt(e)][parseInt(s+this.speed+this.size)]=1,t.fillRect(e,s+this.speed+this.size,this.size,this.size)):(n[parseInt(e)][parseInt(s+this.speed)]=1,t.fillRect(e,s+this.speed,this.size,this.size)),this.reset()}else this.speed=1,this.stepSize=0,parseInt(e)+1<this.target.width&&void 0==n[parseInt(e)+1][parseInt(s)+1]?this.x++:parseInt(e)-1>0&&void 0==n[parseInt(e)-1][parseInt(s)+1]?this.x--:(t.fillStyle="#fff",t.fillRect(e,s,this.size,this.size),n[parseInt(e)][parseInt(s)]=1,this.reset())}(this.x+this.size>d-c||this.x<c)&&this.reset()},this.reset=function(){this.y=0,this.x=h(c,d-c),this.stepSize=h(1,10)/100,this.size=h(100*i.minSize,100*i.maxSize)/100,this.element.style.width=this.size+"px",this.element.style.height=this.size+"px",this.speed=h(i.minSpeed,i.maxSpeed)}}function n(){for(r=0;r<a.length;r+=1)a[r].update();f=requestAnimationFrame(function(){n()})}var a=[],o={flakeCount:35,flakeColor:"#ffffff",flakePosition:"absolute",flakeIndex:999999,minSize:1,maxSize:2,minSpeed:1,maxSpeed:5,round:!1,shadow:!1,collection:!1,collectionHeight:40,deviceorientation:!1},i=t.extend(o,i),h=function(t,e){return Math.round(t+Math.random()*(e-t))};t(e).data("snowfall",this);var r=0,l=t(e).height(),d=t(e).width(),c=0,f=0;if(i.collection!==!1){var p=document.createElement("canvas");if(p.getContext&&p.getContext("2d"))for(var m=[],w=t(i.collection),g=i.collectionHeight,r=0;r<w.length;r++){var u=w[r].getBoundingClientRect(),x=t("<canvas/>",{"class":"snowfall-canvas"}),z=[];if(u.top-g>0){t("body").append(x),x.css({position:i.flakePosition,left:u.left+"px",top:u.top-g+"px"}).prop({width:u.width,height:g});for(var v=0;v<u.width;v++)z[v]=[];m.push({element:x.get(0),x:u.left,y:u.top-g,width:u.width,height:g,colData:z})}}else i.collection=!1}for(t(e).get(0).tagName===t(document).get(0).tagName&&(c=25),t(window).bind("resize",function(){l=t(e)[0].clientHeight,d=t(e)[0].offsetWidth}),r=0;r<i.flakeCount;r+=1)a.push(new s(h(c,d-c),h(0,l),h(100*i.minSize,100*i.maxSize)/100,h(i.minSpeed,i.maxSpeed)));i.round&&t(".snowfall-flakes").css({"-moz-border-radius":i.maxSize,"-webkit-border-radius":i.maxSize,"border-radius":i.maxSize}),i.shadow&&t(".snowfall-flakes").css({"-moz-box-shadow":"1px 1px 1px #555","-webkit-box-shadow":"1px 1px 1px #555","box-shadow":"1px 1px 1px #555"});var y=!1;i.deviceorientation&&t(window).bind("deviceorientation",function(t){y=.1*t.originalEvent.gamma}),n(),this.clear=function(){t(".snowfall-canvas").remove(),t(e).children(".snowfall-flakes").remove(),cancelAnimationFrame(f)}},t.fn.snowfall=function(e){return"object"==typeof e||void 0==e?this.each(function(){new t.snowfall(this,e)}):"string"==typeof e?this.each(function(){var e=t(this).data("snowfall");e&&e.clear()}):void 0}}(jQuery);</script>');
|
||||
//By http://www.somethinghitme.com
|
||||
|
||||
|
||||
$("head").append("<style>.CodeMirror{ min-width:100%; }</style>");
|
||||
|
||||
$("head").append('<style id="bdemotemenustyle"></style>');
|
||||
|
||||
} else {
|
||||
setTimeout(gwDefer, 100);
|
||||
|
|
@ -251,40 +251,57 @@ Core.prototype.initSettings = function() {
|
|||
};
|
||||
|
||||
Core.prototype.saveSettings = function () {
|
||||
$.cookie("better-discord", JSON.stringify(settingsCookie), { expires: 365, path: '/' });
|
||||
$.cookie("better-discord", JSON.stringify(settingsCookie), {
|
||||
expires: 365,
|
||||
path: '/'
|
||||
});
|
||||
};
|
||||
|
||||
Core.prototype.loadSettings = function () {
|
||||
settingsCookie = JSON.parse($.cookie("better-discord"));
|
||||
};
|
||||
|
||||
var botlist = ["119598467310944259"]; //Temp
|
||||
Core.prototype.initObserver = function () {
|
||||
|
||||
mainObserver = new MutationObserver(function (mutations) {
|
||||
mutations.forEach(function (mutation) {
|
||||
if($(mutation.target).find(".emoji-picker").length) {
|
||||
var fc = mutation.target.firstChild;
|
||||
if(fc.classList.contains("popout")) {
|
||||
quickEmoteMenu.obsCallback($(fc));
|
||||
}
|
||||
}
|
||||
if (typeof pluginModule !== "undefined") pluginModule.rawObserver(mutation);
|
||||
if (mutation.target.getAttribute('class') != null) {
|
||||
if(mutation.target.getAttribute('class').indexOf("titlebar") != -1) {
|
||||
quickEmoteMenu.obsCallback();
|
||||
//console.log(mutation.target)
|
||||
if(mutation.target.classList.contains('title-wrap') || mutation.target.classList.contains('chat')){
|
||||
// quickEmoteMenu.obsCallback();
|
||||
voiceMode.obsCallback();
|
||||
if (typeof pluginModule !== "undefined") pluginModule.channelSwitch();
|
||||
}
|
||||
if (mutation.target.getAttribute('class').indexOf('scroller messages') != -1) {
|
||||
if (typeof pluginModule !== "undefined") pluginModule.newMessage();
|
||||
}
|
||||
}
|
||||
emoteModule.obsCallback(mutation);
|
||||
|
||||
});
|
||||
});
|
||||
|
||||
//noinspection JSCheckFunctionSignatures
|
||||
mainObserver.observe(document, { childList: true, subtree: true });
|
||||
mainObserver.observe(document, {
|
||||
childList: true,
|
||||
subtree: true
|
||||
});
|
||||
};
|
||||
|
||||
Core.prototype.constructChangelog = function () {
|
||||
var changeLog = '' +
|
||||
'<div id="bd-wn-modal" class="modal" style="opacity:1;">' +
|
||||
' <div class="modal-inner">' +
|
||||
' <div id="bdcl" class="change-log"> ' +
|
||||
' <div class="header">' +
|
||||
' <strong>What\'s new in BetterDiscord JS v1.53&' + jsVersion + '</strong>' +
|
||||
' <button class="close" onclick=\'$("#bd-wn-modal").remove();\'></button>' +
|
||||
' <div id="bdcl" class="markdown-modal change-log"> ' +
|
||||
' <div class="markdown-modal-header">' +
|
||||
' <strong>What\'s new in BetterDiscord JS' + jsVersion + '</strong>' +
|
||||
' <button class="markdown-modal-close" onclick=\'$("#bd-wn-modal").remove();\'></button>' +
|
||||
' </div><!--header-->' +
|
||||
' <div class="scroller-wrap">' +
|
||||
' <div class="scroller">';
|
||||
|
|
@ -360,3 +377,18 @@ Core.prototype.constructChangelog = function() {
|
|||
|
||||
return changeLog;
|
||||
};
|
||||
|
||||
Core.prototype.alert = function (title, text) {
|
||||
$("body").append('' +
|
||||
'<div class="bd-alert">' +
|
||||
' <div class="bd-alert-header">' +
|
||||
' <span>' + title + '</span>' +
|
||||
' <div class="bd-alert-closebtn" onclick="$(this).parent().parent().remove();">×</div>' +
|
||||
' </div>' +
|
||||
' <div class="bd-alert-body">' +
|
||||
' <div class="scroller-wrap dark fade">' +
|
||||
' <div class="scroller">' + text + '</div>' +
|
||||
' </div>' +
|
||||
' </div>' +
|
||||
'</div>');
|
||||
};
|
||||
|
|
@ -0,0 +1,99 @@
|
|||
function CustomCssEditor() { }
|
||||
|
||||
CustomCssEditor.prototype.init = function() {
|
||||
var self = this;
|
||||
self.hideBackdrop = false;
|
||||
self.editor = CodeMirror.fromTextArea(document.getElementById("bd-custom-css-ta"), {
|
||||
lineNumbers: true,
|
||||
mode: 'css',
|
||||
indentUnit: 4,
|
||||
theme: 'neat'
|
||||
});
|
||||
|
||||
self.editor.on("change", function (cm) {
|
||||
var css = cm.getValue();
|
||||
self.applyCustomCss(css, false, false);
|
||||
});
|
||||
|
||||
var attachEditor="";
|
||||
attachEditor += "<div id=\"bd-customcss-attach-controls\">";
|
||||
attachEditor += " <ul class=\"checkbox-group\">";
|
||||
attachEditor += " <li>";
|
||||
attachEditor += " <div class=\"checkbox\" onclick=\"settingsPanel.updateSetting(this);\">";
|
||||
attachEditor += " <div class=\"checkbox-inner\"><input id=\"bda-css-0\" type=\"checkbox\" "+(settingsCookie["bda-css-0"] ? "checked" : "")+"><span><\/span><\/div>";
|
||||
attachEditor += " <span title=\"Update client css while typing\">Live Update<\/span>";
|
||||
attachEditor += " <\/div>";
|
||||
attachEditor += " <\/li>";
|
||||
attachEditor += " <li>";
|
||||
attachEditor += " <div class=\"checkbox\" onclick=\"settingsPanel.updateSetting(this);\">";
|
||||
attachEditor += " <div class=\"checkbox-inner\"><input id=\"bda-css-1\" type=\"checkbox\" "+(settingsCookie["bda-css-1"] ? "checked" : "")+"><span><\/span><\/div>";
|
||||
attachEditor += " <span title=\"Autosave css to localstorage when typing\">Autosave<\/span>";
|
||||
attachEditor += " <\/div>";
|
||||
attachEditor += " <\/li>";
|
||||
attachEditor += " <li>";
|
||||
attachEditor += " <div class=\"checkbox\" onclick=\"settingsPanel.updateSetting(this);\">";
|
||||
attachEditor += " <div class=\"checkbox-inner\"><input id=\"bda-css-2\" type=\"checkbox\" "+(customCssEditor.hideBackdrop ? "checked" : "")+"><span><\/span><\/div>";
|
||||
attachEditor += " <span title=\"Hide the callout backdrop to disable modal close events\">Hide Backdrop<\/span>";
|
||||
attachEditor += " <\/div>";
|
||||
attachEditor += " <\/li>";
|
||||
attachEditor += " <\/ul>";
|
||||
attachEditor += " <div id=\"bd-customcss-detach-controls-buttons\">";
|
||||
attachEditor += " <button class=\"btn btn-primary\" id=\"bd-customcss-detached-update\" onclick=\"return false;\">Update<\/button>";
|
||||
attachEditor += " <button class=\"btn btn-primary\" id=\"bd-customcss-detached-save\" onclick=\"return false;\">Save<\/button>";
|
||||
attachEditor += " <button class=\"btn btn-primary\" id=\"bd-customcss-detached-detach\" onclick=\"customCssEditor.detach(); return false;\">Detach</button>";
|
||||
attachEditor += " <\/div>";
|
||||
attachEditor += "<\/div>";
|
||||
|
||||
this.attachEditor = attachEditor;
|
||||
|
||||
$("#bd-customcss-innerpane").append(attachEditor);
|
||||
|
||||
$("#bd-customcss-detached-update").on("click", function() {
|
||||
self.applyCustomCss(self.editor.getValue(), true, false);
|
||||
return false;
|
||||
});
|
||||
$("#bd-customcss-detached-save").on("click", function() {
|
||||
self.applyCustomCss(self.editor.getValue(), false, true);
|
||||
return false;
|
||||
});
|
||||
|
||||
|
||||
var detachEditor="";
|
||||
detachEditor += "<div id=\"bd-customcss-detach-container\">";
|
||||
detachEditor += " <div id=\"bd-customcss-detach-editor\">";
|
||||
detachEditor += " <\/div>";
|
||||
detachEditor += "<\/div>";
|
||||
this.detachedEditor = detachEditor;
|
||||
};
|
||||
|
||||
CustomCssEditor.prototype.attach = function() {
|
||||
$("#editor-detached").hide();
|
||||
$("#app-mount").removeClass("bd-detached-editor");
|
||||
$("#bd-customcss-pane").append($("#bd-customcss-innerpane"));
|
||||
$("#bd-customcss-detached-detach").show();
|
||||
$("#bd-customcss-detach-container").remove();
|
||||
};
|
||||
|
||||
CustomCssEditor.prototype.detach = function() {
|
||||
var self = this;
|
||||
this.attach();
|
||||
$("#editor-detached").show();
|
||||
$("#bd-customcss-detached-detach").hide();
|
||||
$("#app-mount").addClass("bd-detached-editor");
|
||||
$(".app").parent().append(this.detachedEditor);
|
||||
$("#bd-customcss-detach-editor").append($("#bd-customcss-innerpane"));
|
||||
};
|
||||
|
||||
CustomCssEditor.prototype.applyCustomCss = function (css, forceupdate, forcesave) {
|
||||
if ($("#customcss").length == 0) {
|
||||
$("head").append('<style id="customcss"></style>');
|
||||
}
|
||||
|
||||
if(forceupdate || settingsCookie["bda-css-0"]) {
|
||||
$("#customcss").html(css);
|
||||
}
|
||||
|
||||
if(forcesave || settingsCookie["bda-css-1"]) {
|
||||
localStorage.setItem("bdcustomcss", btoa(css));
|
||||
}
|
||||
};
|
||||
|
|
@ -15,17 +15,23 @@
|
|||
|
||||
var emotesFfz = {};
|
||||
var emotesBTTV = {};
|
||||
var emotesTwitch = { "emotes": { "emote": { "image_id": 0 } } }; //for ide
|
||||
var emotesTwitch = {
|
||||
"emotes": {
|
||||
"emote": {
|
||||
"image_id": 0
|
||||
}
|
||||
}
|
||||
}; //for ide
|
||||
var subEmotesTwitch = {};
|
||||
|
||||
function EmoteModule() {
|
||||
}
|
||||
function EmoteModule() {}
|
||||
|
||||
EmoteModule.prototype.init = function() {
|
||||
};
|
||||
EmoteModule.prototype.init = function () {};
|
||||
|
||||
EmoteModule.prototype.getBlacklist = function () {
|
||||
$.getJSON("https://cdn.rawgit.com/Jiiks/betterDiscordApp/"+_hash+"/emotefilter.json", function(data) { bemotes = data.blacklist; });
|
||||
$.getJSON("https://cdn.rawgit.com/Jiiks/betterDiscordApp/" + _hash + "/data/emotefilter.json", function (data) {
|
||||
bemotes = data.blacklist;
|
||||
});
|
||||
};
|
||||
|
||||
EmoteModule.prototype.obsCallback = function (mutation) {
|
||||
|
|
@ -33,6 +39,27 @@ EmoteModule.prototype.obsCallback = function(mutation) {
|
|||
|
||||
if (!settingsCookie["bda-es-7"]) return;
|
||||
|
||||
$(".emoji").each(function () {
|
||||
var t = $(this);
|
||||
if (t.attr("src").indexOf(".png") != -1) {
|
||||
|
||||
var next = t.next();
|
||||
var newText = t.attr("alt");
|
||||
if(next.size() > 0) {
|
||||
if(next.prop("tagName") == "SPAN") {
|
||||
newText += next.text();
|
||||
next.remove();
|
||||
}
|
||||
}
|
||||
|
||||
if(t.parent().prop("tagName") != "SPAN") {
|
||||
t.replaceWith("<span>" + newText + "</span>");
|
||||
} else {
|
||||
t.replaceWith(newText);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
for (var i = 0; i < mutation.addedNodes.length; ++i) {
|
||||
var next = mutation.addedNodes.item(i);
|
||||
if (next) {
|
||||
|
|
@ -56,7 +83,6 @@ EmoteModule.prototype.getNodes = function(node) {
|
|||
nodes.push(next);
|
||||
}
|
||||
|
||||
|
||||
return nodes;
|
||||
};
|
||||
|
||||
|
|
@ -72,26 +98,24 @@ EmoteModule.prototype.injectEmote = function(node) {
|
|||
var parent = node.parentElement;
|
||||
|
||||
if (parent.tagName != "SPAN") return;
|
||||
if (!$(parent.parentElement).hasClass("markup") && !$(parent.parentElement).hasClass("message-content")) {
|
||||
return;
|
||||
}
|
||||
|
||||
var edited = false;
|
||||
|
||||
if ($(parent.parentElement).hasClass("edited")) {
|
||||
parent = parent.parentElement.parentElement.firstChild; //:D
|
||||
parent = parent.parentElement.parentElement.firstChild;
|
||||
edited = true;
|
||||
}
|
||||
|
||||
//if(!$(parent.parentElement).hasClass("markup") && !$(parent.parentElement).hasClass("message-content")) return;
|
||||
|
||||
function inject() {
|
||||
if(!$(parent.parentElement).hasClass("markup") && !$(parent.parentElement).hasClass("message-content")) { return; }
|
||||
|
||||
var parentInnerHTML = parent.innerHTML;
|
||||
var words = parentInnerHTML.split(/\s+/g);
|
||||
|
||||
if (!words) return;
|
||||
|
||||
words.some(function (word) {
|
||||
|
||||
if (word.slice(0, 4) == "[!s]") {
|
||||
|
||||
parentInnerHTML = parentInnerHTML.replace("[!s]", "");
|
||||
|
|
@ -115,52 +139,76 @@ EmoteModule.prototype.injectEmote = function(node) {
|
|||
return;
|
||||
}
|
||||
|
||||
if($.inArray(word, bemotes) != -1) return;
|
||||
if (word == "ClauZ") {
|
||||
parentInnerHTML = parentInnerHTML.replace("ClauZ", '<img src="https://cdn.frankerfacez.com/emoticon/70852/1" style="width:25px; transform:translate(-29px, -14px);"></img>');
|
||||
return;
|
||||
}
|
||||
|
||||
if (emotesTwitch.emotes.hasOwnProperty(word)) {
|
||||
var len = Math.round(word.length / 4);
|
||||
parentInnerHTML = parentInnerHTML.replace(word, '<img class="emote" alt="' + word.substr(0, len) + "\uFDD9" + word.substr(len, len) + "\uFDD9" + word.substr(len * 2, len) + "\uFDD9" + word.substr(len * 3) + '" src="' + twitchEmoteUrlStart + emotesTwitch.emotes[word].image_id + twitchEmoteUrlEnd + '" />');
|
||||
var useEmoteCss = false;
|
||||
var sWord = word;
|
||||
var emoteClass = "";
|
||||
var allowedClasses = ["emoteflip", "emotespin", "emotepulse", "emotespin2", "emotespin3", "emote1spin", "emote2spin", "emote3spin", "emotetr", "emotebl", "emotebr", "emoteshake", "emoteshake2", "emoteshake3", "emoteflap"];
|
||||
if(word.indexOf(":") > -1) {
|
||||
var split = word.split(/:(?!.*:)/);
|
||||
if (split[0] != "" && split[1] != "") {
|
||||
userEmoteCss = true;
|
||||
sWord = split[0];
|
||||
if(settingsCookie["bda-es-8"]) {
|
||||
emoteClass = "emote" + split[1];
|
||||
if(allowedClasses.indexOf(emoteClass) < 0) {
|
||||
emoteClass = "";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if ($.inArray(sWord, bemotes) != -1) return;
|
||||
|
||||
if (emotesTwitch.emotes.hasOwnProperty(sWord)) {
|
||||
var len = Math.round(sWord.length / 4);
|
||||
var name = sWord.substr(0, len) + "\uFDD9" + sWord.substr(len, len) + "\uFDD9" + sWord.substr(len * 2, len) + "\uFDD9" + sWord.substr(len * 3);
|
||||
var url = twitchEmoteUrlStart + emotesTwitch.emotes[sWord].image_id + twitchEmoteUrlEnd;
|
||||
parentInnerHTML = parentInnerHTML.replace(word, '<div class="emotewrapper"><img class="emote '+emoteClass+'" alt="' + name + '" src="' + url + '"/><input onclick=\'quickEmoteMenu.favorite(\"' + name + '\", \"' + url + '\");\' class="fav" title="Favorite!" type="button"></div>');
|
||||
return;
|
||||
}
|
||||
|
||||
if (subEmotesTwitch.hasOwnProperty(sWord)) {
|
||||
var len = Math.round(sWord.length / 4);
|
||||
var name = sWord.substr(0, len) + "\uFDD9" + sWord.substr(len, len) + "\uFDD9" + sWord.substr(len * 2, len) + "\uFDD9" + sWord.substr(len * 3);
|
||||
var url = twitchEmoteUrlStart + subEmotesTwitch[sWord] + twitchEmoteUrlEnd;
|
||||
parentInnerHTML = parentInnerHTML.replace(word, '<div class="emotewrapper"><img class="emote '+emoteClass+'" alt="' + name + '" src="' + url + '"/><input onclick=\'quickEmoteMenu.favorite(\"' + name + '\", \"' + url + '\");\' class="fav" title="Favorite!" type="button"></div>');
|
||||
return;
|
||||
}
|
||||
|
||||
if (typeof emotesFfz !== 'undefined' && settingsCookie["bda-es-1"]) {
|
||||
if (emotesFfz.hasOwnProperty(word)) {
|
||||
var len = Math.round(word.length / 4);
|
||||
var name = word.substr(0, len) + "\uFDD9" + word.substr(len, len) + "\uFDD9" + word.substr(len * 2, len) + "\uFDD9" + word.substr(len * 3);
|
||||
var url = ffzEmoteUrlStart + emotesFfz[word] + ffzEmoteUrlEnd;
|
||||
|
||||
parentInnerHTML = parentInnerHTML.replace(word, '<div class="emotewrapper"><img class="emote" alt="' + name + '" src="' + url + '" /><input onclick=\'quickEmoteMenu.favorite(\"'+name+'\", \"'+url+'\");\' class="fav" title="Favorite!" type="button"></div>');
|
||||
if (emotesFfz.hasOwnProperty(sWord)) {
|
||||
var len = Math.round(sWord.length / 4);
|
||||
var name = sWord.substr(0, len) + "\uFDD9" + sWord.substr(len, len) + "\uFDD9" + sWord.substr(len * 2, len) + "\uFDD9" + sWord.substr(len * 3);
|
||||
var url = ffzEmoteUrlStart + emotesFfz[sWord] + ffzEmoteUrlEnd;
|
||||
parentInnerHTML = parentInnerHTML.replace(word, '<div class="emotewrapper"><img class="emote '+emoteClass+'" alt="' + name + '" src="' + url + '"/><input onclick=\'quickEmoteMenu.favorite(\"' + name + '\", \"' + url + '\");\' class="fav" title="Favorite!" type="button"></div>');
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (typeof emotesBTTV !== 'undefined' && settingsCookie["bda-es-2"]) {
|
||||
if (emotesBTTV.hasOwnProperty(word)) {
|
||||
var len = Math.round(word.length / 4);
|
||||
var name = word.substr(0, len) + "\uFDD9" + word.substr(len, len) + "\uFDD9" + word.substr(len * 2, len) + "\uFDD9" + word.substr(len * 3);
|
||||
var url = emotesBTTV[word];
|
||||
parentInnerHTML = parentInnerHTML.replace(word, '<div class="emotewrapper"><img class="emote" alt="' + name + '" src="' + url + '" /><input onclick=\'quickEmoteMenu.favorite(\"'+name+'\", \"'+url+'\");\' class="fav" title="Favorite!" type="button"></div>');
|
||||
if (emotesBTTV.hasOwnProperty(sWord)) {
|
||||
var len = Math.round(sWord.length / 4);
|
||||
var name = sWord.substr(0, len) + "\uFDD9" + sWord.substr(len, len) + "\uFDD9" + sWord.substr(len * 2, len) + "\uFDD9" + sWord.substr(len * 3);
|
||||
var url = emotesBTTV[sWord];
|
||||
parentInnerHTML = parentInnerHTML.replace(word, '<div class="emotewrapper"><img class="emote '+emoteClass+'" alt="' + name + '" src="' + url + '"/><input onclick=\'quickEmoteMenu.favorite(\"' + name + '\", \"' + url + '\");\' class="fav" title="Favorite!" type="button"></div>');
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (typeof emotesBTTV2 !== 'undefined' && settingsCookie["bda-es-2"]) {
|
||||
if(emotesBTTV2.hasOwnProperty(word)) {
|
||||
var len = Math.round(word.length / 4);
|
||||
var name = word.substr(0, len) + "\uFDD9" + word.substr(len, len) + "\uFDD9" + word.substr(len * 2, len) + "\uFDD9" + word.substr(len * 3);
|
||||
var url = bttvEmoteUrlStart + emotesBTTV2[word] + bttvEmoteUrlEnd;
|
||||
parentInnerHTML = parentInnerHTML.replace(word, '<div class="emotewrapper"><img class="emote" alt="' + name + '" src="' + url + '" /><input onclick=\'quickEmoteMenu.favorite(\"'+name+'\", \"'+url+'\");\' class="fav" title="Favorite!" type="button"></div>');
|
||||
if (emotesBTTV2.hasOwnProperty(sWord)) {
|
||||
var len = Math.round(sWord.length / 4);
|
||||
var name = sWord.substr(0, len) + "\uFDD9" + sWord.substr(len, len) + "\uFDD9" + sWord.substr(len * 2, len) + "\uFDD9" + sWord.substr(len * 3);
|
||||
var url = bttvEmoteUrlStart + emotesBTTV2[sWord] + bttvEmoteUrlEnd;
|
||||
parentInnerHTML = parentInnerHTML.replace(word, '<div class="emotewrapper"><img class="emote '+emoteClass+'" alt="' + name + '" src="' + url + '"/><input onclick=\'quickEmoteMenu.favorite(\"' + name + '\", \"' + url + '\");\' class="fav" title="Favorite!" type="button"></div>');
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (subEmotesTwitch.hasOwnProperty(word)) {
|
||||
var len = Math.round(word.length / 4);
|
||||
var name = word.substr(0, len) + "\uFDD9" + word.substr(len, len) + "\uFDD9" + word.substr(len * 2, len) + "\uFDD9" + word.substr(len * 3);
|
||||
var url = twitchEmoteUrlStart + subEmotesTwitch[word] + twitchEmoteUrlEnd;
|
||||
parentInnerHTML = parentInnerHTML.replace(word, '<div class="emotewrapper"><img class="emote" alt="' + name + '" src="' + url + '" /><input onclick=\'quickEmoteMenu.favorite(\"'+name+'\", \"'+url+'\");\' class="fav" title="Favorite!" type="button"></div>');
|
||||
return;
|
||||
}
|
||||
});
|
||||
|
||||
if (parent.parentElement == null) return;
|
||||
|
|
@ -169,9 +217,9 @@ EmoteModule.prototype.injectEmote = function(node) {
|
|||
parent.innerHTML = parentInnerHTML.replace(new RegExp("\uFDD9", "g"), "");
|
||||
var newHeight = parent.parentElement.offsetHeight;
|
||||
|
||||
//Scrollfix
|
||||
var scrollPane = $(".scroller.messages").first();
|
||||
scrollPane.scrollTop(scrollPane.scrollTop() + (newHeight - oldHeight));
|
||||
|
||||
}
|
||||
|
||||
if (edited) {
|
||||
|
|
@ -179,7 +227,6 @@ EmoteModule.prototype.injectEmote = function(node) {
|
|||
} else {
|
||||
inject();
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
EmoteModule.prototype.autoCapitalize = function () {
|
||||
|
|
@ -195,8 +242,9 @@ EmoteModule.prototype.autoCapitalize = function() {
|
|||
|
||||
var lastWord = text.split(" ").pop();
|
||||
if (lastWord.length > 3) {
|
||||
if (lastWord == "danSgame") return;
|
||||
var ret = self.capitalize(lastWord.toLowerCase());
|
||||
if(ret != null) {
|
||||
if (ret !== null && ret !== undefined) {
|
||||
$(".channel-textarea-inner textarea").val(text.replace(lastWord, ret));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,6 +52,25 @@ PluginModule.prototype.handlePlugin = function(checkbox) {
|
|||
this.savePluginData();
|
||||
};
|
||||
|
||||
PluginModule.prototype.showSettings = function (plugin) {
|
||||
if (bdplugins[plugin] != null) {
|
||||
if (typeof bdplugins[plugin].plugin.getSettingsPanel === "function") {
|
||||
var panel = bdplugins[plugin].plugin.getSettingsPanel();
|
||||
|
||||
$(".modal-inner").off("click.bdpsm").on("click.bdpsm", function (e) {
|
||||
if ($("#bd-psm-id").length) {
|
||||
$(".bd-psm").remove();
|
||||
} else {
|
||||
$(".bd-psm").attr("id", "bd-psm-id");
|
||||
}
|
||||
|
||||
});
|
||||
$(".modal").append('<div class="bd-psm"><div class="scroller-wrap" style="height:100%"><div id="bd-psm-s" class="scroller" style="padding:10px;"></div></div></div>');
|
||||
$("#bd-psm-s").append(panel);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
PluginModule.prototype.loadPluginData = function () {
|
||||
var cookie = $.cookie("bd-plugins");
|
||||
if (cookie != undefined) {
|
||||
|
|
@ -60,5 +79,44 @@ PluginModule.prototype.loadPluginData = function() {
|
|||
};
|
||||
|
||||
PluginModule.prototype.savePluginData = function () {
|
||||
$.cookie("bd-plugins", JSON.stringify(pluginCookie), { expires: 365, path: '/' });
|
||||
$.cookie("bd-plugins", JSON.stringify(pluginCookie), {
|
||||
expires: 365,
|
||||
path: '/'
|
||||
});
|
||||
};
|
||||
|
||||
PluginModule.prototype.newMessage = function () {
|
||||
$.each(bdplugins, function () {
|
||||
if (!pluginCookie[this.plugin.getName()]) return;
|
||||
if (typeof this.plugin.onMessage === "function") {
|
||||
this.plugin.onMessage();
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
PluginModule.prototype.channelSwitch = function () {
|
||||
$.each(bdplugins, function () {
|
||||
if (!pluginCookie[this.plugin.getName()]) return;
|
||||
if (typeof this.plugin.onSwitch === "function") {
|
||||
this.plugin.onSwitch();
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
PluginModule.prototype.socketEvent = function (e, data) {
|
||||
$.each(bdplugins, function () {
|
||||
if (!pluginCookie[this.plugin.getName()]) return;
|
||||
if (typeof this.plugin.socketEvent === "function") {
|
||||
this.plugin.socketEvent(data);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
PluginModule.prototype.rawObserver = function(e) {
|
||||
$.each(bdplugins, function() {
|
||||
if (!pluginCookie[this.plugin.getName()]) return;
|
||||
if(typeof this.plugin.observer === "function") {
|
||||
this.plugin.observer(e);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
|
@ -5,8 +5,6 @@
|
|||
* https://github.com/Jiiks/BetterDiscordApp
|
||||
*/
|
||||
|
||||
var publicServers = { "servers": { "server": { "code": 0, "icon": null, "title": "title", "language": "EN", "description": "description" } } }; //for ide
|
||||
|
||||
function PublicServers() {
|
||||
|
||||
}
|
||||
|
|
@ -16,141 +14,206 @@ PublicServers.prototype.getPanel = function() {
|
|||
};
|
||||
|
||||
PublicServers.prototype.init = function () {
|
||||
|
||||
var self = this;
|
||||
|
||||
this.container = $("<div/>", {
|
||||
id: "bd-ps-container",
|
||||
style: "display:none"
|
||||
});
|
||||
var guilds = $(".guilds>li:first-child");
|
||||
|
||||
var header = $("<div/>", {
|
||||
id: "bd-ps-header"
|
||||
});
|
||||
|
||||
$("<h2/>", {
|
||||
text: "Public Servers"
|
||||
}).appendTo(header);
|
||||
|
||||
$("<span/>", {
|
||||
id: "bd-ps-close",
|
||||
style:"cursor:pointer;",
|
||||
text: "X"
|
||||
}).appendTo(header);
|
||||
|
||||
header.appendTo(this.getPanel());
|
||||
|
||||
var psbody = $("<div/>", {
|
||||
id: "bd-ps-body"
|
||||
});
|
||||
|
||||
psbody.appendTo(this.getPanel());
|
||||
|
||||
var table = $("<table/>", {
|
||||
border:"0"
|
||||
});
|
||||
|
||||
var thead = $("<thead/>");
|
||||
|
||||
thead.appendTo(table);
|
||||
|
||||
var headers = $("<tr/>", {
|
||||
|
||||
}).append($("<th/>", {
|
||||
text: "Name"
|
||||
})).append($("<th/>", {
|
||||
text: "Code"
|
||||
})).append($("<th/>", {
|
||||
text: "Language"
|
||||
})).append($("<th/>", {
|
||||
text: "Description"
|
||||
})).append($("<th/>", {
|
||||
text: "Join"
|
||||
}));
|
||||
|
||||
headers.appendTo(thead);
|
||||
|
||||
var tbody = $("<tbody/>", {
|
||||
id: "bd-ps-tbody"
|
||||
});
|
||||
|
||||
tbody.appendTo(table);
|
||||
|
||||
table.appendTo(psbody);
|
||||
|
||||
$("body").append(this.getPanel());
|
||||
|
||||
$("#bd-ps-close").on("click", function() { self.show(); });
|
||||
|
||||
var servers = publicServers.servers;
|
||||
|
||||
for(var server in servers) {
|
||||
if(servers.hasOwnProperty(server)) {
|
||||
var s = servers[server];
|
||||
var code = s.code;
|
||||
var title = s.title;
|
||||
var language = s.language;
|
||||
var description = s.description;
|
||||
|
||||
this.addServer(server, code, title, language, description);
|
||||
guilds.after($("<li></li>", {
|
||||
id: "bd-pub-li",
|
||||
css: {
|
||||
"height": "20px",
|
||||
"display": settingsCookie["bda-gs-1"] == true ? "" : "none"
|
||||
}
|
||||
}).append($("<div/>", {
|
||||
class: "guild-inner",
|
||||
css: {
|
||||
"height": "20px",
|
||||
"border-radius": "4px"
|
||||
}
|
||||
}).append($("<a/>").append($("<div/>", {
|
||||
css: {
|
||||
"line-height": "20px",
|
||||
"font-size": "12px"
|
||||
},
|
||||
text: "public",
|
||||
id: "bd-pub-button"
|
||||
})))));
|
||||
|
||||
$("#bd-pub-button").on("click", function () {
|
||||
self.show();
|
||||
});
|
||||
|
||||
var panelBase="";
|
||||
panelBase += "<div id=\"pubs-container\">";
|
||||
panelBase += " <div id=\"pubs-spinner\">";
|
||||
panelBase += " <span class=\"spinner\" type=\"wandering-cubes\"><span class=\"spinner-inner spinner-wandering-cubes\"><span class=\"spinner-item\"><\/span><span class=\"spinner-item\"><\/span><\/span><\/span>";
|
||||
panelBase += " <\/div>";
|
||||
panelBase += " <div id=\"pubs-header\">";
|
||||
panelBase += " <h2 id=\"pubs-header-title\">Public Servers<\/h2>";
|
||||
panelBase += " <button id=\"sbtn\">Search<\/button>";
|
||||
panelBase += " <input id=\"sterm\" type=\"text\" placeholder=\"Search term...\"\/>";
|
||||
panelBase += " <\/div>";
|
||||
panelBase += " <div class=\"scroller-wrap\">";
|
||||
panelBase += " <div class=\"scroller\">";
|
||||
panelBase += " <div id=\"slist\" class=\"servers-listing\">";
|
||||
panelBase += " ";
|
||||
panelBase += " <\/div>";
|
||||
panelBase += " <\/div>";
|
||||
panelBase += " <\/div>";
|
||||
panelBase += " <div id=\"pubs-footer\">";
|
||||
panelBase += " <div>Server list provided by <a href=\"https:\/\/www.discordservers.com\/\" target=\"_blank\">DiscordServers.com<\/a><\/div>";
|
||||
panelBase += " <\/div>";
|
||||
panelBase += "<\/div>";
|
||||
this.container = panelBase;
|
||||
|
||||
if($("#bd-pub-li").length < 1) {
|
||||
setTimeout(function() {
|
||||
self.init();
|
||||
}, 250);
|
||||
}
|
||||
};
|
||||
|
||||
PublicServers.prototype.addServer = function(name, code, title, language, description) {
|
||||
var self = this;
|
||||
var tableBody = $("#bd-ps-tbody");
|
||||
|
||||
|
||||
var desc = $("<td/>").append($("<div/>", {
|
||||
class: "bd-ps-description",
|
||||
text: description
|
||||
}));
|
||||
|
||||
var tr = $("<tr/>");
|
||||
|
||||
tr.append($("<td/>", {
|
||||
text: title
|
||||
}));
|
||||
|
||||
tr.append($("<td/>", {
|
||||
css: {
|
||||
"-webkit-user-select":"initial",
|
||||
"user-select":"initial"
|
||||
},
|
||||
text: code
|
||||
}));
|
||||
|
||||
tr.append($("<td/>", {
|
||||
text: language
|
||||
}));
|
||||
|
||||
tr.append(desc);
|
||||
|
||||
tr.append($("<td/>").append($("<button/>", {
|
||||
text: "Join",
|
||||
css: {
|
||||
"height": "30px",
|
||||
"display": "block",
|
||||
"margin-top": "10px",
|
||||
"background-color": "#36393E",
|
||||
"border": "1px solid #404040",
|
||||
"outline": "1px solid #000",
|
||||
"color": "#EDEDED"
|
||||
},
|
||||
click: function() { self.joinServer(code); }
|
||||
})));
|
||||
|
||||
tableBody.append(tr);
|
||||
};
|
||||
|
||||
PublicServers.prototype.show = function () {
|
||||
this.getPanel().toggle();
|
||||
var li = $("#bd-pub-li");
|
||||
li.removeClass();
|
||||
if(this.getPanel().is(":visible")) {
|
||||
li.addClass("active");
|
||||
var self = this;
|
||||
$("body").append(this.getPanel());
|
||||
|
||||
var dataset = {
|
||||
"sort": [{
|
||||
"online": "desc"
|
||||
}],
|
||||
"from": 0,
|
||||
"size": 20,
|
||||
"query": {
|
||||
"filtered": {
|
||||
"query": {
|
||||
"match_all": {}
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
$("#sbtn").on("click", function() {
|
||||
self.search();
|
||||
});
|
||||
$("#sterm").on("keyup", function(e) {
|
||||
if (e.keyCode == 13) {
|
||||
self.search();
|
||||
}
|
||||
});
|
||||
|
||||
this.loadServers(dataset, false);
|
||||
var self = this;
|
||||
$(document).on("mouseup.bdps",function(e) {
|
||||
if(!$("#bd-pub-button").is(e.target) && !$("#pubs-container").is(e.target) && $("#pubs-container").has(e.target).length === 0) {
|
||||
self.hide();
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
PublicServers.prototype.hide = function() {
|
||||
$("#pubs-container").remove();
|
||||
$(document).off("mouseup.bdps");
|
||||
};
|
||||
|
||||
PublicServers.prototype.loadServers = function(dataset, search) {
|
||||
var self = this;
|
||||
$("#sbtn").prop("disabled", true);
|
||||
$("#sterm").prop("disabled", true);
|
||||
$("#slist").empty();
|
||||
$("#pubs-spinner").show();
|
||||
$.ajax({
|
||||
type: "POST",
|
||||
dataType: "json",
|
||||
url: "https://search-discordservers-izrtub5nprzrl76ugyy6hdooe4.us-west-1.es.amazonaws.com/app/_search",
|
||||
crossDomain: true,
|
||||
data: JSON.stringify(dataset),
|
||||
success: function(data) {
|
||||
var hits = data.hits.hits;
|
||||
if(search) {
|
||||
$("#pubs-header-title").text("Public Servers - Search Results: " + hits.length);
|
||||
} else {
|
||||
$("#pubs-header-title").text("Public Servers");
|
||||
}
|
||||
hits.forEach(function(hit) {
|
||||
var source = hit._source;
|
||||
var icode = source.invite_code;
|
||||
var html = '<div class="server-row">';
|
||||
html += '<div class="server-icon" style="background-image:url(' + source.icon + ')"></div>';
|
||||
html += '<div class="server-info server-name">';
|
||||
html += '<span>' + source.name + ' by ' + source.owner.name + '</span>';
|
||||
html += '</div>';
|
||||
html += '<div class="server-info server-members">';
|
||||
html += '<span>' + source.online + '/' + source.members + ' Members</span>';
|
||||
html += '</div>';
|
||||
html += '<div class="server-info server-region">';
|
||||
html += '<span>' + source.region + '</span>';
|
||||
html += '</div>';
|
||||
html += '<div class="server-info">';
|
||||
html += '<button data-server-invite-code='+icode+'>Join</button>';
|
||||
html += '</div>';
|
||||
html += '</div>';
|
||||
$("#slist").append(html);
|
||||
$("button[data-server-invite-code="+icode+"]").on("click", function(){
|
||||
self.joinServer(icode);
|
||||
});
|
||||
});
|
||||
},
|
||||
done: function() {
|
||||
$("#pubs-spinner").hide();
|
||||
$("#sbtn").prop("disabled", false);
|
||||
$("#sterm").prop("disabled", false);
|
||||
},
|
||||
always: function() {
|
||||
$("#pubs-spinner").hide();
|
||||
$("#sbtn").prop("disabled", false);
|
||||
$("#sterm").prop("disabled", false);
|
||||
},
|
||||
error: function() {
|
||||
$("#pubs-spinner").hide();
|
||||
$("#sbtn").prop("disabled", false);
|
||||
$("#sterm").prop("disabled", false);
|
||||
},
|
||||
complete: function() {
|
||||
$("#pubs-spinner").hide();
|
||||
$("#sbtn").prop("disabled", false);
|
||||
$("#sterm").prop("disabled", false);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
PublicServers.prototype.search = function() {
|
||||
var dataset = {
|
||||
"sort": [{
|
||||
"online": "desc"
|
||||
}],
|
||||
"from": 0,
|
||||
"size": 20,
|
||||
"query": {
|
||||
"filtered": {
|
||||
"query": {
|
||||
"match_all": {}
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
var filter = {
|
||||
"filter": {
|
||||
"and": [{
|
||||
"query": {
|
||||
"match_phrase_prefix": {
|
||||
"name": $("#sterm").val()
|
||||
}
|
||||
}
|
||||
}]
|
||||
}
|
||||
};
|
||||
|
||||
if ($("#sterm").val()) {
|
||||
$.extend(dataset, filter);
|
||||
}
|
||||
this.loadServers(dataset, true);
|
||||
};
|
||||
|
||||
//Workaround for joining a server
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -12,6 +12,7 @@ var panel = null;
|
|||
function SettingsPanel() {
|
||||
utils.injectJs("https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.9.0/codemirror.min.js");
|
||||
utils.injectJs("https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.9.0/mode/css/css.min.js");
|
||||
utils.injectJs("https://cdnjs.cloudflare.com/ajax/libs/Sortable/1.4.2/Sortable.min.js");
|
||||
}
|
||||
|
||||
SettingsPanel.prototype.init = function () {
|
||||
|
|
@ -40,32 +41,29 @@ SettingsPanel.prototype.init = function() {
|
|||
voiceMode.enable();
|
||||
}
|
||||
|
||||
if(settingsCookie["bda-jd"]) {
|
||||
opublicServers.joinServer("0Tmfo5ZbORCRqbAd");
|
||||
settingsCookie["bda-jd"] = false;
|
||||
mainCore.saveSettings();
|
||||
if(settingsCookie["bda-gs-5"]) {
|
||||
$("#app-mount").addClass("bda-dark");
|
||||
}
|
||||
|
||||
if (settingsCookie["bda-es-6"]) {
|
||||
//Pretty emote titles
|
||||
emoteNamePopup = $("<div class='tipsy tipsy-se' style='display: block; top: 82px; left: 1630.5px; visibility: visible; opacity: 0.8;'><div class='tipsy-inner'></div></div>");
|
||||
$(document).on("mouseover", ".emote", function() { var x = $(this).offset(); var title = $(this).attr("alt"); $(emoteNamePopup).find(".tipsy-inner").text(title); $(emoteNamePopup).css('left', x.left - 25); $(emoteNamePopup).css('top', x.top - 32); $("div[data-reactid='.0.1.1']").append($(emoteNamePopup));});
|
||||
$(document).on("mouseleave", ".emote", function(){$(".tipsy").remove()});
|
||||
$(document).on("mouseover", ".emote", function () {
|
||||
var x = $(this).offset();
|
||||
var title = $(this).attr("alt");
|
||||
$(emoteNamePopup).find(".tipsy-inner").text(title);
|
||||
$(emoteNamePopup).css('left', x.left - 25);
|
||||
$(emoteNamePopup).css('top', x.top - 32);
|
||||
$("div[data-reactid='.0.1.1']").append($(emoteNamePopup));
|
||||
});
|
||||
$(document).on("mouseleave", ".emote", function () {
|
||||
$(".tipsy").remove();
|
||||
});
|
||||
} else {
|
||||
$(document).off('mouseover', '.emote');
|
||||
}
|
||||
};
|
||||
|
||||
SettingsPanel.prototype.applyCustomCss = function(css) {
|
||||
if($("#customcss").length == 0) {
|
||||
$("head").append('<style id="customcss"></style>');
|
||||
}
|
||||
|
||||
$("#customcss").html(css);
|
||||
|
||||
localStorage.setItem("bdcustomcss", btoa(css));
|
||||
};
|
||||
|
||||
var customCssInitialized = false;
|
||||
var lastTab = "";
|
||||
|
||||
|
|
@ -86,35 +84,27 @@ SettingsPanel.prototype.changeTab = function(tab) {
|
|||
break;
|
||||
case "bd-customcss-tab":
|
||||
if (!customCssInitialized) {
|
||||
var editor = CodeMirror.fromTextArea(document.getElementById("bd-custom-css-ta"), {
|
||||
lineNumbers: true, mode: 'css', indentUnit: 4, theme: 'neat'
|
||||
});
|
||||
|
||||
|
||||
editor.on("change", function(cm) {
|
||||
var css = cm.getValue();
|
||||
self.applyCustomCss(css);
|
||||
});
|
||||
|
||||
customCssEditor.init();
|
||||
customCssInitialized = true;
|
||||
}
|
||||
break;
|
||||
case "bd-plugins-tab":
|
||||
|
||||
break;
|
||||
case "bd-themes-tab":
|
||||
controlGroups.html("<span>Coming soon</span>");
|
||||
break;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
SettingsPanel.prototype.updateSetting = function (checkbox) {
|
||||
var cb = $(checkbox).children().find('input[type="checkbox"]');
|
||||
var enabled = !cb.is(":checked");
|
||||
var id = cb.attr("id");
|
||||
cb.prop("checked", enabled);
|
||||
|
||||
if(id == "bda-css-2") {
|
||||
$("#app-mount").removeClass("bd-hide-bd");
|
||||
customCssEditor.hideBackdrop = enabled;
|
||||
if(enabled) {
|
||||
$("#app-mount").addClass("bd-hide-bd")
|
||||
}
|
||||
}
|
||||
|
||||
settingsCookie[id] = enabled;
|
||||
|
||||
if (settingsCookie["bda-es-0"]) {
|
||||
|
|
@ -143,17 +133,30 @@ SettingsPanel.prototype.updateSetting = function(checkbox) {
|
|||
} else {
|
||||
voiceMode.disable();
|
||||
}
|
||||
$("#app-mount").removeClass("bda-dark");
|
||||
if(settingsCookie["bda-gs-5"]) {
|
||||
$("#app-mount").addClass("bda-dark");
|
||||
}
|
||||
if (settingsCookie["bda-es-6"]) {
|
||||
//Pretty emote titles
|
||||
emoteNamePopup = $("<div class='tipsy tipsy-se' style='display: block; top: 82px; left: 1630.5px; visibility: visible; opacity: 0.8;'><div class='tipsy-inner'></div></div>");
|
||||
$(document).on("mouseover", ".emote", function() { var x = $(this).offset(); var title = $(this).attr("alt"); $(emoteNamePopup).find(".tipsy-inner").text(title); $(emoteNamePopup).css('left', x.left - 25); $(emoteNamePopup).css('top', x.top - 32); $("div[data-reactid='.0.1.1']").append($(emoteNamePopup));});
|
||||
$(document).on("mouseleave", ".emote", function(){$(".tipsy").remove()});
|
||||
$(document).on("mouseover", ".emote", function () {
|
||||
var x = $(this).offset();
|
||||
var title = $(this).attr("alt");
|
||||
$(emoteNamePopup).find(".tipsy-inner").text(title);
|
||||
$(emoteNamePopup).css('left', x.left - 25);
|
||||
$(emoteNamePopup).css('top', x.top - 32);
|
||||
$("div[data-reactid='.0.1.1']").append($(emoteNamePopup));
|
||||
});
|
||||
$(document).on("mouseleave", ".emote", function () {
|
||||
$(".tipsy").remove();
|
||||
});
|
||||
} else {
|
||||
$(document).off('mouseover', '.emote');
|
||||
}
|
||||
|
||||
mainCore.saveSettings();
|
||||
}
|
||||
};
|
||||
|
||||
SettingsPanel.prototype.construct = function () {
|
||||
var self = this;
|
||||
|
|
@ -170,24 +173,23 @@ SettingsPanel.prototype.construct = function() {
|
|||
'<div class="scroller-wrap">' +
|
||||
' <div class="scroller settings-wrapper settings-panel">' +
|
||||
' <div class="tab-bar TOP">' +
|
||||
' <div class="tab-bar-item bd-tab" id="bd-settings-tab" onclick="settingsPanel.changeTab(\'bd-settings-tab\');">Settings</div>' +
|
||||
' <div class="tab-bar-item bd-tab" id="bd-settings-tab" onclick="settingsPanel.changeTab(\'bd-settings-tab\');">Core</div>' +
|
||||
' <div class="tab-bar-item bd-tab" id="bd-emotes-tab" onclick="settingsPanel.changeTab(\'bd-emotes-tab\');">Emotes</div>' +
|
||||
' <div class="tab-bar-item bd-tab" id="bd-customcss-tab" onclick="settingsPanel.changeTab(\'bd-customcss-tab\');">Custom CSS</div>' +
|
||||
' <div class="tab-bar-item bd-tab" id="bd-plugins-tab" onclick="settingsPanel.changeTab(\'bd-plugins-tab\');">Plugins</div>' +
|
||||
' <div class="tab-bar-item bd-tab" id="bd-themes-tab" onclick="settingsPanel.changeTab(\'bd-themes-tab\');">Themes</div>' +
|
||||
' </div>' +
|
||||
' <div class="bd-settings">' +
|
||||
'' +
|
||||
' <div class="bd-pane control-group" id="bd-settings-pane" style="display:none;">' +
|
||||
' <ul class="checkbox-group">';
|
||||
|
||||
|
||||
|
||||
for (var setting in settings) {
|
||||
|
||||
var sett = settings[setting];
|
||||
var id = sett["id"];
|
||||
if(sett["cat"] != "core") continue;
|
||||
|
||||
if(sett["implemented"]) {
|
||||
if (sett["implemented"] && !sett["hidden"]) {
|
||||
|
||||
settingsInner += '' +
|
||||
'<li>' +
|
||||
|
|
@ -203,19 +205,54 @@ SettingsPanel.prototype.construct = function() {
|
|||
}
|
||||
}
|
||||
|
||||
var ccss = atob(localStorage.getItem("bdcustomcss"));
|
||||
self.applyCustomCss(ccss);
|
||||
settingsInner += ' </ul>' +
|
||||
' </div>';
|
||||
|
||||
|
||||
settingsInner += '<div class="bd-pane control-group" id="bd-emotes-pane" style="display:none;">' +
|
||||
' <ul class="checkbox-group">';
|
||||
|
||||
for (var setting in settings) {
|
||||
|
||||
var sett = settings[setting];
|
||||
var id = sett["id"];
|
||||
if(sett["cat"] != "emote") continue;
|
||||
|
||||
if (sett["implemented"] && !sett["hidden"]) {
|
||||
|
||||
settingsInner += '' +
|
||||
'<li>' +
|
||||
'<div class="checkbox" onclick="settingsPanel.updateSetting(this);" >' +
|
||||
'<div class="checkbox-inner">' +
|
||||
'<input type="checkbox" id="' + id + '" ' + (settingsCookie[id] ? "checked" : "") + '>' +
|
||||
'<span></span>' +
|
||||
'</div>' +
|
||||
'<span>' + setting + " - " + sett["info"] +
|
||||
'</span>' +
|
||||
'</div>' +
|
||||
'</li>';
|
||||
}
|
||||
}
|
||||
|
||||
settingsInner += ' </ul>' +
|
||||
' </div>' +
|
||||
'' +
|
||||
' </div>';
|
||||
|
||||
|
||||
var ccss = atob(localStorage.getItem("bdcustomcss"));
|
||||
customCssEditor.applyCustomCss(ccss, true, false);
|
||||
|
||||
settingsInner += '' +
|
||||
' <div class="bd-pane control-group" id="bd-customcss-pane" style="display:none;">' +
|
||||
' <textarea id="bd-custom-css-ta">'+ccss+'</textarea>' +
|
||||
' <div id="editor-detached" style="display:none;">' +
|
||||
' <h3>Editor Detached</h3>' +
|
||||
' <button class="btn btn-primary" onclick="customCssEditor.attach(); return false;">Attach</button>' +
|
||||
' </div>' +
|
||||
' <div id="bd-customcss-innerpane"><textarea id="bd-custom-css-ta">' + ccss + '</textarea></div>' +
|
||||
' </div>' +
|
||||
'' +
|
||||
' <div class="bd-pane control-group" id="bd-plugins-pane" style="display:none;">' +
|
||||
' <table class="bd-g-table">' +
|
||||
' <thead><tr><th>Name</th><th>Description</th><th>Author</th><th>Version</th><th></th></tr></thead><tbody>';
|
||||
' <thead><tr><th>Name</th><th>Description</th><th>Author</th><th>Version</th><th></th><th></th></tr></thead><tbody>';
|
||||
|
||||
$.each(bdplugins, function () {
|
||||
var plugin = this["plugin"];
|
||||
|
|
@ -225,6 +262,7 @@ SettingsPanel.prototype.construct = function() {
|
|||
' <td width="99%"><textarea>' + plugin.getDescription() + '</textarea></td>' +
|
||||
' <td>' + plugin.getAuthor() + '</td>' +
|
||||
' <td>' + plugin.getVersion() + '</td>' +
|
||||
' <td><button class="bd-psb" onclick="pluginModule.showSettings(\'' + plugin.getName() + '\'); return false;"></button></td>' +
|
||||
' <td>' +
|
||||
' <div class="checkbox" onclick="pluginModule.handlePlugin(this);">' +
|
||||
' <div class="checkbox-inner">' +
|
||||
|
|
@ -251,7 +289,7 @@ SettingsPanel.prototype.construct = function() {
|
|||
$.each(bdthemes, function () {
|
||||
settingsInner += '' +
|
||||
'<tr>' +
|
||||
' <td>'+this["name"]+'</td>' +
|
||||
' <td>' + this["name"].replace(/_/g, " ") + '</td>' +
|
||||
' <td width="99%"><textarea>' + this["description"] + '</textarea></td>' +
|
||||
' <td>' + this["author"] + '</td>' +
|
||||
' <td>' + this["version"] + '</td>' +
|
||||
|
|
@ -274,6 +312,10 @@ SettingsPanel.prototype.construct = function() {
|
|||
'' +
|
||||
' </div>' +
|
||||
' </div>' +
|
||||
' <div style="background:#2E3136; color:#ADADAD; height:30px; position:absolute; bottom:0; left:0; right:0;">' +
|
||||
' <span style="line-height:30px;margin-left:10px;">BetterDiscord v' + version + '(JSv' + jsVersion + ') by Jiiks</span>' +
|
||||
' <span style="float:right;line-height:30px;margin-right:10px;"><a href="http://betterdiscord.net" target="_blank">BetterDiscord.net</a></span>' +
|
||||
' </div>' +
|
||||
'</div>';
|
||||
|
||||
function showSettings() {
|
||||
|
|
@ -316,7 +358,7 @@ SettingsPanel.prototype.construct = function() {
|
|||
});
|
||||
|
||||
tabBar.append(settingsButton);
|
||||
panel.insertAfter(".form .settings-right .settings-inner");
|
||||
$(".form .settings-right .settings-inner").last().after(panel);
|
||||
$("#bd-settings-new").removeClass("selected");
|
||||
} else {
|
||||
setTimeout(innerDefer, 100);
|
||||
|
|
@ -327,5 +369,4 @@ SettingsPanel.prototype.construct = function() {
|
|||
}
|
||||
}
|
||||
defer();
|
||||
|
||||
};
|
||||
|
|
@ -0,0 +1,106 @@
|
|||
/*BDSocket*/
|
||||
|
||||
var bdSocket;
|
||||
var bdws;
|
||||
|
||||
function BdWSocket() {
|
||||
bdws = this;
|
||||
}
|
||||
|
||||
BdWSocket.prototype.start = function () {
|
||||
var self = this;
|
||||
/* $.ajax({
|
||||
method: "GET",
|
||||
url: "https://discordapp.com/api/gateway",
|
||||
headers: {
|
||||
authorization: localStorage.token.match(/\"(.+)\"/)[1]
|
||||
},
|
||||
success: function (data) {
|
||||
self.open(data.url);
|
||||
}
|
||||
});*/
|
||||
};
|
||||
|
||||
BdWSocket.prototype.open = function (host) {
|
||||
utils.log("Socket Host: " + host);
|
||||
try {
|
||||
bdSocket = new WebSocket(host);
|
||||
bdSocket.onopen = this.onOpen;
|
||||
bdSocket.onmessage = this.onMessage;
|
||||
bdSocket.onerror = this.onError;
|
||||
bdSocket.onclose = this.onClose;
|
||||
} catch (err) {
|
||||
utils.log(err);
|
||||
}
|
||||
};
|
||||
|
||||
BdWSocket.prototype.onOpen = function () {
|
||||
utils.log("Socket Open");
|
||||
var data = {
|
||||
op: 2,
|
||||
d: {
|
||||
token: JSON.parse(localStorage.getItem('token')),
|
||||
properties: JSON.parse(localStorage.getItem('superProperties')),
|
||||
v: 3
|
||||
}
|
||||
};
|
||||
bdws.send(data);
|
||||
};
|
||||
|
||||
BdWSocket.prototype.onMessage = function (e) {
|
||||
|
||||
var packet, data, type;
|
||||
try {
|
||||
packet = JSON.parse(e.data);
|
||||
data = packet.d;
|
||||
type = packet.t;
|
||||
} catch (err) {
|
||||
utils.err(err);
|
||||
return;
|
||||
}
|
||||
|
||||
switch (type) {
|
||||
case "READY":
|
||||
bdSocket.interval = setInterval(function(){bdws.send({
|
||||
op: 1,
|
||||
d: Date.now()
|
||||
});}, data.heartbeat_interval);
|
||||
utils.log("Socket Ready");
|
||||
break;
|
||||
case "PRESENCE_UPDATE":
|
||||
pluginModule.socketEvent("PRESENCE_UPDATE", data);
|
||||
break;
|
||||
case "TYPING_START":
|
||||
pluginModule.socketEvent("TYPING_START", data);
|
||||
break;
|
||||
case "MESSAGE_CREATE":
|
||||
pluginModule.socketEvent("MESSAGE_CREATE", data);
|
||||
break;
|
||||
case "MESSAGE_UPDATE":
|
||||
pluginModule.socketEvent("MESSAGE_UPDATE", data);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
BdWSocket.prototype.onError = function (e) {
|
||||
utils.log("Socket Error - " + e.message);
|
||||
};
|
||||
|
||||
BdWSocket.prototype.onClose = function (e) {
|
||||
utils.log("Socket Closed - " + e.code + " : " + e.reason);
|
||||
clearInterval(bdSocket.interval);
|
||||
bdws.start();
|
||||
};
|
||||
|
||||
BdWSocket.prototype.send = function (data) {
|
||||
if (bdSocket.readyState == 1) {
|
||||
bdSocket.send(JSON.stringify(data));
|
||||
}
|
||||
};
|
||||
|
||||
BdWSocket.prototype.getSocket = function () {
|
||||
return bdSocket;
|
||||
};
|
||||
|
|
@ -57,5 +57,8 @@ ThemeModule.prototype.loadThemeData = function() {
|
|||
};
|
||||
|
||||
ThemeModule.prototype.saveThemeData = function () {
|
||||
$.cookie("bd-themes", JSON.stringify(themeCookie), { expires: 365, path: '/' });
|
||||
$.cookie("bd-themes", JSON.stringify(themeCookie), {
|
||||
expires: 365,
|
||||
path: '/'
|
||||
});
|
||||
};
|
||||
17
js/utils.js
17
js/utils.js
|
|
@ -6,6 +6,7 @@
|
|||
*/
|
||||
|
||||
var _hash;
|
||||
|
||||
function Utils() {
|
||||
|
||||
}
|
||||
|
|
@ -15,7 +16,13 @@ Utils.prototype.getTextArea = function() {
|
|||
};
|
||||
|
||||
Utils.prototype.jqDefer = function (fnc) {
|
||||
if(window.jQuery) { fnc(); } else { setTimeout(function() { this.jqDefer(fnc) }, 100) }
|
||||
if (window.jQuery) {
|
||||
fnc();
|
||||
} else {
|
||||
setTimeout(function () {
|
||||
this.jqDefer(fnc);
|
||||
}, 100);
|
||||
}
|
||||
};
|
||||
|
||||
Utils.prototype.getHash = function () {
|
||||
|
|
@ -50,3 +57,11 @@ Utils.prototype.injectCss = function(uri) {
|
|||
href: uri
|
||||
}).appendTo($("head"));
|
||||
};
|
||||
|
||||
Utils.prototype.log = function (message) {
|
||||
console.info("%c[BetterDiscord]%c " + message, "color:teal; font-weight:bold;", "");
|
||||
};
|
||||
|
||||
Utils.prototype.err = function (message) {
|
||||
console.info("%c[BetterDiscord]%c " + message, "color:red; font-weight:bold;", "");
|
||||
};
|
||||
|
|
@ -17,7 +17,7 @@ VoiceMode.prototype.obsCallback = function() {
|
|||
self.enable();
|
||||
}, 300);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
VoiceMode.prototype.enable = function () {
|
||||
$(".scroller.guild-channels ul").first().css("display", "none");
|
||||
|
|
@ -36,5 +36,3 @@ VoiceMode.prototype.disable = function() {
|
|||
$(".flex-vertical.channels-wrap").first().css("flex-grow", "");
|
||||
$(".guild-header .btn.btn-hamburger").first().css("visibility", "");
|
||||
};
|
||||
|
||||
var pluginCookie = {};
|
||||
Loading…
Reference in New Issue