pepepper/fluxer
1
0
Fork 0
mirror of https://github.com/fluxerapp/fluxer synced 2026-10-07 19:22:14 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix(schema): group category channels text before voice when ordering (#1823)

Browse Source
This commit is contained in:
Hampus
2026-08-23 17:49:26 +02:00
committed by GitHub
parent 137edc7cfb
commit 61b4511ae4
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/schema/src/domains/channel/GuildChannelOrdering.ts
+17 -1
View File
@@ -47,6 +47,22 @@ export function compareChannelOrdering<Id extends string | bigint>(
return idToString(a.id).localeCompare(idToString(b.id));
}
function channelLayoutRank(channel: {type: number}): number {
if (channel.type === ChannelTypes.GUILD_TEXT || channel.type === ChannelTypes.GUILD_LINK) return 0;
if (channel.type === ChannelTypes.GUILD_VOICE) return 1;
return 2;
}
function sortChannelListGroup<Id extends string | bigint, Channel extends ChannelOrderingChannel<Id>>(
channels: ReadonlyArray<Channel>,
): Array<Channel> {
return [...channels].sort((a, b) => {
const rankDelta = channelLayoutRank(a) - channelLayoutRank(b);
if (rankDelta !== 0) return rankDelta;
return compareChannelOrdering(a, b);
});
}
export function sortChannelsForOrdering<Id extends string | bigint, Channel extends ChannelOrderingChannel<Id>>(
channels: ReadonlyArray<Channel>,
): Array<Channel> {
@@ -79,7 +95,7 @@ export function sortChannelsForOrdering<Id extends string | bigint, Channel exte
if (!children) {
continue;
}
for (const child of [...children].sort(compareChannelOrdering)) {
for (const child of sortChannelListGroup(children)) {
orderedChannels.push(child);
seen.add(child.id);
}