SheWhoReignsSupreme/revenge-plugins
1
0
Fork 0
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

ServerDrawer: guard folder-related store lookups against undefined stores

Browse source
This commit is contained in:
Ally Founder 2026-08-11 10:20:27 -04:00
parent e07d071d7a
commit d4083734be
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugins/server-drawer/src/components/FolderItem.tsx
View file

@ -30,7 +30,10 @@ function folderColor(color?: number | null): string {
}
function FolderBadge({ node }: { node: GuildNode }) {
const total = Flux?.useStateFromStores?.(
// Same guard as useFolderExpanded in utils/theme.ts - GuildReadStateStore is a one-shot lookup
// with no retry, and passing an undefined store into useStateFromStores throws instead of
// failing safely, which would take the whole drawer down, not just this badge.
const total = (Flux?.useStateFromStores && GuildReadStateStore) ? Flux.useStateFromStores(
[GuildReadStateStore],
() => {
let sum = 0;
@ -40,7 +43,7 @@ function FolderBadge({ node }: { node: GuildNode }) {
return sum;
},
[node.children],
) ?? 0;
) : 0;
if (total > 0) {
return (

9
plugins/server-drawer/src/utils/theme.ts
View file

@ -13,7 +13,14 @@ export function useTheme() {
}
export function useFolderExpanded(folderId: string | number): boolean {
return Flux?.useStateFromStores?.(
// Confirmed live: an account with folders and one without exercise different code paths (this
// hook is only ever called by FolderItem, which only exists when there's a folder to render) -
// an account with no folders rendered fine while one with folders showed nothing at all.
// ExpandedGuildFolderStore is a one-shot findByStoreName at module-eval time with no retry, so
// if it hadn't registered yet, this passed [undefined] into useStateFromStores - which throws
// rather than returning safely, taking down the whole drawer render, not just this one folder.
if (!Flux?.useStateFromStores || !ExpandedGuildFolderStore) return false;
return Flux.useStateFromStores(
[ExpandedGuildFolderStore],
() => {
const folders = ExpandedGuildFolderStore?.getExpandedFolders?.();