1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-19 05:22:13 +03:00

Merge pull request #3159 from matrix-org/travis/pick-server-tombstone

Use the event sender instead of event ID for viaServers off a tombstone
This commit is contained in:
Travis Ralston
2019-07-02 07:52:40 -06:00
committed by GitHub

View File

@@ -327,9 +327,9 @@ export default class MessageComposer extends React.Component {
event_id: createEventId,
room_id: replacementRoomId,
// Try to join via the server that sent the event. This converts $something:example.org
// into a server domain by splitting on colons and ignoring the first entry ("$something").
via_servers: [this.state.tombstone.getId().split(':').splice(1).join(':')],
// Try to join via the server that sent the event. This converts @something:example.org
// into a server domain by splitting on colons and ignoring the first entry ("@something").
via_servers: [this.state.tombstone.getSender().split(':').splice(1).join(':')],
});
}