imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix being wrongly sent to Home space when creating/joining/leaving rooms (#7418)

Browse source
This commit is contained in:
Michael Telatynski 2021-12-23 12:01:14 +00:00 • committed by GitHub
parent a20f3560da
commit f94bad7f0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -768,11 +768,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
private switchSpaceIfNeeded = throttle(() => {
const roomId = RoomViewStore.getRoomId();
if (this.isRoomInSpace(this.activeSpace, roomId)) return;
if (this.matrixClient.getRoom(roomId)?.isSpaceRoom()) {
this.goToFirstSpace(true);
} else {
if (!this.isRoomInSpace(this.activeSpace, roomId) && !this.matrixClient.getRoom(roomId)?.isSpaceRoom()) {
this.switchToRelatedSpace(roomId);
}
}, 100, { leading: true, trailing: true });
@ -1069,9 +1065,9 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
switch (payload.action) {
case "view_room": {
// Don't auto-switch rooms when reacting to a context-switch
// Don't auto-switch rooms when reacting to a context-switch or for new rooms being created
// as this is not helpful and can create loops of rooms/space switching
if (payload.context_switch) break;
if (payload.context_switch || payload.justCreatedOpts) break;
let roomId = payload.room_id;
if (payload.room_alias && !roomId) {