This commit is contained in:
Mirco Wittrien 2020-11-28 22:54:00 +01:00
parent 27974c60f1
commit a2fd8127b7
2 changed files with 10 additions and 15 deletions

View File

@ -16,7 +16,7 @@ module.exports = (_ => {
"info": {
"name": "BDFDB",
"author": "DevilBro",
"version": "1.2.1",
"version": "1.2.2",
"description": "Give other plugins utility functions"
},
"rawUrl": "https://mwittrien.github.io/BetterDiscordAddons/Library/0BDFDB.plugin.js",
@ -802,11 +802,14 @@ module.exports = (_ => {
if (settingsProps && !BDFDB.ObjectUtils.is(settingsProps) && (BDFDB.ReactUtils.isValidElement(settingsProps) || BDFDB.ArrayUtils.is(settingsProps))) settingsProps = {
children: settingsProps
};
if (isBeta || !document.querySelector("#bd-settingspane-container")) return BDFDB.ReactUtils.createElement(InternalComponents.LibraryComponents.SettingsPanel, Object.assign({
let settingsPanel = BDFDB.ReactUtils.createElement(InternalComponents.LibraryComponents.SettingsPanel, Object.assign({
addon: addon,
collapseStates: settingsProps && settingsProps.collapseStates
}, settingsProps));
if (isBeta || !document.querySelector("#bd-settingspane-container")) return settingsPanel;
else {
let div = document.createElement("div");
div.props = settingsPanel.props;
BDFDB.TimeUtils.timeout(_ => {
BDFDB.ModalUtils.open(addon, {
header: `${addon.name} ${BDFDB.LanguageUtils.LanguageStrings.SETTINGS}`,
@ -816,7 +819,7 @@ module.exports = (_ => {
contentClassName: BDFDB.disCN._repomodalsettings,
footerClassName: BDFDB.disCN._repomodalfooter,
size: "MEDIUM",
children: typeof settingsProps.children == "function" ? settingsProps.children() : settingsProps.children,
children: settingsPanel,
buttons: [{contents: BDFDB.LanguageUtils.LanguageStrings.DONE, color: "BRAND", close: true}]
});
});
@ -824,12 +827,12 @@ module.exports = (_ => {
let settings = document.querySelector(`${BDFDB.dotCN._reposettingsopen} #plugin-settings-${addon.name}`);
if (settings && settings.previousElementSibling && !settings.previousElementSibling.className) settings.previousElementSibling.click();
}, 1000);
return document.createElement("div");
return div;
}
};
BDFDB.PluginUtils.refreshSettingsPanel = function (plugin, settingsPanel, ...args) {
if (BDFDB.ObjectUtils.is(plugin)) {
if (BDFDB.ReactUtils.isValidElement(settingsPanel) && settingsPanel.props && settingsPanel.props._instance) {
if (settingsPanel && settingsPanel.props && BDFDB.ObjectUtils.is(settingsPanel.props._instance)) {
settingsPanel.props._instance.props = Object.assign({}, settingsPanel.props._instance.props, ...args);
BDFDB.ReactUtils.forceUpdate(settingsPanel.props._instance);
}

View File

@ -14,7 +14,7 @@ module.exports = (_ => {
"info": {
"name": "RemoveBlockedMessages",
"author": "DevilBro",
"version": "1.1.7",
"version": "1.1.8",
"description": "Completely removes blocked messages"
},
"changeLog": {
@ -66,21 +66,13 @@ module.exports = (_ => {
removeReplies: {value: true, inner: true, description: "Replies"},
removeMentions: {value: true, inner: true, description: "Mentions"},
removeReactions: {value: true, inner: true, description: "Reactions"},
removeAutocomplete: {value: true, inner: true, description: "Autucomplete Entries"},
removeAutocomplete: {value: true, inner: true, description: "Autocomplete Entries"},
removeUsers: {value: true, inner: true, description: "Members in List"},
removeVoiceUser: {value: true, inner: true, description: "Members in Voice List"},
removeVoiceChats: {value: true, inner: true, description: "Members in Voice Chat"}
}
};
this.defaults = {
settings: {
removeMessages: {value: true, description: "Remove messages of blocked users"},
removeUsers: {value: true, description: "Remove blocked users (memberlist, voicechannels)"},
disableNotifications: {value: true, description: "Disable unread markers for messages of blocked users"},
}
};
this.patchedModules = {
before: {
Message: "default",