From 8acaa3ce95e03df9a8996112df81c9e67ad36033 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 30 Sep 2019 16:05:28 -0600
Subject: [PATCH] Update generated Riot permalinks

Also adds some safety around the Riot URL to ensure it mostly looks like a URL
---
 .../permalinks/RiotPermalinkConstructor.js    | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/utils/permalinks/RiotPermalinkConstructor.js b/src/utils/permalinks/RiotPermalinkConstructor.js
index 207e181a15..1b985e8190 100644
--- a/src/utils/permalinks/RiotPermalinkConstructor.js
+++ b/src/utils/permalinks/RiotPermalinkConstructor.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import PermalinkConstructor from "./PermalinkConstructor";
+import PermalinkConstructor, {PermalinkParts} from "./PermalinkConstructor";
 
 /**
  * Generates permalinks that self-reference the running webapp
@@ -26,31 +26,31 @@ export default class RiotPermalinkConstructor extends PermalinkConstructor {
     constructor(riotUrl: string) {
         super();
         this._riotUrl = riotUrl;
+
+        if (!this._riotUrl.startsWith("http:") && !this._riotUrl.startsWith("https:")) {
+            throw new Error("Riot prefix URL does not appear to be an HTTP(S) URL");
+        }
     }
 
     forEvent(roomId: string, eventId: string, serverCandidates: string[]): string {
-        // TODO: Fix URL
-        return `${this._riotUrl}/#/${roomId}/${eventId}${this.encodeServerCandidates(serverCandidates)}`;
+        return `${this._riotUrl}/#/room/${roomId}/${eventId}${this.encodeServerCandidates(serverCandidates)}`;
     }
 
     forRoom(roomIdOrAlias: string, serverCandidates: string[]): string {
-        // TODO: Fix URL
-        return `${this._riotUrl}/#/${roomIdOrAlias}${this.encodeServerCandidates(serverCandidates)}`;
+        return `${this._riotUrl}/#/room/${roomIdOrAlias}${this.encodeServerCandidates(serverCandidates)}`;
     }
 
     forUser(userId: string): string {
-        // TODO: Fix URL
-        return `${this._riotUrl}/#/${userId}`;
+        return `${this._riotUrl}/#/user/${userId}`;
     }
 
     forGroup(groupId: string): string {
-        // TODO: Fix URL
-        return `${this._riotUrl}/#/${groupId}`;
+        return `${this._riotUrl}/#/group/${groupId}`;
     }
 
     isPermalinkHost(testHost: string): boolean {
-        // TODO: Actual check
-        return testHost === this._riotUrl;
+        const parsedUrl = new URL(this._riotUrl);
+        return testHost === (parsedUrl.host || parsedUrl.hostname); // one of the hosts should match
     }
 
     encodeServerCandidates(candidates: string[]) {