Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

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

Merged
merged 3 commits into from
Dec 23, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee181b8
Fix being wrongly sent to Home space when creating new room in space
t3chguy Dec 20, 2021
29eba13
Handle edge where the current room is being left better
t3chguy Dec 20, 2021
58fefcf
Merge branch 'develop' into t3chguy/rs/7331
t3chguy Dec 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions src/stores/spaces/SpaceStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 });
Expand Down Expand Up @@ -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) {
Expand Down
14 changes: 13 additions & 1 deletion src/utils/membership.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ import ErrorDialog from "../components/views/dialogs/ErrorDialog";
import dis from "../dispatcher/dispatcher";
import RoomViewStore from "../stores/RoomViewStore";
import Spinner from "../components/views/elements/Spinner";
import { isMetaSpace } from "../stores/spaces";
import SpaceStore from "../stores/spaces/SpaceStore";
import { Action } from "../dispatcher/actions";

/**
* Approximation of a membership status for a given room.
Expand Down Expand Up @@ -179,7 +182,16 @@ export async function leaveRoomBehaviour(roomId: string, retry = true, spinner =
return;
}

if (RoomViewStore.getRoomId() === roomId) {
if (SpaceStore.spacesEnabled &&
!isMetaSpace(SpaceStore.instance.activeSpace) &&
SpaceStore.instance.activeSpace !== roomId &&
RoomViewStore.getRoomId() === roomId
) {
dis.dispatch({
action: Action.ViewRoom,
room_id: SpaceStore.instance.activeSpace,
});
} else {
dis.dispatch({ action: 'view_home_page' });
}
}