OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

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

Use the event sender instead of event ID for viaServers off a tombstone
pull/21833/head
Travis Ralston 2019-07-02 07:52:40 -06:00 committed by GitHub
parent 0c0a3c6133 083c1a78ab
commit 1d54911581
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/views/rooms/MessageComposer.js
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(':')],
});
}