PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Fix space ordering to match newer spec (#7481)

Browse source
This commit is contained in:
Michael Telatynski 2022-01-10 08:58:11 +00:00 committed by GitHub
parent 30aee97b78
commit 33b34d4169
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/stores/spaces/SpaceStore.ts
View file

@ -83,9 +83,9 @@ const validOrder = (order: string): string | undefined => {
} }
}; };
// For sorting space children using a validated `order`, `m.room.create`'s `origin_server_ts`, `room_id` // For sorting space children using a validated `order`, `origin_server_ts`, `room_id`
export const getChildOrder = (order: string, creationTs: number, roomId: string): Array<Many<ListIteratee<any>>> => { export const getChildOrder = (order: string, ts: number, roomId: string): Array<Many<ListIteratee<any>>> => {
return [validOrder(order) ?? NaN, creationTs, roomId]; // NaN has lodash sort it at the end in asc return [validOrder(order) ?? NaN, ts, roomId]; // NaN has lodash sort it at the end in asc
}; };
const getRoomFn: FetchRoomFn = (room: Room) => { const getRoomFn: FetchRoomFn = (room: Room) => {
@ -296,10 +296,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
const room = this.matrixClient?.getRoom(spaceId); const room = this.matrixClient?.getRoom(spaceId);
const childEvents = room?.currentState.getStateEvents(EventType.SpaceChild).filter(ev => ev.getContent()?.via); const childEvents = room?.currentState.getStateEvents(EventType.SpaceChild).filter(ev => ev.getContent()?.via);
return sortBy(childEvents, ev => { return sortBy(childEvents, ev => {
const roomId = ev.getStateKey(); return getChildOrder(ev.getContent().order, ev.getTs(), ev.getStateKey());
const childRoom = this.matrixClient?.getRoom(roomId);
const createTs = childRoom?.currentState.getStateEvents(EventType.RoomCreate, "")?.getTs();
return getChildOrder(ev.getContent().order, createTs, roomId);
}).map(ev => { }).map(ev => {
const history = this.matrixClient.getRoomUpgradeHistory(ev.getStateKey(), true); const history = this.matrixClient.getRoomUpgradeHistory(ev.getStateKey(), true);
return history[history.length - 1]; return history[history.length - 1];