fluxerapp/fluxer
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor progress

Browse Source
This commit is contained in:
Hampus Kraft
2026-02-17 12:22:36 +00:00
parent cb31608523
commit d5abd1a7e4
8257 changed files with 1190207 additions and 761040 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
fluxer_app/src/stores/GuildListStore.tsx
View File

@@ -17,10 +17,17 @@
* along with Fluxer. If not, see <https://www.gnu.org/licenses/>.
*/
import {GuildRecord} from '@app/records/GuildRecord';
import GuildStore from '@app/stores/GuildStore';
import UserSettingsStore, {type GuildFolder} from '@app/stores/UserSettingsStore';
import type {GuildReadyData} from '@app/types/gateway/GatewayGuildTypes';
import {UNCATEGORIZED_FOLDER_ID} from '@fluxer/constants/src/UserConstants';
import type {Guild} from '@fluxer/schema/src/domains/guild/GuildResponseSchemas';
import {action, makeAutoObservable} from 'mobx';
import {type Guild, type GuildReadyData, GuildRecord} from '~/records/GuildRecord';
import GuildStore from '~/stores/GuildStore';
import UserSettingsStore from '~/stores/UserSettingsStore';
export type OrganizedItem =
| {type: 'folder'; folder: GuildFolder; guilds: Array<GuildRecord>}
| {type: 'guild'; guild: GuildRecord};
class GuildListStore {
guilds: Array<GuildRecord> = [];
@@ -90,12 +97,39 @@ class GuildListStore {
this.guilds = [...this.sortGuildArray([...this.guilds])];
}
getOrganizedGuildList(): Array<OrganizedItem> {
const guildFolders = UserSettingsStore.guildFolders;
const guildMap = new Map(this.guilds.map((guild) => [guild.id, guild]));
const result: Array<OrganizedItem> = [];
for (const folder of guildFolders) {
const folderGuilds = folder.guildIds
.map((guildId) => guildMap.get(guildId))
.filter((guild): guild is GuildRecord => guild !== undefined);
if (folderGuilds.length === 0) {
continue;
}
if (folder.id === UNCATEGORIZED_FOLDER_ID) {
for (const guild of folderGuilds) {
result.push({type: 'guild', guild});
}
} else {
result.push({type: 'folder', folder, guilds: folderGuilds});
}
}
return result;
}
private sortGuildArray(guilds: ReadonlyArray<GuildRecord>): ReadonlyArray<GuildRecord> {
const guildPositions = UserSettingsStore.guildPositions;
const guildFolders = UserSettingsStore.guildFolders;
const guildOrder = guildFolders.flatMap((folder) => folder.guildIds);
return [...guilds].sort((a, b) => {
const aIndex = guildPositions.indexOf(a.id);
const bIndex = guildPositions.indexOf(b.id);
const aIndex = guildOrder.indexOf(a.id);
const bIndex = guildOrder.indexOf(b.id);
if (aIndex === -1 && bIndex === -1) {
return a.name.localeCompare(b.name);