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 2020-09-12 17:34:45 +02:00
parent 8452df299e
commit 060b3cb923
4 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Library/0BDFDB.plugin.js
View File

@ -1398,13 +1398,14 @@ module.exports = (_ => {
classNames: [InternalData.ModuleUtilsConfig.Finder[unmappedType] && InternalData.ModuleUtilsConfig.Finder[unmappedType].class].flat(10).filter(n => DiscordClasses[n]),
stringFind: InternalData.ModuleUtilsConfig.Finder[unmappedType] && InternalData.ModuleUtilsConfig.Finder[unmappedType].strings,
propertyFind: InternalData.ModuleUtilsConfig.Finder[unmappedType] && InternalData.ModuleUtilsConfig.Finder[unmappedType].props,
specialFilter: InternalData.ModuleUtilsConfig.Finder[unmappedType] && InternalData.ModuleUtilsConfig.Finder[unmappedType].special && InternalBDFDB.createFilter(InternalData.ModuleUtilsConfig.Finder[unmappedType].special),
memoComponent: InternalData.ModuleUtilsConfig.MemoComponent.includes(unmappedType),
forceObserve: InternalData.ModuleUtilsConfig.ForceObserve.includes(unmappedType),
nonRender: BDFDB.ObjectUtils.toArray(pluginData.patchTypes).flat(10).filter(n => n && !InternalData.ModuleUtilsConfig.InstanceFunctions.includes(n)).length > 0,
mapped: InternalData.ModuleUtilsConfig.PatchMap[type]
};
config.ignoreCheck = !!(config.stringFind || config.propertyFind || config.nonRender);
config.nonPrototype = InternalData.ModuleUtilsConfig.NonPrototype.includes(unmappedType) || config.ignoreCheck;
config.ignoreCheck = !!(config.codeFind || config.propertyFind || config.specialFilter || config.nonRender);
config.nonPrototype = InternalData.ModuleUtilsConfig.NonPrototype.includes(unmappedType) || !!(config.codeFind || config.propertyFind || config.nonRender);
let component = InternalData.ModuleUtilsConfig.LoadedInComponents[type] && BDFDB.ObjectUtils.get(InternalComponents, InternalData.ModuleUtilsConfig.LoadedInComponents[type]);
if (component) InternalBDFDB.patchInstance(pluginData, config.nonRender ? (BDFDB.ModuleUtils.find(m => m == component, false) || {}).exports : component, type, config);
@ -1458,14 +1459,18 @@ module.exports = (_ => {
}
}
};
InternalBDFDB.createFilter = function (config) {
return ins => ins && config.every(prop => {
let value = BDFDB.ObjectUtils.get(ins, prop.path);
return value && (!prop.value || [prop.value].flat(10).filter(n => typeof n == "string").some(n => value.toUpperCase().indexOf(n.toUpperCase()) == 0));
}) && ins.return.type;
};
InternalBDFDB.checkEle = function (pluginDataObjs, ele, type, config) {
pluginDataObjs = [pluginDataObjs].flat(10).filter(n => n);
let unmappedType = type.split(" _ _ ")[1] || type;
let ins = BDFDB.ReactUtils.getInstance(ele);
// FIX SpecialFilter
let filter = false && InternalData.ModuleUtilsConfig.SpecialFilter[unmappedType];
if (typeof filter == "function") {
let component = filter(ins);
if (typeof config.specialFilter == "function") {
let component = config.specialFilter(ins);
if (component) {
if (config.nonRender) {
let exports = (BDFDB.ModuleUtils.find(m => m == component, false) || {}).exports;
@ -1671,12 +1676,11 @@ module.exports = (_ => {
let methodNames = [plugin.patchedModules[patchType][type]].flat(10).filter(n => n);
if (BDFDB.ArrayUtils.includes(methodNames, "componentDidMount", "componentDidUpdate", "render", false) && (!selectedTypes.length || selectedTypes.includes(type))) {
let unmappedType = type.split(" _ _ ")[1] || type;
// FIX SpecialFilter
let filter = false && InternalData.ModuleUtilsConfig.SpecialFilter[unmappedType];
let selector = [InternalData.ModuleUtilsConfig.Finder[unmappedType]].flat(10).filter(n => DiscordClasses[n]).map(n => BDFDB.dotCN[n]).join(", ");
if (selector && typeof filter == "function") {
let specialFilter = InternalData.ModuleUtilsConfig.Finder[unmappedType] && InternalData.ModuleUtilsConfig.Finder[unmappedType].special && InternalBDFDB.createFilter(InternalData.ModuleUtilsConfig.Finder[unmappedType].special);
if (selector && typeof specialFilter == "function") {
for (let ele of document.querySelectorAll(selector)) {
let constro = filter(BDFDB.ReactUtils.getInstance(ele));
let constro = specialFilter(BDFDB.ReactUtils.getInstance(ele));
if (constro) {
updateData[plugin.name].specialModules.push([type, constro]);
updateData[plugin.name].specialModuleTypes.push(type);
@ -6978,7 +6982,7 @@ module.exports = (_ => {
const BDFDB_Patrons = Object.assign({}, InternalData.BDFDB_Patrons);
InternalBDFDB._processAvatarRender = function (user, avatar) {
if (BDFDB.ReactUtils.isValidElement(avatar) && BDFDB.ObjectUtils.is(user) && (avatar.props.className || "").indexOf(BDFDB.disCN.bdfdbbadgeavatar) > -1) {
if (BDFDB.ReactUtils.isValidElement(avatar) && BDFDB.ObjectUtils.is(user) && (avatar.props.className || "").indexOf(BDFDB.disCN.bdfdbbadgeavatar) == -1) {
avatar.props["user_by_BDFDB"] = user.id;
let role = "", className = BDFDB.DOMUtils.formatClassName((avatar.props.className || "").replace(BDFDB.disCN.avatar, "")), addBadge = settings.showSupportBadges, customBadge = false;
if (BDFDB_Patrons[user.id] && BDFDB_Patrons[user.id].active) {
@ -7015,7 +7019,7 @@ module.exports = (_ => {
}
};
InternalBDFDB._processAvatarMount = function (user, avatar, wrapper) {
if (Node.prototype.isPrototypeOf(avatar) && BDFDB.ObjectUtils.is(user) && (avatar.className || "").indexOf(BDFDB.disCN.bdfdbbadgeavatar) > -1) {
if (Node.prototype.isPrototypeOf(avatar) && BDFDB.ObjectUtils.is(user) && (avatar.className || "").indexOf(BDFDB.disCN.bdfdbbadgeavatar) == -1) {
if (wrapper) wrapper.setAttribute("user_by_BDFDB", user.id);
avatar.setAttribute("user_by_BDFDB", user.id);
let role = "", addBadge = settings.showSupportBadges, customBadge = false;

9
Library/_res/BDFDB.data.json
View File

@ -166,7 +166,7 @@
"DirectMessage": {"class": "guildouter"},
"EmojiPicker": {"strings": ["allowManagedEmojis", "EMOJI_PICKER_TAB_PANEL_ID", "diversitySelector"]},
"Guild": {"class": "guildouter"},
"GuildFolder": {"class": "guildfolderwrapper"},
"GuildFolder": {"class": "guildfolderwrapper", "special": [{"path": "return.memoizedProps.folderId"}, {"path": "return.memoizedProps.guildIds"}]},
"GuildIcon": {"class": "avataricon"},
"GuildRoleSettings": {"class": "settingswindowcontent"},
"Guilds": {"class": "guildswrapper"},
@ -208,7 +208,7 @@
"UserHook": {"class": "auditloguserhook"},
"UserPopout": {"class": "userpopout"},
"UserProfile": {"class": "userprofile"},
"V2C_ContentColumn": {"class": "settingswindowcontentcolumn"}
"V2C_ContentColumn": {"class": "settingswindowcontentcolumn", "special": [{"path": "return.stateNode.props.title", "value": ["PLUGINS", "THEMES"]}]}
},
"LoadedInComponents": {
"AutocompleteChannelResult": "LibraryComponents.AutocompleteItems.Channel",
@ -725,7 +725,8 @@
"EmojiPicker": {"props": ["emojiPicker", "inspector"]},
"EmojiPickerDiversitySelector": {"props": ["diversityEmojiItemImage", "diversitySelectorPopout"]},
"EmojiPickerItem": {"props": ["emojiSpriteImage"]},
"EmojiPickerInspector": {"props": ["inspector", "glyphEmoji"]},
"EmojiPickerInspector": {"props": ["inspector", "graphicPrimary"]},
"EmojiPickerInspectorEmoji": {"props": ["emoji", "glyphEmoji"]},
"ErrorScreen": {"props": ["wrapper", "flexWrapper", "note"]},
"ExpressionPicker": {"props": ["contentWrapper", "navButton", "navList"]},
"File": {"props": ["downloadButton", "fileNameLink"]},
@ -1440,7 +1441,7 @@
"emojipickeremojispriteimage": ["EmojiPickerItem", "emojiSpriteImage"],
"emojipickerheader": ["EmojiPicker", "header"],
"emojipickerinspector": ["EmojiPickerInspector", "inspector"],
"emojipickerinspectoremoji": ["EmojiPickerInspector", "emoji"],
"emojipickerinspectoremoji": ["EmojiPickerInspectorEmoji", "emoji"],
"errorscreen": ["ErrorScreen", "wrapper"],
"expressionpicker": ["ExpressionPicker", "contentWrapper"],
"expressionpickernav": ["ExpressionPicker", "nav"],

15
Plugins/BDFDB.js
View File

@ -1584,13 +1584,14 @@
classNames: [WebModulesData.PatchFinder[unmappedType]].flat(10).filter(n => DiscordClasses[n]),
codeFind: WebModulesData.CodeFinder[unmappedType],
propertyFind: WebModulesData.PropsFinder[unmappedType],
specialFilter: WebModulesData.SpecialFilter[unmappedType],
memoComponent: WebModulesData.MemoComponent.includes(unmappedType),
forceObserve: WebModulesData.ForceObserve.includes(unmappedType),
nonRender: BDFDB.ObjectUtils.toArray(pluginData.patchTypes).flat(10).filter(n => n && !WebModulesData.InstanceFunctions.includes(n)).length > 0,
mapped: WebModulesData.PatchMap[type]
};
config.ignoreCheck = !!(config.codeFind || config.propertyFind || config.nonRender);
config.nonPrototype = WebModulesData.NonPrototype.includes(unmappedType) || config.ignoreCheck;
config.ignoreCheck = !!(config.codeFind || config.propertyFind || config.specialFilter || config.nonRender);
config.nonPrototype = WebModulesData.NonPrototype.includes(unmappedType) || !!(config.codeFind || config.propertyFind || config.nonRender);
let component = WebModulesData.LoadedInComponents[type] && BDFDB.ReactUtils.getValue(InternalComponents, WebModulesData.LoadedInComponents[type]);
if (component) InternalBDFDB.patch_PatchInstance(pluginData, config.nonRender ? (BDFDB.ModuleUtils.find(m => m == component, false) || {}).exports : component, type, config);
@ -1648,9 +1649,8 @@
pluginDataObjs = [pluginDataObjs].flat(10).filter(n => n);
let unmappedType = type.split(" _ _ ")[1] || type;
let ins = BDFDB.ReactUtils.getInstance(ele);
let filter = WebModulesData.SpecialFilter[unmappedType];
if (typeof filter == "function") {
let component = filter(ins);
if (typeof config.specialFilter == "function") {
let component = config.specialFilter(ins);
if (component) {
if (config.nonRender) {
let exports = (BDFDB.ModuleUtils.find(m => m == component, false) || {}).exports;
@ -4586,7 +4586,8 @@
DiscordClassModules.EmojiPicker = BDFDB.ModuleUtils.findByProperties("emojiPicker", "inspector");
DiscordClassModules.EmojiPickerDiversitySelector = BDFDB.ModuleUtils.findByProperties("diversityEmojiItemImage", "diversitySelectorPopout");
DiscordClassModules.EmojiPickerItem = BDFDB.ModuleUtils.findByProperties("emojiSpriteImage");
DiscordClassModules.EmojiPickerInspector = BDFDB.ModuleUtils.findByProperties("inspector", "glyphEmoji");
DiscordClassModules.EmojiPickerInspector = BDFDB.ModuleUtils.findByProperties("inspector", "graphicPrimary");
DiscordClassModules.EmojiPickerInspectorEmoji = BDFDB.ModuleUtils.findByProperties("emoji", "glyphEmoji");
DiscordClassModules.ErrorScreen = BDFDB.ModuleUtils.findByProperties("wrapper", "flexWrapper", "note");
DiscordClassModules.ExpressionPicker = BDFDB.ModuleUtils.findByProperties("contentWrapper", "navButton", "navList");
DiscordClassModules.File = BDFDB.ModuleUtils.findByProperties("downloadButton", "fileNameLink");
@ -5302,7 +5303,7 @@
emojipickeremojispriteimage: ["EmojiPickerItem", "emojiSpriteImage"],
emojipickerheader: ["EmojiPicker", "header"],
emojipickerinspector: ["EmojiPickerInspector", "inspector"],
emojipickerinspectoremoji: ["EmojiPickerInspector", "emoji"],
emojipickerinspectoremoji: ["EmojiPickerInspectorEmoi", "emoji"],
errorscreen: ["ErrorScreen", "wrapper"],
expressionpicker: ["ExpressionPicker", "contentWrapper"],
expressionpickernav: ["ExpressionPicker", "nav"],

2
Plugins/BDFDB.min.js vendored
View File

File diff suppressed because one or more lines are too long