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

Commit e48c491

Browse files
authored
Merge pull request #1294 from matrix-org/revert-1290-luke/fix-user-url-no-middle-panel
Revert "At /user, view member of current room"
2 parents 1ce433b + 2844b57 commit e48c491

File tree

1 file changed

+3
-24
lines changed

1 file changed

+3
-24
lines changed

src/components/structures/MatrixChat.js

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,6 @@ module.exports = React.createClass({
448448
});
449449
}, 0);
450450
}
451-
this.notifyNewScreen('user/' + payload.member.userId);
452451
break;
453452
case 'view_room':
454453
// Takes either a room ID or room alias: if switching to a room the client is already
@@ -1214,29 +1213,9 @@ module.exports = React.createClass({
12141213
return;
12151214
}
12161215

1217-
// Get the member object for the current room, if a current room is set or
1218-
// we have a last_room in localStorage. The user might not be a member of
1219-
// this room (in which case member will be falsey).
1220-
let member;
1221-
const roomId = this.state.currentRoomId || localStorage.getItem('mx_last_room_id');
1222-
if (roomId) {
1223-
const room = MatrixClientPeg.get().getRoom(roomId);
1224-
if (room) {
1225-
member = room.getMember(userId);
1226-
}
1227-
}
1228-
1229-
if (member) {
1230-
// This user is a member of this room, so view the room
1231-
dis.dispatch({
1232-
action: 'view_room',
1233-
room_id: roomId,
1234-
});
1235-
} else {
1236-
// This user is not a member of this room, show the user view
1237-
member = new Matrix.RoomMember(null, userId);
1238-
this._setPage(PageTypes.UserView);
1239-
}
1216+
this._setPage(PageTypes.UserView);
1217+
this.notifyNewScreen('user/' + userId);
1218+
const member = new Matrix.RoomMember(null, userId);
12401219
dis.dispatch({
12411220
action: 'view_user',
12421221
member: member,

0 commit comments

Comments
 (0)