From d0c716d61c07666deb5bc5455705120e20f4f547 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 8 Sep 2020 10:26:37 +0100
Subject: [PATCH 1/2] Fix permalink local linkification to not strip via
 servers

---
 src/utils/permalinks/Permalinks.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/utils/permalinks/Permalinks.js b/src/utils/permalinks/Permalinks.js
index 466d1ed57d..d97ba55c4d 100644
--- a/src/utils/permalinks/Permalinks.js
+++ b/src/utils/permalinks/Permalinks.js
@@ -332,6 +332,10 @@ export function tryTransformPermalinkToLocalHref(permalink: string): string {
             if (permalinkParts.roomIdOrAlias) {
                 const eventIdPart = permalinkParts.eventId ? `/${permalinkParts.eventId}` : '';
                 permalink = `#/room/${permalinkParts.roomIdOrAlias}${eventIdPart}`;
+                if (permalinkParts.viaServers.length > 0) {
+                    const riotPermalinkConstructor = new SpecPermalinkConstructor();
+                    permalink += riotPermalinkConstructor.encodeServerCandidates(permalinkParts.viaServers);
+                }
             } else if (permalinkParts.groupId) {
                 permalink = `#/group/${permalinkParts.groupId}`;
             } else if (permalinkParts.userId) {

From 1b99c11b1189fdf529471ede9c0f1482f10921fd Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 8 Sep 2020 15:09:45 +0100
Subject: [PATCH 2/2] tidy

---
 src/utils/permalinks/Permalinks.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/utils/permalinks/Permalinks.js b/src/utils/permalinks/Permalinks.js
index d97ba55c4d..3e510ffee9 100644
--- a/src/utils/permalinks/Permalinks.js
+++ b/src/utils/permalinks/Permalinks.js
@@ -333,8 +333,7 @@ export function tryTransformPermalinkToLocalHref(permalink: string): string {
                 const eventIdPart = permalinkParts.eventId ? `/${permalinkParts.eventId}` : '';
                 permalink = `#/room/${permalinkParts.roomIdOrAlias}${eventIdPart}`;
                 if (permalinkParts.viaServers.length > 0) {
-                    const riotPermalinkConstructor = new SpecPermalinkConstructor();
-                    permalink += riotPermalinkConstructor.encodeServerCandidates(permalinkParts.viaServers);
+                    permalink += new SpecPermalinkConstructor().encodeServerCandidates(permalinkParts.viaServers);
                 }
             } else if (permalinkParts.groupId) {
                 permalink = `#/group/${permalinkParts.groupId}`;