pepepper/fluxer
1
0 Fork 0
mirror of https://github.com/fluxerapp/fluxer synced 2026-10-17 21:15:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix(app): read instance config safely in startup skeletons (#3259)

Browse Source
This commit is contained in:
Hampus authored and GitHub committed 2026-10-07 23:27:59 +02:00
1 parent 317fedeef9
commit c402c52a8a
4 files changed
+38 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

fluxer_app/src/features/app/components/skeleton/ChatSkeleton.tsx
+2 -2
View File
@@ -17,12 +17,12 @@ import {
SKELETON_UNMEASURED_WIDTH_PX,
} from '@app/features/app/components/skeleton/SkeletonLayoutMemory';
import {SkeletonLine} from '@app/features/app/components/skeleton/SkeletonLine';
import {skeletonGifEnabled} from '@app/features/app/components/skeleton/SkeletonRuntimeConfig';
import {SkeletonEmphasis, SkeletonRadius} from '@app/features/app/components/skeleton/SkeletonStyle';
import {
type SkeletonInjectedToken,
skeletonSurfaceVar,
} from '@app/features/app/components/skeleton/SkeletonSurfaceContract';
import RuntimeConfig from '@app/features/app/state/RuntimeConfig';
import {CHANNEL_HEADER_DM_AVATAR_SIZE_PX} from '@app/features/channel/components/ChannelHeaderMetrics';
import {MemberListSkeleton, MemberListSkeletonVariant} from '@app/features/channel/components/MemberListSkeleton';
import composerWrapperStyles from '@app/features/channel/components/textarea/InputWrapper.module.css';
@@ -163,7 +163,7 @@ export const ChatSkeleton = observer(function ChatSkeleton({presentation}: ChatS
const [rememberedChatState] = useState(() =>
Object.freeze({
composerLayout:
getRememberedSkeletonComposerLayout() ?? resolveDefaultSkeletonComposerLayout(RuntimeConfig.gifEnabled),
getRememberedSkeletonComposerLayout() ?? resolveDefaultSkeletonComposerLayout(skeletonGifEnabled()),
messagePresentation: getRememberedSkeletonMessagePresentation() ?? resolveDefaultSkeletonMessagePresentation(),
}),
);
fluxer_app/src/features/app/components/skeleton/GuildRailSkeleton.tsx
+6 -3
View File
@@ -13,9 +13,12 @@ import {
SkeletonGuildRailItemIndicator,
SkeletonGuildRailItemKind,
} from '@app/features/app/components/skeleton/SkeletonLayoutMemory';
import {
skeletonDirectMessagesDisabled,
skeletonSingleCommunityEnabled,
} from '@app/features/app/components/skeleton/SkeletonRuntimeConfig';
import {SkeletonEmphasis, SkeletonRadius} from '@app/features/app/components/skeleton/SkeletonStyle';
import {skeletonSurfaceVar} from '@app/features/app/components/skeleton/SkeletonSurfaceContract';
import RuntimeConfig from '@app/features/app/state/RuntimeConfig';
import {Platform} from '@app/features/platform/types/Platform';
import {getRemScaleForDocument} from '@app/features/theme/layout/RemFromPx';
import Dimension from '@app/features/ui/state/Dimension';
@@ -454,7 +457,7 @@ export const GuildRailSkeleton: React.FC<GuildRailSkeletonProps> = ({
});
});
const {rememberedLayout} = mountState;
const communityActionsAvailable = !RuntimeConfig.singleCommunityEnabled;
const communityActionsAvailable = !skeletonSingleCommunityEnabled();
const inlineDmRowCount = rememberedLayout?.inlineDmRowCount ?? 0;
const inlineDmUnreadFlags = rememberedLayout?.inlineDmUnreadFlags ?? EMPTY_INLINE_DM_UNREAD_FLAGS;
const selectedInlineDmRowIndex = rememberedLayout?.selectedInlineDmRowIndex ?? SKELETON_NO_SELECTED_RAIL_ITEM_INDEX;
@@ -462,7 +465,7 @@ export const GuildRailSkeleton: React.FC<GuildRailSkeletonProps> = ({
const outageVisible = rememberedLayout?.outageVisible ?? false;
const organizedItems = rememberedLayout?.organizedItems ?? SKELETON_GUILD_RAIL_FALLBACK_ITEMS;
const selectedItemIndex = rememberedLayout?.selectedItemIndex ?? SKELETON_NO_SELECTED_RAIL_ITEM_INDEX;
const fluxerVisible = rememberedLayout?.fluxerVisible ?? !RuntimeConfig.directMessagesDisabled;
const fluxerVisible = rememberedLayout?.fluxerVisible ?? !skeletonDirectMessagesDisabled();
const favoritesVisible = rememberedLayout?.favoritesVisible ?? true;
const discoveryVisible = rememberedLayout?.discoveryVisible ?? communityActionsAvailable;
const addGuildVisible = rememberedLayout?.addGuildVisible ?? communityActionsAvailable;
fluxer_app/src/features/app/components/skeleton/ShellHint.ts
+10 -5
View File
@@ -39,7 +39,12 @@ import {
SkeletonGuildRailItemIndicator,
SkeletonGuildRailItemKind,
} from '@app/features/app/components/skeleton/SkeletonLayoutMemory';
import RuntimeConfig from '@app/features/app/state/RuntimeConfig';
import {
skeletonDirectMessagesDisabled,
skeletonGifEnabled,
skeletonSelfHosted,
skeletonSingleCommunityEnabled,
} from '@app/features/app/components/skeleton/SkeletonRuntimeConfig';
import {AppStorageKey} from '@app/features/platform/state/AppStorageKeys';
import {
GATEWAY_PREBOOT_SESSION_STORAGE_KEY,
@@ -162,7 +167,7 @@ interface RailProjection {
}
function resolveRailProjection(layout: RememberedSkeletonGuildRailLayout | null): RailProjection {
const communityActionsAvailable = !RuntimeConfig.singleCommunityEnabled;
const communityActionsAvailable = !skeletonSingleCommunityEnabled();
const inlineDmRowCount = layout?.inlineDmRowCount ?? 0;
const rememberedUnread = layout?.inlineDmUnreadFlags ?? [];
const inlineDmUnreadFlags = Array.from(
@@ -170,7 +175,7 @@ function resolveRailProjection(layout: RememberedSkeletonGuildRailLayout | null)
(_unused, index) => rememberedUnread[index] === true,
);
return {
fluxerVisible: layout?.fluxerVisible ?? !RuntimeConfig.directMessagesDisabled,
fluxerVisible: layout?.fluxerVisible ?? !skeletonDirectMessagesDisabled(),
favoritesVisible: layout?.favoritesVisible ?? true,
inlineDmUnreadFlags,
selectedInlineDmRowIndex: layout?.selectedInlineDmRowIndex ?? NO_SELECTED_ROW_INDEX,
@@ -245,7 +250,7 @@ function resolveDMActionMask(layout: RememberedSkeletonDMSidebarLayout | null, m
if (layout?.personalNotesVisible ?? true) {
mask |= DM_ACTION_PERSONAL_NOTES_BIT;
}
if (layout?.premiumVisible ?? (!RuntimeConfig.isSelfHosted() && !mobile)) {
if (layout?.premiumVisible ?? (!skeletonSelfHosted() && !mobile)) {
mask |= DM_ACTION_PREMIUM_BIT;
}
return mask;
@@ -297,7 +302,7 @@ export function writeShellHint(): void {
const isChat = shell.content.kind === 'chat';
const chat = resolveChatSkeletonPresentation(pathname, !mobile && viewportWidth >= MEMBER_LIST_FIT_MIN_WIDTH_PX);
const composer =
getRememberedSkeletonComposerLayout() ?? resolveDefaultSkeletonComposerLayout(RuntimeConfig.gifEnabled);
getRememberedSkeletonComposerLayout() ?? resolveDefaultSkeletonComposerLayout(skeletonGifEnabled());
const message = getRememberedSkeletonMessagePresentation() ?? resolveDefaultSkeletonMessagePresentation();
const voice = getRememberedSkeletonVoicePresence() ?? SKELETON_DEFAULT_VOICE_PRESENCE;
const showMemberList = isChat && chat.showMemberList;
fluxer_app/src/features/app/components/skeleton/SkeletonRuntimeConfig.ts
+20
View File
@@ -0,0 +1,20 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import RuntimeConfig from '@app/features/app/state/RuntimeConfig';
import DeveloperOptions from '@app/features/devtools/state/DeveloperOptions';
export function skeletonSingleCommunityEnabled(): boolean {
return RuntimeConfig.getSnapshotOrNull()?.community.single_community ?? false;
}
export function skeletonDirectMessagesDisabled(): boolean {
return RuntimeConfig.getSnapshotOrNull()?.community.direct_messages_disabled ?? false;
}
export function skeletonGifEnabled(): boolean {
return RuntimeConfig.getSnapshotOrNull()?.services.gif_enabled ?? true;
}
export function skeletonSelfHosted(): boolean {
return DeveloperOptions.selfHostedModeOverride || (RuntimeConfig.getSnapshotOrNull()?.features.self_hosted ?? false);
}