lightcordwarez
/
BetterDiscordAddons
mirror of https://github.com/mwittrien/BetterDiscordAddons.git
1
0
Fork 0
Code Issues 24 Releases Wiki Activity

stuff

This commit is contained in:
Mirco Wittrien 2022-12-10 11:15:13 +01:00
parent 84d45cc70a
commit 618c8bbc8f
4 changed files with 54 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/_res/0BDFDB.data.json
View File

@ -1450,7 +1450,7 @@
"GuildSettingsEmoji": {"props": ["emojiRow", "emojiAliasPlaceholder"]}, "GuildSettingsEmoji": {"props": ["emojiRow", "emojiAliasPlaceholder"]},
"GuildSettingsInvite": {"props": ["countdownColumn", "inviteSettingsInviteRow"]}, "GuildSettingsInvite": {"props": ["countdownColumn", "inviteSettingsInviteRow"]},
"GuildSettingsMember": {"props": ["member", "membersFilterPopout"]}, "GuildSettingsMember": {"props": ["member", "membersFilterPopout"]},
"GuildsInbox": {"props": ["listItemWrapper", "listItemTooltip"]}, "GuildsListItem": {"props": ["listItemWrapper", "listItemTooltip"]},
"GuildsInboxIcon": {"props": ["iconButton", "selected"]}, "GuildsInboxIcon": {"props": ["iconButton", "selected"]},
"GuildsItems": {"props": ["circleIcon", "guildsError"]}, "GuildsItems": {"props": ["circleIcon", "guildsError"]},
"GuildsWrapper": {"props": ["scroller", "unreadMentionsBar", "wrapper"]}, "GuildsWrapper": {"props": ["scroller", "unreadMentionsBar", "wrapper"]},
@ -2407,13 +2407,13 @@
"guildiconchildwrapper": ["GuildIcon", "childWrapper"], "guildiconchildwrapper": ["GuildIcon", "childWrapper"],
"guildiconselected": ["GuildIcon", "selected"], "guildiconselected": ["GuildIcon", "selected"],
"guildiconwrapper": ["GuildIcon", "wrapper"], "guildiconwrapper": ["GuildIcon", "wrapper"],
"guildinbox": ["GuildsInbox", "listItemWrapper"],
"guildinboxicon": ["GuildsInboxIcon", "iconButton"], "guildinboxicon": ["GuildsInboxIcon", "iconButton"],
"guildinboxiconmask": ["GuildsInboxIcon", "iconMask"], "guildinboxiconmask": ["GuildsInboxIcon", "iconMask"],
"guildinboxiconselected": ["GuildsInboxIcon", "selected"], "guildinboxiconselected": ["GuildsInboxIcon", "selected"],
"guildinboxtooltip": ["GuildsInbox", "listItemTooltip"],
"guildinner": ["Guild", "wrapper"], "guildinner": ["Guild", "wrapper"],
"guildinnerwrapper": ["GuildsItems", "listItemWrapper"], "guildinnerwrapper": ["GuildsItems", "listItemWrapper"],
"guildlistitem": ["GuildsListItem", "listItemWrapper"],
"guildlistitemtooltip": ["GuildsListItem", "listItemTooltip"],
"guildlowerbadge": ["Guild", "lowerBadge"], "guildlowerbadge": ["Guild", "lowerBadge"],
"guildlowerleftbadge": ["BDFDB", "guildLowerLeftBadge"], "guildlowerleftbadge": ["BDFDB", "guildLowerLeftBadge"],
"guildouter": ["GuildItem", "listItem"], "guildouter": ["GuildItem", "listItem"],

4
Plugins/CompleteTimestamps/CompleteTimestamps.plugin.js
View File

