mirror of
https://github.com/Vendicated/Vencord.git
synced 2025-02-24 15:35:11 +00:00
fix if missing parent folder within nest
This commit is contained in:
parent
e0841e6ba7
commit
36f716a050
1 changed files with 12 additions and 2 deletions
|
@ -41,7 +41,6 @@ export default ErrorBoundary.wrap(guildsBarProps => {
|
||||||
const expandedFolders = useStateFromStores([ExpandedGuildFolderStore], () => ExpandedGuildFolderStore.getExpandedFolders());
|
const expandedFolders = useStateFromStores([ExpandedGuildFolderStore], () => ExpandedGuildFolderStore.getExpandedFolders());
|
||||||
const isFullscreen = useStateFromStores([ChannelRTCStore], () => ChannelRTCStore.isFullscreenInContext());
|
const isFullscreen = useStateFromStores([ChannelRTCStore], () => ChannelRTCStore.isFullscreenInContext());
|
||||||
|
|
||||||
const allFolders = SortedGuildStore.getGuildFolders();
|
|
||||||
|
|
||||||
let Sidebars;
|
let Sidebars;
|
||||||
switch (settings.store.nestMode) {
|
switch (settings.store.nestMode) {
|
||||||
|
@ -52,9 +51,20 @@ export default ErrorBoundary.wrap(guildsBarProps => {
|
||||||
Sidebars = Array.from(expandedFolders).map(e => generateSidebar(guildsBarProps, [e], e as number));
|
Sidebars = Array.from(expandedFolders).map(e => generateSidebar(guildsBarProps, [e], e as number));
|
||||||
break;
|
break;
|
||||||
case NestMode.NESTED:
|
case NestMode.NESTED:
|
||||||
|
const allFolders = SortedGuildStore.getGuildFolders();
|
||||||
Sidebars = Array.from(expandedFolders).map(e => {
|
Sidebars = Array.from(expandedFolders).map(e => {
|
||||||
const current = allFolders.filter(it => it.folderId == e)[0];
|
const current = allFolders.filter(it => it.folderId == e)[0];
|
||||||
const folders: any[] = !current ? [] : allFolders.filter(it => it.folderName?.startsWith(`${current.folderName}/`) && !it.folderName.substring(current.folderName.length + 1).includes("/")).map(it => it.folderId);
|
const folders: any[] = !current ? [] : allFolders.filter(it => {
|
||||||
|
if (!it.folderName?.startsWith(`${current.folderName}/`)) return false;
|
||||||
|
const subName = it.folderName.substring(current.folderName.length + 1);
|
||||||
|
if (subName.includes("/")) {
|
||||||
|
// check if parent actually exists.
|
||||||
|
const parentName = `${current.folderName}/${subName.substring(0, subName.indexOf("/"))}`;
|
||||||
|
return !allFolders.find(f => f.folderName == parentName);
|
||||||
|
} else {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}).map(it => it.folderId);
|
||||||
folders.push(e);
|
folders.push(e);
|
||||||
return generateSidebar(guildsBarProps, folders, e as number);
|
return generateSidebar(guildsBarProps, folders, e as number);
|
||||||
});
|
});
|
||||||
|
|
Loading…
Add table
Reference in a new issue