${this.getName()}
`;
+ let settings = BDFDB.getAllData(this, "settings");
+ let choices = BDFDB.getAllData(this, "choices");
+ let formats = BDFDB.getAllData(this, "formats");
+ let settingshtml = ``;
}
-
- getName () {return "PersonalPins";}
-
- getDescription () {return "Similar to normal pins. Lets you save messages as notes for yourself.";}
-
- getVersion () {return "1.7.2";}
-
- getAuthor () {return "DevilBro";}
getSettingsPanel () {
if (!this.started || typeof BDFDB !== "object") return;
@@ -163,7 +163,7 @@ class PersonalPins {
let settingspanel = BDFDB.htmlToElement(settingshtml);
- BDFDB.initElements(settingspanel);
+ BDFDB.initElements(settingspanel, this);
settingspanel.querySelector(".reset-button").addEventListener("click", () => {
BDFDB.openConfirmModal(this, "Are you sure you want to delete all pinned notes?", () => {
@@ -177,22 +177,25 @@ class PersonalPins {
load () {}
start () {
- let libraryScript = null;
- if (typeof BDFDB !== "object" || typeof BDFDB.isLibraryOutdated !== "function" || BDFDB.isLibraryOutdated()) {
- libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ var libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ if (!libraryScript || performance.now() - libraryScript.getAttribute("date") > 600000) {
if (libraryScript) libraryScript.remove();
libraryScript = document.createElement("script");
libraryScript.setAttribute("type", "text/javascript");
libraryScript.setAttribute("src", "https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js");
+ libraryScript.setAttribute("date", performance.now());
+ libraryScript.addEventListener("load", () => {
+ BDFDB.loaded = true;
+ this.initialize();
+ });
document.head.appendChild(libraryScript);
}
+ else if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) this.initialize();
this.startTimeout = setTimeout(() => {this.initialize();}, 30000);
- if (typeof BDFDB === "object" && typeof BDFDB.isLibraryOutdated === "function") this.initialize();
- else libraryScript.addEventListener("load", () => {this.initialize();});
}
initialize () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
BDFDB.loadMessage(this);
this.SelectChannelUtils = BDFDB.WebModules.findByProperties("selectGuild","selectChannel");
@@ -244,7 +247,7 @@ class PersonalPins {
stop () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
BDFDB.removeEles(".popout-personalpins-notes", ".personalpins-sort-popout", ".notes-button");
BDFDB.unloadMessage(this);
}
@@ -319,6 +322,8 @@ class PersonalPins {
processMessageOptionPopout (instance, wrapper) {
if (instance.props.message && instance.props.channel && instance._reactInternalFiber.memoizedProps.target && !wrapper.querySelector(".personalpins-itembtn")) {
+ let {messagediv, pos} = this.getMessageAndPos(instance._reactInternalFiber.memoizedProps.target);
+ if (!messagediv || pos == -1) return;
let popoutUnpinEntry = BDFDB.htmlToElement(this.getNoteData(instance.props.message, instance._reactInternalFiber.memoizedProps.target, instance.props.channel) ? this.popoutUnpinEntryMarkup : this.popoutPinEntryMarkup);
wrapper.appendChild(popoutUnpinEntry);
popoutUnpinEntry.addEventListener("click", () => {
@@ -330,12 +335,12 @@ class PersonalPins {
openNotesPopout (button) {
let container = document.querySelector(BDFDB.dotCN.popouts);
- if (!container || button.classList.contains("popout-open")) return;
- button.classList.add("popout-open");
+ if (!container || BDFDB.containsClass(button, "popout-open")) return;
+ BDFDB.addClass(button, "popout-open");
let notespopout = BDFDB.htmlToElement(this.notesPopoutMarkup);
container.appendChild(notespopout);
BDFDB.initElements(notespopout);
- let buttonrects = button.getBoundingClientRect();
+ let buttonrects = BDFDB.getRects(button);
notespopout.style.setProperty("left", buttonrects.left + buttonrects.width/2 + "px");
notespopout.style.setProperty("top", buttonrects.top + buttonrects.height + "px")
notespopout.querySelectorAll(BDFDB.dotCN.tabbarheaderitem).forEach(tab => {tab.addEventListener("click", () => {
@@ -353,11 +358,11 @@ class PersonalPins {
BDFDB.createSortPopout(e.currentTarget, this.sortPopoutMarkup, () => {this.addNotes(notespopout);});
});
- var removePopout = (e) => {
+ var removePopout = e => {
if (!notespopout.contains(e.target) && !BDFDB.getParentEle(".personalpins-sort-popout", e.target)) {
document.removeEventListener("mousedown", removePopout);
notespopout.remove();
- setTimeout(() => {button.classList.remove("popout-open");},300);
+ setTimeout(() => {BDFDB.removeClass(button, "popout-open");},300);
}
};
document.addEventListener("mousedown", removePopout);
@@ -400,8 +405,7 @@ class PersonalPins {
note.remove();
}
}
- if (container.firstElementChild == placeholder) placeholder.style.removeProperty("display");
- else placeholder.style.setProperty("display", "none", "important");
+ BDFDB.toggleEles(placeholder, container.firstElementChild == placeholder);
}
}
}
@@ -456,7 +460,7 @@ class PersonalPins {
require("request")(ytlink, (error, response, result) => {
if (result) {
wrapper.innerHTML = `
`;
- wrapper.querySelector(BDFDB.dotCN.iconplay).addEventListener("click", (e) => {
+ wrapper.querySelector(BDFDB.dotCN.iconplay).addEventListener("click", e => {
while (wrapper.firstChild) wrapper.firstChild.remove();
let width = 400;
let height = Math.round(width*(result.split(' {
+ messagedivider.querySelector(BDFDB.dotCN.messagespopoutchannelname).addEventListener("click", e => {
if (!BDFDB.isObjectEmpty(channel)) {
notespopout.remove();
this.SelectChannelUtils.selectChannel(server.id, channel.id);
}
else BDFDB.shake();
});
- message.querySelector(BDFDB.dotCN.messagespopoutclosebutton).addEventListener("click", (e) => {
- messagedivider.remove();
- message.remove();
+ message.querySelector(BDFDB.dotCN.messagespopoutclosebutton).addEventListener("click", e => {
+ BDFDB.removeEles(messagedivider, message);
this.removeNoteData(noteData);
- if (container.firstElementChild == placeholder) placeholder.style.removeProperty("display");
+ BDFDB.toggleEles(placeholder, container.firstElementChild == placeholder);
});
- message.querySelector(BDFDB.dotCN.messagespopoutjumpbutton + ".jump").addEventListener("click", (e) => {
+ message.querySelector(BDFDB.dotCN.messagespopoutjumpbutton + ".jump").addEventListener("click", e => {
this.HistoryUtils.transitionTo(this.MainDiscord.Routes.MESSAGE(noteData.guild_id, noteData.channel_id, noteData.id));
});
- message.querySelector(BDFDB.dotCN.messagespopoutjumpbutton + ".copy").addEventListener("click", (e) => {
+ message.querySelector(BDFDB.dotCN.messagespopoutjumpbutton + ".copy").addEventListener("click", e => {
let clipboard = require("electron").clipboard;
if (noteData.content) clipboard.write({text: noteData.content});
else {
@@ -575,7 +578,7 @@ class PersonalPins {
getMessageAndPos (target) {
let messagediv = BDFDB.getParentEle(BDFDB.dotCN.message, target);
- let pos = Array.from(messagediv.parentElement.querySelectorAll(BDFDB.dotCN.message)).indexOf(messagediv);
+ let pos = messagediv ? Array.from(messagediv.parentElement.querySelectorAll(BDFDB.dotCN.message)).indexOf(messagediv) : -1;
return {messagediv, pos};
}
diff --git a/Plugins/PinDMs/PinDMs.plugin.js b/Plugins/PinDMs/PinDMs.plugin.js
index 52b2ea8cad..f213f03b9c 100644
--- a/Plugins/PinDMs/PinDMs.plugin.js
+++ b/Plugins/PinDMs/PinDMs.plugin.js
@@ -3,7 +3,7 @@
class PinDMs {
getName () {return "PinDMs";}
- getVersion () {return "1.2.6";}
+ getVersion () {return "1.2.7";}
getAuthor () {return "DevilBro";}
@@ -31,22 +31,25 @@ class PinDMs {
load () {}
start () {
- var libraryScript = null;
- if (typeof BDFDB !== "object" || typeof BDFDB.isLibraryOutdated !== "function" || BDFDB.isLibraryOutdated()) {
- libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ var libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ if (!libraryScript || performance.now() - libraryScript.getAttribute("date") > 600000) {
if (libraryScript) libraryScript.remove();
libraryScript = document.createElement("script");
libraryScript.setAttribute("type", "text/javascript");
libraryScript.setAttribute("src", "https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js");
+ libraryScript.setAttribute("date", performance.now());
+ libraryScript.addEventListener("load", () => {
+ BDFDB.loaded = true;
+ this.initialize();
+ });
document.head.appendChild(libraryScript);
}
+ else if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) this.initialize();
this.startTimeout = setTimeout(() => {this.initialize();}, 30000);
- if (typeof BDFDB === "object" && typeof BDFDB.isLibraryOutdated === "function") this.initialize();
- else libraryScript.addEventListener("load", () => {this.initialize();});
}
initialize () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
BDFDB.loadMessage(this);
this.ChannelUtils = BDFDB.WebModules.findByProperties("getDMFromUserId");
@@ -82,7 +85,7 @@ class PinDMs {
}
stop () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
let dmsscrollerinstance = BDFDB.getReactInstance(document.querySelector(BDFDB.dotCNS.dmchannels + BDFDB.dotCN.scroller));
if (dmsscrollerinstance) {
let dms = dmsscrollerinstance.return.return.return.memoizedProps.children;
diff --git a/Plugins/PluginRepo/PluginRepo.plugin.js b/Plugins/PluginRepo/PluginRepo.plugin.js
index 581f4b15ba..adeff59ea1 100644
--- a/Plugins/PluginRepo/PluginRepo.plugin.js
+++ b/Plugins/PluginRepo/PluginRepo.plugin.js
@@ -3,7 +3,7 @@
class PluginRepo {
getName () {return "PluginRepo";}
- getVersion () {return "1.7.0";}
+ getVersion () {return "1.7.1";}
getAuthor () {return "DevilBro";}
@@ -247,11 +247,11 @@ class PluginRepo {
BDFDB.initElements(settingspanel, this);
- BDFDB.addChildEventListener(settingspanel, "click", ".btn-addplugin", () => {this.addPluginToOwnList(settingspanel);});
- BDFDB.addChildEventListener(settingspanel, "click", "#input-pluginurl", e => {if (e.which == 13) this.addPluginToOwnList(settingspanel);});
- BDFDB.addChildEventListener(settingspanel, "click", ".remove-plugin", e => {this.removePluginFromOwnList(e);});
- BDFDB.addChildEventListener(settingspanel, "click", ".remove-all", () => {this.removeAllFromOwnList();})
- BDFDB.addChildEventListener(settingspanel, "click", ".refresh-button", () => {
+ BDFDB.addEventListener(this, settingspanel, "click", ".btn-addplugin", () => {this.addPluginToOwnList(settingspanel);});
+ BDFDB.addEventListener(this, settingspanel, "click", "#input-pluginurl", e => {if (e.which == 13) this.addPluginToOwnList(settingspanel);});
+ BDFDB.addEventListener(this, settingspanel, "click", ".remove-plugin", e => {this.removePluginFromOwnList(e);});
+ BDFDB.addEventListener(this, settingspanel, "click", ".remove-all", () => {this.removeAllFromOwnList(settingspanel);})
+ BDFDB.addEventListener(this, settingspanel, "click", ".refresh-button", () => {
this.loading = {is:false, timeout:null, amount:0};
this.loadPlugins();
});
@@ -263,22 +263,25 @@ class PluginRepo {
load () {}
start () {
- var libraryScript = null;
- if (typeof BDFDB !== "object" || typeof BDFDB.isLibraryOutdated !== "function" || BDFDB.isLibraryOutdated()) {
- libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ var libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ if (!libraryScript || performance.now() - libraryScript.getAttribute("date") > 600000) {
if (libraryScript) libraryScript.remove();
libraryScript = document.createElement("script");
libraryScript.setAttribute("type", "text/javascript");
libraryScript.setAttribute("src", "https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js");
+ libraryScript.setAttribute("date", performance.now());
+ libraryScript.addEventListener("load", () => {
+ BDFDB.loaded = true;
+ this.initialize();
+ });
document.head.appendChild(libraryScript);
}
+ else if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) this.initialize();
this.startTimeout = setTimeout(() => {this.initialize();}, 30000);
- if (typeof BDFDB === "object" && typeof BDFDB.isLibraryOutdated === "function") this.initialize();
- else libraryScript.addEventListener("load", () => {this.initialize();});
}
initialize () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
BDFDB.loadMessage(this);
this.loadPlugins();
@@ -294,7 +297,7 @@ class PluginRepo {
stop () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
clearInterval(this.updateInterval);
clearTimeout(this.loading.timeout);
@@ -311,7 +314,7 @@ class PluginRepo {
let observer = new MutationObserver(changes => {
changes.forEach(change => {
if (change.addedNodes) change.addedNodes.forEach(node => {
- if (node.tagName && node.classList && node.className.includes("plugin-context-menu") && !node.querySelector(".pluginrepo-item")) {
+ if (node.tagName && BDFDB.containsClass(node, "plugin-context-menu") && !node.querySelector(".pluginrepo-item")) {
observer.disconnect();
let item = node.querySelectorAll(BDFDB.dotCN.contextmenuitem);
item = item[item.length-1];
@@ -321,7 +324,8 @@ class PluginRepo {
this.openPluginRepoModal();
});
item.parentElement.insertBefore(settingsContextEntry, item.nextElementSibling);
- node.style.setProperty("top", (menu.getBoundingClientRect().top - node.getBoundingClientRect().height + menu.getBoundingClientRect().height) + "px");
+ var menurects = BDFDB.getRects(menu);
+ node.style.setProperty("top", (menurects.top - BDFDB.getRects(node).height + menurects.height) + "px");
}
});
});
@@ -355,7 +359,9 @@ class PluginRepo {
if (!ownlist.includes(url)) {
ownlist.push(url);
BDFDB.saveData("ownlist", ownlist, this, "ownlist");
- pluginList.appendChild(BDFDB.htmlToElement(``));
+ let entry = BDFDB.htmlToElement(``);
+ BDFDB.addChildEventListener(entry, "click", ".remove-plugin", e => {this.removePluginFromOwnList(e);});
+ pluginList.appendChild(entry);
}
}
}
@@ -369,10 +375,10 @@ class PluginRepo {
BDFDB.saveData("ownlist", ownlist, this, "ownlist");
}
- removeAllFromOwnList () {
+ removeAllFromOwnList (settingspanel) {
BDFDB.openConfirmModal(this, "Are you sure you want to remove all added Plugins from your own list?", () => {
BDFDB.saveData("ownlist", [], this, "ownlist");
- BDFDB.removeEles("." + this.getName() + "-settings " + BDFDB.dotCN.hovercard);
+ BDFDB.removeEles(settingspanel.querySelector(BDFDB.dotCN.hovercard));
});
}
@@ -412,7 +418,7 @@ class PluginRepo {
BDFDB.createSortPopout(e.currentTarget, this.orderPopoutMarkup, () => {this.sortEntries(pluginRepoModal);});
});
BDFDB.addChildEventListener(pluginRepoModal, "click", BDFDB.dotCN.tabbaritem + "[tab=plugins]", e => {
- if (!e.currentTarget.classList.contains(BDFDB.disCN.settingsitemselected) && pluginRepoModal.updateHidden) {
+ if (!BDFDB.containsClass(e.currentTarget, BDFDB.disCN.settingsitemselected) && pluginRepoModal.updateHidden) {
delete pluginRepoModal.updateHidden;
this.sortEntries(pluginRepoModal);
}
@@ -457,7 +463,7 @@ class PluginRepo {
entry.querySelector(BDFDB.dotCN._repoauthor).innerHTML = data.author;
entry.querySelector(BDFDB.dotCN._repodescription).innerHTML = data.description;
let favbutton = entry.querySelector(BDFDB.dotCN.giffavoritebutton);
- favbutton.classList.toggle(BDFDB.disCN.giffavoriteselected, data.fav == 0);
+ BDFDB.toggleClass(favbutton, BDFDB.disCN.giffavoriteselected, data.fav == 0);
favbutton.addEventListener("click", e => {
let favorize = data.fav == 1;
data.fav = favorize ? 0 : 1;
@@ -486,7 +492,7 @@ class PluginRepo {
});
let trashbutton = entry.querySelector(".trashIcon");
trashbutton.addEventListener("click", e => {
- if (entry.classList.contains("outdated") || entry.classList.contains("updated")) {
+ if (BDFDB.containsClass(entry, "outdated", "updated", false)) {
setEntryState(2);
this.deletePluginFile(data);
if (!BDFDB.isRestartNoMoreEnabled()) this.stopPlugin(data);
@@ -505,9 +511,9 @@ class PluginRepo {
function setEntryState (state) {
data.state = state;
- entry.classList.toggle("downloadable", state > 1);
- entry.classList.toggle("outdated", state == 1);
- entry.classList.toggle("updated", state < 1);
+ BDFDB.toggleClass(entry, "downloadable", state > 1);
+ BDFDB.toggleClass(entry, "outdated", state == 1);
+ BDFDB.toggleClass(entry, "updated", state < 1);
let downloadbutton = entry.querySelector(".btn-download");
downloadbutton.innerText = state < 1 ? "Updated" : (state > 1 ? "Download" : "Outdated");
downloadbutton.style.setProperty("background-color", "rgb(" + (state < 1 ? "67,181,129" : (state > 1 ? "114,137,218" : "241,71,71")) + ")", "important");
@@ -542,13 +548,10 @@ class PluginRepo {
li.querySelectorAll(BDFDB.dotCNC._reponame + BDFDB.dotCNC._repoversion + BDFDB.dotCNC._repoauthor + BDFDB.dotCN._repodescription).forEach(ele => {
if (searchstring && searchstring.length > 2 || ele.querySelector(BDFDB.dotCN.highlight)) ele.innerHTML = BDFDB.highlightText(ele.innerText, searchstring);
});
- li.style.removeProperty("display");
li.style.setProperty("order", pos, "important");
}
- else {
- li.style.setProperty("display", "none", "important");
- li.style.removeProperty("order");
- }
+ else li.style.removeProperty("order");
+ BDFDB.toggleEles(li, pos > -1);
}
}
diff --git a/Plugins/README.md b/Plugins/README.md
index 0d8279231e..ca2694375f 100644
--- a/Plugins/README.md
+++ b/Plugins/README.md
@@ -42,4 +42,5 @@
- [Theme Repo](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/ThemeRepo) - Allows you to preview all themes from the theme repo and download them on the fly.
- [Theme Settings](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/ThemeSettings) - Allows you to change Theme Variables within BetterDiscord.
- [Top Role Everywhere](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/TopRoleEverywhere) - Adds the highest role of a user as a tag.
+ - [User Notes](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/UserNotes) - Allows you to write your own user notes wihtout a character limit.
- [Write UpperCase](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/WriteUpperCase) - Changes the input in the textarea to uppercase.
\ No newline at end of file
diff --git a/Plugins/ReadAllNotificationsButton/ReadAllNotificationsButton.plugin.js b/Plugins/ReadAllNotificationsButton/ReadAllNotificationsButton.plugin.js
index 51a0252b13..8717e74996 100644
--- a/Plugins/ReadAllNotificationsButton/ReadAllNotificationsButton.plugin.js
+++ b/Plugins/ReadAllNotificationsButton/ReadAllNotificationsButton.plugin.js
@@ -1,6 +1,14 @@
//META{"name":"ReadAllNotificationsButton"}*//
class ReadAllNotificationsButton {
+ getName () {return "ReadAllNotificationsButton";}
+
+ getVersion () {return "1.3.8";}
+
+ getAuthor () {return "DevilBro";}
+
+ getDescription () {return "Adds a button to clear all notifications.";}
+
initConstructor () {
this.patchModules = {
"Guilds":"componentDidMount",
@@ -27,30 +35,20 @@ class ReadAllNotificationsButton {
}
};
}
-
- getName () {return "ReadAllNotificationsButton";}
-
- getDescription () {return "Adds a button to clear all notifications.";}
-
- getVersion () {return "1.3.7";}
-
- getAuthor () {return "DevilBro";}
getSettingsPanel () {
if (!this.started || typeof BDFDB !== "object") return;
var settings = BDFDB.getAllData(this, "settings");
var settingshtml = ``;
- var settingspanel = $(settingshtml)[0];
+ let settingspanel = BDFDB.htmlToElement(settingshtml);
- BDFDB.initElements(settingspanel);
+ BDFDB.initElements(settingspanel, this);
- $(settingspanel)
- .on("click", BDFDB.dotCN.switchinner, () => {this.updateSettings(settingspanel);});
return settingspanel;
}
@@ -58,22 +56,25 @@ class ReadAllNotificationsButton {
load () {}
start () {
- var libraryScript = null;
- if (typeof BDFDB !== "object" || typeof BDFDB.isLibraryOutdated !== "function" || BDFDB.isLibraryOutdated()) {
- libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ var libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ if (!libraryScript || performance.now() - libraryScript.getAttribute("date") > 600000) {
if (libraryScript) libraryScript.remove();
libraryScript = document.createElement("script");
libraryScript.setAttribute("type", "text/javascript");
libraryScript.setAttribute("src", "https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js");
+ libraryScript.setAttribute("date", performance.now());
+ libraryScript.addEventListener("load", () => {
+ BDFDB.loaded = true;
+ this.initialize();
+ });
document.head.appendChild(libraryScript);
}
+ else if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) this.initialize();
this.startTimeout = setTimeout(() => {this.initialize();}, 30000);
- if (typeof BDFDB === "object" && typeof BDFDB.isLibraryOutdated === "function") this.initialize();
- else libraryScript.addEventListener("load", () => {this.initialize();});
}
initialize () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
BDFDB.loadMessage(this);
BDFDB.WebModules.forceAllUpdates(this);
@@ -84,7 +85,7 @@ class ReadAllNotificationsButton {
}
stop () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
BDFDB.removeEles(".RANbutton-frame", ".RAMbutton");
BDFDB.removeClasses("RAN-added", "RAM-added");
BDFDB.unloadMessage(this);
@@ -93,29 +94,29 @@ class ReadAllNotificationsButton {
// begin of own functions
-
- updateSettings (settingspanel) {
- var settings = {};
- for (var input of settingspanel.querySelectorAll(BDFDB.dotCN.switchinner)) {
- settings[input.value] = input.checked;
- }
- BDFDB.saveAllData(settings, this, "settings");
- }
processGuilds (instance, wrapper) {
- $(this.RANbuttonMarkup).insertBefore(wrapper.querySelector(BDFDB.dotCN.guildseparator))
- .on("click", ".RANbutton", () => {
+ let guildseparator = wrapper.querySelector(BDFDB.dotCN.guildseparator);
+ if (guildseparator) {
+ let ranbutton = BDFDB.htmlToElement(this.RANbuttonMarkup);
+ guildseparator.parentElement.insertBefore(ranbutton, guildseparator);
+ ranbutton.addEventListener("click", () => {
BDFDB.clearReadNotifications(BDFDB.getData("includeMuted", this, "settings") ? BDFDB.readServerList() : BDFDB.readUnreadServerList());
});
- wrapper.classList.add("RAN-added");
+ BDFDB.addClass(wrapper, "RAN-added");
+ }
}
processRecentMentions (instance, wrapper) {
BDFDB.removeEles(".RAMbutton");
if (instance.props && instance.props.popoutName == "RECENT_MENTIONS_POPOUT") {
- wrapper.classList.add("RAM-added");
- $(this.RAMbuttonMarkup).appendTo(wrapper.querySelector(BDFDB.dotCN.recentmentionstitle))
- .on("click", () => {this.clearMentions(instance, wrapper);});
+ let recentmentionstitle = wrapper.querySelector(BDFDB.dotCN.recentmentionstitle);
+ if (recentmentionstitle) {
+ let ranbutton = BDFDB.htmlToElement(this.RANbuttonMarkup);
+ recentmentionstitle.appendChild(ranbutton);
+ ranbutton.addEventListener("click", () => {this.clearMentions(instance, wrapper);});
+ BDFDB.addClass(wrapper, "RAM-added");
+ }
}
}
diff --git a/Plugins/RemoveNicknames/RemoveNicknames.plugin.js b/Plugins/RemoveNicknames/RemoveNicknames.plugin.js
index d85b10c25b..a0ed7251f0 100644
--- a/Plugins/RemoveNicknames/RemoveNicknames.plugin.js
+++ b/Plugins/RemoveNicknames/RemoveNicknames.plugin.js
@@ -3,7 +3,7 @@
class RemoveNicknames {
getName () {return "RemoveNicknames";}
- getVersion () {return "1.1.3";}
+ getVersion () {return "1.1.4";}
getAuthor () {return "DevilBro";}
@@ -38,8 +38,7 @@ class RemoveNicknames {
let settingspanel = BDFDB.htmlToElement(settingshtml);
- BDFDB.initElements(settingspanel, this);
-;
+ BDFDB.initElements(settingspanel, this);
;
return settingspanel;
}
@@ -47,22 +46,25 @@ class RemoveNicknames {
load () {}
start () {
- var libraryScript = null;
- if (typeof BDFDB !== "object" || typeof BDFDB.isLibraryOutdated !== "function" || BDFDB.isLibraryOutdated()) {
- libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
- if (libraryScript) libraryScript.remove();
- libraryScript = document.createElement("script");
- libraryScript.setAttribute("type", "text/javascript");
- libraryScript.setAttribute("src", "https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js");
- document.head.appendChild(libraryScript);
- }
+ var libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ if (!libraryScript || performance.now() - libraryScript.getAttribute("date") > 600000) {
+ if (libraryScript) libraryScript.remove();
+ libraryScript = document.createElement("script");
+ libraryScript.setAttribute("type", "text/javascript");
+ libraryScript.setAttribute("src", "https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js");
+ libraryScript.setAttribute("date", performance.now());
+ libraryScript.addEventListener("load", () => {
+ BDFDB.loaded = true;
+ this.initialize();
+ });
+ document.head.appendChild(libraryScript);
+ }
+ else if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) this.initialize();
this.startTimeout = setTimeout(() => {this.initialize();}, 30000);
- if (typeof BDFDB === "object" && typeof BDFDB.isLibraryOutdated === "function") this.initialize();
- else libraryScript.addEventListener("load", () => {this.initialize();});
}
initialize () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
BDFDB.loadMessage(this);
this.reseting = false;
@@ -81,7 +83,7 @@ class RemoveNicknames {
stop () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
this.reseting = true;
BDFDB.WebModules.forceAllUpdates(this);
@@ -105,7 +107,7 @@ class RemoveNicknames {
}
processNameTag (instance, wrapper) {
- let username = wrapper.parentElement.querySelector("." + (wrapper.classList && wrapper.classList.contains(BDFDB.disCN.userpopoutheadertagwithnickname) ? BDFDB.disCN.userpopoutheadernickname : instance.props.usernameClass).replace(/ /g, "."));
+ let username = wrapper.parentElement.querySelector("." + (BDFDB.containsClass(wrapper, BDFDB.disCN.userpopoutheadertagwithnickname) ? BDFDB.disCN.userpopoutheadernickname : instance.props.usernameClass).replace(/ /g, "."));
if (username) BDFDB.setInnerText(username, this.getNewName(instance.props.user));
}
@@ -127,7 +129,7 @@ class RemoveNicknames {
processClickable (instance, wrapper) {
if (!wrapper || !instance.props || !instance.props.className) return;
if (instance.props.tag == "a" && instance.props.className.indexOf(BDFDB.disCN.anchorunderlineonhover) > -1) {
- if (wrapper.parentElement.classList.contains(BDFDB.disCN.messagesystemcontent)) {
+ if (BDFDB.containsClass(wrapper.parentElement, BDFDB.disCN.messagesystemcontent)) {
let message = BDFDB.getKeyInformation({node:wrapper.parentElement, key:"message", up:true});
if (message) BDFDB.setInnerText(wrapper, this.getNewName(message.author));
}
diff --git a/Plugins/RepoControls/RepoControls.plugin.js b/Plugins/RepoControls/RepoControls.plugin.js
index 50eab9004c..c1406cd65e 100644
--- a/Plugins/RepoControls/RepoControls.plugin.js
+++ b/Plugins/RepoControls/RepoControls.plugin.js
@@ -3,7 +3,7 @@
class RepoControls {
getName () {return "RepoControls";}
- getVersion () {return "1.2.4";}
+ getVersion () {return "1.2.5";}
getAuthor () {return "DevilBro";}
@@ -37,8 +37,8 @@ class RepoControls {
${this.getName()}
`;
for (let key in settings) {
- settingshtml += ``;
+ settingshtml += ``;
}
for (let key in choices) {
settingshtml += ``;
@@ -49,21 +52,20 @@ class CompleteTimestamps {
for (let key in formats) {
settingshtml += ``;
}
- var infoHidden = BDFDB.loadData("hideInfo", this, "hideInfo");
+ let infoHidden = BDFDB.loadData("hideInfo", this, "hideInfo");
settingshtml += ``;
settingshtml += `
`;
- var settingspanel = $(settingshtml)[0];
+ let settingspanel = BDFDB.htmlToElement(settingshtml);
- BDFDB.initElements(settingspanel);
+ BDFDB.initElements(settingspanel, this);
- $(settingspanel)
- .on("click", BDFDB.dotCN.switchinner, () => {this.updateSettings(settingspanel);})
- .on("keyup", BDFDB.dotCN.input, () => {this.saveInputs(settingspanel);})
- .on("click", BDFDB.dotCN.selectcontrol, (e) => {this.openDropdownMenu(e);})
- .on("click", ".toggle-info", (e) => {this.toggleInfo(settingspanel, e.currentTarget);});
+ BDFDB.addEventListener(this, settingspanel, "click", ".settings-switch", () => {this.updateSettingsPanel(settingspanel);});
+ BDFDB.addEventListener(this, settingspanel, "keyup", BDFDB.dotCN.input, () => {this.saveInputs(settingspanel);});
+ BDFDB.addEventListener(this, settingspanel, "click", BDFDB.dotCN.selectcontrol, e => {this.openDropdownMenu(e);});
+ BDFDB.addEventListener(this, settingspanel, "click", ".toggle-info", e => {this.toggleInfo(e.currentTarget);});
return settingspanel;
}
@@ -72,94 +74,55 @@ class CompleteTimestamps {
load () {}
start () {
- var libraryScript = null;
- if (typeof BDFDB !== "object" || typeof BDFDB.isLibraryOutdated !== "function" || BDFDB.isLibraryOutdated()) {
- libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ var libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ if (!libraryScript || performance.now() - libraryScript.getAttribute("date") > 600000) {
if (libraryScript) libraryScript.remove();
libraryScript = document.createElement("script");
libraryScript.setAttribute("type", "text/javascript");
libraryScript.setAttribute("src", "https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js");
+ libraryScript.setAttribute("date", performance.now());
+ libraryScript.addEventListener("load", () => {
+ BDFDB.loaded = true;
+ this.initialize();
+ });
document.head.appendChild(libraryScript);
}
+ else if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) this.initialize();
this.startTimeout = setTimeout(() => {this.initialize();}, 30000);
- if (typeof BDFDB === "object" && typeof BDFDB.isLibraryOutdated === "function") this.initialize();
- else libraryScript.addEventListener("load", () => {this.initialize();});
}
initialize () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
BDFDB.loadMessage(this);
- var observer = null;
-
- observer = new MutationObserver((changes, _) => {
- changes.forEach(
- (change, i) => {
- if (change.addedNodes) {
- change.addedNodes.forEach((node) => {
- if (node.tagName && node.querySelector("time")) {
- node.querySelectorAll("time").forEach(stamp => {this.changeTimestamp(stamp);});
- }
- else if (node.tagName && node.tagName == "TIME") {
- this.changeTimestamp(node);
- }
- });
- }
- }
- );
+ this.languages = Object.assign({"own":{name:"Own",id:"own",integrated:false,dic:false}},BDFDB.languages);
+
+ BDFDB.addEventListener(this, document, "mouseenter", BDFDB.dotCNS.message + BDFDB.dotCN.messagecontent, e => {
+ if (BDFDB.getData("showOnHover", this, "settings")) {
+ let message = e.currentTarget;
+ let messagegroup = BDFDB.getParentEle(BDFDB.dotCN.messagegroup, message);
+ if (!messagegroup || !messagegroup.tagName) return;
+ let info = this.getMessageData(message, messagegroup);
+ if (!info || !info.timestamp || !info.timestamp._i) return;
+ let choice = BDFDB.getData("creationDateLang", this, "choices");
+ BDFDB.createTooltip(this.getTimestamp(this.languages[choice].id, info.timestamp._i), message, {type:"left",selector:"completetimestamp-tooltip"});
+ }
});
- BDFDB.addObserver(this, BDFDB.dotCN.appmount, {name:"messageObserver",instance:observer}, {childList: true, subtree: true});
-
- observer = new MutationObserver((changes, _) => {
- changes.forEach(
- (change, i) => {
- if (change.removedNodes) {
- change.removedNodes.forEach((node) => {
- if (this.updateTimestamps && node.tagName && node.getAttribute("layer-id") == "user-settings") {
- document.querySelectorAll(".complete-timestamp").forEach(timestamp => {timestamp.classList.remove("complete-timestamp");});
- document.querySelectorAll(".complete-timestamp-divider").forEach(divider => {divider.remove();});
- document.querySelectorAll("time").forEach(stamp => {this.changeTimestamp(stamp);})
- this.updateTimestamps = false;
- }
- });
- }
- }
- );
+ BDFDB.addEventListener(this, document, "mouseenter", BDFDB.dotCNS.message + BDFDB.dotCN.messageedited, e => {
+ if (BDFDB.getData("changeForEdit", this, "settings")) {
+ let marker = e.currentTarget;
+ let time = marker.getAttribute("datetime");
+ if (!time) return;
+ let choice = BDFDB.getData("creationDateLang", this, "choices");
+ let customTooltipCSS = `
+ body ${BDFDB.dotCN.tooltip}:not(.completetimestampedit-tooltip) {
+ display: none !important;
+ }`;
+ BDFDB.createTooltip(this.getTimestamp(this.languages[choice].id, time), marker, {type:"top",selector:"completetimestampedit-tooltip",css:customTooltipCSS});
+ }
});
- BDFDB.addObserver(this, BDFDB.dotCN.layers, {name:"settingsWindowObserver",instance:observer}, {childList:true});
- this.languages = Object.assign({},
- {"own": {name:"Own", id:"own", integrated:false, dic:false}},
- BDFDB.languages
- );
-
- $(document)
- .on("mouseenter." + this.getName(), BDFDB.dotCNS.message + BDFDB.dotCN.messagecontent, (e) => {
- if (BDFDB.getData("showOnHover", this, "settings")) {
- let message = e.currentTarget;
- let messagegroup = this.getMessageGroup(message);
- if (!messagegroup || !messagegroup.tagName) return;
- let info = this.getMessageData(message, messagegroup);
- if (!info || !info.timestamp || !info.timestamp._i) return;
- let choice = BDFDB.getData("creationDateLang", this, "choices");
- BDFDB.createTooltip(this.getTimestamp(this.languages[choice].id, info.timestamp._i), message, {type:"left",selector:"completetimestamp-tooltip"});
- }
- })
- .on("mouseenter." + this.getName(), BDFDB.dotCNS.message + BDFDB.dotCN.messageedited, (e) => {
- if (BDFDB.getData("changeForEdit", this, "settings")) {
- let marker = e.currentTarget;
- let time = marker.getAttribute("datetime");
- if (!time) return;
- let choice = BDFDB.getData("creationDateLang", this, "choices");
- let customTooltipCSS = `
- body ${BDFDB.dotCN.tooltip}:not(.completetimestampedit-tooltip) {
- display: none !important;
- }`;
- BDFDB.createTooltip(this.getTimestamp(this.languages[choice].id, time), marker, {type:"top",selector:"completetimestampedit-tooltip",css:customTooltipCSS});
- }
- });
-
- document.querySelectorAll("time").forEach(stamp => {this.changeTimestamp(stamp);})
+ BDFDB.WebModules.forceAllUpdates();
}
else {
console.error(this.getName() + ": Fatal Error: Could not load BD functions!");
@@ -168,9 +131,9 @@ class CompleteTimestamps {
stop () {
- if (typeof BDFDB === "object") {
- document.querySelectorAll(".complete-timestamp").forEach(stamp => {stamp.classList.remove("complete-timestamp");});
- document.querySelectorAll(".complete-timestamp-divider").forEach(divider => {divider.remove();});
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
+ BDFDB.removeEles(".complete-timestamp-divider");
+ BDFDB.removeClasses("complete-timestamp");
BDFDB.removeLocalStyle(this.getName() + "CompactCorrection");
@@ -181,18 +144,9 @@ class CompleteTimestamps {
// begin of own functions
- updateSettings (settingspanel) {
- var settings = {};
- for (var input of settingspanel.querySelectorAll(BDFDB.dotCN.switchinner)) {
- settings[input.value] = input.checked;
- }
- BDFDB.saveAllData(settings, this, "settings");
- this.updateSettingsPanel(settingspanel);
- }
-
saveInputs (settingspanel) {
- var formats = {};
- for (var input of settingspanel.querySelectorAll(BDFDB.dotCN.input)) {
+ let formats = {};
+ for (let input of settingspanel.querySelectorAll(BDFDB.dotCN.input)) {
formats[input.getAttribute("option")] = input.value;
}
BDFDB.saveAllData(formats, this, "formats");
@@ -200,71 +154,85 @@ class CompleteTimestamps {
}
updateSettingsPanel (settingspanel) {
- var choices = BDFDB.getAllData(this, "choices");
+ let choices = BDFDB.getAllData(this, "choices");
for (let key in choices) {
settingspanel.querySelector(`${BDFDB.dotCN.select}[option='${key}'] .languageTimestamp`).innerText = this.getTimestamp(this.languages[choices[key]].id);
}
- this.updateTimestamps = true;
+ this.SettingsUpdated = true;
}
-
- toggleInfo (settingspanel, ele) {
- ele.classList.toggle(BDFDB.disCN.categorywrappercollapsed);
- ele.classList.toggle(BDFDB.disCN.categorywrapperdefault);
+
+ toggleInfo (ele) {
+ BDFDB.toggleClass(ele, BDFDB.disCN.categorywrappercollapsed);
+ BDFDB.toggleClass(ele, BDFDB.disCN.categorywrapperdefault);
var svg = ele.querySelector(BDFDB.dotCN.categoryicontransition);
- svg.classList.toggle(BDFDB.disCN.directionright);
- svg.classList.toggle(BDFDB.disCN.categoryiconcollapsed);
- svg.classList.toggle(BDFDB.disCN.categoryicondefault);
+ BDFDB.toggleClass(svg, BDFDB.disCN.directionright);
+ BDFDB.toggleClass(svg, BDFDB.disCN.categoryiconcollapsed);
+ BDFDB.toggleClass(svg, BDFDB.disCN.categoryicondefault);
- var visible = $(settingspanel).find(".info-container").is(":visible");
- $(settingspanel).find(".info-container").toggle(!visible);
- BDFDB.saveData("hideInfo", visible, this, "hideInfo");
+ BDFDB.toggleEles(ele.nextElementSibling);
+ BDFDB.saveData("hideInfo", BDFDB.isEleHidden(ele.nextElementSibling), this, "hideInfo");
}
openDropdownMenu (e) {
- var selectControl = e.currentTarget;
- var selectWrap = selectControl.parentElement;
+ let selectControl = e.currentTarget;
+ let selectWrap = selectControl.parentElement;
+ let plugincard = BDFDB.getParentEle("li", selectWrap);
- if (selectWrap.classList.contains(BDFDB.disCN.selectisopen)) return;
+ if (!plugincard || BDFDB.containsClass(selectWrap, BDFDB.disCN.selectisopen)) return;
- selectWrap.classList.add(BDFDB.disCN.selectisopen);
- $("li").has(selectWrap).css("overflow", "visible");
+ BDFDB.addClass(selectWrap, BDFDB.disCN.selectisopen);
+ plugincard.style.setProperty("overflow", "visible", "important");
- var selectMenu = this.createDropdownMenu(selectWrap.getAttribute("value"));
+ let selectMenu = this.createDropdownMenu(selectWrap.getAttribute("value"));
selectWrap.appendChild(selectMenu);
- $(selectMenu).on("mousedown." + this.getName(), BDFDB.dotCN.selectoption, (e2) => {
- var language = e2.currentTarget.getAttribute("value");
+ BDFDB.addChildEventListener(selectMenu, "mousedown", BDFDB.dotCN.selectoption, e2 => {
+ let language = e2.currentTarget.getAttribute("value");
selectWrap.setAttribute("value", language);
selectControl.querySelector(".languageName").innerText = this.languages[language].name;
selectControl.querySelector(".languageTimestamp").innerText = this.getTimestamp(this.languages[language].id);
BDFDB.saveData(selectWrap.getAttribute("option"), language, this, "choices");
});
- $(document).on("mousedown.select" + this.getName(), (e2) => {
- if (e2.target.parentElement == selectMenu) return;
- $(document).off("mousedown.select" + this.getName());
- selectMenu.remove();
- $("li").has(selectWrap).css("overflow", "auto");
- setTimeout(() => {selectWrap.classList.remove(BDFDB.disCN.selectisopen);},100);
- });
+
+ var removeMenu = e2 => {
+ if (e2.target.parentElement != selectMenu) {
+ document.removeEventListener("mousedown", removeMenu);
+ selectMenu.remove();
+ plugincard.style.removeProperty("overflow");
+ setTimeout(() => {BDFDB.removeClass(selectWrap, BDFDB.disCN.selectisopen);},100);
+ }
+ };
+
+ document.addEventListener("mousedown", removeMenu);
}
createDropdownMenu (choice) {
- var menuhtml = `${this.defaults.settings[key].description}
${this.defaults.settings[key].description}
${this.defaults.choices[key].description}
${this.languages[choices[key]].name}
${this.getTimestamp(this.languages[choices[key]].id)}
${this.defaults.formats[key].description}
Information
`;
settingshtml += `
$hour will be replaced with the current hour
$minute will be replaced with the current minutes
$second will be replaced with the current seconds
$msecond will be replaced with the current milliseconds
$timemode will change $hour to a 12h format and will be replaced with AM/PM
$year will be replaced with the current year
$month will be replaced with the current month
$day will be replaced with the current day
$monthnameL will be replaced with the monthname in long format based on the Discord Language
$monthnameS will be replaced with the monthname in short format based on the Discord Language
$weekdayL will be replaced with the weekday in long format based on the Discord Language
$weekdayS will be replaced with the weekday in short format based on the Discord Language
`;
settingshtml += ``;
- for (var key in this.languages) {
- var isSelected = key == choice ? ` ${BDFDB.disCN.selectselected}` : ``;
+ let menuhtml = ``;
- return $(menuhtml)[0];
+ return BDFDB.htmlToElement(menuhtml);
+ }
+
+ processMessageGroup (instance, wrapper) {
+ for (let stamp of wrapper.querySelectorAll("time[datetime]")) this.changeTimestamp(stamp);
+ }
+
+ processStandardSidebarView (instance, wrapper) {
+ if (this.SettingsUpdated) {
+ delete this.SettingsUpdated;
+ BDFDB.WebModules.forceAllUpdates(this);
+ }
}
changeTimestamp (stamp) {
- if (!stamp.className || stamp.className.toLowerCase().indexOf("timestamp") == -1 || stamp.classList.contains("complete-timestamp")) return;
+ if (!stamp.className || stamp.className.toLowerCase().indexOf("timestamp") == -1 || BDFDB.containsClass(stamp, "complete-timestamp")) return;
let time = stamp.getAttribute("datetime");
if (time) {
this.setMaxWidth();
- let choice = BDFDB.getData("creationDateLang", this, "choices");
- stamp.classList.add("complete-timestamp");
+ BDFDB.addClass(stamp, "complete-timestamp");
let stampdivider = document.createElement("span");
stampdivider.className = "complete-timestamp-divider arabic-fix";
stampdivider.style.setProperty("display", "inline", "important");
@@ -273,24 +241,15 @@ class CompleteTimestamps {
stampdivider.style.setProperty("font-size", "0px", "important");
stampdivider.innerText = "ARABIC FIX";
stamp.parentElement.insertBefore(stampdivider, stamp);
- BDFDB.setInnerText(stamp, this.getTimestamp(this.languages[choice].id, time));
+ BDFDB.setInnerText(stamp, this.getTimestamp(this.languages[BDFDB.getData("creationDateLang", this, "choices")].id, time));
}
}
- getMessageGroup (div) {
- var messagegroup = null;
- while (messagegroup == null || div.parentElement) {
- div = div.parentElement;
- if (div.classList && div.classList.contains(BDFDB.disCN.messagegroup)) messagegroup = div;
- }
- return messagegroup;
- }
-
getMessageData (div, messagegroup) {
- var pos = Array.from(messagegroup.querySelectorAll("." + div.className.replace(/ /g, "."))).indexOf(div);
- var instance = BDFDB.getReactInstance(messagegroup);
+ let pos = Array.from(messagegroup.querySelectorAll("." + div.className.replace(/ /g, "."))).indexOf(div);
+ let instance = BDFDB.getReactInstance(messagegroup);
if (!instance) return;
- var info = instance.return.stateNode.props.messages;
+ let info = instance.return.stateNode.props.messages;
return info && pos > -1 ? info[pos] : null;
}
@@ -299,9 +258,9 @@ class CompleteTimestamps {
if (typeof time == "string") timeobj = new Date(time);
if (timeobj.toString() == "Invalid Date") timeobj = new Date(parseInt(time));
if (timeobj.toString() == "Invalid Date") return;
- var settings = BDFDB.getAllData(this, "settings"), timestring = "";
+ let settings = BDFDB.getAllData(this, "settings"), timestring = "";
if (languageid != "own") {
- var timestamp = [];
+ let timestamp = [];
if (settings.displayDate) timestamp.push(timeobj.toLocaleDateString(languageid));
if (settings.displayTime) timestamp.push(settings.cutSeconds ? this.cutOffSeconds(timeobj.toLocaleTimeString(languageid)) : timeobj.toLocaleTimeString(languageid));
if (settings.otherOrder) timestamp.reverse();
@@ -309,9 +268,9 @@ class CompleteTimestamps {
if (timestring && settings.forceZeros) timestring = this.addLeadingZeros(timestring);
}
else {
- var ownformat = BDFDB.getData("ownFormat", this, "formats");
+ let ownformat = BDFDB.getData("ownFormat", this, "formats");
languageid = BDFDB.getDiscordLanguage().id;
- var hour = timeobj.getHours(), minute = timeobj.getMinutes(), second = timeobj.getSeconds(), msecond = timeobj.getMilliseconds(), day = timeobj.getDate(), month = timeobj.getMonth()+1, timemode = "";
+ let hour = timeobj.getHours(), minute = timeobj.getMinutes(), second = timeobj.getSeconds(), msecond = timeobj.getMilliseconds(), day = timeobj.getDate(), month = timeobj.getMonth()+1, timemode = "";
if (ownformat.indexOf("$timemode") > -1) {
timemode = hour >= 12 ? "PM" : "AM";
hour = hour % 12;
@@ -339,9 +298,9 @@ class CompleteTimestamps {
}
addLeadingZeros (timestring) {
- var chararray = timestring.split("");
- var numreg = /[0-9]/;
- for (var i = 0; i < chararray.length; i++) {
+ let chararray = timestring.split("");
+ let numreg = /[0-9]/;
+ for (let i = 0; i < chararray.length; i++) {
if (!numreg.test(chararray[i-1]) && numreg.test(chararray[i]) && !numreg.test(chararray[i+1])) chararray[i] = "0" + chararray[i];
}
@@ -351,12 +310,12 @@ class CompleteTimestamps {
setMaxWidth () {
if (this.currentMode != BDFDB.getDiscordMode()) {
this.currentMode = BDFDB.getDiscordMode();
- var timestamp = document.querySelector(BDFDB.dotCN.messagetimestampcompact);
+ let timestamp = document.querySelector(BDFDB.dotCN.messagetimestampcompact);
if (timestamp) {
- var choice = BDFDB.getData("creationDateLang", this, "choices");
- var testtimestamp = $(``);
- $(testtimestamp).appendTo(document.body);
- var width = testtimestamp.outerWidth() + 5;
+ let choice = BDFDB.getData("creationDateLang", this, "choices");
+ let testtimestamp = BDFDB.htmlToElement(``);
+ document.body.appendChild(testtimestamp);
+ let width = BDFDB.getRects(testtimestamp).width + 5;
testtimestamp.remove();
BDFDB.appendLocalStyle(this.getName() + "CompactCorrection", `
${BDFDB.dotCN.messagetimestampcompact} {
@@ -374,9 +333,7 @@ class CompleteTimestamps {
}
`);
}
- else {
- BDFDB.removeLocalStyle(this.getName() + "CompactCorrection");
- }
+ else BDFDB.removeLocalStyle(this.getName() + "CompactCorrection");
}
}
}
diff --git a/Plugins/CreationDate/CreationDate.plugin.js b/Plugins/CreationDate/CreationDate.plugin.js
index 450fef86f8..a58d36d5f2 100644
--- a/Plugins/CreationDate/CreationDate.plugin.js
+++ b/Plugins/CreationDate/CreationDate.plugin.js
@@ -1,6 +1,14 @@
//META{"name":"CreationDate"}*//
class CreationDate {
+ getName () {return "CreationDate";}
+
+ getVersion () {return "1.2.4";}
+
+ getAuthor () {return "DevilBro";}
+
+ getDescription () {return "Displays the Creation Date of an Account in the UserPopout and UserModal.";}
+
initConstructor () {
this.labels = {};
@@ -46,14 +54,6 @@ class CreationDate {
}
};
}
-
- getName () {return "CreationDate";}
-
- getDescription () {return "Displays the Creation Date of an Account in the UserPopout and UserModal.";}
-
- getVersion () {return "1.2.3";}
-
- getAuthor () {return "DevilBro";}
getSettingsPanel () {
if (!this.started || typeof BDFDB !== "object") return;
@@ -61,26 +61,22 @@ class CreationDate {
let choices = BDFDB.getAllData(this, "choices");
let settingshtml = ``;
- let settingspanel = $(settingshtml)[0];
+ let settingspanel = BDFDB.htmlToElement(settingshtml);
- BDFDB.initElements(settingspanel);
+ BDFDB.initElements(settingspanel, this);
- $(settingspanel)
- .on("click", BDFDB.dotCN.switchinner, () => {
- this.updateSettings(settingspanel);
- let choices = BDFDB.getAllData(this, "choices");
- for (let key in choices) {
- settingspanel.querySelector(`${BDFDB.dotCN.select}[type='${key}'] .languageTimestamp`).innerText = this.getCreationTime(this.languages[choices[key]].id);
- }
- })
- .on("click", BDFDB.dotCN.selectcontrol, (e) => {this.openDropdownMenu(e);});
+ BDFDB.addEventListener(this, settingspanel, "click", ".settings-switch", () => {
+ let choices = BDFDB.getAllData(this, "choices");
+ for (let key in choices) settingspanel.querySelector(`${BDFDB.dotCN.select}[type='${key}'] .languageTimestamp`).innerText = this.getCreationTime(this.languages[choices[key]].id);
+ });
+ BDFDB.addEventListener(this, settingspanel, "click", BDFDB.dotCN.selectcontrol, e => {this.openDropdownMenu(e);});
return settingspanel;
}
@@ -88,23 +84,25 @@ class CreationDate {
load () {}
start () {
- let libraryScript = null;
- if (typeof BDFDB !== "object" || BDFDB.isLibraryOutdated()) {
- if (typeof BDFDB === "object") BDFDB = "";
- libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ var libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ if (!libraryScript || performance.now() - libraryScript.getAttribute("date") > 600000) {
if (libraryScript) libraryScript.remove();
libraryScript = document.createElement("script");
libraryScript.setAttribute("type", "text/javascript");
libraryScript.setAttribute("src", "https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js");
+ libraryScript.setAttribute("date", performance.now());
+ libraryScript.addEventListener("load", () => {
+ BDFDB.loaded = true;
+ this.initialize();
+ });
document.head.appendChild(libraryScript);
}
+ else if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) this.initialize();
this.startTimeout = setTimeout(() => {this.initialize();}, 30000);
- if (typeof BDFDB === "object") this.initialize();
- else libraryScript.addEventListener("load", () => {this.initialize();});
}
initialize () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
BDFDB.loadMessage(this);
this.languages = Object.assign({},BDFDB.languages);
@@ -118,7 +116,7 @@ class CreationDate {
stop () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
BDFDB.removeEles(".creationDate");
BDFDB.unloadMessage(this);
}
@@ -126,52 +124,49 @@ class CreationDate {
// begin of own functions
-
- updateSettings (settingspanel) {
- let settings = {};
- for (let input of settingspanel.querySelectorAll(BDFDB.dotCN.switchinner)) {
- settings[input.value] = input.checked;
- }
- BDFDB.saveAllData(settings, this, "settings");
- }
openDropdownMenu (e) {
let selectControl = e.currentTarget;
let selectWrap = selectControl.parentElement;
+ let plugincard = BDFDB.getParentEle("li", selectWrap);
- if (selectWrap.classList.contains(BDFDB.disCN.selectisopen)) return;
+ if (!plugincard || BDFDB.containsClass(selectWrap, BDFDB.disCN.selectisopen)) return;
- selectWrap.classList.add(BDFDB.disCN.selectisopen);
- $("li").has(selectWrap).css("overflow", "visible");
+ BDFDB.addClass(selectWrap, BDFDB.disCN.selectisopen);
+ plugincard.style.setProperty("overflow", "visible", "important");
let type = selectWrap.getAttribute("type");
- let selectMenu = this.createDropdownMenu(selectWrap.getAttribute("value"), type);
+ let selectMenu = this.createDropdownMenu(selectWrap.getAttribute("value"));
selectWrap.appendChild(selectMenu);
- $(selectMenu).on("mousedown." + this.getName(), BDFDB.dotCN.selectoption, (e2) => {
+ BDFDB.addChildEventListener(selectMenu, "mousedown", BDFDB.dotCN.selectoption, e2 => {
let language = e2.currentTarget.getAttribute("value");
selectWrap.setAttribute("value", language);
selectControl.querySelector(".languageName").innerText = this.languages[language].name;
selectControl.querySelector(".languageTimestamp").innerText = this.getCreationTime(language);
BDFDB.saveData(type, language, this, "choices");
});
- $(document).on("mousedown.select" + this.getName(), (e2) => {
- if (e2.target.parentElement == selectMenu) return;
- $(document).off("mousedown.select" + this.getName());
- selectMenu.remove();
- $("li").has(selectWrap).css("overflow", "auto");
- setTimeout(() => {selectWrap.classList.remove(BDFDB.disCN.selectisopen);},100);
- });
+
+ var removeMenu = e2 => {
+ if (e2.target.parentElement != selectMenu) {
+ document.removeEventListener("mousedown", removeMenu);
+ selectMenu.remove();
+ plugincard.style.removeProperty("overflow");
+ setTimeout(() => {BDFDB.removeClass(selectWrap, BDFDB.disCN.selectisopen);},100);
+ }
+ };
+
+ document.addEventListener("mousedown", removeMenu);
}
- createDropdownMenu (choice, type) {
+ createDropdownMenu (choice) {
let menuhtml = ``;
- return $(menuhtml)[0];
+ return BDFDB.htmlToElement(menuhtml);
}
processUserPopout (instance, wrapper) {
@@ -188,15 +183,14 @@ class CreationDate {
addCreationDate (info, container, popout) {
if (!info || !container || container.querySelector(".creationDate")) return;
- let creationDate = $(this.creationDateMarkup);
let choice = BDFDB.getData("creationDateLang", this, "choices");
let nametag = container.querySelector(BDFDB.dotCN.nametag);
let joinedAtDate = container.querySelector(".joinedAtDate");
- container.insertBefore($(``)[0], joinedAtDate ? joinedAtDate.nextSibling : (nametag ? nametag.nextSibling : null));
+ container.insertBefore(BDFDB.htmlToElement(``), joinedAtDate ? joinedAtDate.nextSibling : (nametag ? nametag.nextSibling : null));
BDFDB.initElements(container.parentElement);
if (popout && popout.style.transform.indexOf("translateY(-1") == -1) {
- let arect = document.querySelector(BDFDB.dotCN.appmount).getBoundingClientRect();
- let prect = popout.getBoundingClientRect();
+ let arect = BDFDB.getRects(document.querySelector(BDFDB.dotCN.appmount));
+ let prect = BDFDB.getRects(popout);
popout.style.setProperty("top", (prect.y + prect.height > arect.height ? (arect.height - prect.height) : prect.y) + "px");
}
}
diff --git a/Plugins/DisplayServersAsChannels/DisplayServersAsChannels.plugin.js b/Plugins/DisplayServersAsChannels/DisplayServersAsChannels.plugin.js
index c97dd3966d..0330fbcec8 100644
--- a/Plugins/DisplayServersAsChannels/DisplayServersAsChannels.plugin.js
+++ b/Plugins/DisplayServersAsChannels/DisplayServersAsChannels.plugin.js
@@ -201,7 +201,7 @@ class DisplayServersAsChannels {
start () {
var libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
- if ((!global.BDFDB || typeof BDFDB !== "object" || typeof BDFDB.isLibraryOutdated !== "function" || BDFDB.isLibraryOutdated()) && !(libraryScript && performance.now() - libraryScript.getAttribute("date") < 600000)) {
+ if (!libraryScript || performance.now() - libraryScript.getAttribute("date") > 600000) {
if (libraryScript) libraryScript.remove();
libraryScript = document.createElement("script");
libraryScript.setAttribute("type", "text/javascript");
diff --git a/Plugins/EditChannels/EditChannels.plugin.js b/Plugins/EditChannels/EditChannels.plugin.js
index 9f6fc56344..f07c06ac90 100644
--- a/Plugins/EditChannels/EditChannels.plugin.js
+++ b/Plugins/EditChannels/EditChannels.plugin.js
@@ -1,6 +1,14 @@
//META{"name":"EditChannels"}*//
class EditChannels {
+ getName () {return "EditChannels";}
+
+ getVersion () {return "3.8.8";}
+
+ getAuthor () {return "DevilBro";}
+
+ getDescription () {return "Allows you to rename and recolor channelnames.";}
+
initConstructor () {
this.labels = {};
@@ -96,37 +104,27 @@ class EditChannels {
}
};
}
-
- getName () {return "EditChannels";}
-
- getDescription () {return "Allows you to rename and recolor channelnames.";}
-
- getVersion () {return "3.8.7";}
-
- getAuthor () {return "DevilBro";}
getSettingsPanel () {
if (!this.started || typeof BDFDB !== "object") return;
var settings = BDFDB.getAllData(this, "settings");
var settingshtml = ``;
- var settingspanel = $(settingshtml)[0];
+ let settingspanel = BDFDB.htmlToElement(settingshtml);
- BDFDB.initElements(settingspanel);
+ BDFDB.initElements(settingspanel, this);
- $(settingspanel)
- .on("click", BDFDB.dotCN.switchinner, () => {this.updateSettings(settingspanel);})
- .on("click", ".reset-button", () => {
- BDFDB.openConfirmModal(this, "Are you sure you want to reset all channels?", () => {
- BDFDB.removeAllData(this, "channels");
- BDFDB.WebModules.forceAllUpdates(this);
- });
+ BDFDB.addEventListener(this, settingspanel, "click", ".reset-button", () => {
+ BDFDB.openConfirmModal(this, "Are you sure you want to reset all channels?", () => {
+ BDFDB.removeAllData(this, "channels");
+ BDFDB.WebModules.forceAllUpdates(this);
});
+ });
return settingspanel;
}
@@ -134,22 +132,25 @@ class EditChannels {
load () {}
start () {
- var libraryScript = null;
- if (typeof BDFDB !== "object" || typeof BDFDB.isLibraryOutdated !== "function" || BDFDB.isLibraryOutdated()) {
- libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ var libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ if (!libraryScript || performance.now() - libraryScript.getAttribute("date") > 600000) {
if (libraryScript) libraryScript.remove();
libraryScript = document.createElement("script");
libraryScript.setAttribute("type", "text/javascript");
libraryScript.setAttribute("src", "https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js");
+ libraryScript.setAttribute("date", performance.now());
+ libraryScript.addEventListener("load", () => {
+ BDFDB.loaded = true;
+ this.initialize();
+ });
document.head.appendChild(libraryScript);
}
+ else if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) this.initialize();
this.startTimeout = setTimeout(() => {this.initialize();}, 30000);
- if (typeof BDFDB === "object" && typeof BDFDB.isLibraryOutdated === "function") this.initialize();
- else libraryScript.addEventListener("load", () => {this.initialize();});
}
initialize () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
BDFDB.loadMessage(this);
this.UserUtils = BDFDB.WebModules.findByProperties("getUsers","getUser");
@@ -166,7 +167,7 @@ class EditChannels {
}
stop () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
let data = BDFDB.loadAllData(this, "channels");
BDFDB.removeAllData(this, "channels");
BDFDB.WebModules.forceAllUpdates(this);
@@ -179,15 +180,6 @@ class EditChannels {
// begin of own functions
- updateSettings (settingspanel) {
- var settings = {};
- for (var input of settingspanel.querySelectorAll(BDFDB.dotCN.switchinner)) {
- settings[input.value] = input.checked;
- }
- BDFDB.saveAllData(settings, this, "settings");
- this.updateChannels = true;
- }
-
changeLanguageStrings () {
this.channelContextEntryMarkup = this.channelContextEntryMarkup.replace("REPLACE_context_localchannelsettings_text", this.labels.context_localchannelsettings_text);
@@ -202,78 +194,79 @@ class EditChannels {
onChannelContextMenu (instance, menu) {
if (instance.props && instance.props.channel && !menu.querySelector(".localchannelsettings-item")) {
- $(menu).append(this.channelContextEntryMarkup)
- .on("mouseenter", ".localchannelsettings-item", (e) => {
- var channelContextSubMenu = $(this.channelContextSubMenuMarkup);
- channelContextSubMenu
- .on("click", ".channelsettings-item", () => {
- $(menu).hide();
- this.showChannelSettings(instance.props.channel);
- });
- if (BDFDB.loadData(instance.props.channel.id, this, "channels")) {
- channelContextSubMenu
- .find(".resetsettings-item")
- .removeClass(BDFDB.disCN.contextmenuitemdisabled)
- .on("click", () => {
- $(menu).hide();
- BDFDB.removeData(instance.props.channel.id, this, "channels");
- BDFDB.WebModules.forceAllUpdates(this);
- });
- }
- BDFDB.appendSubMenu(e.currentTarget, channelContextSubMenu);
+ let channelContextEntry = BDFDB.htmlToElement(this.channelContextEntryMarkup);
+ menu.appendChild(channelContextEntry);
+ let settingsitem = channelContextEntry.querySelector(".localchannelsettings-item");
+ settingsitem.addEventListener("mouseenter", () => {
+ let channelContextSubMenu = BDFDB.htmlToElement(this.channelContextSubMenuMarkup);
+ let channelitem = channelContextSubMenu.querySelector(".channelsettings-item");
+ channelitem.addEventListener("click", () => {
+ instance._reactInternalFiber.return.memoizedProps.closeContextMenu();
+ this.showChannelSettings(instance.props.channel);
});
+ if (BDFDB.loadData(instance.props.channel.id, this, "channels")) {
+ let resetitem = channelContextSubMenu.querySelector(".resetsettings-item");
+ BDFDB.removeClass(resetitem, BDFDB.disCN.contextmenuitemdisabled);
+ resetitem.addEventListener("click", () => {
+ instance._reactInternalFiber.return.memoizedProps.closeContextMenu();
+ BDFDB.removeData(instance.props.channel.id, this, "channels");
+ BDFDB.WebModules.forceAllUpdates(this);
+ });
+ }
+ BDFDB.appendSubMenu(settingsitem, channelContextSubMenu);
+ });
}
}
showChannelSettings (info) {
var {name,color} = BDFDB.loadData(info.id, this, "channels") || {}
- var channelSettingsModal = $(this.channelSettingsModalMarkup);
- channelSettingsModal.find(BDFDB.dotCN.modalguildname).text(info.name);
- channelSettingsModal.find("#input-channelname").val(name);
- channelSettingsModal.find("#input-channelname").attr("placeholder", info.name);
+ let channelSettingsModal = BDFDB.htmlToElement(this.channelSettingsModalMarkup);
+ let channelnameinput = channelSettingsModal.querySelector("#input-channelname");
+
+ channelSettingsModal.querySelector(BDFDB.dotCN.modalguildname).innerText = info.name;
+ channelnameinput.value = name || "";
+ channelnameinput.setAttribute("placeholder", info.name);
BDFDB.setColorSwatches(channelSettingsModal, color);
+
BDFDB.appendModal(channelSettingsModal);
- channelSettingsModal
- .on("click", ".btn-save", (event) => {
- event.preventDefault();
-
- name = null;
- if (channelSettingsModal.find("#input-channelname").val()) {
- if (channelSettingsModal.find("#input-channelname").val().trim().length > 0) {
- name = channelSettingsModal.find("#input-channelname").val().trim();
- }
- }
-
- color = BDFDB.getSwatchColor(channelSettingsModal, 1);
- if (color) {
- if (color[0] < 30 && color[1] < 30 && color[2] < 30) BDFDB.colorCHANGE(color, 30);
- else if (color[0] > 225 && color[1] > 225 && color[2] > 225) BDFDB.colorCHANGE(color, -30);
- }
- if (name == null && color == null) {
- BDFDB.removeData(info.id, this, "channels");
- }
- else {
- BDFDB.saveData(info.id, {name,color}, this, "channels");
- }
- BDFDB.WebModules.forceAllUpdates(this);
- });
+
+ BDFDB.addChildEventListener(channelSettingsModal, "click", ".btn-save", e => {
+ e.preventDefault();
- channelSettingsModal.find("#input-channelname").focus();
+ name = channelnameinput.value.trim();
+ name = name ? name : null;
+
+ color = BDFDB.getSwatchColor(channelSettingsModal, 1);
+ if (color) {
+ if (color[0] < 30 && color[1] < 30 && color[2] < 30) color = BDFDB.colorCHANGE(color, 30);
+ else if (color[0] > 225 && color[1] > 225 && color[2] > 225) color = BDFDB.colorCHANGE(color, -30);
+ }
+
+ if (name == null && color == null) {
+ BDFDB.removeData(info.id, this, "channels");
+ }
+ else {
+ BDFDB.saveData(info.id, {name,color}, this, "channels");
+ }
+ BDFDB.WebModules.forceAllUpdates(this);
+ });
+ channelnameinput.focus();
}
processChannelTextArea (instance, wrapper) {
- if (instance.props && instance.props.type == "normal" && instance.props.channel && instance.props.channel.type == 0) {
- let channel = instance.props.channel;
+ let channel = BDFDB.getReactValue(instance, "props.channel");
+ if (channel && channel.type == 0 && instance.props.type == "normal") {
let data = BDFDB.loadData(channel.id, this, "channels") || {};
wrapper.querySelector("textarea").setAttribute("placeholder", BDFDB.LanguageStrings.TEXTAREA_PLACEHOLDER.replace("{{channel}}", "#" + (data.name || channel.name)));
}
}
processAuditLog (instance, wrapper) {
- if (instance.props && instance.props.log && instance.props.log.options && instance.props.log.options.channel) {
+ let channel = BDFDB.getReactValue(instance, "props.log.options.channel");
+ if (channel) {
let hooks = wrapper.querySelectorAll(BDFDB.dotCN.flexchild + " > span:not(" + BDFDB.dotCN.auditloguserhook + ")");
- if (hooks.length > 0) this.changeChannel2(instance.props.log.options.channel, hooks[0].firstChild);
+ if (hooks.length > 0) this.changeChannel2(channel, hooks[0].firstChild);
}
}
@@ -290,11 +283,11 @@ class EditChannels {
}
processHeaderBar (instance, wrapper) {
- let fiber = instance._reactInternalFiber;
- if (fiber.return && fiber.return.memoizedProps && fiber.return.memoizedProps.channelId) {
+ let channel_id = BDFDB.getReactValue(instance, "_reactInternalFiber.return.memoizedProps.channelId");
+ if (channel_id) {
let channelname = wrapper.querySelector(BDFDB.dotCN.channelheaderchannelname);
if (channelname) {
- let channel = this.ChannelUtils.getChannel(fiber.return.memoizedProps.channelId);
+ let channel = this.ChannelUtils.getChannel(channel_id);
if (channel) {
if (channel.type == 0) this.changeChannel(channel, wrapper.querySelector(BDFDB.dotCN.channelheaderchannelname));
else {
@@ -312,10 +305,10 @@ class EditChannels {
processClickable (instance, wrapper) {
if (!instance.props || !instance.props.className) return;
else if (instance.props.tag == "span" && instance.props.className.indexOf(BDFDB.disCN.mentionwrapper) > -1 && instance.props.className.indexOf(BDFDB.disCN.mention) == -1) {
- let fiber = instance._reactInternalFiber;
- if (fiber.memoizedProps && fiber.memoizedProps.children && typeof fiber.memoizedProps.children[0] == "string") {
- let channelname = fiber.memoizedProps.children[0].slice(1);
- let categoryname = fiber.return && fiber.return.return && fiber.return.return.type && fiber.return.return.type.displayName == "Tooltip" ? fiber.return.return.memoizedProps.text : null;
+ let children = BDFDB.getReactValue(instance, "_reactInternalFiber.memoizedProps.children");
+ if (children && typeof children[0] == "string") {
+ let channelname = children[0].slice(1);
+ let categoryname = BDFDB.getReactValue(instance, "_reactInternalFiber.return.return.type.displayName") == "Tooltip" ? BDFDB.getReactValue(instance, "_reactInternalFiber.return.return.memoizedProps.text") : null;
for (let channel of this.CurrentChannelUtils.getChannels(this.LastGuildStore.getGuildId())[0]) {
if (channelname == channel.channel.name) {
let category = categoryname ? this.ChannelUtils.getChannel(channel.channel.parent_id) : null;
@@ -328,32 +321,31 @@ class EditChannels {
}
}
else if (instance.props.tag == "div" && instance.props.className.indexOf(BDFDB.disCN.quickswitchresult) > -1) {
- let fiber = instance._reactInternalFiber;
- if (fiber.return && fiber.return.memoizedProps && fiber.return.memoizedProps.result && fiber.return.memoizedProps.result.type.indexOf("_CHANNEL") != -1) {
- this.changeChannel(fiber.return.memoizedProps.result.record, wrapper.querySelector(BDFDB.dotCN.quickswitchresultmatch));
- if (fiber.return.memoizedProps.result.record.parent_id) {
- this.changeChannel(this.ChannelUtils.getChannel(fiber.return.memoizedProps.result.record.parent_id), wrapper.querySelector(BDFDB.dotCN.quickswitchresultnote));
+ let result = BDFDB.getReactValue(instance, "_reactInternalFiber.return.memoizedProps.result");
+ if (result && result.type.indexOf("_CHANNEL") != -1) {
+ this.changeChannel(result.record, wrapper.querySelector(BDFDB.dotCN.quickswitchresultmatch));
+ if (result.record.parent_id) {
+ this.changeChannel(this.ChannelUtils.getChannel(result.record.parent_id), wrapper.querySelector(BDFDB.dotCN.quickswitchresultnote));
}
}
}
else if (instance.props.tag == "div" && instance.props.className.indexOf(BDFDB.disCN.autocompleterow) > -1) {
- let fiber = instance._reactInternalFiber;
- if (fiber.return && fiber.return.memoizedProps && fiber.return.memoizedProps.channel) {
- this.changeChannel(fiber.return.memoizedProps.channel, wrapper.querySelector(BDFDB.dotCN.marginleft4));
- if (fiber.return.memoizedProps.category) this.changeChannel(fiber.return.memoizedProps.category, wrapper.querySelector(BDFDB.dotCN.autocompletedescription));
+ let channel = BDFDB.getReactValue(instance, "_reactInternalFiber.return.memoizedProps.channel");
+ if (channel) {
+ this.changeChannel(channel, wrapper.querySelector(BDFDB.dotCN.marginleft4));
+ let category = BDFDB.getReactValue(instance, "_reactInternalFiber.return.memoizedProps.category");
+ if (category) this.changeChannel(category, wrapper.querySelector(BDFDB.dotCN.autocompletedescription));
}
}
else if (instance.props.tag == "span" && instance.props.className.indexOf(BDFDB.disCN.messagespopoutchannelname) > -1) {
- let fiber = instance._reactInternalFiber;
- if (fiber.return && fiber.return.sibling && fiber.return.sibling.child && fiber.return.sibling.child.child && fiber.return.sibling.child.child.memoizedProps) {
- this.changeChannel2(fiber.return.sibling.child.child.memoizedProps.channel, wrapper);
- }
+ let channel = BDFDB.getReactValue(instance, "_reactInternalFiber.return.sibling.child.child.memoizedProps.channel");
+ if (channel) this.changeChannel2(channel, wrapper);
}
}
processStandardSidebarView (instance, wrapper) {
- if (this.updateChannels) {
- this.updateChannels = false;
+ if (this.SettingsUpdated) {
+ delete this.SettingsUpdated;
BDFDB.WebModules.forceAllUpdates(this);
}
}
@@ -366,8 +358,8 @@ class EditChannels {
let color = this.chooseColor(channelname, data.color);
channelname.style.setProperty("color", color, "important");
BDFDB.setInnerText(channelname, data.name || info.name);
- let iconparent = channelname.classList && channelname.classList.contains(BDFDB.disCN.quickswitchresultmatch) ? channelname.parentElement.parentElement : channelname.parentElement;
- if (channelname.classList && !channelname.classList.contains(BDFDB.disCN.autocompletedescription)) {
+ let iconparent = BDFDB.containsClass(channelname, BDFDB.disCN.quickswitchresultmatch) ? channelname.parentElement.parentElement : channelname.parentElement;
+ if (!BDFDB.containsClass(channelname, BDFDB.disCN.autocompletedescription)) {
iconparent.querySelectorAll('svg [stroke]:not([stroke="none"]').forEach(icon => {
if (!icon.getAttribute("oldstroke")) icon.setAttribute("oldstroke", icon.getAttribute("stroke"));
icon.setAttribute("stroke", color && settings.changeChannelIcon ? color : icon.getAttribute("oldstroke"), "important");
@@ -385,7 +377,7 @@ class EditChannels {
channelname.EditChannelsChangeObserver = new MutationObserver((changes, _) => {
changes.forEach(
(change, i) => {
- if (change.type == "childList" && change.addedNodes.length && change.target.tagName && (change.target.tagName == "SVG" || change.target.querySelector("svg")) || change.type == "attributes" && change.attributeName == "class" && change.target.className.length && change.target.className.indexOf("name") > -1 || change.type == "attributes" && change.attributeName == "style" && change.target.classList && change.target.classList.contains(BDFDB.disCN.channelheaderchannelname)) {
+ if (change.type == "childList" && change.addedNodes.length && change.target.tagName && (change.target.tagName == "SVG" || change.target.querySelector("svg")) || change.type == "attributes" && change.attributeName == "class" && change.target.className.length && change.target.className.indexOf("name") > -1 || change.type == "attributes" && change.attributeName == "style" && BDFDB.containsClass(change.target, BDFDB.disCN.channelheaderchannelname)) {
channelname.EditChannelsChangeObserver.disconnect();
this.changeChannel(info, channelname);
}
@@ -421,23 +413,25 @@ class EditChannels {
changeMention (info, mention, categoryinfo) {
if (!info || !mention || !mention.parentElement) return;
if (mention.EditChannelsChangeObserver && typeof mention.EditChannelsChangeObserver.disconnect == "function") mention.EditChannelsChangeObserver.disconnect();
+ mention.removeEventListener("mouseover", mention.mouseoverListenerEditChannels);
+ mention.removeEventListener("mouseout", mention.mouseoutListenerEditChannels);
let data = BDFDB.loadData(info.id, this, "channels") || {};
let color = BDFDB.colorCONVERT(data.color, "RGBCOMP");
BDFDB.setInnerText(mention, "#" + (data.name || info.name));
if (mention.EditChannelsHovered) colorHover();
else colorDefault();
- $(mention)
- .off("mouseenter." + this.getName()).off("mouseleave." + this.getName())
- .on("mouseenter." + this.getName(), (e) => {
- mention.EditChannelsHovered = true;
- colorHover();
- let categorydata = BDFDB.loadData(categoryinfo.id, this, "channels") || {};
- if (categorydata.name) BDFDB.createTooltip(categorydata.name, mention, {type:"top",selector:"EditChannels-tooltip",css:`body ${BDFDB.dotCN.tooltip}:not(.EditChannels-tooltip) {display: none !important;}`});
- })
- .on("mouseleave." + this.getName(), (e) => {
- mention.EditChannelsHovered = false;
- colorDefault();
- });
+ mention.mouseoverListenerEditChannels = () => {
+ mention.EditChannelsHovered = true;
+ colorHover();
+ let categorydata = BDFDB.loadData(categoryinfo.id, this, "channels") || {};
+ if (categorydata.name) BDFDB.createTooltip(categorydata.name, mention, {type:"top",selector:"EditChannels-tooltip",css:`body ${BDFDB.dotCN.tooltip}:not(.EditChannels-tooltip) {display: none !important;}`});
+ };
+ mention.mouseoutListenerEditChannels = () => {
+ delete mention.EditChannelsHovered;
+ colorDefault();
+ };
+ mention.addEventListener("mouseover", mention.mouseoverListenerEditChannels);
+ mention.addEventListener("mouseout", mention.mouseoutListenerEditChannels);
mention.EditChannelsChangeObserver = new MutationObserver((changes, _) => {
mention.EditChannelsChangeObserver.disconnect();
this.changeMention(info, mention, categoryinfo);
diff --git a/Plugins/EditServers/EditServers.plugin.js b/Plugins/EditServers/EditServers.plugin.js
index 3ba1d8bcb5..e7a9a97a93 100644
--- a/Plugins/EditServers/EditServers.plugin.js
+++ b/Plugins/EditServers/EditServers.plugin.js
@@ -1,6 +1,14 @@
//META{"name":"EditServers"}*//
class EditServers {
+ getName () {return "EditServers";}
+
+ getVersion () {return "1.9.0";}
+
+ getAuthor () {return "DevilBro";}
+
+ getDescription () {return "Allows you to change the icon, name and color of servers.";}
+
initConstructor () {
this.labels = {};
@@ -38,7 +46,7 @@ class EditServers {
`;
- let settingspanel = $(settingshtml)[0];
+ let settingspanel = BDFDB.htmlToElement(settingshtml);
- BDFDB.initElements(settingspanel);
-
- $(settingspanel)
- .on("click", BDFDB.dotCN.switchinner, () => {this.updateSettings(settingspanel);});
+ BDFDB.initElements(settingspanel, this);
return settingspanel;
}
@@ -76,22 +73,25 @@ class GoogleSearchReplace {
load () {}
start () {
- let libraryScript = null;
- if (typeof BDFDB !== "object" || typeof BDFDB.isLibraryOutdated !== "function" || BDFDB.isLibraryOutdated()) {
- libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ var libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ if (!libraryScript || performance.now() - libraryScript.getAttribute("date") > 600000) {
if (libraryScript) libraryScript.remove();
libraryScript = document.createElement("script");
libraryScript.setAttribute("type", "text/javascript");
libraryScript.setAttribute("src", "https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js");
+ libraryScript.setAttribute("date", performance.now());
+ libraryScript.addEventListener("load", () => {
+ BDFDB.loaded = true;
+ this.initialize();
+ });
document.head.appendChild(libraryScript);
}
+ else if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) this.initialize();
this.startTimeout = setTimeout(() => {this.initialize();}, 30000);
- if (typeof BDFDB === "object" && typeof BDFDB.isLibraryOutdated === "function") this.initialize();
- else libraryScript.addEventListener("load", () => {this.initialize();});
}
initialize () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
BDFDB.loadMessage(this);
}
else {
@@ -100,20 +100,13 @@ class GoogleSearchReplace {
}
stop () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
BDFDB.unloadMessage(this);
}
}
+
// begin of own functions
-
- updateSettings (settingspanel) {
- let settings = {};
- for (let input of settingspanel.querySelectorAll(BDFDB.dotCN.switchinner)) {
- settings[input.value] = input.checked;
- }
- BDFDB.saveAllData(settings, this, "engines");
- }
changeLanguageStrings () {
this.messageContextEntryMarkup = this.messageContextEntryMarkup.replace("REPLACE_context_googlesearchreplace_text", this.labels.context_googlesearchreplace_text);
@@ -123,46 +116,40 @@ class GoogleSearchReplace {
onNativeContextMenu (instance, menu) {
if (instance.props && instance.props.type == "NATIVE_TEXT" && instance.props.value && !menu.querySelector(".reverseimagesearch-item")) {
- let searchinstance = BDFDB.getOwnerInstance({node:menu,props:["handleSearchWithGoogle"]});
- if (searchinstance && searchinstance._reactInternalFiber && searchinstance._reactInternalFiber.return && searchinstance._reactInternalFiber.return.stateNode) {
- this.appendItem(instance, searchinstance._reactInternalFiber.return.stateNode, instance.props.value);
- }
+ let searchentry = BDFDB.React.findDOMNodeSafe(BDFDB.getOwnerInstance({node:menu,props:["handleSearchWithGoogle"]}));
+ if (searchentry) this.appendItem(instance, searchentry, instance.props.value);
}
}
onMessageContextMenu (instance, menu) {
if (instance.props && instance.props.message && instance.props.channel && instance.props.target && !menu.querySelector(".googlereplacesearch-item")) {
let text = document.getSelection().toString();
- let searchinstance = BDFDB.getOwnerInstance({node:menu,props:["handleSearchWithGoogle"]});
- if (text && searchinstance && searchinstance._reactInternalFiber && searchinstance._reactInternalFiber.return && searchinstance._reactInternalFiber.return.stateNode) {
- this.appendItem(instance, searchinstance._reactInternalFiber.return.stateNode, text);
+ if (text) {
+ let searchentry = BDFDB.React.findDOMNodeSafe(BDFDB.getOwnerInstance({node:menu,props:["handleSearchWithGoogle"]}));
+ if (searchentry) this.appendItem(instance, searchentry, text);
}
}
}
appendItem (instance, target, text) {
- $(this.messageContextEntryMarkup).appendTo(target)
- .on("mouseenter", (e) => {
- let messageContextSubMenu = $(this.messageContextSubMenuMarkup)[0];
- let engines = BDFDB.getAllData(this, "engines");
- $(messageContextSubMenu)
- .on("click", ".GRS-item", (e2) => {
- instance._reactInternalFiber.return.memoizedProps.closeContextMenu();
- let engine = e2.currentTarget.getAttribute("engine");
- if (engine == "_all") {
- for (let key in engines) {
- if (key != "_all" && engines[key]) {
- window.open(this.defaults.engines[key].url.replace(this.textUrlReplaceString, encodeURIComponent(text)), "_blank");
- }
- }
- }
- else window.open(this.defaults.engines[engine].url.replace(this.textUrlReplaceString, encodeURIComponent(text)), "_blank");
- });
- for (let key in engines) if (!engines[key]) BDFDB.removeEles(messageContextSubMenu.querySelector("[engine='" + key + "']"));
- if (messageContextSubMenu.querySelector(".GRS-item")) BDFDB.removeEles(messageContextSubMenu.querySelector(".alldisabled-item"));
- BDFDB.appendSubMenu(e.currentTarget, messageContextSubMenu);
+ let messageContextEntry = BDFDB.htmlToElement(this.messageContextEntryMarkup);
+ target.parentElement.insertBefore(messageContextEntry, target.nextElementSibling);
+ messageContextEntry.addEventListener("mouseenter", () => {
+ let messageContextSubMenu = BDFDB.htmlToElement(this.messageContextSubMenuMarkup);
+ let engines = BDFDB.getAllData(this, "engines");
+ for (let key in engines) if (!engines[key]) BDFDB.removeEles(messageContextSubMenu.querySelector("[engine='" + key + "']"));
+ if (messageContextSubMenu.querySelector(".GRS-item")) BDFDB.removeEles(messageContextSubMenu.querySelector(".alldisabled-item"));
+ BDFDB.addChildEventListener(messageContextSubMenu, "click", ".GRS-item", e => {
+ instance._reactInternalFiber.return.memoizedProps.closeContextMenu();
+ let engine = e.currentTarget.getAttribute("engine");
+ if (engine == "_all") {
+ for (let key in engines) if (key != "_all" && engines[key]) window.open(this.defaults.engines[key].url.replace(this.textUrlReplaceString, encodeURIComponent(text)), "_blank");
+ }
+ else window.open(this.defaults.engines[engine].url.replace(this.textUrlReplaceString, encodeURIComponent(text)), "_blank");
});
- target.firstElementChild.style.setProperty("display", "none", "important");
+ BDFDB.appendSubMenu(messageContextEntry, messageContextSubMenu);
+ });
+ BDFDB.toggleEles(target, false);
}
setLabelsByLanguage () {
diff --git a/Plugins/GoogleTranslateOption/GoogleTranslateOption.plugin.js b/Plugins/GoogleTranslateOption/GoogleTranslateOption.plugin.js
index 72c0ed3a25..47bb90f077 100644
--- a/Plugins/GoogleTranslateOption/GoogleTranslateOption.plugin.js
+++ b/Plugins/GoogleTranslateOption/GoogleTranslateOption.plugin.js
@@ -3,7 +3,7 @@
class GoogleTranslateOption {
getName () {return "GoogleTranslateOption";}
- getVersion () {return "1.6.3";}
+ getVersion () {return "1.6.4";}
getAuthor () {return "DevilBro, square";}
@@ -412,7 +412,7 @@ class GoogleTranslateOption {
BDFDB.initElements(settingspanel, this);
- BDFDB.addChildEventListener(settingspanel, "click", BDFDB.dotCN.selectcontrol, e => {this.openDropdownMenu("inSettings", e);});
+ BDFDB.addEventListener(this, settingspanel, "click", BDFDB.dotCN.selectcontrol, e => {this.openDropdownMenu("inSettings", e);});
return settingspanel;
}
@@ -421,22 +421,25 @@ class GoogleTranslateOption {
load () {}
start () {
- var libraryScript = null;
- if (typeof BDFDB !== "object" || typeof BDFDB.isLibraryOutdated !== "function" || BDFDB.isLibraryOutdated()) {
- libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ var libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ if (!libraryScript || performance.now() - libraryScript.getAttribute("date") > 600000) {
if (libraryScript) libraryScript.remove();
libraryScript = document.createElement("script");
libraryScript.setAttribute("type", "text/javascript");
libraryScript.setAttribute("src", "https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js");
+ libraryScript.setAttribute("date", performance.now());
+ libraryScript.addEventListener("load", () => {
+ BDFDB.loaded = true;
+ this.initialize();
+ });
document.head.appendChild(libraryScript);
}
+ else if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) this.initialize();
this.startTimeout = setTimeout(() => {this.initialize();}, 30000);
- if (typeof BDFDB === "object" && typeof BDFDB.isLibraryOutdated === "function") this.initialize();
- else libraryScript.addEventListener("load", () => {this.initialize();});
}
initialize () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
BDFDB.loadMessage(this);
this.GuildUtils = BDFDB.WebModules.findByProperties("getGuilds","getGuild");
@@ -454,7 +457,7 @@ class GoogleTranslateOption {
}
stop () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
this.stopDeepL();
document.querySelectorAll(BDFDB.dotCN.message + ".translated").forEach(message => {
@@ -522,7 +525,7 @@ class GoogleTranslateOption {
};
searchitem.removeEventListener("click", openGoogleSearch);
searchitem.addEventListener("click", openGoogleSearch);
- let rects = searchitem.getBoundingClientRect();
+ let rects = BDFDB.getRects(searchitem);
BDFDB.createTooltip(`From ${input.name}:\n${text}\n\nTo ${output.name}:\n${translation}`, searchitem, {type: "right",selector:"googletranslate-tooltip",style:`max-width: ${window.outerWidth - rects.left - rects.width}px !important;`});
}
});
@@ -633,7 +636,7 @@ class GoogleTranslateOption {
getMessageAndPos (target) {
let messagediv = BDFDB.getParentEle(BDFDB.dotCN.message, target);
- let pos = Array.from(messagediv.parentElement.querySelectorAll(BDFDB.dotCN.message)).indexOf(messagediv);
+ let pos = messagediv ? Array.from(messagediv.parentElement.querySelectorAll(BDFDB.dotCN.message)).indexOf(messagediv) : -1;
return {messagediv, pos};
}
@@ -764,7 +767,7 @@ class GoogleTranslateOption {
BDFDB.addClass(button, "popout-open");
let translatepopout = BDFDB.htmlToElement(this.translatePopoutMarkup);
container.appendChild(translatepopout);
- let buttonrects = button.getBoundingClientRect();
+ let buttonrects = BDFDB.getRects(button);
translatepopout.style.setProperty("left", buttonrects.left + buttonrects.width + "px");
translatepopout.style.setProperty("top", buttonrects.top - buttonrects.height/2 + "px")
diff --git a/Plugins/ImageGallery/ImageGallery.plugin.js b/Plugins/ImageGallery/ImageGallery.plugin.js
index 1a70fa86ab..f40f67dc4b 100644
--- a/Plugins/ImageGallery/ImageGallery.plugin.js
+++ b/Plugins/ImageGallery/ImageGallery.plugin.js
@@ -3,7 +3,7 @@
class ImageGallery {
getName () {return "ImageGallery";}
- getVersion () {return "1.5.6";}
+ getVersion () {return "1.5.7";}
getAuthor () {return "DevilBro";}
@@ -36,22 +36,25 @@ class ImageGallery {
load () {}
start () {
- var libraryScript = null;
- if (typeof BDFDB !== "object" || typeof BDFDB.isLibraryOutdated !== "function" || BDFDB.isLibraryOutdated()) {
- libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ var libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ if (!libraryScript || performance.now() - libraryScript.getAttribute("date") > 600000) {
if (libraryScript) libraryScript.remove();
libraryScript = document.createElement("script");
libraryScript.setAttribute("type", "text/javascript");
libraryScript.setAttribute("src", "https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js");
+ libraryScript.setAttribute("date", performance.now());
+ libraryScript.addEventListener("load", () => {
+ BDFDB.loaded = true;
+ this.initialize();
+ });
document.head.appendChild(libraryScript);
}
+ else if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) this.initialize();
this.startTimeout = setTimeout(() => {this.initialize();}, 30000);
- if (typeof BDFDB === "object" && typeof BDFDB.isLibraryOutdated === "function") this.initialize();
- else libraryScript.addEventListener("load", () => {this.initialize();});
}
initialize () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
BDFDB.loadMessage(this);
BDFDB.WebModules.forceAllUpdates(this);
@@ -62,13 +65,16 @@ class ImageGallery {
}
stop () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
this.closemodal = true;
BDFDB.WebModules.forceAllUpdates(this, "ImageModal");
delete this.closemodal;
+ document.removeEventListener("keydown", document.keydownImageGalleryListener);
+ document.removeEventListener("keyup", document.keyupImageGalleryListener);
+
BDFDB.unloadMessage(this);
}
}
@@ -88,7 +94,7 @@ class ImageGallery {
clearInterval(waitForImg);
let message = this.getMessageGroupOfImage(img);
if (message) {
- modal.classList.add("image-gallery");
+ BDFDB.addClass(modal, "image-gallery");
this.addImages(modal, message.querySelectorAll(BDFDB.dotCNS.imagewrapper + "img"), img);
}
}
@@ -97,7 +103,10 @@ class ImageGallery {
}
}, 100);
}
- else if (methodnames.includes("componentWillUnmount")) $(document).off("keyup." + this.getName()).off("keydown." + this.getName());
+ else if (methodnames.includes("componentWillUnmount")) {
+ document.removeEventListener("keydown", document.keydownImageGalleryListener);
+ document.removeEventListener("keyup", document.keyupImageGalleryListener);
+ }
}
getMessageGroupOfImage (thisimg) {
@@ -118,7 +127,11 @@ class ImageGallery {
}
addImages (modal, imgs, img) {
- BDFDB.removeEles(`${BDFDB.dotCN.imagewrapper}.prev`,`${BDFDB.dotCN.imagewrapper}.next`);
+ BDFDB.removeEles(modal.querySelector(`${BDFDB.dotCN.imagewrapper}.prev, ${BDFDB.dotCN.imagewrapper}.next`));
+
+ let inner = modal.querySelector(BDFDB.dotCN.modalinner);
+
+ if (!inner) return;
var prevImg, nextImg, index;
for (index = 0; index < imgs.length; index++) {
@@ -130,46 +143,39 @@ class ImageGallery {
}
}
- $(modal).find(BDFDB.dotCN.imagewrapper)
- .addClass("current")
- .find("img").attr("src", this.getSrcOfImage(img));
-
- $(modal.querySelector(BDFDB.dotCN.downloadlink))
- .attr("href", this.getSrcOfImage(img));
-
- this.resizeImage(modal, img, modal.querySelector(BDFDB.dotCN.imagewrapper + ".current img"));
- if (prevImg) {
- $(this.imageMarkup)
- .appendTo(modal.querySelector(BDFDB.dotCN.modalinner))
- .addClass("prev")
- .off("click." + this.getName()).on("click." + this.getName(), () => {
- this.addImages(modal, imgs, prevImg);
- })
- .find("img").attr("src", this.getSrcOfImage(prevImg));
- this.resizeImage(modal, prevImg, modal.querySelector(BDFDB.dotCN.imagewrapper + ".prev img"));
- }
- if (nextImg) {
- $(this.imageMarkup)
- .appendTo(modal.querySelector(BDFDB.dotCN.modalinner))
- .addClass("next")
- .off("click." + this.getName()).on("click." + this.getName(), () => {
- this.addImages(modal, imgs, nextImg);
- })
- .find("img").attr("src", this.getSrcOfImage(nextImg));
- this.resizeImage(modal, nextImg, modal.querySelector(BDFDB.dotCN.imagewrapper + ".next img"));
- }
+ var imagesrc = this.getSrcOfImage(img);
+ modal.querySelector(BDFDB.dotCN.downloadlink).setAttribute("href", imagesrc);
- $(document).off("keydown." + this.getName()).off("keyup." + this.getName())
- .on("keydown." + this.getName(), (e) => {
- this.keyPressed({modal, imgs, prevImg, nextImg}, e);
- })
- .on("keyup." + this.getName(), () => {
- this.eventFired = false;
- });
+ var imagewrapper = modal.querySelector(BDFDB.dotCN.imagewrapper);
+ BDFDB.addClass(imagewrapper, "current");
+ var imagewrapperimage = imagewrapper.querySelector("img");
+ imagewrapperimage.setAttribute("src", imagesrc);
+
+ this.resizeImage(modal, img, imagewrapperimage);
+
+ if (prevImg) inner.appendChild(this.createImage(modal, imgs, prevImg, "prev"));
+ if (nextImg) inner.appendChild(this.createImage(modal, imgs, nextImg, "next"));
+
+ document.removeEventListener("keydown", document.keydownImageGalleryListener);
+ document.removeEventListener("keyup", document.keyupImageGalleryListener);
+ document.keydownImageGalleryListener = e => {this.keyPressed({modal, imgs, prevImg, nextImg}, e);};
+ document.keyupImageGalleryListener = e => {this.eventFired = false;};
+ document.addEventListener("keydown", document.keydownImageGalleryListener);
+ document.addEventListener("keyup", document.keyupImageGalleryListener);
+ }
+
+ createImage (modal, imgs, img, type) {
+ var imagewrapper = BDFDB.htmlToElement(this.imageMarkup);
+ BDFDB.addClass(imagewrapper, type);
+ imagewrapper.addEventListener("click", () => {this.addImages(modal, imgs, img);});
+ var imagewrapperimage = imagewrapper.querySelector("img");
+ imagewrapperimage.setAttribute("src", this.getSrcOfImage(img));
+ this.resizeImage(modal, img, imagewrapperimage);
+ return imagewrapper;
}
resizeImage (container, src, img) {
- $(img).hide();
+ BDFDB.toggleEles(img, false);
var temp = new Image();
temp.src = src.src.split("?width=")[0];
temp.onload = function () {
@@ -182,28 +188,22 @@ class ImageGallery {
newHeight = temp.height > newHeight ? newHeight : temp.height;
var wrapper = img.parentElement;
+ if (!BDFDB.containsClass(wrapper, "current")) wrapper.style.setProperty("top", (container.clientHeight - newHeight) / 2 + "px");
+ wrapper.style.setProperty("width", newWidth + "px");
+ wrapper.style.setProperty("height", newHeight + "px");
- $(wrapper)
- .css("top", !wrapper.classList.contains("current") ? (container.clientHeight - newHeight) / 2 : "")
- .css("width", newWidth)
- .css("height", newHeight);
-
- $(img)
- .css("width", newWidth)
- .css("height", newHeight)
- .show();
+ img.style.setProperty("width", newWidth + "px");
+ img.style.setProperty("height", newHeight + "px");
+
+ BDFDB.toggleEles(img, true);
};
}
- keyPressed (data, e) {
+ keyPressed ({modal, imgs, prevImg, nextImg}, e) {
if (!this.eventFired) {
this.eventFired = true;
- if (e.keyCode == 37 && data.prevImg) {
- this.addImages(data.modal, data.imgs, data.prevImg);
- }
- else if (e.keyCode == 39 && data.nextImg) {
- this.addImages(data.modal, data.imgs, data.nextImg);
- }
+ if (e.keyCode == 37 && prevImg) this.addImages(modal, imgs, prevImg);
+ else if (e.keyCode == 39 && nextImg) this.addImages(modal, imgs, nextImg);
}
}
}
diff --git a/Plugins/JoinedAtDate/JoinedAtDate.plugin.js b/Plugins/JoinedAtDate/JoinedAtDate.plugin.js
index 035688da24..cf4ef105df 100644
--- a/Plugins/JoinedAtDate/JoinedAtDate.plugin.js
+++ b/Plugins/JoinedAtDate/JoinedAtDate.plugin.js
@@ -3,7 +3,7 @@
class JoinedAtDate {
getName () {return "JoinedAtDate";}
- getVersion () {return "1.0.6";}
+ getVersion () {return "1.0.7";}
getAuthor () {return "DevilBro";}
@@ -74,15 +74,11 @@ class JoinedAtDate {
BDFDB.initElements(settingspanel, this);
- $(settingspanel)
- .on("click", BDFDB.dotCN.switchinner, () => {
- this.updateSettings(settingspanel);
- let choices = BDFDB.getAllData(this, "choices");
- for (let key in choices) {
- settingspanel.querySelector(`${BDFDB.dotCN.select}[type='${key}'] .languageTimestamp`).innerText = this.getJoinedTime(this.languages[choices[key]].id);
- }
- })
- .on("click", BDFDB.dotCN.selectcontrol, e => {this.openDropdownMenu(e);});
+ BDFDB.addEventListener(this, settingspanel, "click", ".settings-switch", () => {
+ let choices = BDFDB.getAllData(this, "choices");
+ for (let key in choices) settingspanel.querySelector(`${BDFDB.dotCN.select}[type='${key}'] .languageTimestamp`).innerText = this.getJoinedTime(this.languages[choices[key]].id);
+ });
+ BDFDB.addEventListener(this, settingspanel, "click", BDFDB.dotCN.selectcontrol, e => {this.openDropdownMenu(e);});
return settingspanel;
}
@@ -90,23 +86,25 @@ class JoinedAtDate {
load () {}
start () {
- let libraryScript = null;
- if (typeof BDFDB !== "object" || BDFDB.isLibraryOutdated()) {
- if (typeof BDFDB === "object") BDFDB = "";
- libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ var libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ if (!libraryScript || performance.now() - libraryScript.getAttribute("date") > 600000) {
if (libraryScript) libraryScript.remove();
libraryScript = document.createElement("script");
libraryScript.setAttribute("type", "text/javascript");
libraryScript.setAttribute("src", "https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js");
+ libraryScript.setAttribute("date", performance.now());
+ libraryScript.addEventListener("load", () => {
+ BDFDB.loaded = true;
+ this.initialize();
+ });
document.head.appendChild(libraryScript);
}
+ else if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) this.initialize();
this.startTimeout = setTimeout(() => {this.initialize();}, 30000);
- if (typeof BDFDB === "object") this.initialize();
- else libraryScript.addEventListener("load", () => {this.initialize();});
}
initialize () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
BDFDB.loadMessage(this);
this.CurrentGuildStore = BDFDB.WebModules.findByProperties("getLastSelectedGuildId");
@@ -124,7 +122,7 @@ class JoinedAtDate {
stop () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
BDFDB.removeEles(".joinedAtDate");
BDFDB.unloadMessage(this);
}
@@ -132,45 +130,39 @@ class JoinedAtDate {
// begin of own functions
-
- updateSettings (settingspanel) {
- let settings = {};
- for (let input of settingspanel.querySelectorAll(BDFDB.dotCN.switchinner)) {
- settings[input.value] = input.checked;
- }
- BDFDB.saveAllData(settings, this, "settings");
- }
openDropdownMenu (e) {
let selectControl = e.currentTarget;
let selectWrap = selectControl.parentElement;
let plugincard = BDFDB.getParentEle("li", selectWrap);
- if (!plugincard || selectWrap.classList.contains(BDFDB.disCN.selectisopen)) return;
+ if (!plugincard || BDFDB.containsClass(selectWrap, BDFDB.disCN.selectisopen)) return;
- selectWrap.classList.add(BDFDB.disCN.selectisopen);
+ BDFDB.addClass(selectWrap, BDFDB.disCN.selectisopen);
plugincard.style.setProperty("overflow", "visible", "important");
let type = selectWrap.getAttribute("type");
let selectMenu = this.createDropdownMenu(selectWrap.getAttribute("value"), type);
selectWrap.appendChild(selectMenu);
- $(selectMenu)
- .on("mousedown." + this.getName(), BDFDB.dotCN.selectoption, e2 => {
- let language = e2.currentTarget.getAttribute("value");
- selectWrap.setAttribute("value", language);
- selectControl.querySelector(".languageName").innerText = this.languages[language].name;
- selectControl.querySelector(".languageTimestamp").innerText = this.getJoinedTime(language);
- BDFDB.saveData(type, language, this, "choices");
- });
- $(document)
- .on("mousedown.select" + this.getName(), e2 => {
- if (e2.target.parentElement == selectMenu) return;
- $(document).off("mousedown.select" + this.getName());
+ BDFDB.addChildEventListener(selectMenu, "mousedown", BDFDB.dotCN.selectoption, e2 => {
+ let language = e2.currentTarget.getAttribute("value");
+ selectWrap.setAttribute("value", language);
+ selectControl.querySelector(".languageName").innerText = this.languages[language].name;
+ selectControl.querySelector(".languageTimestamp").innerText = this.getJoinedTime(language);
+ BDFDB.saveData(type, language, this, "choices");
+ });
+
+ var removeMenu = e2 => {
+ if (e2.target.parentElement != selectMenu) {
+ document.removeEventListener("mousedown", removeMenu);
selectMenu.remove();
plugincard.style.removeProperty("overflow");
- setTimeout(() => {selectWrap.classList.remove(BDFDB.disCN.selectisopen);},100);
- });
+ setTimeout(() => {BDFDB.removeClass(selectWrap, BDFDB.disCN.selectisopen);},100);
+ }
+ };
+
+ document.addEventListener("mousedown", removeMenu);
}
createDropdownMenu (choice, type) {
@@ -205,11 +197,11 @@ class JoinedAtDate {
let choice = BDFDB.getData("joinedAtDateLang", this, "choices");
let nametag = container.querySelector(BDFDB.dotCN.nametag);
let creationDate = container.querySelector(".creationDate");
- container.insertBefore(BDFDB.htmlToElement(``), creationDate ? creationDate : (nametag ? nametag.nextSibling : null));
+ container.insertBefore(BDFDB.htmlToElement(``), creationDate ? creationDate : (nametag ? nametag.nextSibling : null));
BDFDB.initElements(container.parentElement);
if (popout && popout.style.transform.indexOf("translateY(-1") == -1) {
- let arect = document.querySelector(BDFDB.dotCN.appmount).getBoundingClientRect();
- let prect = popout.getBoundingClientRect();
+ let arect = BDFDB.getRects(document.querySelector(BDFDB.dotCN.appmount));
+ let prect = BDFDB.getRects(popout);
popout.style.setProperty("top", (prect.y + prect.height > arect.height ? (arect.height - prect.height) : prect.y) + "px");
}
}
diff --git a/Plugins/MessageUtilities/MessageUtilities.plugin.js b/Plugins/MessageUtilities/MessageUtilities.plugin.js
index 7a0166bdce..c3158ea470 100644
--- a/Plugins/MessageUtilities/MessageUtilities.plugin.js
+++ b/Plugins/MessageUtilities/MessageUtilities.plugin.js
@@ -1,6 +1,14 @@
//META{"name":"MessageUtilities"}*//
class MessageUtilities {
+ getName () {return "MessageUtilities";}
+
+ getVersion () {return "1.4.4";}
+
+ getAuthor () {return "DevilBro";}
+
+ getDescription () {return "Offers a number of useful message options. Remap the keybindings in the settings.";}
+
initConstructor () {
this.bindings = {};
@@ -31,21 +39,13 @@ class MessageUtilities {
"Delete_Message": {name:"Delete Message", func:this.doDelete, value:{click:0, key1:46, key2:0}},
"Pin/Unpin_Message": {name:"Pin/Unpin Message", func:this.doPinUnPin, value:{click:0, key1:17, key2:0}},
"React_to_Message": {name:"React to Message", func:this.doOpenReact, value:{click:0, key1:9, key2:0}},
- "__Note_Message": {name:"Note Message (Pesonal Pins)", func:this.doNote, value:{click:0, key1:16, key2:0}},
- "__Translate_Message": {name:"Translate Message (Google Translate Option)", func:this.doTranslate, value:{click:0, key1:20, key2:0}},
- "__Quote_Message": {name:"Quote Message (Quoter)", func:this.doQuote, value:{click:0, key1:113, key2:0}},
- "__Citate_Message": {name:"Quote Message (Citador)", func:this.doCitate, value:{click:0, key1:114, key2:0}}
+ "__Note_Message": {name:"Note Message (Pesonal Pins)", func:this.doNote, value:{click:0, key1:16, key2:0}, plugin:"PersonalPins"},
+ "__Translate_Message": {name:"Translate Message (Google Translate Option)", func:this.doTranslate, value:{click:0, key1:20, key2:0}, plugin:"GoogleTranslateOption"},
+ "__Quote_Message": {name:"Quote Message (Quoter)", func:this.doQuote, value:{click:0, key1:113, key2:0}, plugin:"Quoter"},
+ "__Citate_Message": {name:"Quote Message (Citador)", func:this.doCitate, value:{click:0, key1:114, key2:0}, plugin:"Citador"}
}
};
}
-
- getName () {return "MessageUtilities";}
-
- getDescription () {return "Offers a number of useful message options. Remap the keybindings in the settings.";}
-
- getVersion () {return "1.4.3";}
-
- getAuthor () {return "DevilBro";}
getSettingsPanel () {
if (!this.started || typeof BDFDB !== "object") return;
@@ -53,36 +53,31 @@ class MessageUtilities {
let bindings = BDFDB.getAllData(this, "bindings");
let settingshtml = ``;
- let settingspanel = $(settingshtml)[0];
+ let settingspanel = BDFDB.htmlToElement(settingshtml);
- BDFDB.initElements(settingspanel);
+ BDFDB.initElements(settingspanel, this);
- $(settingspanel)
- .on("click", BDFDB.dotCN.switchinner, () => {this.updateSettings(settingspanel);})
- .on("click", BDFDB.dotCN.selectcontrol, (e) => {this.openDropdownMenu(settingspanel, e);})
- .on("click", BDFDB.dotCN.hotkeycontainer, (e) => {this.startRecording(settingspanel, e);})
- .on("click", ".reset-recorder", (e) => {this.resetRecorder(settingspanel, e);})
- .on("click", ".reset-button", () => {this.resetAll(settingspanel);});
-
- $(settingspanel).find(".__Note_Message-key-settings").toggle(BDFDB.isPluginEnabled("PersonalPins") == true);
- $(settingspanel).find(".__Translate_Message-key-settings").toggle(BDFDB.isPluginEnabled("GoogleTranslateOption") == true);
- $(settingspanel).find(".__Quote_Message-key-settings").toggle(BDFDB.isPluginEnabled("Quoter") == true);
- $(settingspanel).find(".__Citate_Message-key-settings").toggle(BDFDB.isPluginEnabled("Citador") == true);
+ BDFDB.addEventListener(this, settingspanel, "click", BDFDB.dotCN.selectcontrol, e => {this.openDropdownMenu(e);})
+ BDFDB.addEventListener(this, settingspanel, "click", BDFDB.dotCN.hotkeycontainer, e => {this.startRecording(settingspanel, e);})
+ BDFDB.addEventListener(this, settingspanel, "click", ".reset-recorder", e => {this.resetRecorder(settingspanel, e);})
+ BDFDB.addEventListener(this, settingspanel, "click", ".reset-button", () => {this.resetAll(settingspanel);});
return settingspanel;
}
@@ -91,22 +86,25 @@ class MessageUtilities {
load () {}
start () {
- let libraryScript = null;
- if (typeof BDFDB !== "object" || typeof BDFDB.isLibraryOutdated !== "function" || BDFDB.isLibraryOutdated()) {
- libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ var libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ if (!libraryScript || performance.now() - libraryScript.getAttribute("date") > 600000) {
if (libraryScript) libraryScript.remove();
libraryScript = document.createElement("script");
libraryScript.setAttribute("type", "text/javascript");
libraryScript.setAttribute("src", "https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js");
+ libraryScript.setAttribute("date", performance.now());
+ libraryScript.addEventListener("load", () => {
+ BDFDB.loaded = true;
+ this.initialize();
+ });
document.head.appendChild(libraryScript);
}
+ else if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) this.initialize();
this.startTimeout = setTimeout(() => {this.initialize();}, 30000);
- if (typeof BDFDB === "object" && typeof BDFDB.isLibraryOutdated === "function") this.initialize();
- else libraryScript.addEventListener("load", () => {this.initialize();});
}
initialize () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
BDFDB.loadMessage(this);
this.ChannelUtils = BDFDB.WebModules.findByProperties("getChannels","getChannel");
@@ -115,16 +113,15 @@ class MessageUtilities {
this.CurrentUserPerms = BDFDB.WebModules.findByProperties("getChannelPermissions", "can");
this.Permissions = BDFDB.WebModules.findByProperties("Permissions", "ActivityTypes").Permissions
- $(document)
- .on("click." + this.getName(), BDFDB.dotCNC.message + BDFDB.dotCN.messagesystem, (e) => {
- this.onClick(e.currentTarget, 0, "onSglClick");
- })
- .on("dblclick." + this.getName(), BDFDB.dotCNC.message + BDFDB.dotCN.messagesystem, (e) => {
- this.onClick(e.currentTarget, 1, "onDblClick");
- })
- .on("keydown." + this.getName(), BDFDB.dotCN.textareawrapchat, (e) => {
- this.onKeyDown(e.currentTarget, e.which, "onKeyDown");
- });
+ BDFDB.addEventListener(this, document, "click", BDFDB.dotCNC.message + BDFDB.dotCN.messagesystem, e => {
+ this.onClick(e.currentTarget, 0, "onSglClick");
+ })
+ BDFDB.addEventListener(this, document, "dblclick", BDFDB.dotCNC.message + BDFDB.dotCN.messagesystem, e => {
+ this.onClick(e.currentTarget, 1, "onDblClick");
+ });
+ BDFDB.addEventListener(this, document, "keydown", BDFDB.dotCN.textareawrapchat, e => {
+ this.onKeyDown(e.currentTarget, e.which, "onKeyDown");
+ });
}
else {
console.error(this.getName() + ": Fatal Error: Could not load BD functions!");
@@ -132,21 +129,13 @@ class MessageUtilities {
}
stop () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
BDFDB.unloadMessage(this);
}
}
//begin of own functions
-
- updateSettings (settingspanel) {
- let settings = {};
- for (let input of settingspanel.querySelectorAll(BDFDB.dotCN.switchinner)) {
- settings[input.value] = input.checked;
- }
- BDFDB.saveAllData(settings, this, "settings");
- }
resetAll (settingspanel) {
BDFDB.openConfirmModal(this, "Are you sure you want to delete all key bindings?", () => {
@@ -167,13 +156,15 @@ class MessageUtilities {
});
}
- openDropdownMenu (settingspanel, e) {
+ openDropdownMenu (e) {
let selectControl = e.currentTarget;
- let selectWrap = e.currentTarget.parentElement;
+ let selectWrap = selectControl.parentElement;
+ let plugincard = BDFDB.getParentEle("li", selectWrap);
- if (selectWrap.classList.contains(BDFDB.disCN.selectisopen)) return;
+ if (!plugincard || BDFDB.containsClass(selectWrap, BDFDB.disCN.selectisopen)) return;
- selectWrap.classList.add(BDFDB.disCN.selectisopen);
+ BDFDB.addClass(selectWrap, BDFDB.disCN.selectisopen);
+ plugincard.style.setProperty("overflow", "visible", "important");
let action = selectWrap.getAttribute("type");
let option = selectWrap.getAttribute("option");
@@ -181,8 +172,8 @@ class MessageUtilities {
let selectMenu = this.createDropdownMenu(action, value);
selectWrap.appendChild(selectMenu);
-
- $(selectMenu).on("mousedown." + this.getName(), BDFDB.dotCN.selectoption, (e2) => {
+
+ BDFDB.addChildEventListener(selectMenu, "mousedown", BDFDB.dotCN.selectoption, e2 => {
let binding = BDFDB.getData(action, this, "bindings");
let selection = e2.currentTarget.getAttribute("value");
selectWrap.setAttribute("value", selection);
@@ -190,12 +181,16 @@ class MessageUtilities {
binding[option] = parseInt(selection);
BDFDB.saveData(action, binding, this, "bindings");
});
- $(document).on("mousedown.select" + this.getName(), (e2) => {
- if (e2.target.parentElement == selectMenu) return;
- $(document).off("mousedown.select" + this.getName());
- selectMenu.remove()
- setTimeout(() => {selectWrap.classList.remove(BDFDB.disCN.selectisopen);},100);
- });
+
+ var removeMenu = e2 => {
+ if (e2.target.parentElement != selectMenu) {
+ document.removeEventListener("mousedown", removeMenu);
+ selectMenu.remove();
+ plugincard.style.removeProperty("overflow");
+ setTimeout(() => {BDFDB.removeClass(selectWrap, BDFDB.disCN.selectisopen);},100);
+ }
+ };
+ document.addEventListener("mousedown", removeMenu);
}
createDropdownMenu (action, value) {
@@ -205,40 +200,43 @@ class MessageUtilities {
menuhtml += ``
}
menuhtml += ``;
- return $(menuhtml)[0];
+ return BDFDB.htmlToElement(menuhtml);
}
startRecording (settingspanel, e) {
let recorderWrap = e.currentTarget;
-
- if (recorderWrap.classList.contains(BDFDB.disCN.hotkeyrecording)) return;
+ if (BDFDB.containsClass(recorderWrap, BDFDB.disCN.hotkeyrecording)) return;
let recorderInput = recorderWrap.querySelector("input");
let recorderText = recorderWrap.querySelector(BDFDB.dotCN.hotkeytext);
let action = recorderWrap.getAttribute("type");
let option = recorderWrap.getAttribute("option");
- recorderWrap.classList.add(BDFDB.disCN.hotkeyrecording);
- recorderWrap.classList.remove(BDFDB.disCN.hotkeyhasvalue);
+ BDFDB.addClass(recorderWrap, BDFDB.disCN.hotkeyrecording);
+ BDFDB.removeClass(recorderWrap, BDFDB.disCN.hotkeyhasvalue);
recorderText.innerText = BDFDB.LanguageStrings.SHORTCUT_RECORDER_BUTTON_RECORDING;
- $(document).on("keydown.recorder" + this.getName(), (e) => {
+
+ var saveRecording = e => {
recorderWrap.setAttribute("value", e.which);
recorderInput.setAttribute("value", this.keyboardMap[e.which]);
- });
+ };
- $(document).on("mousedown.recorder" + this.getName(), () => {
- $(document).off("mousedown.recorder" + this.getName());
- $(document).off("keydown.recorder" + this.getName());
+ var stopRecording = e => {
+ document.removeEventListener("mousedown", stopRecording);
+ document.removeEventListener("keydown", saveRecording);
let binding = BDFDB.getData(action, this, "bindings");
binding[option] = parseInt(recorderWrap.getAttribute("value"));
BDFDB.saveData(action, binding, this, "bindings");
setTimeout(() => {
- recorderWrap.classList.remove(BDFDB.disCN.hotkeyrecording);
- recorderWrap.classList.add(BDFDB.disCN.hotkeyhasvalue);
+ BDFDB.removeClass(recorderWrap, BDFDB.disCN.hotkeyrecording);
+ BDFDB.addClass(recorderWrap, BDFDB.disCN.hotkeyhasvalue);
recorderText.innerText = BDFDB.LanguageStrings.SHORTCUT_RECORDER_BUTTON_EDIT;
},100);
- });
+ };
+
+ document.addEventListener("mousedown", stopRecording);
+ document.addEventListener("keydown", saveRecording);
}
resetRecorder (settingspanel, e) {
@@ -308,31 +306,28 @@ class MessageUtilities {
}
doNote ({messagediv, pos, message}) {
- if (BDFDB.isPluginEnabled("PersonalPins") == true) {
+ if (BDFDB.isPluginEnabled(this.defaults.bindings.__Note_Message.plugin)) {
let channel = this.ChannelUtils.getChannel(message.channel_id);
- if (channel) {
- if (bdplugins.PersonalPins.plugin.getNoteData(message, channel, pos)) bdplugins.PersonalPins.plugin.removeNoteData(message, channel, pos);
- else bdplugins.PersonalPins.plugin.addMessageToNotes(message, messagediv, channel);
- }
+ if (channel) bdplugins[this.defaults.bindings.__Note_Message.plugin].plugin.addMessageToNotes(message, messagediv, channel);
}
}
doTranslate ({messagediv, pos, message}) {
- if (BDFDB.isPluginEnabled("GoogleTranslateOption") == true) {
+ if (BDFDB.isPluginEnabled(this.defaults.bindings.__Translate_Message.plugin)) {
let channel = this.ChannelUtils.getChannel(message.channel_id);
- if (channel) bdplugins.GoogleTranslateOption.plugin.translateMessage(message, messagediv, channel);
+ if (channel) bdplugins[this.defaults.bindings.__Translate_Message.plugin].plugin.translateMessage(message, messagediv, channel);
}
}
doQuote ({messagediv, pos, message}) {
- if (BDFDB.isPluginEnabled("Quoter") == true) {
+ if (BDFDB.isPluginEnabled(this.defaults.bindings.__Quote_Message.plugin)) {
let quoteButton = messagediv.querySelector(".btn-quote");
if (quoteButton) quoteButton.click();
}
}
doCitate ({messagediv, pos, message}) {
- if (BDFDB.isPluginEnabled("Citador") == true) {
+ if (BDFDB.isPluginEnabled(this.defaults.bindings.__Citate_Message.plugin)) {
let citarButton = messagediv.parentElement.querySelector(".citar-btn");
if (citarButton) citarButton.click();
}
diff --git a/Plugins/MoveablePopups/MoveablePopups.plugin.js b/Plugins/MoveablePopups/MoveablePopups.plugin.js
index b7e913c6bc..dfcf600d91 100644
--- a/Plugins/MoveablePopups/MoveablePopups.plugin.js
+++ b/Plugins/MoveablePopups/MoveablePopups.plugin.js
@@ -3,7 +3,7 @@
class MoveablePopups {
getName () {return "MoveablePopups";}
- getVersion () {return "1.1.1";}
+ getVersion () {return "1.1.2";}
getAuthor () {return "DevilBro";}
@@ -13,22 +13,25 @@ class MoveablePopups {
load () {}
start () {
- var libraryScript = null;
- if (typeof BDFDB !== "object" || typeof BDFDB.isLibraryOutdated !== "function" || BDFDB.isLibraryOutdated()) {
- libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ var libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ if (!libraryScript || performance.now() - libraryScript.getAttribute("date") > 600000) {
if (libraryScript) libraryScript.remove();
libraryScript = document.createElement("script");
libraryScript.setAttribute("type", "text/javascript");
libraryScript.setAttribute("src", "https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js");
+ libraryScript.setAttribute("date", performance.now());
+ libraryScript.addEventListener("load", () => {
+ BDFDB.loaded = true;
+ this.initialize();
+ });
document.head.appendChild(libraryScript);
}
+ else if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) this.initialize();
this.startTimeout = setTimeout(() => {this.initialize();}, 30000);
- if (typeof BDFDB === "object" && typeof BDFDB.isLibraryOutdated === "function") this.initialize();
- else libraryScript.addEventListener("load", () => {this.initialize();});
}
initialize () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
BDFDB.loadMessage(this);
var observer = null;
@@ -73,7 +76,7 @@ class MoveablePopups {
stop () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
BDFDB.unloadMessage(this);
}
}
@@ -94,7 +97,7 @@ class MoveablePopups {
if (!e.ctrlKey) return;
div.style.setProperty("position", "fixed", "important");
this.dragging = true;
- var rects = div.getBoundingClientRect();
+ var rects = BDFDB.getRects(div);
var transform = getComputedStyle(div,null).getPropertyValue("transform").replace(/[^0-9,-]/g,"").split(",");
var left = rects.left - (transform.length > 4 ? parseFloat(transform[4]) : 0);
var top = rects.top - (transform.length > 4 ? parseFloat(transform[5]) : 0);
diff --git a/Plugins/NotificationSounds/NotificationSounds.plugin.js b/Plugins/NotificationSounds/NotificationSounds.plugin.js
index 4289834896..5dd96f4a25 100644
--- a/Plugins/NotificationSounds/NotificationSounds.plugin.js
+++ b/Plugins/NotificationSounds/NotificationSounds.plugin.js
@@ -1,6 +1,14 @@
//META{"name":"NotificationSounds"}*//
class NotificationSounds {
+ getName () {return "NotificationSounds";}
+
+ getVersion () {return "3.2.4";}
+
+ getAuthor () {return "DevilBro";}
+
+ getDescription () {return "Allows you to replace the native sounds of Discord with your own";}
+
initConstructor () {
this.patchModules = {
"IncomingCalls":"componentDidMount",
@@ -91,14 +99,6 @@ class NotificationSounds {
this.firedEvents = {};
}
-
- getName () {return "NotificationSounds";}
-
- getDescription () {return "Allows you to replace the native sounds of Discord with your own";}
-
- getVersion () {return "3.2.3";}
-
- getAuthor () {return "DevilBro";}
getSettingsPanel () {
if (!this.started || typeof BDFDB !== "object") return;
@@ -119,8 +119,7 @@ class NotificationSounds {
for (var type in this.types) {
var choice = BDFDB.loadData(type, this, "choices");
- var unimplemented = this.types[type].implemented ? "" : " unimplemented";
- settingshtml += ``;
- return $(menuhtml)[0];
+ return BDFDB.htmlToElement(menuhtml);
}
dragSlider (settingspanel, e) {
@@ -309,36 +315,32 @@ class NotificationSounds {
var slider = track.parentNode;
var input = slider.querySelector(".volumeInput");
var bar = slider.querySelector(BDFDB.dotCN.sliderbarfill);
-
- var disableTextSelectionCSS = `
- * {
- user-select: none !important;
- }`;
- BDFDB.appendLocalStyle("disableTextSelection", disableTextSelectionCSS);
+ BDFDB.appendLocalStyle("disableTextSelection", `*{user-select: none !important;}`);
var volume = 0;
var sY = 0;
- var sHalfW = grabber.offsetWidth/2;
- var sMinX = $(track).offset().left;
- var sMaxX = sMinX + track.offsetWidth;
- $(document)
- .off("mouseup.slider" + this.getName()).off("mousemove.slider" + this.getName())
- .on("mouseup.slider" + this.getName(), () => {
- $(document).off("mouseup.slider" + this.getName()).off("mousemove.slider" + this.getName());
- BDFDB.removeLocalStyle("disableTextSelection");
- var type = slider.getAttribute("type");
- var choice = this.choices[type];
- choice.volume = volume;
- this.saveChoice(type, choice, true);
- })
- .on("mousemove.slider" + this.getName(), (e2) => {
- sY = e2.clientX > sMaxX ? sMaxX - sHalfW : (e2.clientX < sMinX ? sMinX - sHalfW : e2.clientX - sHalfW);
- volume = BDFDB.mapRange([sMinX - sHalfW, sMaxX - sHalfW], [0, 100], sY);
- grabber.style.left = volume + "%";
- bar.style.width = volume + "%";
- input.value = volume;
- });
+ var sHalfW = BDFDB.getRects(grabber).width/2;
+ var sMinX = BDFDB.getRects(track).left;
+ var sMaxX = sMinX + BDFDB.getRects(track).width;
+ var mouseup = () => {
+ document.removeEventListener("mouseup", mouseup);
+ document.removeEventListener("mousemove", mousemove);
+ BDFDB.removeLocalStyle("disableTextSelection");
+ var type = slider.getAttribute("type");
+ var choice = this.choices[type];
+ choice.volume = volume;
+ this.saveChoice(type, choice, true);
+ };
+ var mousemove = e2 => {
+ sY = e2.clientX > sMaxX ? sMaxX - sHalfW : (e2.clientX < sMinX ? sMinX - sHalfW : e2.clientX - sHalfW);
+ volume = BDFDB.mapRange([sMinX - sHalfW, sMaxX - sHalfW], [0, 100], sY);
+ grabber.style.setProperty("left", volume + "%");
+ bar.style.setProperty("width", volume + "%");
+ input.value = volume;
+ };
+ document.addEventListener("mouseup", mouseup);
+ document.addEventListener("mousemove", mousemove);
}
loadAudios () {
diff --git a/Plugins/OldTitleBar/OldTitleBar.plugin.js b/Plugins/OldTitleBar/OldTitleBar.plugin.js
index 0a6b14c347..32dd484477 100644
--- a/Plugins/OldTitleBar/OldTitleBar.plugin.js
+++ b/Plugins/OldTitleBar/OldTitleBar.plugin.js
@@ -3,7 +3,7 @@
class OldTitleBar {
getName () {return "OldTitleBar";}
- getVersion () {return "1.5.2";}
+ getVersion () {return "1.5.3";}
getAuthor () {return "DevilBro";}
@@ -94,7 +94,7 @@ class OldTitleBar {
var settings = BDFDB.getAllData(this, "settings");
var settingshtml = ``;
@@ -102,7 +102,21 @@ class OldTitleBar {
BDFDB.initElements(settingspanel, this);
- BDFDB.addChildEventListener(settingspanel, "click", BDFDB.dotCN.switchinner, e => {this.updateSettings(settingspanel, e.currentTarget.value);});
+ BDFDB.addEventListener(this, settingspanel, "click", ".nativetitlebar-switch", e => {
+ if (this.patchMainScreen(e.currentTarget.checked)) {
+ this.patched = !this.patched;
+ let notifybar = document.querySelector("#OldTitleBarNotifyBar");
+ if (notifybar) notifybar.querySelector(BDFDB.dotCN.noticedismiss).click();
+ if (this.patched) {
+ notifybar = BDFDB.createNotificationsBar("Changed nativebar settings, relaunch to see changes:", {type:"danger",btn:"Relaunch",id:"OldTitleBarNotifyBar"});
+ notifybar.querySelector(BDFDB.dotCN.noticebutton).addEventListener("click", () => {
+ let app = require("electron").remote.app;
+ app.relaunch();
+ app.quit();
+ });
+ }
+ }
+ });
return settingspanel;
}
@@ -111,21 +125,21 @@ class OldTitleBar {
load () {}
start () {
- var libraryScript = null;
- if (!global.BDFDB || typeof BDFDB !== "object" || typeof BDFDB.isLibraryOutdated !== "function" || BDFDB.isLibraryOutdated()) {
- libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ var libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ if (!libraryScript || performance.now() - libraryScript.getAttribute("date") > 600000) {
if (libraryScript) libraryScript.remove();
libraryScript = document.createElement("script");
libraryScript.setAttribute("type", "text/javascript");
libraryScript.setAttribute("src", "https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js");
+ libraryScript.setAttribute("date", performance.now());
+ libraryScript.addEventListener("load", () => {
+ BDFDB.loaded = true;
+ this.initialize();
+ });
document.head.appendChild(libraryScript);
}
+ else if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) this.initialize();
this.startTimeout = setTimeout(() => {this.initialize();}, 30000);
- if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) this.initialize();
- else if (libraryScript) libraryScript.addEventListener("load", () => {
- BDFDB.loaded = true;
- this.initialize();
- });
}
initialize () {
@@ -160,29 +174,6 @@ class OldTitleBar {
// begin of own functions
-
- updateSettings (settingspanel, key) {
- var settings = {};
- for (var input of settingspanel.querySelectorAll(BDFDB.dotCN.switchinner)) {
- settings[input.value] = input.checked;
- }
- BDFDB.saveAllData(settings, this, "settings");
- if (key == "displayNative") {
- if (this.patchMainScreen(settings[key])) {
- this.patched = !this.patched;
- let notifybar = document.querySelector("#OldTitleBarNotifyBar");
- if (notifybar) notifybar.querySelector(BDFDB.dotCN.noticedismiss).click();
- if (this.patched) {
- notifybar = BDFDB.createNotificationsBar("Changed nativebar settings, relaunch to see changes:", {type:"danger",btn:"Relaunch",id:"OldTitleBarNotifyBar"});
- notifybar.querySelector(BDFDB.dotCN.noticebutton).addEventListener("click", e => {
- let app = require("electron").remote.app;
- app.relaunch();
- app.quit();
- });
- }
- }
- }
- }
processHeaderBar (instance, wrapper) {
this.addTitleBar();
diff --git a/Plugins/OwnerTag/OwnerTag.plugin.js b/Plugins/OwnerTag/OwnerTag.plugin.js
index 9154820a24..37eaa69146 100644
--- a/Plugins/OwnerTag/OwnerTag.plugin.js
+++ b/Plugins/OwnerTag/OwnerTag.plugin.js
@@ -3,7 +3,7 @@
class OwnerTag {
getName () {return "OwnerTag";}
- getVersion () {return "1.0.6";}
+ getVersion () {return "1.0.7";}
getAuthor () {return "DevilBro";}
@@ -53,7 +53,7 @@ class OwnerTag {
BDFDB.initElements(settingspanel, this);
- BDFDB.addChildEventListener(settingspanel, "keyup", BDFDB.dotCN.input, () => {this.saveInputs(settingspanel);});
+ BDFDB.addEventListener(this, settingspanel, "keyup", BDFDB.dotCN.input, () => {this.saveInputs(settingspanel);});
return settingspanel;
}
@@ -62,22 +62,25 @@ class OwnerTag {
load () {}
start () {
- var libraryScript = null;
- if (typeof BDFDB !== "object" || typeof BDFDB.isLibraryOutdated !== "function" || BDFDB.isLibraryOutdated()) {
- libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ var libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ if (!libraryScript || performance.now() - libraryScript.getAttribute("date") > 600000) {
if (libraryScript) libraryScript.remove();
libraryScript = document.createElement("script");
libraryScript.setAttribute("type", "text/javascript");
libraryScript.setAttribute("src", "https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js");
+ libraryScript.setAttribute("date", performance.now());
+ libraryScript.addEventListener("load", () => {
+ BDFDB.loaded = true;
+ this.initialize();
+ });
document.head.appendChild(libraryScript);
}
+ else if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) this.initialize();
this.startTimeout = setTimeout(() => {this.initialize();}, 30000);
- if (typeof BDFDB === "object" && typeof BDFDB.isLibraryOutdated === "function") this.initialize();
- else libraryScript.addEventListener("load", () => {this.initialize();});
}
initialize () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
BDFDB.loadMessage(this);
this.MemberUtils = BDFDB.WebModules.findByProperties("getMembers", "getMember");
@@ -92,7 +95,7 @@ class OwnerTag {
}
stop () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
BDFDB.removeEles(".owner-tag");
BDFDB.unloadMessage(this);
}
@@ -107,7 +110,7 @@ class OwnerTag {
inputs[input.getAttribute("option")] = input.value;
}
BDFDB.saveAllData(inputs, this, "inputs");
- this.updateTags = true;
+ this.SettingsUpdated = true;
}
processNameTag (instance, wrapper) {
diff --git a/Plugins/PersonalPins/PersonalPins.plugin.js b/Plugins/PersonalPins/PersonalPins.plugin.js
index d79bc1d4dd..7654c757cb 100644
--- a/Plugins/PersonalPins/PersonalPins.plugin.js
+++ b/Plugins/PersonalPins/PersonalPins.plugin.js
@@ -1,6 +1,14 @@
//META{"name":"PersonalPins"}*//
class PersonalPins {
+ getName () {return "PersonalPins";}
+
+ getDescription () {return "Similar to normal pins. Lets you save messages as notes for yourself.";}
+
+ getVersion () {return "1.7.3";}
+
+ getAuthor () {return "DevilBro";}
+
initConstructor () {
this.labels = {};
@@ -146,14 +154,6 @@ class PersonalPins {
${this.getName()}
`;
for (let key in settings) {
- settingshtml += ``;
+ settingshtml += ``;
}
for (let key in choices) {
settingshtml += ``;
}
settingshtml += `
${this.defaults.settings[key].description}
${this.defaults.settings[key].description}
${this.defaults.choices[key].description}
${this.languages[choices[key]].name}
${this.getCreationTime(this.languages[choices[key]].id)}
${this.labels.createdat_text + " " + this.getCreationTime(this.languages[choice].id, info.createdAt)}
${this.labels.createdat_text + " " + this.getCreationTime(this.languages[choice].id, info.createdAt)}
${this.getName()}
`;
for (let key in settings) {
- settingshtml += ``;
+ settingshtml += ``;
}
settingshtml += ``;
settingshtml += `
${this.defaults.settings[key].description}
${this.defaults.settings[key].description}
Reset all Channels.
-
`;
}
-
- getName () {return "GoogleSearchReplace";}
-
- getDescription () {return "Replaces the default Google Text Search with a selection menu of several search engines.";}
-
- getVersion () {return "1.1.6";}
-
- getAuthor () {return "DevilBro";}
getSettingsPanel () {
if (!this.started || typeof BDFDB !== "object") return;
@@ -57,17 +57,14 @@ class GoogleSearchReplace {
let settingshtml = `
+
- `;
- this.dividerMarkup = ``;
-
- this.emojiButtonMarkup = ``;
-
this.defaults = {
settings: {
enableEmojiHovering: {value:true, description:"Show Information about Emojis on hover over an Emoji in the Emojipicker."},
@@ -166,37 +159,27 @@ class EmojiStatistics {
};
}
- getName () {return "EmojiStatistics";}
-
- getDescription () {return "Adds some helpful options to show you more information about emojis and emojiservers.";}
-
- getVersion () {return "2.7.8";}
-
- getAuthor () {return "DevilBro";}
-
getSettingsPanel () {
if (!this.started || typeof BDFDB !== "object") return;
var settings = BDFDB.getAllData(this, "settings");
var amounts = BDFDB.getAllData(this, "amounts");
var settingshtml = ``;
- var settingspanel = $(settingshtml)[0];
+ let settingspanel = BDFDB.htmlToElement(settingshtml);
- BDFDB.initElements(settingspanel);
+ BDFDB.initElements(settingspanel, this);
- $(settingspanel)
- .on("click", BDFDB.dotCN.switchinner, () => {this.updateSettings(settingspanel);})
- .on("input", ".amountInput", (e) => {
- var input = parseInt(e.currentTarget.value);
- if (!isNaN(input) && input > -1) BDFDB.saveData(e.currentTarget.getAttribute("option"), input, this, "amounts");
- });
+ BDFDB.addEventListener(this, settingspanel, "input", ".amountInput", e => {
+ var input = parseInt(e.currentTarget.value);
+ if (!isNaN(input) && input > -1) BDFDB.saveData(e.currentTarget.getAttribute("option"), input, this, "amounts");
+ });
return settingspanel;
}
@@ -205,22 +188,25 @@ class EmojiStatistics {
load () {}
start () {
- var libraryScript = null;
- if (typeof BDFDB !== "object" || typeof BDFDB.isLibraryOutdated !== "function" || BDFDB.isLibraryOutdated()) {
- libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ var libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ if (!libraryScript || performance.now() - libraryScript.getAttribute("date") > 600000) {
if (libraryScript) libraryScript.remove();
libraryScript = document.createElement("script");
libraryScript.setAttribute("type", "text/javascript");
libraryScript.setAttribute("src", "https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js");
+ libraryScript.setAttribute("date", performance.now());
+ libraryScript.addEventListener("load", () => {
+ BDFDB.loaded = true;
+ this.initialize();
+ });
document.head.appendChild(libraryScript);
}
+ else if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) this.initialize();
this.startTimeout = setTimeout(() => {this.initialize();}, 30000);
- if (typeof BDFDB === "object" && typeof BDFDB.isLibraryOutdated === "function") this.initialize();
- else libraryScript.addEventListener("load", () => {this.initialize();});
}
initialize () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
BDFDB.loadMessage(this);
this.GuildEmojis = BDFDB.WebModules.findByProperties("getGuildEmoji", "getDisambiguatedEmojiContext");
@@ -233,7 +219,7 @@ class EmojiStatistics {
}
stop () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
BDFDB.removeEles(".emoji-tooltip",".emojistatistics-button");
BDFDB.unloadMessage(this);
}
@@ -241,14 +227,6 @@ class EmojiStatistics {
// begin of own functions
-
- updateSettings (settingspanel) {
- var settings = {};
- for (var input of settingspanel.querySelectorAll(BDFDB.dotCN.switchinner)) {
- settings[input.value] = input.checked;
- }
- BDFDB.saveAllData(settings, this, "settings");
- }
changeLanguageStrings () {
this.emojiInformationModalMarkup = this.emojiInformationModalMarkup.replace("REPLACE_modal_header_text", this.labels.modal_header_text);
@@ -265,24 +243,26 @@ class EmojiStatistics {
processEmojiPicker (instance, wrapper) {
if (!wrapper.querySelector(".emojistatistics-button")) {
+ let emojipickerdiversityselector = document.querySelector(BDFDB.dotCN.emojipickerdiversityselector);
+ if (!emojipickerdiversityselector) return;
this.loadEmojiList();
let settings = BDFDB.getAllData(this, "settings");
if (settings.enableEmojiStatisticsButton) {
- $(this.emojiButtonMarkup)
- .insertBefore(BDFDB.dotCN.emojipickerdiversityselector, wrapper)
- .off("click." + this.getName())
- .on("click." + this.getName(), () => {
- instance._reactInternalFiber.return.return.return.return.stateNode.close();
- this.showEmojiInformationModal();
- });
+ let emojiStatisticsButton = BDFDB.htmlToElement(``);
+ emojipickerdiversityselector.parentElement.insertBefore(emojiStatisticsButton, emojipickerdiversityselector);
+ emojiStatisticsButton.addEventListener("click", () => {
+ instance._reactInternalFiber.return.return.return.return.stateNode.close();
+ this.showEmojiInformationModal();
+ });
+ emojiStatisticsButton.addEventListener("mouseenter", e => {
+ BDFDB.createTooltip("Emoji Statistics", emojiStatisticsButton, {type:"top",selector:"emojistatistics-tooltip"});
+ });
}
if (settings.enableEmojiHovering) {
- $(wrapper)
- .off("mouseenter." + this.getName())
- .on("mouseenter." + this.getName(), BDFDB.dotCN.emojipickeremojiitem, e => {
- let data = this.emojiToServerList[e.target.style.getPropertyValue("background-image").replace('url("',"").replace('")',"")];
- if (data) BDFDB.createTooltip(`${BDFDB.encodeToHTML(data.emoji)}\n${BDFDB.encodeToHTML(data.server)}`, e.target, {type:"right",selector:"emoji-tooltip",delay:BDFDB.getData("hoverDelay", this, "amounts")});
- });
+ BDFDB.addEventListener(this, wrapper, "mouseenter", BDFDB.dotCN.emojipickeremojiitem, e => {
+ let data = this.emojiToServerList[e.target.style.getPropertyValue("background-image").replace('url("',"").replace('")',"")];
+ if (data) BDFDB.createTooltip(`${BDFDB.encodeToHTML(data.emoji)}\n${BDFDB.encodeToHTML(data.server)}`, e.target, {type:"right",selector:"emoji-tooltip",delay:BDFDB.getData("hoverDelay", this, "amounts")});
+ });
}
}
}
@@ -299,13 +279,43 @@ class EmojiStatistics {
}
showEmojiInformationModal () {
- var emojiInformationModal = $(this.emojiInformationModalMarkup);
- BDFDB.appendModal(emojiInformationModal);
+ var emojiInformationModal = BDFDB.htmlToElement(this.emojiInformationModalMarkup);
+ let titlescontainer = emojiInformationModal.querySelector(".titles");
+ let entriescontainer = emojiInformationModal.querySelector(".entries");
+
+ if (!titlescontainer || !entriescontainer) return;
+
+ var titleEntry = BDFDB.htmlToElement(this.emojiserverTitlesMarkup);
+ titlescontainer.appendChild(titleEntry);
+ BDFDB.addChildEventListener(titleEntry, "click", ".modal-sorttitle-label ", e => {
+ var oldTitle = e.currentTarget.innerText;
+
+ var reverse = oldTitle.indexOf("▼") < 0 ? false : true;
+
+ titleEntry.querySelector(".modal-titlesname-label").innerText = this.labels.modal_titlesname_text;
+ titleEntry.querySelector(".modal-titlestotal-label").innerText = this.labels.modal_titlestotal_text;
+ titleEntry.querySelector(".modal-titlesglobal-label").innerText = this.labels.modal_titlesglobal_text;
+ titleEntry.querySelector(".modal-titleslocal-label").innerText = this.labels.modal_titleslocal_text;
+ titleEntry.querySelector(".modal-titlescopies-label").innerText = this.labels.modal_titlescopies_text;
+
+ var sortKey = "index";
+ if (oldTitle.indexOf("▲") < 0) {
+ sortKey = e.currentTarget.getAttribute("sortkey");
+ var title = this.labels["modal_titles" + sortKey + "_text"];
+ e.currentTarget.innerText = oldTitle.indexOf("▼") < 0 ? title + "▼" : title + "▲";
+ }
+
+ BDFDB.sortArrayByKey(entries, sortKey);
+ if (reverse) entries.reverse();
+
+ this.updateAllEntries(entriescontainer, entries);
+ });
+
var entries = [], index = 0;
- for (let serverObj of BDFDB.readServerList()) {
+ for (let info of BDFDB.readServerList()) {
let amountGlobal = 0, amountLocal = 0, amountCopies = 0;
- for (let emoji of this.GuildEmojis.getGuildEmoji(serverObj.id)) {
+ for (let emoji of this.GuildEmojis.getGuildEmoji(info.id)) {
if (emoji.managed) {
amountGlobal++;
if (this.emojiReplicaList[emoji.name]) amountCopies++;
@@ -314,59 +324,36 @@ class EmojiStatistics {
amountLocal++;
}
}
- var entry = $(this.emojiserverEntryMarkup);
- if (serverObj.icon) {
- entry.find(".modal-emojiserver-icon").css("background-image", "url('https://cdn.discordapp.com/icons/" + serverObj.id + "/" + serverObj.icon + ".png')");
- }
- else {
- entry.find(".modal-emojiserver-icon").text(serverObj.div.querySelector("a").innerText);
- }
- entry.find(".modal-emojiname-label").text(serverObj.name);
- entry.find(".modal-emojitotal-label").text(amountGlobal+amountLocal);
- entry.find(".modal-emojiglobal-label").text(amountGlobal);
- entry.find(".modal-emojilocal-label").text(amountLocal);
- entry.find(".modal-emojicopies-label").text(amountCopies);
- entries.push({entry:entry, index:index++, name:serverObj.name, total:amountGlobal+amountLocal, global:amountGlobal, local:amountLocal, copies:amountCopies});
+ var emojiEntry = BDFDB.htmlToElement(this.emojiserverEntryMarkup);
+ emojiEntry.querySelector(".modal-emojiserver-icon").innerHTML = this.createCopyOfServer(info).outerHTML;
+ emojiEntry.querySelector(".modal-emojiname-label").innerText = info.name || "";
+ emojiEntry.querySelector(".modal-emojitotal-label").innerText = amountGlobal + amountLocal;
+ emojiEntry.querySelector(".modal-emojiglobal-label").innerText = amountGlobal;
+ emojiEntry.querySelector(".modal-emojilocal-label").innerText = amountLocal;
+ emojiEntry.querySelector(".modal-emojicopies-label").innerText = amountCopies;
+ entries.push({div:emojiEntry, index:index++, name:info.name || "", total:amountGlobal+amountLocal, global:amountGlobal, local:amountLocal, copies:amountCopies});
}
-
- var titleentry = $(this.emojiserverTitlesMarkup)
- .appendTo(".titles", emojiInformationModal)
- .on("click", ".modal-sorttitle-label ", (e2) => {
- var oldTitle = e2.target.innerText;
+
+ BDFDB.appendModal(emojiInformationModal);
- var reverse = oldTitle.indexOf("▼") < 0 ? false : true;
-
- titleentry.find(".modal-titlesname-label").text(this.labels.modal_titlesname_text);
- titleentry.find(".modal-titlestotal-label").text(this.labels.modal_titlestotal_text);
- titleentry.find(".modal-titlesglobal-label").text(this.labels.modal_titlesglobal_text);
- titleentry.find(".modal-titleslocal-label").text(this.labels.modal_titleslocal_text);
- titleentry.find(".modal-titlescopies-label").text(this.labels.modal_titlescopies_text);
-
- var sortKey = "index";
- if (oldTitle.indexOf("▲") < 0) {
- sortKey = e2.target.getAttribute("sortkey");
- var title = this.labels["modal_titles" + sortKey + "_text"];
- e2.target.innerText = oldTitle.indexOf("▼") < 0 ? title + "▼" : title + "▲";
- }
-
- BDFDB.sortArrayByKey(entries, sortKey);
- if (reverse) entries.reverse();
-
- this.updateAllEntries(emojiInformationModal, entries);
- });
-
- this.updateAllEntries(emojiInformationModal, entries);
+ this.updateAllEntries(entriescontainer, entries);
}
- updateAllEntries (modal, entries) {
- var container = modal.find(".entries");
- container.children().remove();
- for (let i = 0; entries.length > i; i++) {
- if (i > 0) container.append(this.dividerMarkup);
- container.append(entries[i].entry);
+ updateAllEntries (entriescontainer, entries) {
+ BDFDB.removeEles(entriescontainer.childNodes);
+ for (let entry of entries) {
+ if (entriescontainer.childElementCount) entriescontainer.appendChild(BDFDB.htmlToElement(``));
+ entriescontainer.appendChild(entry.div);
}
}
+ createCopyOfServer (info) {
+ let serverCopy = info.div.cloneNode(true);
+ BDFDB.toggleEles(serverCopy, true);
+ BDFDB.removeClass(serverCopy, BDFDB.disCN.guildunread, BDFDB.disCN.guildselected);
+ return serverCopy;
+ }
+
setLabelsByLanguage () {
switch (BDFDB.getDiscordLanguage().id) {
case "hr": //croatian
diff --git a/Plugins/ForceImagePreviews/ForceImagePreviews.plugin.js b/Plugins/ForceImagePreviews/ForceImagePreviews.plugin.js
index f9c8c860ac..7331c4faae 100644
--- a/Plugins/ForceImagePreviews/ForceImagePreviews.plugin.js
+++ b/Plugins/ForceImagePreviews/ForceImagePreviews.plugin.js
@@ -1,40 +1,43 @@
//META{"name":"ForceImagePreviews"}*//
class ForceImagePreviews {
+ getName () {return "ForceImagePreviews";}
+
+ getVersion () {return "1.0.9";}
+
+ getAuthor () {return "DevilBro";}
+
+ getDescription () {return "Forces embedded Image Previews, if Discord doesn't do it itself. Caution: Externals Images can contain malicious code and reveal your IP!";}
+
initConstructor () {
this.patchModules = {
"Message":"componentDidMount"
};
}
- getName () {return "ForceImagePreviews";}
-
- getDescription () {return "Forces embedded Image Previews, if Discord doesn't do it itself. Caution: Externals Images can contain malicious code and reveal your IP!";}
-
- getVersion () {return "1.0.8";}
-
- getAuthor () {return "DevilBro";}
-
//legacy
load () {}
start () {
- var libraryScript = null;
- if (typeof BDFDB !== "object" || typeof BDFDB.isLibraryOutdated !== "function" || BDFDB.isLibraryOutdated()) {
- libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ var libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ if (!libraryScript || performance.now() - libraryScript.getAttribute("date") > 600000) {
if (libraryScript) libraryScript.remove();
libraryScript = document.createElement("script");
libraryScript.setAttribute("type", "text/javascript");
libraryScript.setAttribute("src", "https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js");
+ libraryScript.setAttribute("date", performance.now());
+ libraryScript.addEventListener("load", () => {
+ BDFDB.loaded = true;
+ this.initialize();
+ });
document.head.appendChild(libraryScript);
}
+ else if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) this.initialize();
this.startTimeout = setTimeout(() => {this.initialize();}, 30000);
- if (typeof BDFDB === "object" && typeof BDFDB.isLibraryOutdated === "function") this.initialize();
- else libraryScript.addEventListener("load", () => {this.initialize();});
}
initialize () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
BDFDB.loadMessage(this);
BDFDB.WebModules.forceAllUpdates(this);
@@ -45,7 +48,7 @@ class ForceImagePreviews {
}
stop () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
BDFDB.removeEles(".FIP-embed");
BDFDB.unloadMessage(this);
}
@@ -93,7 +96,7 @@ class ForceImagePreviews {
}
let checkedsrc = itemsrc.indexOf("imgur.com/") > -1 ? ("imgur.com/" + itemsrc.split("/")[3].split(".")[0]) : itemsrc;
if (!accessory.querySelector(`${BDFDB.dotCN.embedimage}[href*="${checkedsrc}"]`)) {
- let embed = $(`
`)[0];
+ let embed = BDFDB.htmlToElement(``);
this.insertEmbed(embed, previmage, links, accessory);
}
this.addItemToAccessory(item, links, accessory);
@@ -104,11 +107,11 @@ class ForceImagePreviews {
result = result.replace(new RegExp("[\\r|\\n|\\t]|[\\s]{2,}", "g"), "");
let width = 400;
let height = Math.round(width*(result.split('`)[0];
- $(embed).on("click." + this.getName(), BDFDB.dotCN.iconplay, (e) => {
+ let embed = BDFDB.htmlToElement(``);
+ BDFDB.addChildEventListener(embed, "click", BDFDB.dotCN.iconplay, () => {
let videowrapper = embed.querySelector(BDFDB.dotCN.embedvideo);
- while (videowrapper.firstChild) videowrapper.firstChild.remove();
- $(``).appendTo(videowrapper);
+ BDFDB.removeEles(videowrapper.childNodes);
+ videowrapper.appendChild(BDFDB.htmlToElement(``));
});
this.insertEmbed(embed, previmage, links, accessory);
}
@@ -125,10 +128,10 @@ class ForceImagePreviews {
prev = prev ? prev : accessory.querySelector(`${BDFDB.dotCNS.embed + BDFDB.dotCN.embedtitlelink}[href="${previmage ? this.parseSrc(previmage.src) : void 0}"]`);
next = next ? next : accessory.querySelector(`${BDFDB.dotCNS.embed + BDFDB.dotCN.embedtitlelink}[href="${links[0] ? this.parseSrc(links[0].src) : void 0}"]`);
let isempty = accessory.childElementCount == 0;
- if (embed.firstElementChild.classList.contains(BDFDB.disCN.embedimage)) embed.style.setProperty("pointer-events", "none", "important");
+ if (BDFDB.containsClass(embed.firstElementChild, BDFDB.disCN.embedimage)) embed.style.setProperty("pointer-events", "none", "important");
accessory.insertBefore(embed, prev ? prev.nextSibling : next);
let scroller = document.querySelector(BDFDB.dotCNS.chat + BDFDB.dotCN.messages);
- if (scroller) scroller.scrollTop += (embed.getBoundingClientRect().height + (isempty ? 15 : 0));
+ if (scroller) scroller.scrollTop += (BDFDB.getRects(embed).height + (isempty ? 15 : 0));
}
parseSrc (src) {
diff --git a/Plugins/FriendNotifications/FriendNotifications.plugin.js b/Plugins/FriendNotifications/FriendNotifications.plugin.js
index 411e52d111..3e5a86d7d5 100644
--- a/Plugins/FriendNotifications/FriendNotifications.plugin.js
+++ b/Plugins/FriendNotifications/FriendNotifications.plugin.js
@@ -1,6 +1,14 @@
//META{"name":"FriendNotifications"}*//
class FriendNotifications {
+ getName () {return "FriendNotifications";}
+
+ getVersion () {return "1.1.7";}
+
+ getAuthor () {return "DevilBro";}
+
+ getDescription () {return "Notifies you when a friend either logs in or out. Click the Online Friend-Counter to display a timelog of the current session.";}
+
initConstructor () {
this.patchModules = {
"FluxContainer(FriendsOnline)":["componentDidMount","componentDidUpdate"]
@@ -47,8 +55,6 @@ class FriendNotifications {
`;
-
- this.dividerMarkup = ``;
this.css = `
${BDFDB.dotCN.guilds} > ${BDFDB.dotCN.friendsonline} {
@@ -115,14 +121,6 @@ class FriendNotifications {
}
};
}
-
- getName () {return "FriendNotifications";}
-
- getDescription () {return "Notifies you when a friend either logs in or out. Click the Online Friend-Counter to display a timelog of the current session.";}
-
- getVersion () {return "1.1.6";}
-
- getAuthor () {return "DevilBro";}
getSettingsPanel () {
if (!this.started || typeof BDFDB !== "object") return;
@@ -133,7 +131,7 @@ class FriendNotifications {
let disabled = BDFDB.loadAllData(this, "disabled");
let settingshtml = ``;
- let settingspanel = $(settingshtml)[0];
+ let settingspanel = BDFDB.htmlToElement(settingshtml);
- BDFDB.initElements(settingspanel);
+ BDFDB.initElements(settingspanel, this);
- $(settingspanel)
- .on("click", ".settings-checkbox", () => {this.updateSettings(settingspanel);})
- .on("click", ".btn-savesong", (e) => {this.saveAudio(settingspanel, e.currentTarget.getAttribute("option"));})
- .on("click", ".mute-checkbox", (e) => {
- let option = e.currentTarget.getAttribute("option");
- let notificationsound = BDFDB.getData(option, this, "notificationsounds");
- notificationsound.mute = e.currentTarget.checked;
- BDFDB.saveData(option, notificationsound, this, "notificationsounds");
- })
- .on("mouseenter", ".settings-avatar", (e) => {
- let user = this.UserUtils.getUser(e.currentTarget.getAttribute("user-id"));
- let data = BDFDB.loadData(user.id, "EditUsers", "users") || {};
- BDFDB.createTooltip(data.name ? data.name : user.username, e.currentTarget, {type:"top"});
- })
- .on("contextmenu", ".settings-avatar", (e) => {
- if (!("Notification" in window)) return;
- let desktopoff = !e.currentTarget.classList.contains("desktop");
- let id = e.currentTarget.getAttribute("user-id");
- e.currentTarget.classList.remove("disabled");
- e.currentTarget.classList.toggle("desktop", desktopoff);
- BDFDB.saveData(id, desktopoff, this, "desktop");
- BDFDB.removeData(id, this, "disabled");
- })
- .on("click", ".settings-avatar", (e) => {
- let disableoff = !e.currentTarget.classList.contains("disabled");
- let id = e.currentTarget.getAttribute("user-id");
- e.currentTarget.classList.remove("desktop");
- e.currentTarget.classList.toggle("disabled", disableoff);
- BDFDB.saveData(id, disableoff, this, "disabled");
- BDFDB.removeData(id, this, "desktop");
- })
- .on("click", ".disable-all, .toast-all, .desktop-all", (e) => {
- let button = e.currentTarget;
- let disableon = button.getAttribute("do-disable");
- let desktopon = button.getAttribute("do-desktop");
- let disabledata = BDFDB.loadAllData(this, "disabled");
- let desktopdata = BDFDB.loadAllData(this, "desktop");
- settingspanel.querySelectorAll(".settings-avatar").forEach(avatar => {
- let id = avatar.getAttribute("user-id");
- avatar.classList.toggle("disabled", disableon);
- avatar.classList.toggle("desktop", desktopon);
- disableon ? disabledata[id] = true : delete disabledata[id];
- desktopon ? desktopdata[id] = true : delete desktopdata[id];
- });
- BDFDB.saveAllData(disabledata, this, "disabled");
- BDFDB.saveAllData(desktopdata, this, "desktop");
+ BDFDB.addEventListener(this, settingspanel, "click", ".btn-savesong", e => {this.saveAudio(settingspanel, e.currentTarget.getAttribute("option"));});
+ BDFDB.addEventListener(this, settingspanel, "click", ".mute-checkbox", e => {
+ let option = e.currentTarget.getAttribute("option");
+ let notificationsound = BDFDB.getData(option, this, "notificationsounds");
+ notificationsound.mute = e.currentTarget.checked;
+ BDFDB.saveData(option, notificationsound, this, "notificationsounds");
+ });
+ BDFDB.addEventListener(this, settingspanel, "mouseenter", ".settings-avatar", e => {
+ let user = this.UserUtils.getUser(e.currentTarget.getAttribute("user-id"));
+ let data = BDFDB.loadData(user.id, "EditUsers", "users") || {};
+ BDFDB.createTooltip(data.name ? data.name : user.username, e.currentTarget, {type:"top"});
+ });
+ BDFDB.addEventListener(this, settingspanel, "contextmenu", ".settings-avatar", e => {
+ if (!("Notification" in window)) return;
+ let desktopoff = !BDFDB.containsClass(e.currentTarget, "desktop");
+ let id = e.currentTarget.getAttribute("user-id");
+ BDFDB.removeClass(e.currentTarget, "disabled");
+ BDFDB.toggleClass(e.currentTarget, "desktop", desktopoff);
+ BDFDB.saveData(id, desktopoff, this, "desktop");
+ BDFDB.removeData(id, this, "disabled");
+ });
+ BDFDB.addEventListener(this, settingspanel, "click", ".settings-avatar", e => {
+ let disableoff = !BDFDB.containsClass(e.currentTarget, "disabled");
+ let id = e.currentTarget.getAttribute("user-id");
+ BDFDB.removeClass(e.currentTarget, "desktop");
+ BDFDB.toggleClass(e.currentTarget, "disabled", disableoff);
+ BDFDB.saveData(id, disableoff, this, "disabled");
+ BDFDB.removeData(id, this, "desktop");
+ });
+ BDFDB.addEventListener(this, settingspanel, "click", ".disable-all, .toast-all, .desktop-all", e => {
+ let disableon = e.currentTarget.getAttribute("do-disable");
+ let desktopon = e.currentTarget.getAttribute("do-desktop");
+ let disabledata = BDFDB.loadAllData(this, "disabled");
+ let desktopdata = BDFDB.loadAllData(this, "desktop");
+ settingspanel.querySelectorAll(".settings-avatar").forEach(avatar => {
+ let id = avatar.getAttribute("user-id");
+ BDFDB.toggleClass(avatar, "disabled", disableon);
+ BDFDB.toggleClass(avatar, "desktop", desktopon);
+ disableon ? disabledata[id] = true : delete disabledata[id];
+ desktopon ? desktopdata[id] = true : delete desktopdata[id];
});
+ BDFDB.saveAllData(disabledata, this, "disabled");
+ BDFDB.saveAllData(desktopdata, this, "desktop");
+ });
return settingspanel;
}
@@ -211,22 +206,25 @@ class FriendNotifications {
load () {}
start () {
- let libraryScript = null;
- if (typeof BDFDB !== "object" || typeof BDFDB.isLibraryOutdated !== "function" || BDFDB.isLibraryOutdated()) {
- libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ var libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ if (!libraryScript || performance.now() - libraryScript.getAttribute("date") > 600000) {
if (libraryScript) libraryScript.remove();
libraryScript = document.createElement("script");
libraryScript.setAttribute("type", "text/javascript");
libraryScript.setAttribute("src", "https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js");
+ libraryScript.setAttribute("date", performance.now());
+ libraryScript.addEventListener("load", () => {
+ BDFDB.loaded = true;
+ this.initialize();
+ });
document.head.appendChild(libraryScript);
}
+ else if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) this.initialize();
this.startTimeout = setTimeout(() => {this.initialize();}, 30000);
- if (typeof BDFDB === "object" && typeof BDFDB.isLibraryOutdated === "function") this.initialize();
- else libraryScript.addEventListener("load", () => {this.initialize();});
}
initialize () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
BDFDB.loadMessage(this);
this.FriendUtils = BDFDB.WebModules.findByProperties("getFriendIDs", "getRelationships");
@@ -248,21 +246,13 @@ class FriendNotifications {
}
stop () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
BDFDB.unloadMessage(this);
}
}
// begin of own functions
-
- updateSettings (settingspanel) {
- let settings = {};
- for (let input of settingspanel.querySelectorAll(BDFDB.dotCN.switchinner + ".settings-checkbox")) {
- settings[input.value] = input.checked;
- }
- BDFDB.saveAllData(settings, this, "settings");
- }
saveAudio (settingspanel, option) {
let successSavedAudio = (parsedurl, parseddata) => {
@@ -299,14 +289,8 @@ class FriendNotifications {
}
processFluxContainerFriendsOnline (instance, wrapper) {
- $(wrapper)
- .off("." + this.getName())
- .on("mouseenter." + this.getName(), (e) => {
- BDFDB.createTooltip("Timelog", e.currentTarget, {type:"right"});
- })
- .on("click." + this.getName(), (e) => {
- this.showTimeLog();
- });
+ BDFDB.addEventListener(this, wrapper, "mouseenter", () => {BDFDB.createTooltip("Timelog", wrapper, {type:"right"});});
+ BDFDB.addEventListener(this, wrapper, "click", () => {this.showTimeLog();});
let settings = BDFDB.getAllData(this, "settings");
for (let id of this.FriendUtils.getFriendIDs()) {
@@ -328,7 +312,7 @@ class FriendNotifications {
};
if (!BDFDB.loadData(id, this, "desktop")) {
let toast = BDFDB.showToast(``, {html:true, timeout:5000, type:(online ? "success" : null), icon:false, selector:`friendnotifications-${online ? "online" : "offline"}-toast`});
- $(toast).on("click." + this.getName(), openChannel);
+ toast.addEventListener("click", openChannel);
let notificationsound = BDFDB.getData(online ? "toastonline" : "toastoffline", this, "notificationsounds");
if (!notificationsound.mute && notificationsound.song) {
let audio = new Audio();
@@ -346,19 +330,20 @@ class FriendNotifications {
}
}
- showTimeLog () {
- let timeLogModal = $(this.timeLogModalMarkup);
+ showTimeLog () {
+ let timeLogModal = BDFDB.htmlToElement(this.timeLogModalMarkup);
+ let container = timeLogModal.querySelector(".entries");
+ if (!container) return;
let logs = this.timeLog.slice(0).reverse();
for (let log of logs) {
- let entry = $(this.logEntryMarkup);
- let divider = $(this.dividerMarkup);
+ if (container.childElementCount) container.appendChild(BDFDB.htmlToElement(``));
let data = BDFDB.loadData(log.user.id, "EditUsers", "users") || {};
- entry.find(".log-time").text(`[${log.time.toLocaleTimeString()}]`);
- entry.find(".log-avatar").css("background-image", `url(${data.removeIcon ? "" : (data.url ? data.url : BDFDB.getUserAvatar(log.user.id))})`);
- entry.find(".log-description").text(`${data.name ? data.name : log.user.username} is ${log.online ? "online" : "offline"}.`);
- timeLogModal.find(".entries").append(entry).append(divider);
+ let entry = BDFDB.htmlToElement(this.logEntryMarkup);
+ entry.querySelector(".log-time").innerText = `[${log.time.toLocaleTimeString()}]`;
+ entry.querySelector(".log-avatar").style.setProperty("background-image", `url(${data.removeIcon ? "" : (data.url ? data.url : BDFDB.getUserAvatar(log.user.id))})`);
+ entry.querySelector(".log-description").innerText = `${data.name || log.user.username} is ${log.online ? "online" : "offline"}.`;
+ container.appendChild(entry)
}
- BDFDB.removeEles("." + this.getName() + "-modal " + BDFDB.dotCN.modaldivider + ":last-of-type");
BDFDB.appendModal(timeLogModal);
}
}
\ No newline at end of file
diff --git a/Plugins/GoogleSearchReplace/GoogleSearchReplace.plugin.js b/Plugins/GoogleSearchReplace/GoogleSearchReplace.plugin.js
index 0117fdfab2..5566b653b4 100644
--- a/Plugins/GoogleSearchReplace/GoogleSearchReplace.plugin.js
+++ b/Plugins/GoogleSearchReplace/GoogleSearchReplace.plugin.js
@@ -1,6 +1,14 @@
//META{"name":"GoogleSearchReplace"}*//
class GoogleSearchReplace {
+ getName () {return "GoogleSearchReplace";}
+
+ getVersion () {return "1.1.7";}
+
+ getAuthor () {return "DevilBro";}
+
+ getDescription () {return "Replaces the default Google Text Search with a selection menu of several search engines.";}
+
initConstructor () {
this.labels = {};
@@ -42,14 +50,6 @@ class GoogleSearchReplace {
REPLACE_modal_header_text
@@ -50,10 +58,12 @@ class EditServers {
-
`;
settingshtml += `
`;
- var settingspanel = $(settingshtml)[0];
+ let settingspanel = BDFDB.htmlToElement(settingshtml);
- BDFDB.initElements(settingspanel);
+ BDFDB.initElements(settingspanel, this);
- $(settingspanel)
- .on("click", ".reset-button", () => {
- BDFDB.openConfirmModal(this, "Are you sure you want to reset all servers?", () => {
- BDFDB.removeAllData(this, "servers");
- BDFDB.WebModules.forceAllUpdates(this);
- });
+ BDFDB.addEventListener(this, settingspanel, "click", ".reset-button", () => {
+ BDFDB.openConfirmModal(this, "Are you sure you want to reset all servers?", () => {
+ BDFDB.removeAllData(this, "servers");
+ BDFDB.WebModules.forceAllUpdates(this);
});
+ });
return settingspanel;
}
@@ -148,22 +149,25 @@ class EditServers {
load () {}
start () {
- var libraryScript = null;
- if (typeof BDFDB !== "object" || typeof BDFDB.isLibraryOutdated !== "function" || BDFDB.isLibraryOutdated()) {
- libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ var libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ if (!libraryScript || performance.now() - libraryScript.getAttribute("date") > 600000) {
if (libraryScript) libraryScript.remove();
libraryScript = document.createElement("script");
libraryScript.setAttribute("type", "text/javascript");
libraryScript.setAttribute("src", "https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js");
+ libraryScript.setAttribute("date", performance.now());
+ libraryScript.addEventListener("load", () => {
+ BDFDB.loaded = true;
+ this.initialize();
+ });
document.head.appendChild(libraryScript);
}
+ else if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) this.initialize();
this.startTimeout = setTimeout(() => {this.initialize();}, 30000);
- if (typeof BDFDB === "object" && typeof BDFDB.isLibraryOutdated === "function") this.initialize();
- else libraryScript.addEventListener("load", () => {this.initialize();});
}
initialize () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
BDFDB.loadMessage(this);
this.GuildUtils = BDFDB.WebModules.findByProperties("getGuilds","getGuild");
@@ -176,7 +180,7 @@ class EditServers {
}
stop () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
let data = BDFDB.loadAllData(this, "servers");
BDFDB.removeAllData(this, "servers");
BDFDB.WebModules.forceAllUpdates(this);
@@ -212,160 +216,133 @@ class EditServers {
onGuildContextMenu (instance, menu) {
if (instance.props && instance.props.target && instance.props.guild && !menu.querySelector(".localserversettings-item")) {
- $(this.serverContextEntryMarkup).appendTo(menu)
- .on("mouseenter", ".localserversettings-item", (e) => {
- var serverContextSubMenu = $(this.serverContextSubMenuMarkup);
- serverContextSubMenu
- .on("click", ".serversettings-item", () => {
- instance._reactInternalFiber.return.memoizedProps.closeContextMenu();
- this.showServerSettings(instance.props.guild);
- });
-
- if (BDFDB.loadData(instance.props.guild.id, this, "servers")) {
- serverContextSubMenu
- .find(".resetsettings-item")
- .removeClass(BDFDB.disCN.contextmenuitemdisabled)
- .on("click", () => {
- instance._reactInternalFiber.return.memoizedProps.closeContextMenu();
- BDFDB.removeData(instance.props.guild.id, this, "servers");
- BDFDB.WebModules.forceAllUpdates(this);
- });
- }
- BDFDB.appendSubMenu(e.currentTarget, serverContextSubMenu);
+ let serverContextEntry = BDFDB.htmlToElement(this.serverContextEntryMarkup);
+ menu.appendChild(serverContextEntry);
+ let settingsitem = serverContextEntry.querySelector(".localserversettings-item");
+ settingsitem.addEventListener("mouseenter", () => {
+ let serverContextSubMenu = BDFDB.htmlToElement(this.serverContextSubMenuMarkup);
+ let serveritem = serverContextSubMenu.querySelector(".serversettings-item");
+ serveritem.addEventListener("click", () => {
+ instance._reactInternalFiber.return.memoizedProps.closeContextMenu();
+ this.showServerSettings(instance.props.guild);
});
+ if (BDFDB.loadData(instance.props.guild.id, this, "servers")) {
+ let resetitem = serverContextSubMenu.querySelector(".resetsettings-item");
+ BDFDB.removeClass(resetitem, BDFDB.disCN.contextmenuitemdisabled);
+ resetitem.addEventListener("click", () => {
+ instance._reactInternalFiber.return.memoizedProps.closeContextMenu();
+ BDFDB.removeData(instance.props.guild.id, this, "servers");
+ BDFDB.WebModules.forceAllUpdates(this);
+ });
+ }
+ BDFDB.appendSubMenu(settingsitem, serverContextSubMenu);
+ });
}
}
showServerSettings (info) {
var {name,shortName,url,removeIcon,color1,color2,color3,color4} = BDFDB.loadData(info.id, this, "servers") || {};
- var serverSettingsModal = $(this.serverSettingsModalMarkup);
- serverSettingsModal.find(BDFDB.dotCN.modalguildname).text(info.name);
- serverSettingsModal.find("#input-servername").val(name);
- serverSettingsModal.find("#input-servername").attr("placeholder", info.name);
- serverSettingsModal.find("#input-servershortname").val(shortName || (info.icon ? "" : info.acronym));
- serverSettingsModal.find("#input-servershortname").attr("placeholder", info.acronym);
- serverSettingsModal.find("#input-serverurl").val(url);
- serverSettingsModal.find("#input-serverurl").attr("placeholder", info.icon ? "https://cdn.discordapp.com/icons/" + info.id + "/" + info.icon + ".png" : null);
- serverSettingsModal.find("#input-serverurl").addClass(url ? "valid" : "");
- serverSettingsModal.find("#input-serverurl").prop("disabled", removeIcon);
- serverSettingsModal.find("#input-removeicon").prop("checked", removeIcon);
+ let serverSettingsModal = BDFDB.htmlToElement(this.serverSettingsModalMarkup);
+ let servernameinput = serverSettingsModal.querySelector("#input-servername");
+ let servershortnameinput = serverSettingsModal.querySelector("#input-servershortname");
+ let serverurlinput = serverSettingsModal.querySelector("#input-serverurl");
+ let removeiconinput = serverSettingsModal.querySelector("#input-removeicon");
+
+ serverSettingsModal.querySelector(BDFDB.dotCN.modalguildname).innerText = info.name;
+ servernameinput.value = name || "";
+ servernameinput.setAttribute("placeholder", info.name);
+ servershortnameinput.value = shortName || (info.icon ? "" : info.acronym);
+ servershortnameinput.setAttribute("placeholder", info.acronym);
+ serverurlinput.value = url || "";
+ serverurlinput.setAttribute("placeholder", BDFDB.getGuildIcon(info.id) || "");
+ BDFDB.toggleClass(serverurlinput, "valid", serverurlinput.value.length > 0);
+ serverurlinput.disabled = removeIcon;
+ removeiconinput.checked = removeIcon;
BDFDB.setColorSwatches(serverSettingsModal, color1);
BDFDB.setColorSwatches(serverSettingsModal, color2);
BDFDB.setColorSwatches(serverSettingsModal, color3);
BDFDB.setColorSwatches(serverSettingsModal, color4);
+
BDFDB.appendModal(serverSettingsModal);
- serverSettingsModal
- .on("click", "#input-removeicon", (e) => {
- serverSettingsModal.find("#input-serverurl").prop("disabled", e.currentTarget.checked);
- })
- .on("change keyup paste", "#input-serverurl", (e) => {
- this.checkUrl(e.currentTarget);
- })
- .on("mouseenter", "#input-serverurl", (e) => {
- e.currentTarget.classList.add("hovering");
- this.createNoticeTooltip(e.currentTarget);
- })
- .on("mouseleave", "#input-serverurl", (e) => {
- e.currentTarget.classList.remove("hovering");
- BDFDB.removeEles(BDFDB.dotCNS.tooltips + ".notice-tooltip");
- })
- .on("click", ".btn-save", (e) => {
- e.preventDefault();
-
- name = null;
- if (serverSettingsModal.find("#input-servername").val() && serverSettingsModal.find("#input-servername").val().trim().length > 0) {
- name = serverSettingsModal.find("#input-servername").val().trim();
- }
-
- shortName = null;
- if (serverSettingsModal.find("#input-servershortname").val() && serverSettingsModal.find("#input-servershortname").val().trim().length > 0) {
- shortName = serverSettingsModal.find("#input-servershortname").val().trim();
- shortName = shortName == info.acronym ? null : shortName;
- }
-
- removeIcon = serverSettingsModal.find("#input-removeicon").prop("checked");
- if (serverSettingsModal.find("#input-serverurl:not('.invalid')").length > 0) {
- url = null;
- if (!removeIcon && serverSettingsModal.find("#input-serverurl").val() && serverSettingsModal.find("#input-serverurl").val().trim().length > 0) {
- url = serverSettingsModal.find("#input-serverurl").val().trim();
- }
- }
-
- color1 = BDFDB.getSwatchColor(serverSettingsModal, 1);
- color2 = BDFDB.getSwatchColor(serverSettingsModal, 2);
- color3 = BDFDB.getSwatchColor(serverSettingsModal, 3);
- color4 = BDFDB.getSwatchColor(serverSettingsModal, 4);
-
- if (name == null && shortName == null && url == null && !removeIcon && color1 == null && color2 == null && color3 == null && color4 == null) {
- BDFDB.removeData(info.id, this, "servers");
- }
- else {
- BDFDB.saveData(info.id, {name,shortName,url,removeIcon,color1,color2,color3,color4}, this, "servers");
- }
- BDFDB.WebModules.forceAllUpdates(this);
- });
- serverSettingsModal.find("#input-servername").focus();
+
+ removeiconinput.addEventListener("click", e => {
+ serverurlinput.disabled = e.currentTarget.checked;
+ });
+ serverurlinput.addEventListener("change keyup paste", e => {
+ this.checkUrl(e.currentTarget);
+ });
+ serverurlinput.addEventListener("mouseenter", e => {
+ BDFDB.addClass(e.currentTarget, "hovering");
+ this.createNoticeTooltip(e.currentTarget);
+ });
+ serverurlinput.addEventListener("mouseleave", e => {
+ BDFDB.removeClass(e.currentTarget, "hovering");
+ BDFDB.removeEles(BDFDB.dotCNS.tooltips + ".notice-tooltip");
+ });
+ BDFDB.addChildEventListener(serverSettingsModal, "click", ".btn-save", e => {
+ e.preventDefault();
+
+ name = servernameinput.value.trim();
+ name = name ? name : null;
+
+ shortName = servershortnameinput.value.trim();
+ shortName = shortName && shortName != info.acronym ? shortName : null;
+
+ removeIcon = removeiconinput.checked;
+
+ url = !removeIcon && BDFDB.containsClass(serverurlinput, "valid") ? serverurlinput.value.trim() : null;
+ url = url ? url : null;
+
+ color1 = BDFDB.getSwatchColor(serverSettingsModal, 1);
+ color2 = BDFDB.getSwatchColor(serverSettingsModal, 2);
+ color3 = BDFDB.getSwatchColor(serverSettingsModal, 3);
+ color4 = BDFDB.getSwatchColor(serverSettingsModal, 4);
+
+ if (name == null && shortName == null && url == null && !removeIcon && color1 == null && color2 == null && color3 == null && color4 == null) {
+ BDFDB.removeData(info.id, this, "servers");
+ }
+ else {
+ BDFDB.saveData(info.id, {name,shortName,url,removeIcon,color1,color2,color3,color4}, this, "servers");
+ }
+ BDFDB.WebModules.forceAllUpdates(this);
+ });
+ servernameinput.focus();
}
checkUrl (input) {
BDFDB.removeEles(BDFDB.dotCNS.tooltips + ".notice-tooltip");
if (!input.value) {
- input.classList.remove("valid");
- input.classList.remove("invalid");
+ BDFDB.removeClass(input, "valid");
+ BDFDB.removeClass(input, "invalid");
}
else {
require("request")(input.value, (error, response, result) => {
if (response && response.headers["content-type"] && response.headers["content-type"].indexOf("image") != -1) {
- input.classList.add("valid");
- input.classList.remove("invalid");
+ BDFDB.addClass(input, "valid");
+ BDFDB.removeClass(input, "invalid");
}
else {
- input.classList.remove("valid");
- input.classList.add("invalid");
+ BDFDB.removeClass(input, "valid");
+ BDFDB.addClass(input, "invalid");
}
- if (input.classList.contains("hovering")) this.createNoticeTooltip(input);
+ if (BDFDB.containsClass(input, "hovering")) this.createNoticeTooltip(input);
});
}
}
createNoticeTooltip (input) {
var disabled = input.disabled;
- var valid = input.classList.contains("valid");
- var invalid = input.classList.contains("invalid");
+ var valid = BDFDB.containsClass(input, "valid");
+ var invalid = BDFDB.containsClass(input, "invalid");
if (disabled || valid || invalid) {
BDFDB.createTooltip(disabled ? this.labels.modal_ignoreurl_text : valid ? this.labels.modal_validurl_text : this.labels.modal_invalidurl_text, input, {type:"right",selector:"notice-tooltip",color: disabled ? "black" : invalid ? "red" : "green"});
}
}
- loadServer (serverObj) {
- if (typeof serverObj !== "object" || !serverObj) return;
- var data = BDFDB.loadData(serverObj.id, this, "servers");
- if (data) {
- var name = data.name ? data.name : serverObj.name;
- var bgImage = data.url ? ("url(" + data.url + ")") : (serverObj.icon ? "url('https://cdn.discordapp.com/icons/" + serverObj.id + "/" + serverObj.icon + ".png')" : "");
- var removeIcon = data.removeIcon;
- var shortName = data.shortName ? data.shortName : (serverObj.icon && !removeIcon ? "" : serverObj.data.acronym);
- var color1 = data.color1 ? BDFDB.colorCONVERT(data.color1, "RGB") : "";
- var color2 = data.color2 ? BDFDB.colorCONVERT(data.color2, "RGB") : "";
- $(serverObj.div)
- .off("mouseenter." + this.getName())
- .on("mouseenter." + this.getName(), () => {this.createServerToolTip(serverObj);})
- .attr("custom-editservers", true)
- .find(BDFDB.dotCN.avataricon)
- .text(bgImage && !removeIcon ? "" : shortName)
- .addClass(removeIcon || !bgImage ? BDFDB.disCN.avatarnoicon : "")
- .removeClass(!removeIcon && bgImage ? BDFDB.disCN.avatarnoicon : "")
- .css("font-size", removeIcon || !bgImage ? "10px" : "")
- .css("background-image", removeIcon ? "" : bgImage)
- .css("background-color", color1)
- .css("color", color2);
- }
- }
-
processGuildIcon (instance, wrapper) {
if (instance.props && instance.props.guild) {
- let icon = wrapper.classList && wrapper.classList.contains(BDFDB.disCN.avataricon) ? wrapper : wrapper.querySelector(BDFDB.dotCN.avataricon);
+ let icon = wrapper.classList && BDFDB.containsClass(wrapper, BDFDB.disCN.avataricon) ? wrapper : wrapper.querySelector(BDFDB.dotCN.avataricon);
if (!icon) return;
this.changeGuildIcon(instance.props.guild, icon);
if (BDFDB.getParentEle(BDFDB.dotCN.guild, icon)) this.changeTooltip(instance.props.guild, wrapper, "right");
@@ -382,18 +359,18 @@ class EditServers {
processClickable (instance, wrapper) {
if (!wrapper || !instance.props || !instance.props.className) return;
else if (instance.props.tag == "div" && instance.props.className.indexOf(BDFDB.disCN.userprofilelistrow) > -1) {
- let fiber = instance._reactInternalFiber;
- if (fiber.return && fiber.return.type && fiber.return.type.displayName == "GuildRow" && fiber.return.memoizedProps && fiber.return.memoizedProps.guild) {
- this.changeGuildName(fiber.return.memoizedProps.guild, wrapper.querySelector(BDFDB.dotCN.userprofilelistname));
+ let guild = BDFDB.getReactValue(instance, "_reactInternalFiber.return.memoizedProps.guild");
+ if (guild && BDFDB.getReactValue(instance, "_reactInternalFiber.return.type.displayName") == "GuildRow") {
+ this.changeGuildName(guild, wrapper.querySelector(BDFDB.dotCN.userprofilelistname));
}
}
else if (instance.props.tag == "div" && instance.props.className.indexOf(BDFDB.disCN.quickswitchresult) > -1) {
- let fiber = instance._reactInternalFiber;
- if (fiber.return && fiber.return.memoizedProps && fiber.return.memoizedProps.result && fiber.return.memoizedProps.result.type == "GUILD") {
- this.changeGuildName(fiber.return.memoizedProps.result.record, wrapper.querySelector(BDFDB.dotCN.quickswitchresultmatch));
+ let result = BDFDB.getReactValue(instance, "_reactInternalFiber.return.memoizedProps.result");
+ if (result && result.type == "GUILD") {
+ this.changeGuildName(result.record, wrapper.querySelector(BDFDB.dotCN.quickswitchresultmatch));
}
- else if (fiber.return && fiber.return.memoizedProps && fiber.return.memoizedProps.result && fiber.return.memoizedProps.result.type.indexOf("_CHANNEL") != -1 && fiber.return.memoizedProps.result.record && fiber.return.memoizedProps.result.record.guild_id) {
- this.changeGuildName(this.GuildUtils.getGuild(fiber.return.memoizedProps.result.record.guild_id), wrapper.querySelector(BDFDB.dotCN.quickswitchresultmisccontainer));
+ else if (result && result.type.indexOf("_CHANNEL") != -1 && result.record && result.record.guild_id) {
+ this.changeGuildName(this.GuildUtils.getGuild(result.record.guild_id), wrapper.querySelector(BDFDB.dotCN.quickswitchresultmisccontainer));
}
}
}
@@ -402,14 +379,18 @@ class EditServers {
if (!info || !guildname || !guildname.parentElement) return;
if (guildname.EditServersChangeObserver && typeof guildname.EditServersChangeObserver.disconnect == "function") guildname.EditServersChangeObserver.disconnect();
let data = BDFDB.loadData(info.id, this, "servers") || {};
- guildname.style.setProperty("color", BDFDB.colorCONVERT(data.color2, "RGB"), "important");
- BDFDB.setInnerText(guildname, data.name || info.name);
- if (!BDFDB.isObjectEmpty(data)) {
- guildname.EditServersChangeObserver = new MutationObserver((changes, _) => {
- guildname.EditServersChangeObserver.disconnect();
- this.changeName(info, guildname);
- });
- guildname.EditServersChangeObserver.observe(guildname, {attributes:true});
+ if (data.name || data.color2 || guildname.getAttribute("changed-by-editservers")) {
+ guildname.style.setProperty("color", BDFDB.colorCONVERT(data.color2, "RGB"), "important");
+ BDFDB.setInnerText(guildname, data.name || info.name);
+ if (data.name || data.color2) {
+ guildname.setAttribute("changed-by-editservers", true);
+ guildname.EditServersChangeObserver = new MutationObserver((changes, _) => {
+ guildname.EditServersChangeObserver.disconnect();
+ this.changeName(info, guildname);
+ });
+ guildname.EditServersChangeObserver.observe(guildname, {attributes:true});
+ }
+ else guildname.removeAttribute("changed-by-editservers");
}
}
@@ -417,65 +398,65 @@ class EditServers {
if (!info || !icon || !icon.parentElement) return;
if (icon.EditServersChangeObserver && typeof icon.EditServersChangeObserver.disconnect == "function") icon.EditServersChangeObserver.disconnect();
let data = BDFDB.loadData(info.id, this, "servers") || {};
- let url = data.url || BDFDB.getGuildIcon(info.id);
- if (icon.tagName == "IMG") icon.setAttribute("src", data.removeIcon || data.shortName ? null : url);
- else {
- BDFDB.setInnerText(icon, data.url ? "" : (data.shortName || (info.icon && !data.removeIcon ? "" : info.acronym)));
- icon.style.setProperty("background-image", data.removeIcon || data.shortName ? null : (url ? `url(${url})` : null), "important");
- icon.style.setProperty("background-color", BDFDB.colorCONVERT(data.color1, "RGB"), "important");
- icon.style.setProperty("color", BDFDB.colorCONVERT(data.color2, "RGB", "important"));
- icon.style.setProperty("font-size", this.getFontSize(icon));
- let hasicon = icon.style.getPropertyValue("background-image");
- for (let noiconclass of this.getNoIconClasses(icon)) {
- if (hasicon) icon.classList.remove(noiconclass);
- else icon.classList.add(noiconclass);
- }
- if (data.url && !data.removeIcon) {
- icon.style.setProperty("background-position", "center");
- icon.style.setProperty("background-size", "cover");
- }
+ if (data.url || data.removeIcon || icon.getAttribute("changed-by-editservers")) {
+ if (icon.tagName == "IMG") icon.setAttribute("src", data.removeIcon ? null : (data.url || BDFDB.getGuildIcon(info.id)));
else {
- icon.style.removeProperty("background-position");
- icon.style.removeProperty("background-size");
+ BDFDB.setInnerText(icon, data.url ? "" : (data.shortName || (info.icon && !data.removeIcon ? "" : info.acronym)));
+ icon.style.setProperty("background-image", data.removeIcon || data.shortName ? null : (url ? `url(${data.url || BDFDB.getUserAvatar(info.id)})` : null));
+ icon.style.setProperty("background-color", BDFDB.colorCONVERT(data.color1, "RGB"), "important");
+ icon.style.setProperty("color", BDFDB.colorCONVERT(data.color2, "RGB", "important"));
+ icon.style.setProperty("font-size", this.getFontSize(icon));
+ let hasicon = icon.style.getPropertyValue("background-image");
+ if (hasicon) BDFDB.removeClass(icon, this.getNoIconClasses(icon));
+ else BDFDB.addClass(icon, this.getNoIconClasses(icon));
+ if (data.url && !data.removeIcon) {
+ icon.style.setProperty("background-position", "center");
+ icon.style.setProperty("background-size", "cover");
+ }
}
- }
- if (!BDFDB.isObjectEmpty(data)) {
- icon.EditServersChangeObserver = new MutationObserver((changes, _) => {
- changes.forEach(
- (change, i) => {
- icon.EditServersChangeObserver.disconnect();
- this.changeGuildIcon(info, icon);
- }
- );
- });
- icon.EditServersChangeObserver.observe(icon, {attributes:true});
+ if (data.url || data.removeIcon) {
+ icon.setAttribute("changed-by-editservers", true);
+ icon.EditServersChangeObserver = new MutationObserver((changes, _) => {
+ changes.forEach(
+ (change, i) => {
+ icon.EditServersChangeObserver.disconnect();
+ this.changeGuildIcon(info, icon);
+ }
+ );
+ });
+ icon.EditServersChangeObserver.observe(icon, {attributes:true});
+ }
+ else icon.removeAttribute("changed-by-editservers");
}
}
changeTooltip (info, wrapper, type) {
if (!info || !wrapper || !wrapper.parentElement) return;
let data = BDFDB.loadData(info.id, this, "servers") || {};
- $(wrapper).off("mouseenter." + this.getName());
- if (data.name || data.color3 || data.color4) $(wrapper).on("mouseenter." + this.getName(), () => {
+ wrapper.removeEventListener("mouseenter", wrapper.tooltipListenerEditServers);
+ if (data.name || data.color3 || data.color4) {
var bgColor = data.color3 ? BDFDB.colorCONVERT(data.color3, "RGB") : "";
var fontColor = data.color4 ? BDFDB.colorCONVERT(data.color4, "RGB") : "";
- BDFDB.createTooltip(data.name || info.name, wrapper, {type,selector:"EditServers-tooltip",style:`color: ${fontColor} !important; background-color: ${bgColor} !important; border-color: ${bgColor} !important;`,css:`body ${BDFDB.dotCN.tooltip}:not(.EditServers-tooltip) {display: none !important;}`});
- });
+ wrapper.tooltipListenerEditServers = () => {
+ BDFDB.createTooltip(data.name || info.name, wrapper, {type,selector:"EditServers-tooltip",style:`color: ${fontColor} !important; background-color: ${bgColor} !important; border-color: ${bgColor} !important;`,css:`body ${BDFDB.dotCN.tooltip}:not(.EditServers-tooltip) {display: none !important;}`});
+ };
+ wrapper.addEventListener("mouseenter", wrapper.tooltipListenerEditServers);
+ }
}
getFontSize (icon) {
if (icon.style.getPropertyValue("background-image")) return null;
- else if (icon.classList.contains(BDFDB.disCN.avatariconsizexlarge)) return "12px";
- else if (icon.classList.contains(BDFDB.disCN.avatariconsizelarge)) return "10px";
- else if (icon.classList.contains(BDFDB.disCN.avatariconsizemedium)) return "8px";
- else if (icon.classList.contains(BDFDB.disCN.avatariconsizesmall)) return "4.8px";
- else if (icon.classList.contains(BDFDB.disCN.avatariconsizemini)) return "4px";
+ else if (BDFDB.containsClass(icon, BDFDB.disCN.avatariconsizexlarge)) return "12px";
+ else if (BDFDB.containsClass(icon, BDFDB.disCN.avatariconsizelarge)) return "10px";
+ else if (BDFDB.containsClass(icon, BDFDB.disCN.avatariconsizemedium)) return "8px";
+ else if (BDFDB.containsClass(icon, BDFDB.disCN.avatariconsizesmall)) return "4.8px";
+ else if (BDFDB.containsClass(icon, BDFDB.disCN.avatariconsizemini)) return "4px";
else return "10px";
}
getNoIconClasses (icon) {
let noiconclasses = [BDFDB.disCN.avatarnoicon];
- if (icon.classList.contains(BDFDB.disCN.userprofilelistavatar)) noiconclasses.push(BDFDB.disCN.userprofilelistguildavatarwithouticon);
+ if (BDFDB.containsClass(icon, BDFDB.disCN.userprofilelistavatar)) noiconclasses.push(BDFDB.disCN.userprofilelistguildavatarwithouticon);
return noiconclasses;
}
diff --git a/Plugins/EditUsers/EditUsers.plugin.js b/Plugins/EditUsers/EditUsers.plugin.js
index ab16142560..810bd674a6 100644
--- a/Plugins/EditUsers/EditUsers.plugin.js
+++ b/Plugins/EditUsers/EditUsers.plugin.js
@@ -3,11 +3,11 @@
class EditUsers {
getName () {return "EditUsers";}
- getVersion () {return "3.2.2";}
+ getVersion () {return "3.2.3";}
getAuthor () {return "DevilBro";}
- getDescription () {return "Allows you to change the icon, name, tag and color of users. Does not work in compact mode.";}
+ getDescription () {return "Allows you to change the icon, name, tag and color of users.";}
initConstructor () {
this.labels = {};
@@ -196,13 +196,12 @@ class EditUsers {
BDFDB.initElements(settingspanel, this);
- $(settingspanel)
- .on("click", ".reset-button", () => {
- BDFDB.openConfirmModal(this, "Are you sure you want to reset all users?", () => {
- BDFDB.removeAllData(this, "users");
- BDFDB.WebModules.forceAllUpdates(this);
- });
+ BDFDB.addEventListener(this, settingspanel, "click", ".reset-button", () => {
+ BDFDB.openConfirmModal(this, "Are you sure you want to reset all users?", () => {
+ BDFDB.removeAllData(this, "users");
+ BDFDB.WebModules.forceAllUpdates(this);
});
+ });
return settingspanel;
}
@@ -210,22 +209,25 @@ class EditUsers {
load () {}
start () {
- var libraryScript = null;
- if (typeof BDFDB !== "object" || typeof BDFDB.isLibraryOutdated !== "function" || BDFDB.isLibraryOutdated()) {
- libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ var libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ if (!libraryScript || performance.now() - libraryScript.getAttribute("date") > 600000) {
if (libraryScript) libraryScript.remove();
libraryScript = document.createElement("script");
libraryScript.setAttribute("type", "text/javascript");
libraryScript.setAttribute("src", "https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js");
+ libraryScript.setAttribute("date", performance.now());
+ libraryScript.addEventListener("load", () => {
+ BDFDB.loaded = true;
+ this.initialize();
+ });
document.head.appendChild(libraryScript);
}
+ else if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) this.initialize();
this.startTimeout = setTimeout(() => {this.initialize();}, 30000);
- if (typeof BDFDB === "object" && typeof BDFDB.isLibraryOutdated === "function") this.initialize();
- else libraryScript.addEventListener("load", () => {this.initialize();});
}
initialize () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
BDFDB.loadMessage(this);
this.RelationshipUtils = BDFDB.WebModules.findByProperties("isBlocked", "isFriend");
@@ -244,7 +246,7 @@ class EditUsers {
stop () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
let data = BDFDB.loadAllData(this, "users");
BDFDB.removeAllData(this, "users");
BDFDB.WebModules.forceAllUpdates(this);
@@ -284,26 +286,25 @@ class EditUsers {
if (instance.props && instance.props.user && !menu.querySelector(".localusersettings-item")) {
let userContextEntry = BDFDB.htmlToElement(this.userContextEntryMarkup);
menu.appendChild(userContextEntry);
- $(userContextEntry)
- .on("mouseenter." + this.getName(), ".localusersettings-item", e => {
- var userContextSubMenu = BDFDB.htmlToElement(this.userContextSubMenuMarkup);
- $(userContextSubMenu)
- .on("click", ".usersettings-item", () => {
- instance._reactInternalFiber.return.memoizedProps.closeContextMenu();
- this.showUserSettings(instance.props.user);
- });
- if (BDFDB.loadData(instance.props.user.id, this, "users")) {
- $(userContextSubMenu)
- .find(".resetsettings-item")
- .removeClass(BDFDB.disCN.contextmenuitemdisabled)
- .on("click", () => {
- instance._reactInternalFiber.return.memoizedProps.closeContextMenu();
- BDFDB.removeData(instance.props.user.id, this, "users");
- BDFDB.WebModules.forceAllUpdates(this);
- });
- }
- BDFDB.appendSubMenu(e.currentTarget, userContextSubMenu);
+ let settingsitem = userContextEntry.querySelector(".localusersettings-item");
+ settingsitem.addEventListener("mouseenter", () => {
+ let userContextSubMenu = BDFDB.htmlToElement(this.userContextSubMenuMarkup);
+ let useritem = userContextSubMenu.querySelector(".usersettings-item");
+ useritem.addEventListener("click", () => {
+ instance._reactInternalFiber.return.memoizedProps.closeContextMenu();
+ this.showUserSettings(instance.props.user);
});
+ if (BDFDB.loadData(instance.props.user.id, this, "users")) {
+ let resetitem = userContextSubMenu.querySelector(".resetsettings-item");
+ BDFDB.removeClass(resetitem, BDFDB.disCN.contextmenuitemdisabled);
+ resetitem.addEventListener("click", () => {
+ instance._reactInternalFiber.return.memoizedProps.closeContextMenu();
+ BDFDB.removeData(instance.props.user.id, this, "users");
+ BDFDB.WebModules.forceAllUpdates(this);
+ });
+ }
+ BDFDB.appendSubMenu(settingsitem, userContextSubMenu);
+ });
}
}
@@ -325,7 +326,7 @@ class EditUsers {
usertaginput.value = tag || "";
userurlinput.value = url || "";
userurlinput.setAttribute("placeholder", BDFDB.getUserAvatar(info.id) || "");
- userurlinput.classList.toggle("valid", userurlinput.value);
+ BDFDB.toggleClass(userurlinput, "valid", userurlinput.value.length > 0);
userurlinput.disabled = removeIcon;
removeiconinput.checked = removeIcon;
ignoretagcolorinput.checked = ignoreTagColor;
@@ -336,86 +337,84 @@ class EditUsers {
let ignoredswatches = userSettingsModal.querySelectorAll(".swatches[swatchnr='3'], .swatches[swatchnr='4']");
- ignoredswatches.forEach(swatches => {swatches.classList.toggle("disabled", ignoretagcolorinput.checked);});
+ BDFDB.toggleClass(ignoredswatches, "disabled", ignoretagcolorinput.checked);
BDFDB.appendModal(userSettingsModal);
- $(userSettingsModal)
- .on("click", "#input-removeicon", e => {
- userurlinput.disabled = e.currentTarget.checked;
- })
- .on("click", "#input-ignoretagcolor", e => {
- ignoredswatches.forEach(swatches => {swatches.classList.toggle("disabled", e.currentTarget.checked);});
- })
- .on("change keyup paste", "#input-userurl", e => {
- this.checkUrl(e.currentTarget);
- })
- .on("mouseenter", "#input-userurl", e => {
- e.currentTarget.classList.add("hovering");
- this.createNoticeTooltip(e.currentTarget);
- })
- .on("mouseleave", "#input-userurl", e => {
- e.currentTarget.classList.remove("hovering");
- BDFDB.removeEles(BDFDB.dotCNS.tooltips + ".notice-tooltip");
- })
- .on("click", ".btn-save", e => {
- e.preventDefault();
-
- name = usernameinput.value.trim();
- name = name ? name : null;
-
- tag = usertaginput.value.trim();
- tag = tag ? tag : null;
-
- removeIcon = removeiconinput.checked;
-
- ignoreTagColor = ignoretagcolorinput.checked;
-
- url = !removeIcon && userurlinput.classList.contains("valid") ? userurlinput.value.trim() : null;
- url = url ? url : null;
-
- color1 = BDFDB.getSwatchColor(userSettingsModal, 1);
- color2 = BDFDB.getSwatchColor(userSettingsModal, 2);
- color3 = BDFDB.getSwatchColor(userSettingsModal, 3);
- color4 = BDFDB.getSwatchColor(userSettingsModal, 4);
-
- if (name == null && tag == null && url == null && !removeIcon && !ignoreTagColor && color1 == null && color2 == null && color3 == null && color4 == null) {
- BDFDB.removeData(info.id, this, "users")
- }
- else {
- BDFDB.saveData(info.id, {name,tag,url,removeIcon,ignoreTagColor,color1,color2,color3,color4}, this, "users");
- }
- BDFDB.WebModules.forceAllUpdates(this);
- });
+ removeiconinput.addEventListener("click", e => {
+ userurlinput.disabled = e.currentTarget.checked;
+ });
+ ignoretagcolorinput.addEventListener("click", e => {
+ BDFDB.toggleClass(ignoredswatches, "disabled", e.currentTarget.checked);
+ });
+ userurlinput.addEventListener("change keyup paste", e => {
+ this.checkUrl(e.currentTarget);
+ });
+ userurlinput.addEventListener("mouseenter", e => {
+ BDFDB.addClass(e.currentTarget, "hovering");
+ this.createNoticeTooltip(e.currentTarget);
+ });
+ userurlinput.addEventListener("mouseleave", e => {
+ BDFDB.removeClass(e.currentTarget, "hovering");
+ BDFDB.removeEles(BDFDB.dotCNS.tooltips + ".notice-tooltip");
+ });
+ BDFDB.addChildEventListener(userSettingsModal, "click", ".btn-save", e => {
+ e.preventDefault();
+ name = usernameinput.value.trim();
+ name = name ? name : null;
+
+ tag = usertaginput.value.trim();
+ tag = tag ? tag : null;
+
+ removeIcon = removeiconinput.checked;
+
+ ignoreTagColor = ignoretagcolorinput.checked;
+
+ url = !removeIcon && BDFDB.containsClass(userurlinput, "valid") ? userurlinput.value.trim() : null;
+ url = url ? url : null;
+
+ color1 = BDFDB.getSwatchColor(userSettingsModal, 1);
+ color2 = BDFDB.getSwatchColor(userSettingsModal, 2);
+ color3 = BDFDB.getSwatchColor(userSettingsModal, 3);
+ color4 = BDFDB.getSwatchColor(userSettingsModal, 4);
+
+ if (name == null && tag == null && url == null && !removeIcon && !ignoreTagColor && color1 == null && color2 == null && color3 == null && color4 == null) {
+ BDFDB.removeData(info.id, this, "users")
+ }
+ else {
+ BDFDB.saveData(info.id, {name,tag,url,removeIcon,ignoreTagColor,color1,color2,color3,color4}, this, "users");
+ }
+ BDFDB.WebModules.forceAllUpdates(this);
+ });
usernameinput.focus();
}
checkUrl (input) {
BDFDB.removeEles(BDFDB.dotCNS.tooltips + ".notice-tooltip");
if (!input.value) {
- input.classList.remove("valid");
- input.classList.remove("invalid");
+ BDFDB.removeClass(input, "valid");
+ BDFDB.removeClass(input, "invalid");
}
else {
require("request")(input.value, (error, response, result) => {
if (response && response.headers["content-type"] && response.headers["content-type"].indexOf("image") != -1) {
- input.classList.add("valid");
- input.classList.remove("invalid");
+ BDFDB.addClass(input, "valid");
+ BDFDB.removeClass(input, "invalid");
}
else {
- input.classList.remove("valid");
- input.classList.add("invalid");
+ BDFDB.removeClass(input, "valid");
+ BDFDB.addClass(input, "invalid");
}
- if (input.classList.contains("hovering")) this.createNoticeTooltip(input);
+ if (BDFDB.containsClass(input, "hovering")) this.createNoticeTooltip(input);
});
}
}
createNoticeTooltip (input) {
var disabled = input.disabled;
- var valid = input.classList.contains("valid");
- var invalid = input.classList.contains("invalid");
+ var valid = BDFDB.containsClass(input, "valid");
+ var invalid = BDFDB.containsClass(input, "invalid");
if (disabled || valid || invalid) {
BDFDB.createTooltip(disabled ? this.labels.modal_ignoreurl_text : valid ? this.labels.modal_validurl_text : this.labels.modal_invalidurl_text, input, {type:"right",selector:"notice-tooltip",color: disabled ? "black" : invalid ? "red" : "green"});
}
@@ -432,7 +431,7 @@ class EditUsers {
}
processNameTag (instance, wrapper) {
- let username = wrapper.parentElement.querySelector("." + (wrapper.classList && wrapper.classList.contains(BDFDB.disCN.userpopoutheadertagwithnickname) ? BDFDB.disCN.userpopoutheadernickname : instance.props.usernameClass).replace(/ /g, "."));
+ let username = wrapper.parentElement.querySelector("." + (BDFDB.containsClass(wrapper, BDFDB.disCN.userpopoutheadertagwithnickname) ? BDFDB.disCN.userpopoutheadernickname : instance.props.usernameClass).replace(/ /g, "."));
this.changeName(instance.props.user, username);
this.changeAvatar(instance.props.user, this.getAvatarDiv(wrapper));
this.addTag(instance.props.user, username.parentElement, BDFDB.disCN.bottagnametag + (instance.props.botClass ? (" " + instance.props.botClass) : ""));
@@ -445,11 +444,11 @@ class EditUsers {
if (username) {
let channel = this.ChannelUtils.getChannel(message.channel_id) || {};
this.changeName(message.author, username, channel.guild_id);
- if (wrapper.parentElement && wrapper.parentElement.classList && !wrapper.parentElement.classList.contains(BDFDB.disCN.messageheadercompact)) {
+ if (!BDFDB.containsClass(wrapper.parentElement, BDFDB.disCN.messageheadercompact)) {
this.changeAvatar(message.author, this.getAvatarDiv(wrapper));
}
let messagegroup = BDFDB.getParentEle(BDFDB.dotCN.messagegroup, wrapper);
- this.addTag(message.author, wrapper, BDFDB.disCN.bottagmessage + " " + (messagegroup.classList.contains(BDFDB.disCN.messagegroupcozy) ? BDFDB.disCN.bottagmessagecozy : BDFDB.disCN.bottagmessagecompact));
+ this.addTag(message.author, wrapper, BDFDB.disCN.bottagmessage + " " + (BDFDB.containsClass(messagegroup, BDFDB.disCN.messagegroupcozy) ? BDFDB.disCN.bottagmessagecozy : BDFDB.disCN.bottagmessagecompact));
}
}
}
@@ -496,7 +495,7 @@ class EditUsers {
let avatar = wrapper.querySelector(BDFDB.dotCN.callavatar);
this.changeName2(user, wrapper.parentElement.querySelector(BDFDB.dotCN.callmembers));
this.changeAvatar(user, avatar);
- if (avatar.classList.contains(BDFDB.disCN.callvideo)) this.changeTooltip(user, avatar, "left");
+ if (BDFDB.containsClass(avatar, BDFDB.disCN.callvideo)) this.changeTooltip(user, avatar, "left");
}
}
}
@@ -531,7 +530,7 @@ class EditUsers {
processClickable (instance, wrapper) {
if (!wrapper || !instance.props || !instance.props.className) return;
if (instance.props.tag == "a" && instance.props.className.indexOf(BDFDB.disCN.anchorunderlineonhover) > -1) {
- if (wrapper.parentElement.classList.contains(BDFDB.disCN.messagesystemcontent) && wrapper.parentElement.querySelector("a") == wrapper) {
+ if (BDFDB.containsClass(wrapper.parentElement, BDFDB.disCN.messagesystemcontent) && wrapper.parentElement.querySelector("a") == wrapper) {
let message = BDFDB.getKeyInformation({node:wrapper.parentElement, key:"message", up:true});
if (message) this.changeName(message.author, wrapper);
}
@@ -611,14 +610,14 @@ class EditUsers {
if (data.name || data.color1 || data.color2 || username.getAttribute("changed-by-editusers")) {
let member = this.MemberUtils.getMember(guildid, info.id) || {};
let isBRCenabled = BDFDB.isPluginEnabled("BetterRoleColors");
- let usenick = !username.parentElement.classList.contains(BDFDB.disCN.userprofilelistname) && !username.classList.contains(BDFDB.disCN.userprofileusername) && !username.parentElement.classList.contains(BDFDB.disCN.accountinfodetails) && member.nick;
- let usemembercolor = !username.parentElement.classList.contains(BDFDB.disCN.userprofilelistname) && (username.classList.contains(BDFDB.disCN.memberusername) || username.classList.contains(BDFDB.disCN.messageusername) || isBRCenabled);
+ let usenick = !BDFDB.containsClass(username, BDFDB.disCN.userprofileusername) && !BDFDB.containsClass(username.parentElement, BDFDB.disCN.userprofilelistname, BDFDB.disCN.accountinfodetails, false) && member.nick;
+ let usemembercolor = !BDFDB.containsClass(username.parentElement, BDFDB.disCN.userprofilelistname) && (BDFDB.containsClass(username, BDFDB.disCN.memberusername, BDFDB.disCN.messageusername, false) || isBRCenabled);
username.style.setProperty("color", BDFDB.colorCONVERT(data.color1 || (usemembercolor ? member.colorString : null), "RGB"), "important");
username.style.setProperty("background-color", BDFDB.colorCONVERT(data.color2, "RGB"), "important");
BDFDB.setInnerText(username, data.name || (usenick ? member.nick : info.username));
for (let tag of username.parentElement.querySelectorAll(BDFDB.dotCN.bottag)) {
let invert = tag.className.indexOf(BDFDB.disCN.bottaginvert) > -1;
- let tagcolor = BDFDB.colorCONVERT(data.color1 || (isBRCenabled || tag.classList.contains("owner-tag-rolecolor") ? member.colorString : null), "RGB");
+ let tagcolor = BDFDB.colorCONVERT(data.color1 || (isBRCenabled || BDFDB.containsClass(tag, "owner-tag-rolecolor") ? member.colorString : null), "RGB");
tagcolor = BDFDB.colorISBRIGHT(tagcolor) ? BDFDB.colorCHANGE(tagcolor, -0.3) : tagcolor;
tag.style.setProperty(invert ? "color" : "background-color", tagcolor, "important");
}
@@ -687,7 +686,7 @@ class EditUsers {
if (avatar.tagName == "IMG") avatar.setAttribute("src", data.removeIcon ? null : (data.url || BDFDB.getUserAvatar(info.id)));
else {
let url = data.removeIcon ? null : ("url(" + (data.url || BDFDB.getUserAvatar(info.id)) + ")");
- if (url && avatar.classList.contains(BDFDB.disCN.avatarmaskprofile) && url.search(/discordapp\.com\/avatars\/[0-9]*\/a_/) > -1) url = url.replace(".webp)", ".gif)");
+ if (url && BDFDB.containsClass(avatar, BDFDB.disCN.avatarmaskprofile) && url.search(/discordapp\.com\/avatars\/[0-9]*\/a_/) > -1) url = url.replace(".webp)", ".gif)");
avatar.style.setProperty("background-image", url);
if (data.url && !data.removeIcon) {
avatar.style.setProperty("background-position", "center");
@@ -713,14 +712,17 @@ class EditUsers {
changeTooltip (info, wrapper, type) {
if (!info || !wrapper || !wrapper.parentElement) return;
let data = this.getUserData(info.id, wrapper);
- $(wrapper).off("mouseenter." + this.getName());
- if (data.name) $(wrapper).on("mouseenter." + this.getName(), () => {
- BDFDB.createTooltip(data.name, wrapper, {type,selector:"EditUsers-tooltip",css:`body ${BDFDB.dotCN.tooltip}:not(.EditUsers-tooltip) {display: none !important;}`});
- });
+ wrapper.removeEventListener("mouseenter", wrapper.tooltipListenerEditUsers);
+ if (data.name) {
+ wrapper.tooltipListenerEditUsers = () => {
+ BDFDB.createTooltip(data.name, wrapper, {type,selector:"EditUsers-tooltip",css:`body ${BDFDB.dotCN.tooltip}:not(.EditUsers-tooltip) {display: none !important;}`});
+ };
+ wrapper.addEventListener("mouseenter", wrapper.tooltipListenerEditUsers);
+ }
}
addTag (info, wrapper, selector = "") {
- if (!info || !wrapper || !wrapper.parentElement || wrapper.classList.contains(BDFDB.disCN.accountinfodetails) || wrapper.classList.contains("discord-tag")) return;
+ if (!info || !wrapper || !wrapper.parentElement || BDFDB.containsClass(wrapper, BDFDB.disCN.accountinfodetails) || BDFDB.containsClass(wrapper, "discord-tag")) return;
BDFDB.removeEles(wrapper.querySelectorAll(".EditUsers-tag"));
let data = this.getUserData(info.id, wrapper);
if (data.tag) {
@@ -741,25 +743,27 @@ class EditUsers {
let dmchannel = BDFDB.getParentEle(BDFDB.dotCN.dmchannel, username);
if (!dmchannel) return;
if (username.EditUsersChangeObserver && typeof username.EditUsersChangeObserver.disconnect == "function") username.EditUsersChangeObserver.disconnect();
- $(dmchannel).off("." + this.getName())
+ dmchannel.removeEventListener("mouseenter", dmchannel.mouseenterListenerEditUsers);
+ dmchannel.removeEventListener("mouseleave", dmchannel.mouseleaveListenerEditUsers);
let data = this.getUserData(info.id, username);
if (data.name || data.color1 || data.color2 || username.getAttribute("changed-by-editusers")) {
let color1 = BDFDB.colorCONVERT(data.color1, "RGB");
let color2 = BDFDB.colorCONVERT(data.color2, "RGB");
BDFDB.setInnerText(username, data.name || info.username);
- if (username.EditUsersHovered || dmchannel.classList.contains(BDFDB.disCN.dmchannelselected)) colorHover();
+ if (username.EditUsersHovered || BDFDB.containsClass(dmchannel, BDFDB.disCN.dmchannelselected)) colorHover();
else colorDefault();
if (data.name || data.color1 || data.color2) {
- $(dmchannel)
- .on("mouseenter." + this.getName(), () => {
- username.EditUsersHovered = true;
- colorHover();
- })
- .on("mouseleave." + this.getName(), () => {
- delete username.EditUsersHovered;
- colorDefault();
- });
+ dmchannel.mouseenterListenerEditUsers = () => {
+ username.EditUsersHovered = true;
+ colorHover();
+ };
+ dmchannel.mouseleaveListenerEditUsers = () => {
+ delete username.EditUsersHovered;
+ colorDefault();
+ };
+ dmchannel.addEventListener("mouseenter", dmchannel.mouseenterListenerEditUsers);
+ dmchannel.addEventListener("mouseleave", dmchannel.mouseleaveListenerEditUsers);
username.setAttribute("changed-by-editusers", true);
username.EditUsersChangeObserver = new MutationObserver((changes, _) => {
username.EditUsersChangeObserver.disconnect();
@@ -782,6 +786,8 @@ class EditUsers {
changeMention (info, mention) {
if (!info || !mention || !mention.parentElement) return;
if (mention.EditUsersChangeObserver && typeof mention.EditUsersChangeObserver.disconnect == "function") mention.EditUsersChangeObserver.disconnect();
+ mention.removeEventListener("mouseover", mention.mouseoverListenerEditUsers);
+ mention.removeEventListener("mouseout", mention.mouseoutListenerEditUsers);
let data = this.getUserData(info.id, mention);
let member = this.MemberUtils.getMember(this.LastGuildStore.getGuildId(), info.id) || {};
let color1 = BDFDB.colorCONVERT(data.color1 || (BDFDB.isPluginEnabled("BetterRoleColors") ? member.colorString : null), "RGBCOMP");
@@ -789,16 +795,16 @@ class EditUsers {
BDFDB.setInnerText(mention, "@" + name);
if (mention.EditUsersHovered) colorHover();
else colorDefault();
- $(mention)
- .off("." + this.getName())
- .on("mouseenter." + this.getName(), () => {
- mention.EditUsersHovered = true;
- colorHover();
- })
- .on("mouseleave." + this.getName(), () => {
- delete mention.EditUsersHovered;
- colorDefault();
- });
+ mention.mouseoverListenerEditUsers = () => {
+ mention.EditUsersHovered = true;
+ colorHover();
+ };
+ mention.mouseoutListenerEditUsers = () => {
+ delete mention.EditUsersHovered;
+ colorDefault();
+ };
+ mention.addEventListener("mouseover", mention.mouseoverListenerEditUsers);
+ mention.addEventListener("mouseout", mention.mouseoutListenerEditUsers);
mention.EditUsersChangeObserver = new MutationObserver((changes, _) => {
mention.EditUsersChangeObserver.disconnect();
this.changeMention(info, mention);
@@ -822,7 +828,7 @@ class EditUsers {
let member = this.MemberUtils.getMember(this.LastGuildStore.getGuildId(), info.id) || {};
let color1 = BDFDB.colorCONVERT(data.color1 || (BDFDB.isPluginEnabled("BetterRoleColors") ? member.colorString : ""), "RGB");
BDFDB.setInnerText(username, data.name || member.nick || info.username);
- username.style.setProperty("color", username.classList.contains(BDFDB.disCN.voicenamedefault) ? BDFDB.colorCHANGE(color1, -50) : color1, "important");
+ username.style.setProperty("color", BDFDB.containsClass(username, BDFDB.disCN.voicenamedefault) ? BDFDB.colorCHANGE(color1, -50) : color1, "important");
if (data.name || data.color1) {
username.EditUsersChangeObserver = new MutationObserver((changes, _) => {
username.EditUsersChangeObserver.disconnect();
@@ -850,8 +856,8 @@ class EditUsers {
for (let i in settings) if (!settings[i]) allenabled = false;
if (allenabled) return data;
let key = null, ele = null;
- if (!wrapper.classList.contains(BDFDB.disCN.mention) && BDFDB.getParentEle(BDFDB.dotCN.messagegroup, wrapper)) key = "changeInChatWindow";
- else if (wrapper.classList.contains(BDFDB.disCN.mention)) key = "changeInMentions";
+ if (!BDFDB.containsClass(wrapper, BDFDB.disCN.mention) && BDFDB.getParentEle(BDFDB.dotCN.messagegroup, wrapper)) key = "changeInChatWindow";
+ else if (BDFDB.containsClass(wrapper, BDFDB.disCN.mention)) key = "changeInMentions";
else if (BDFDB.getParentEle(BDFDB.dotCN.textareawrapchat, wrapper)) key = "changeInChatTextarea";
else if (BDFDB.getParentEle(BDFDB.dotCN.voiceuser, wrapper)) key = "changeInVoiceChat";
else if (BDFDB.getParentEle(BDFDB.dotCN.members, wrapper)) key = "changeInMemberList";
diff --git a/Plugins/EmojiStatistics/EmojiStatistics.plugin.js b/Plugins/EmojiStatistics/EmojiStatistics.plugin.js
index 82228700cf..7896bc7a87 100644
--- a/Plugins/EmojiStatistics/EmojiStatistics.plugin.js
+++ b/Plugins/EmojiStatistics/EmojiStatistics.plugin.js
@@ -1,6 +1,14 @@
//META{"name":"EmojiStatistics"}*//
class EmojiStatistics {
+ getName () {return "EmojiStatistics";}
+
+ getVersion () {return "2.7.9";}
+
+ getAuthor () {return "DevilBro";}
+
+ getDescription () {return "Adds some helpful options to show you more information about emojis and emojiservers.";}
+
initConstructor () {
this.labels = {};
@@ -9,6 +17,7 @@ class EmojiStatistics {
};
this.css = `
+ .emojistatistics-tooltip,
.emoji-tooltip {
z-index: 2002;
}
@@ -24,19 +33,7 @@ class EmojiStatistics {
}
.${this.getName()}-modal .emojiserver-entry .modal-emojiserver-icon {
- background-color: #484B51;
- background-size: cover;
- border-radius: 25px;
- color: #b9bbbe;
display: inline-block;
- font-size: 16px;
- font-weight: 600;
- height: 35px;
- letter-spacing: .5px;
- overflow: hidden;
- padding-top: 15px;
- text-align: center;
- width: 50px;
}
.${this.getName()}-modal .titles-entry label,
@@ -151,10 +148,6 @@ class EmojiStatistics {
REPLACE_modal_tabheader1_text
- REPLACE_modal_tabheader2_text
- REPLACE_modal_tabheader3_text
+
@@ -115,14 +125,6 @@ class EditServers {
`;
}
-
- getName () {return "EditServers";}
-
- getDescription () {return "Allows you to change the icon, name and color of servers.";}
-
- getVersion () {return "1.8.9";}
-
- getAuthor () {return "DevilBro";}
getSettingsPanel () {
if (!this.started || typeof BDFDB !== "object") return;
@@ -130,17 +132,16 @@ class EditServers {
settingshtml += `Reset all Servers.
${this.getName()}
`;
for (let key in settings) {
- settingshtml += ``;
+ settingshtml += ``;
}
for (let key in amounts) {
settingshtml += ``;
}
settingshtml += `
${this.defaults.settings[key].description}
${this.defaults.settings[key].description}
${this.defaults.amounts[key].description}
${this.getName()}
`;
for (let key in settings) {
- settingshtml += ``;
+ settingshtml += ``;
}
for (let key in notificationsounds) {
if (key.indexOf("desktop") == -1 || "Notification" in window) settingshtml += ``;
@@ -152,57 +150,54 @@ class FriendNotifications {
settingshtml += ``;
settingshtml += `
${this.defaults.settings[key].description}
${this.defaults.settings[key].description}
${key} notification sound:
Mute:
Batch set Users:
${"Notification" in window ? `` : ``}${string}
${this.getName()}
`;
settingshtml += `
Search Engines:
`;
for (let key in engines) {
- settingshtml += ``;
+ settingshtml += ``;
}
settingshtml += `
`;
settingshtml += `${this.defaults.engines[key].name}
${this.defaults.engines[key].name}
${this.labels.joinedat_text + " " + this.getJoinedTime(this.languages[choice].id, timestamp)}
${this.labels.joinedat_text + " " + this.getJoinedTime(this.languages[choice].id, timestamp)}
${this.getName()}
`;
for (let key in settings) {
- if (this.defaults.settings[key].description) settingshtml += ``;
+ if (this.defaults.settings[key].description) settingshtml += ``;
}
for (let action in bindings) {
- settingshtml += ``;
}
settingshtml += ``;
settingshtml += `
${this.defaults.settings[key].description}
${this.defaults.settings[key].description}
${this.defaults.bindings[action].name}:
`;
- for (let click of this.clicks) {
- settingshtml += ``;
+ if (!this.defaults.bindings[action].plugin || BDFDB.isPluginEnabled(this.defaults.bindings[action].plugin)) {
+ settingshtml += ``;
}
- for (let key of this.keys) {
- settingshtml += ``;
- }
- settingshtml += `
${click}:
${this.clickMap[bindings[action][click]]}
${this.defaults.bindings[action].name}:
`;
+ for (let click of this.clicks) {
+ settingshtml += ``;
+ }
+ for (let key of this.keys) {
+ settingshtml += ``;
+ }
+ settingshtml += `
${click}:
${this.clickMap[bindings[action][click]]}
${key}:
${key}:
Reset all key bindings.
${this.clickMap[i]}
${this.types[type].name}:
Mute in DnD:
`;
+ settingshtml += ``;
- var settingspanel = $(settingshtml)[0];
+ let settingspanel = BDFDB.htmlToElement(settingshtml);
- BDFDB.initElements(settingspanel);
+ BDFDB.initElements(settingspanel, this);
- $(settingspanel)
- .on("click", BDFDB.dotCN.selectcontrol, (e) => {this.openDropdownMenu(settingspanel, e);})
- .on("click", ".btn-addsong", (e) => {this.saveAudio(settingspanel);})
- .on("keyup", ".songInput", (e) => {if (e.which == 13) this.saveAudio(settingspanel);})
- .on("click", ".reset-button", () => {
- BDFDB.openConfirmModal(this, "Are you sure you want to delete all added songs?", () => {
- BDFDB.removeAllData(this, "choices");
- BDFDB.removeAllData(this, "audios");
- this.loadAudios();
- this.loadChoices();
- settingspanel.querySelectorAll(BDFDB.dotCN.select).forEach((wrap) => {
- wrap.setAttribute("value", "---");
- wrap.querySelector(BDFDB.dotCN.title).innerText = "---";
- });
- settingspanel.querySelectorAll(BDFDB.dotCN.slidergrabber).forEach((grabber) => {
- grabber.style.left = "100%";
- });
- settingspanel.querySelectorAll(BDFDB.dotCN.sliderbarfill).forEach((bar) => {
- bar.style.width = "100%";
- });
- settingspanel.querySelectorAll(".volumeInput").forEach((input) => {
- input.value = 100;
- });
+ BDFDB.addEventListener(this, settingspanel, "click", BDFDB.dotCN.selectcontrol, e => {this.openDropdownMenu(settingspanel, e);});
+ BDFDB.addEventListener(this, settingspanel, "click", ".btn-addsong", e => {this.saveAudio(settingspanel);});
+ BDFDB.addEventListener(this, settingspanel, "keyup", ".songInput", e => {if (e.which == 13) this.saveAudio(settingspanel);});
+ BDFDB.addEventListener(this, settingspanel, "click", ".reset-button", () => {
+ BDFDB.openConfirmModal(this, "Are you sure you want to delete all added songs?", () => {
+ BDFDB.removeAllData(this, "choices");
+ BDFDB.removeAllData(this, "audios");
+ this.loadAudios();
+ this.loadChoices();
+ settingspanel.querySelectorAll(BDFDB.dotCN.select).forEach(wrap => {
+ wrap.setAttribute("value", "---");
+ wrap.querySelector(BDFDB.dotCN.title).innerText = "---";
});
- })
- .on("click", ".mute-checkbox", (e) => {
- var checkbox = e.currentTarget;
- var type = checkbox.parentElement.getAttribute("type");
- var choice = BDFDB.loadData(type, this, "choices");
- choice.mute = checkbox.checked;
- this.saveChoice(type, choice, false);
- })
- .on("click", "#input-unimplemented", (e) => {
- $(settingspanel).find(".unimplemented").toggle(e.currentTarget.checked);
- })
- .on("mousedown", BDFDB.dotCN.slidergrabber, (e) => {this.dragSlider(settingspanel,e);})
- .find(".unimplemented").hide();
+ settingspanel.querySelectorAll(BDFDB.dotCN.slidergrabber).forEach(grabber => {
+ grabber.style.left = "100%";
+ });
+ settingspanel.querySelectorAll(BDFDB.dotCN.sliderbarfill).forEach(bar => {
+ bar.style.width = "100%";
+ });
+ settingspanel.querySelectorAll(".volumeInput").forEach(input => {
+ input.value = 100;
+ });
+ });
+ });
+ BDFDB.addEventListener(this, settingspanel, "click", ".mute-checkbox", e => {
+ var type = e.currentTarget.parentElement.getAttribute("type");
+ var choice = BDFDB.loadData(type, this, "choices");
+ choice.mute = e.currentTarget.checked;
+ this.saveChoice(type, choice, false);
+ });
+ BDFDB.addEventListener(this, settingspanel, "click", "#input-unimplemented", e => {
+ BDFDB.toggleEles(settingspanel.querySelectorAll(".unimplemented"), e.currentTarget.checked);
+ });
+ BDFDB.addEventListener(this, settingspanel, "mousedown", BDFDB.dotCN.slidergrabber, e => {this.dragSlider(settingspanel,e);});
return settingspanel;
}
@@ -180,27 +176,30 @@ class NotificationSounds {
load () {}
start () {
- var libraryScript = null;
- if (typeof BDFDB !== "object" || typeof BDFDB.isLibraryOutdated !== "function" || BDFDB.isLibraryOutdated()) {
- libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ var libraryScript = document.querySelector('head script[src="https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js"]');
+ if (!libraryScript || performance.now() - libraryScript.getAttribute("date") > 600000) {
if (libraryScript) libraryScript.remove();
libraryScript = document.createElement("script");
libraryScript.setAttribute("type", "text/javascript");
libraryScript.setAttribute("src", "https://mwittrien.github.io/BetterDiscordAddons/Plugins/BDFDB.js");
+ libraryScript.setAttribute("date", performance.now());
+ libraryScript.addEventListener("load", () => {
+ BDFDB.loaded = true;
+ this.initialize();
+ });
document.head.appendChild(libraryScript);
}
+ else if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) this.initialize();
this.startTimeout = setTimeout(() => {this.initialize();}, 30000);
- if (typeof BDFDB === "object" && typeof BDFDB.isLibraryOutdated === "function") this.initialize();
- else libraryScript.addEventListener("load", () => {this.initialize();});
}
initialize () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
BDFDB.loadMessage(this);
this.ChannelSettingsUtils = BDFDB.WebModules.findByProperties("isGuildOrCategoryOrChannelMuted");
- BDFDB.WebModules.patch(BDFDB.WebModules.findByProperties("receiveMessage"), "receiveMessage", this, {before: (e) => {
+ BDFDB.WebModules.patch(BDFDB.WebModules.findByProperties("receiveMessage"), "receiveMessage", this, {before: e => {
let message = e.methodArguments[1];
let guildid = message.guild_id ? message.guild_id : null;
if (!this.ChannelSettingsUtils.isGuildOrCategoryOrChannelMuted(guildid, message.channel_id) && message.author.id != BDFDB.myData.id) {
@@ -218,7 +217,7 @@ class NotificationSounds {
}
}});
- BDFDB.WebModules.patch(BDFDB.WebModules.findByProperties("playSound"), "playSound", this, {instead: (e) => {
+ BDFDB.WebModules.patch(BDFDB.WebModules.findByProperties("playSound"), "playSound", this, {instead: e => {
setImmediate(() => {
var type = e.methodArguments[0];
if (type == "message1") {
@@ -242,7 +241,7 @@ class NotificationSounds {
stop () {
- if (typeof BDFDB === "object") {
+ if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
BDFDB.unloadMessage(this);
}
}
@@ -251,12 +250,14 @@ class NotificationSounds {
// begin of own functions
openDropdownMenu (settingspanel, e) {
- var selectControl = e.currentTarget;
- var selectWrap = selectControl.parentElement;
+ let selectControl = e.currentTarget;
+ let selectWrap = selectControl.parentElement;
+ let plugincard = BDFDB.getParentEle("li", selectWrap);
- if (selectWrap.classList.contains(BDFDB.disCN.selectisopen)) return;
+ if (!plugincard || BDFDB.containsClass(selectWrap, BDFDB.disCN.selectisopen)) return;
- selectWrap.classList.add(BDFDB.disCN.selectisopen);
+ BDFDB.addClass(selectWrap, BDFDB.disCN.selectisopen);
+ plugincard.style.setProperty("overflow", "visible", "important");
var type = selectWrap.getAttribute("type");
var option = selectWrap.getAttribute("option");
@@ -269,7 +270,7 @@ class NotificationSounds {
var selectMenu = this.createDropdownMenu({type, option, category, song});
selectWrap.appendChild(selectMenu);
- $(selectMenu).on("mousedown." + this.getName(), BDFDB.dotCN.selectoption, (e2) => {
+ BDFDB.addChildEventListener(selectMenu, "mousedown", BDFDB.dotCN.selectoption, e2 => {
var choice = BDFDB.loadData(type, this, "choices");
var selection = e2.currentTarget.textContent;
selectWrap.setAttribute("value", selection);
@@ -283,12 +284,17 @@ class NotificationSounds {
choice.src = choice.src ? choice.src : this.types[type].src;
this.saveChoice(type, choice, true);
});
- $(document).on("mousedown.select" + this.getName(), (e2) => {
- if (e2.target.parentElement == selectMenu) return;
- $(document).off("mousedown.select" + this.getName());
- selectMenu.remove()
- setTimeout(() => {selectWrap.classList.remove(BDFDB.disCN.selectisopen);},100);
- });
+
+ var removeMenu = e2 => {
+ if (e2.target.parentElement != selectMenu) {
+ document.removeEventListener("mousedown", removeMenu);
+ selectMenu.remove();
+ plugincard.style.removeProperty("overflow");
+ setTimeout(() => {BDFDB.removeClass(selectWrap, BDFDB.disCN.selectisopen);},100);
+ }
+ };
+
+ document.addEventListener("mousedown", removeMenu);
}
createDropdownMenu ({type, option, category, song} = data) {
@@ -300,7 +306,7 @@ class NotificationSounds {
menuhtml += ``
}
menuhtml += `
${ele}
${this.getName()}
`;
for (let key in settings) {
- settingshtml += ``;
+ settingshtml += ``;
}
settingshtml += `
${this.defaults.settings[key].description}
${this.defaults.settings[key].description}
${url}
${url}
${this.getName()}
`;
for (let key in settings) {
- settingshtml += ``;
+ settingshtml += ``;
}
settingshtml += `
${this.defaults.settings[key].description}
${this.defaults.settings[key].description}
@@ -66,7 +66,7 @@ class RepoControls {
`;
this.sortPopoutMarkup =
- `
+ `