This commit is contained in:
Mirco Wittrien 2019-11-24 22:48:57 +01:00
parent 670fd63242
commit 53963af968
3 changed files with 9 additions and 14 deletions

View File

@ -1855,6 +1855,9 @@ var BDFDB = {
if (!guild || !guild.banner) return null;
return LibraryModules.IconUtils.getGuildBannerURL(guild).split("?")[0];
};
BDFDB.GuildUtils.getFolder = function (id) {
return BDFDB.LibraryModules.FolderStore.guildFolders.filter(n => n.folderId && n.guildIds.includes(id));
};
BDFDB.GuildUtils.getId = function (div) {
if (!Node.prototype.isPrototypeOf(div) || !BDFDB.ReactUtils.getInstance(div)) return;
let guilddiv = BDFDB.DOMUtils.getParent(BDFDB.dotCN.guildouter, div);
@ -6829,7 +6832,7 @@ var BDFDB = {
tooltipConfig: Object.assign({type: "right"}, this.props.tooltipConfig, {guild: this.props.list && this.props.guild}),
children: Guild
})
];
].filter(n => n);
return this.props.list ? LibraryComponents.GuildComponents.renderListItem(BDFDB.ReactUtils.createElement(BDFDB.ReactUtils.Fragment, {
children: children
}), null != this.props.setRef ? this.setRef : null) : BDFDB.ReactUtils.createElement("div", {
@ -6838,7 +6841,7 @@ var BDFDB = {
});
}
};
InternalBDFDB.setDefaultProps(LibraryComponents.GuildComponents.Guild, {menu:true, tooltip:true, state:false, draggable:false, sorting:false});
InternalBDFDB.setDefaultProps(LibraryComponents.GuildComponents.Guild, {menu:true, tooltip:true, list:false, state:false, draggable:false, sorting:false});
LibraryComponents.GuildComponents.Icon = BDFDB.ModuleUtils.findByName("GuildIconWrapper");

File diff suppressed because one or more lines are too long

View File

@ -3,7 +3,7 @@
class EditServers {
getName () {return "EditServers";}
getVersion () {return "2.1.1";}
getVersion () {return "2.1.2";}
getAuthor () {return "DevilBro";}
@ -214,13 +214,6 @@ class EditServers {
forceUpdateAll (guildid) {
this.updateGuildSidebar();
BDFDB.ModuleUtils.forceAllUpdates(this);
if (guildid) {
let ServerFolders = BDFDB.BDUtils.getPlugin("ServerFolders", true);
if (ServerFolders) {
let folder = ServerFolders.getFolderOfGuildId(guildid);
if (folder) ServerFolders.updateGuildInFolderContent(folder.folderId, guildid);
}
}
}
showServerSettings (info) {
@ -546,9 +539,8 @@ class EditServers {
let data = this.getGuildData(info.id, wrapper);
wrapper.removeEventListener("mouseenter", wrapper.tooltipListenerEditServers);
if (data.name || data.color3 || data.color4) {
let ServerFolders = BDFDB.BDUtils.getPlugin("ServerFolders", true);
let folder = ServerFolders ? ServerFolders.getFolderOfGuildId(info.id) : null;
let folderData = folder ? BDFDB.DataUtils.load("ServerFolders", "folders", folder.folderId) : null;
let folder = BDFDB.GuildUtils.getFolder(info.id);
let folderData = folder && BDFDB.BDUtils.getPlugin("ServerFolders", true) ? BDFDB.DataUtils.load("ServerFolders", "folders", folder.folderId) : null;
let color3 = data.color3 || (folderData && folderData.copyTooltipColor ? folderData.color3 : null);
let color4 = data.color4 || (folderData && folderData.copyTooltipColor ? folderData.color4 : null);
var isgradient3 = color3 && BDFDB.ObjectUtils.is(color3);