@ -2,7 +2,7 @@
* @name CompleteTimestamps * @name CompleteTimestamps
* @author DevilBro * @author DevilBro
* @authorId 278543574059057154 * @authorId 278543574059057154
* @version 1.6.2 * @version 1.6.3
* @description Replaces Timestamps with your own custom Timestamps * @description Replaces Timestamps with your own custom Timestamps
* @invite Jx3TjNS * @invite Jx3TjNS
* @donate https://www.paypal.me/MircoWittrien * @donate https://www.paypal.me/MircoWittrien
@ -167,7 +167,7 @@ module.exports = (_ => {
} }
processMessageTimestamp (e) { processMessageTimestamp (e) {
let tooltipWrapper = BDFDB.ReactUtils.findChild(e.returnvalue, {name: "Tooltip"}); let tooltipWrapper = BDFDB.ReactUtils.findChild(e.returnvalue, {name: "TooltipContainer"});
if (!tooltipWrapper) return; if (!tooltipWrapper) return;
let childClassName = BDFDB.ObjectUtils.get(e, "instance.props.children.props.className"); let childClassName = BDFDB.ObjectUtils.get(e, "instance.props.children.props.className");
if (childClassName && childClassName.indexOf(BDFDB.disCN.messageedited) > -1) { if (childClassName && childClassName.indexOf(BDFDB.disCN.messageedited) > -1) {

52
Plugins/ServerFolders/ServerFolders.plugin.js
View File

@ -2,7 +2,7 @@
* @name ServerFolders * @name ServerFolders
* @author DevilBro * @author DevilBro
* @authorId 278543574059057154 * @authorId 278543574059057154
* @version 7.0.9 * @version 7.1.0
* @description Changes Discord's Folders, Servers open in a new Container, also adds extra Features to more easily organize, customize and manage your Folders * @description Changes Discord's Folders, Servers open in a new Container, also adds extra Features to more easily organize, customize and manage your Folders
* @invite Jx3TjNS * @invite Jx3TjNS
* @donate https://www.paypal.me/MircoWittrien * @donate https://www.paypal.me/MircoWittrien
@ -120,10 +120,13 @@ module.exports = (_ => {
className: BDFDB.disCN.guildfoldericonwrapper, className: BDFDB.disCN.guildfoldericonwrapper,
style: {background: `url(${folderIcon}) center/cover no-repeat`} style: {background: `url(${folderIcon}) center/cover no-repeat`}
}) : BDFDB.ReactUtils.createElement("div", { }) : BDFDB.ReactUtils.createElement("div", {
className: BDFDB.disCN.guildfoldericonwrapper,
children: BDFDB.ReactUtils.createElement("div", {
className: BDFDB.disCN.guildfoldericonwrapperexpanded, className: BDFDB.disCN.guildfoldericonwrapperexpanded,
children: BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SvgIcon, { children: BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SvgIcon, {
name: BDFDB.LibraryComponents.SvgIcon.Names.FOLDER, name: BDFDB.LibraryComponents.SvgIcon.Names.FOLDER,
color: BDFDB.ColorUtils.convert(folder.folderColor, "RGB") || "var(--bdfdb-blurple)" style: {color: BDFDB.ColorUtils.convert(folder.folderColor || BDFDB.DiscordConstants.Colors.BRAND, "RGB")}
})
}) })
}); });
} }
@ -460,14 +463,14 @@ module.exports = (_ => {
before: [ before: [
"FolderItem", "FolderItem",
"GuildItemWrapper", "GuildItemWrapper",
"GuildsBar" "GuildsBar",
"TooltipContainer"
], ],
after: [ after: [
"FolderHeader", "FolderHeader",
"FolderSettingsModal", "FolderSettingsModal",
"GuildItem", "GuildItem",
"GuildsBar", "GuildsBar"
"ListItemTooltip"
], ],
componentDidMount: [ componentDidMount: [
"FolderSettingsModal" "FolderSettingsModal"
@ -767,17 +770,26 @@ module.exports = (_ => {
let data = this.getFolderConfig(e.instance.props.folderNode.id); let data = this.getFolderConfig(e.instance.props.folderNode.id);
if (e.instance.props.expanded || data.useCloseIcon) { let [children, index] = BDFDB.ReactUtils.findParent(e.returnvalue, {name: "FolderIcon"});
if (index > -1) {
if (parseInt(data.iconID) == -1 && data.useCloseIcon && !e.instance.props.expanded) children[index] = BDFDB.ReactUtils.createElement("div", {
className: BDFDB.disCN.guildfoldericonwrapper,
children: BDFDB.ReactUtils.createElement("div", {
className: BDFDB.disCN.guildfoldericonwrapperexpanded,
children: BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SvgIcon, {
name: BDFDB.LibraryComponents.SvgIcon.Names.FOLDER,
style: {color: BDFDB.ColorUtils.convert(data.folderColor || BDFDB.DiscordConstants.Colors.BRAND, "RGB")}
})
})
});
else if (e.instance.props.expanded || data.useCloseIcon) {
let folderIcons = this.loadAllIcons(), iconType = e.instance.props.expanded ? "openicon" : "closedicon"; let folderIcons = this.loadAllIcons(), iconType = e.instance.props.expanded ? "openicon" : "closedicon";
let icon = folderIcons[data.iconID] ? (!folderIcons[data.iconID].customID ? this.createBase64SVG(folderIcons[data.iconID][iconType], data.color1, data.color2) : folderIcons[data.iconID][iconType]) : null; let icon = folderIcons[data.iconID] ? (!folderIcons[data.iconID].customID ? this.createBase64SVG(folderIcons[data.iconID][iconType], data.color1, data.color2) : folderIcons[data.iconID][iconType]) : null;
if (icon) { if (icon) children[index] = BDFDB.ReactUtils.createElement("div", {
let [children, index] = BDFDB.ReactUtils.findParent(e.returnvalue, {name: "FolderIcon"});
if (index > -1) children[index] = BDFDB.ReactUtils.createElement("div", {
className: BDFDB.disCN.guildfoldericonwrapper, className: BDFDB.disCN.guildfoldericonwrapper,
style: {background: `url(${icon}) center/cover no-repeat`} style: {background: `url(${icon}) center/cover no-repeat`}
}); });
} }
}
if (this.settings.general.showCountBadge) { if (this.settings.general.showCountBadge) {
let mask = BDFDB.ReactUtils.findChild(e.returnvalue, {name: "BlobMask"}); let mask = BDFDB.ReactUtils.findChild(e.returnvalue, {name: "BlobMask"});
if (mask) { if (mask) {
@ -789,15 +801,19 @@ module.exports = (_ => {
} }
} }
} }
}
processListItemTooltip (e) { processTooltipContainer (e) {
let folderNodeChild = BDFDB.ReactUtils.findChild(e.instance, {filter: n => n && n.props && n.props.folderNode}); if (!e.instance.props.tooltipClassName || e.instance.props.tooltipClassName.indexOf(BDFDB.disCN.guildlistitemtooltip) == -1) return;
if (!folderNodeChild) return; let child = e.instance.props.children({});
if (!child || !child.props || !child.props.children || !child.props.children.props || !child.props.children.props.folderNode) return;
let data = this.getFolderConfig(folderNodeChild.props.folderNode.id); e.instance.props.shouldShow = false;
let data = this.getFolderConfig(child.props.children.props.folderNode.id);
e.returnvalue = BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.TooltipContainer, { let childrenRender = e.instance.props.children;
text: folderNodeChild.props.folderNode.name || folderNodeChild.props.tooltipName, e.instance.props.children = BDFDB.TimeUtils.suppress((...args) => BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.TooltipContainer, {
text: child.props.children.props.folderNode.name || e.instance.props.text,
tooltipConfig: { tooltipConfig: {
type: "right", type: "right",
list: true, list: true,
@ -805,8 +821,8 @@ module.exports = (_ => {
backgroundColor: data.color3, backgroundColor: data.color3,
fontColor: data.color4 fontColor: data.color4
}, },
children: e.returnvalue.props.children children: childrenRender(...args)
}); }), "Error in children Render of Guild Folder Tooltip!");
} }
processGuildItemWrapper (e) { processGuildItemWrapper (e) {

2
Plugins/ShowBadgesInChat/ShowBadgesInChat.plugin.js
View File

@ -345,7 +345,7 @@ module.exports = (_ => {
let key = parseInt(e.returnvalue.props.children[i].key); let key = parseInt(e.returnvalue.props.children[i].key);
let keyName = filter && Object.keys(badges).find(n => badges[n].keys.includes(key)); let keyName = filter && Object.keys(badges).find(n => badges[n].keys.includes(key));
if (keyName && badgeConfigs[keyName] && !badgeConfigs[keyName][e.instance.props.place]) e.returnvalue.props.children[i] = null; if (keyName && badgeConfigs[keyName] && !badgeConfigs[keyName][e.instance.props.place]) e.returnvalue.props.children[i] = null;
else if (e.returnvalue.props.children[i].type.displayName == "TooltipContainer" || e.returnvalue.props.children[i].type.displayName == "Tooltip") { else if (typeof e.returnvalue.props.children[i].props.children == "function" && e.returnvalue.props.children[i].props.text) {
const childrenRender = e.returnvalue.props.children[i].props.children; const childrenRender = e.returnvalue.props.children[i].props.children;
e.returnvalue.props.children[i].props.children = (...args) => { e.returnvalue.props.children[i].props.children = (...args) => {
const children = childrenRender(...args); const children = childrenRender(...args);