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

Merge pull request #2432 from matrix-org/travis/rver/7998

Browse source 
Navigate to the upgraded room's create event where possible
This commit is contained in:
David Baker 2019-01-11 10:35:30 +00:00 committed by GitHub
commit 93cf281ff9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/components/views/rooms/MessageComposer.js
View file

@ -281,9 +281,17 @@ export default class MessageComposer extends React.Component {
ev.preventDefault(); ev.preventDefault();
const replacementRoomId = this.state.tombstone.getContent()['replacement_room']; const replacementRoomId = this.state.tombstone.getContent()['replacement_room'];
const replacementRoom = MatrixClientPeg.get().getRoom(replacementRoomId);
let createEventId = null;
if (replacementRoom) {
const createEvent = replacementRoom.currentState.getStateEvents('m.room.create', '');
if (createEvent && createEvent.getId()) createEventId = createEvent.getId();
}
this.props.roomViewStore.getDispatcher().dispatch({ this.props.roomViewStore.getDispatcher().dispatch({
action: 'view_room', action: 'view_room',
highlighted: true, highlighted: true,
event_id: createEventId,
room_id: replacementRoomId, room_id: replacementRoomId,
// Try to join via the server that sent the event. This converts $something:example.org // Try to join via the server that sent the event. This converts $something:example.org