From cec9c908fcf01cbd6b0f2bf914fbeeea7d5aec10 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 10 Jan 2019 14:33:46 -0700
Subject: [PATCH] Set which servers to try and join upgraded rooms through

Fixes https://github.com/vector-im/riot-web/issues/7991
---
 src/components/views/rooms/MessageComposer.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index e15ca047ac2..aefee9809ac 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -285,6 +285,10 @@ export default class MessageComposer extends React.Component {
             action: 'view_room',
             highlighted: true,
             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(':')],
         });
     }