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): pick default channel when guild channels arrive late (#2475)

Browse Source
This commit is contained in:
Hampus authored and GitHub committed 2026-09-06 00:04:43 +02:00
1 parent 622bd124b9
commit 7cb8f9f4ae
3 files changed
+67 -56
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

fluxer_app/src/app/router/components/GuildChannelRouter.tsx
+23 -37
View File
@@ -3,7 +3,7 @@
import {Routes} from '@app/app/Routes';
import {GuildLayout} from '@app/features/app/components/layout/GuildLayout';
import Channels from '@app/features/channel/state/Channels';
import {compareChannelPosition, filterViewableChannels} from '@app/features/messaging/utils/ChannelShared';
import {pickDefaultGuildChannelId} from '@app/features/messaging/utils/ChannelShared';
import * as NavigationCommands from '@app/features/navigation/commands/NavigationCommands';
import SelectedChannel from '@app/features/navigation/state/SelectedChannel';
import {useLocation} from '@app/features/platform/components/router/RouterReact';
@@ -13,47 +13,33 @@ import {observer} from 'mobx-react-lite';
import type React from 'react';
import {useEffect} from 'react';
function isGuildRootPath(pathname: string, guildId: string): boolean {
if (guildId === ME || pathname === Routes.ME || pathname.startsWith(Routes.ME)) {
return false;
}
if (!pathname.startsWith('/channels/')) {
return false;
}
const segments = pathname.split('/');
return segments.length === 3 && segments[2] === guildId;
}
export const GuildChannelRouter = observer<{guildId: string; children: React.ReactNode}>(({guildId, children}) => {
const location = useLocation();
const needsDefaultChannel = !MobileLayout.enabled && isGuildRootPath(location.pathname, guildId);
const defaultChannelId = needsDefaultChannel
? pickDefaultGuildChannelId({
guildId,
channels: Channels.getGuildChannels(guildId),
selectedChannelId: SelectedChannel.selectedChannelIds.get(guildId),
})
: null;
useEffect(() => {
if (guildId === ME || location.pathname === Routes.ME) {
if (!defaultChannelId) {
return;
}
if (MobileLayout.enabled) {
return;
}
if (location.pathname.startsWith('/channels/') && !location.pathname.startsWith(Routes.ME)) {
if (location.pathname.split('/').length === 3) {
const pathSegments = location.pathname.split('/');
const currentGuildId = pathSegments[2];
if (currentGuildId !== guildId) {
return;
}
const selectedChannelId = SelectedChannel.selectedChannelIds.get(guildId);
if (selectedChannelId) {
const channel = Channels.getChannel(selectedChannelId);
const isViewableChannel = channel ? filterViewableChannels([channel]).length > 0 : false;
if (channel && channel.guildId === guildId && isViewableChannel) {
NavigationCommands.selectChannel(guildId, selectedChannelId, undefined, 'replace');
} else {
const channels = Channels.getGuildChannels(guildId);
const viewableChannels = filterViewableChannels(channels).sort(compareChannelPosition);
if (viewableChannels.length > 0) {
const firstChannel = viewableChannels[0];
NavigationCommands.selectChannel(guildId, firstChannel.id, undefined, 'replace');
}
}
} else {
const channels = Channels.getGuildChannels(guildId);
const viewableChannels = filterViewableChannels(channels).sort(compareChannelPosition);
if (viewableChannels.length > 0) {
const firstChannel = viewableChannels[0];
NavigationCommands.selectChannel(guildId, firstChannel.id, undefined, 'replace');
}
}
}
}
}, [guildId, location.pathname, MobileLayout.enabled]);
NavigationCommands.selectChannel(guildId, defaultChannelId, undefined, 'replace');
}, [guildId, defaultChannelId]);
if (guildId === ME || location.pathname === Routes.ME) {
return null;
}