Update the remainder of the module API interface

Author: turt2live

src/modules/ProxiedModuleApi.ts

@@ -17,18 +17,24 @@ limitations under the License.
 import { ModuleApi } from "@matrix-org/react-sdk-module-api/lib/ModuleApi";
 import { TranslationStringsObject } from "@matrix-org/react-sdk-module-api/lib/types/translations";
 import { Optional } from "matrix-events-sdk";
-import { _t } from "../languageHandler";
 import { DialogProps } from "@matrix-org/react-sdk-module-api/lib/components/DialogContent";
-import Modal from "../Modal";
-import { ModuleUiDialog } from "../components/views/dialogs/ModuleUiDialog";
 import React from "react";
-import { AccountInformation } from "@matrix-org/react-sdk-module-api/lib/types/credentials";
+import { AccountAuthInfo } from "@matrix-org/react-sdk-module-api/lib/types/AccountAuthInfo";
+import { PlainSubstitution } from "@matrix-org/react-sdk-module-api/src/types/translations";
 import * as Matrix from "matrix-js-sdk/src/matrix";
+
+import Modal from "../Modal";
+import { _t } from "../languageHandler";
+import { ModuleUiDialog } from "../components/views/dialogs/ModuleUiDialog";
 import SdkConfig from "../SdkConfig";
 import PlatformPeg from "../PlatformPeg";
 import { doSetLoggedIn } from "../Lifecycle";
 import dispatcher from "../dispatcher/dispatcher";
-import { PlainSubstitution } from "@matrix-org/react-sdk-module-api/src/types/translations";
+import { navigateToPermalink } from "../utils/permalinks/navigator";
+import { parsePermalink } from "../utils/permalinks/Permalinks";
+import { MatrixClientPeg } from "../MatrixClientPeg";
+import { getCachedRoomIDForAlias } from "../RoomAliasCache";
+import { Action } from "../dispatcher/actions";
 
 export class ProxiedModuleApi implements ModuleApi {
     private cachedTranslations: Optional<TranslationStringsObject>;
@@ -59,7 +65,7 @@ export class ProxiedModuleApi implements ModuleApi {
         });
     }
 
-    public async registerAccount(username: string, password: string, displayName?: string): Promise<AccountInformation> {
+    public async registerSimpleAccount(username: string, password: string, displayName?: string): Promise<AccountAuthInfo> {
         const hsUrl = SdkConfig.get("validated_server_config").hsUrl;
         const client = Matrix.createClient({ baseUrl: hsUrl });
         const req = {
@@ -95,23 +101,41 @@ export class ProxiedModuleApi implements ModuleApi {
         };
     }
 
-    public async useAccount(accountInfo: AccountInformation): Promise<void> {
+    public async overwriteAccountAuth(accountInfo: AccountAuthInfo): Promise<void> {
         await doSetLoggedIn({
             ...accountInfo,
             guest: false,
         }, true);
     }
 
-    public async switchToRoom(roomId: string, andJoin?: boolean): Promise<void> {
-        dispatcher.dispatch({
-            action: "view_room",
-            room_id: roomId,
-        });
-
-        if (andJoin) {
+    public async navigatePermalink(uri: string, andJoin?: boolean): Promise<void> {
+        navigateToPermalink(uri);
+
+        const parts = parsePermalink(uri);
+        if (parts.roomIdOrAlias)
+        if (parts.roomIdOrAlias && andJoin) {
+            let roomId = parts.roomIdOrAlias;
+            let servers = parts.viaServers;
+            if (roomId.startsWith("#")) {
+                roomId = getCachedRoomIDForAlias(parts.roomIdOrAlias);
+                if (!roomId) {
+                    // alias resolution failed
+                    const result = await MatrixClientPeg.get().getRoomIdForAlias(parts.roomIdOrAlias);
+                    roomId = result.room_id;
+                    if (!servers) servers = result.servers; // use provided servers first, if available
+                }
+            }
             dispatcher.dispatch({
-                action: "join_room",
+                action: Action.ViewRoom,
+                room_id: roomId,
+                via_servers: servers,
             });
+
+            if (andJoin) {
+                dispatcher.dispatch({
+                    action: Action.JoinRoom,
+                });
+            }
         }
     }
 

src/stores/widgets/StopGapWidgetDriver.ts

@@ -50,6 +50,7 @@ import { tryTransformPermalinkToLocalHref } from "../../utils/permalinks/Permali
 import SettingsStore from "../../settings/SettingsStore";
 import { RoomViewStore } from "../RoomViewStore";
 import { ElementWidgetCapabilities } from "./ElementWidgetCapabilities";
+import { navigateToPermalink } from "../../utils/permalinks/navigator";
 
 // TODO: Purge this from the universe
 
@@ -280,10 +281,6 @@ export class StopGapWidgetDriver extends WidgetDriver {
     }
 
     public async navigate(uri: string): Promise<void> {
-        const localUri = tryTransformPermalinkToLocalHref(uri);
-        if (!localUri || localUri === uri) { // parse failure can lead to an unmodified URL
-            throw new Error("Failed to transform URI");
-        }
-        window.location.hash = localUri; // it'll just be a fragment
+        navigateToPermalink(uri);
     }
 }

src/utils/permalinks/navigator.ts

@@ -0,0 +1,30 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { tryTransformPermalinkToLocalHref } from "./Permalinks";
+
+/**
+ * Converts a permalink to a local HREF and navigates accordingly. Throws if the permalink
+ * cannot be transformed.
+ * @param uri The permalink to navigate to.
+ */
+export function navigateToPermalink(uri: string): void {
+    const localUri = tryTransformPermalinkToLocalHref(uri);
+    if (!localUri || localUri === uri) { // parse failure can lead to an unmodified URL
+        throw new Error("Failed to transform URI");
+    }
+    window.location.hash = localUri; // it'll just be a fragment
+}