Avoid using deprecated exports, fields, and duplicate code (#12555)

src/utils/AutoDiscoveryUtils.tsx

@@ -68,7 +68,7 @@ const mapAutoDiscoveryErrorTranslation = (err: AutoDiscoveryError): TranslationK
             return _td("auth|autodiscovery_no_well_known");
         case AutoDiscoveryError.InvalidJson:
             return _td("auth|autodiscovery_invalid_json");
-        case AutoDiscoveryError.HomeserverTooOld:
+        case AutoDiscoveryError.UnsupportedHomeserverSpecVersion:
             return _td("auth|autodiscovery_hs_incompatible");
     }
 };

src/utils/PasswordScorer.ts

@@ -20,7 +20,6 @@ import * as zxcvbnEnPackage from "@zxcvbn-ts/language-en";
 import { MatrixClient } from "matrix-js-sdk/src/matrix";
 
 import { _t } from "../languageHandler";
-import { MatrixClientPeg } from "../MatrixClientPeg";
 import SdkConfig from "../SdkConfig";
 
 zxcvbnOptions.setOptions({
@@ -96,13 +95,13 @@ export function scorePassword(
 
     if (matrixClient) {
         inputs.push(matrixClient.getUserIdLocalpart()!);
-    }
 
-    try {
-        const domain = MatrixClientPeg.getHomeserverName();
-        inputs.push(domain);
-    } catch {
-        // This is fine
+        try {
+            const domain = matrixClient.getDomain()!;
+            inputs.push(domain);
+        } catch {
+            // This is fine
+        }
     }
 
     zxcvbnOptions.setTranslations(getTranslations());

src/utils/device/dehydration.ts

@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import { logger } from "matrix-js-sdk/src/logger";
-import { CryptoApi } from "matrix-js-sdk/src/matrix";
+import { Crypto } from "matrix-js-sdk/src/matrix";
 
 import { MatrixClientPeg } from "../../MatrixClientPeg";
 
@@ -29,7 +29,7 @@ import { MatrixClientPeg } from "../../MatrixClientPeg";
  *
  * Dehydration can currently only be enabled by setting a flag in the .well-known file.
  */
-async function deviceDehydrationEnabled(crypto: CryptoApi | undefined): Promise<boolean> {
+async function deviceDehydrationEnabled(crypto: Crypto.CryptoApi | undefined): Promise<boolean> {
     if (!crypto) {
         return false;
     }

src/utils/dm/createDmLocalRoom.ts

@@ -46,7 +46,6 @@ export async function createDmLocalRoom(client: MatrixClient, targets: Member[])
                 room_version: KNOWN_SAFE_ROOM_VERSION,
             },
             state_key: "",
-            user_id: userId,
             sender: userId,
             room_id: localRoom.roomId,
             origin_server_ts: Date.now(),
@@ -62,7 +61,6 @@ export async function createDmLocalRoom(client: MatrixClient, targets: Member[])
                 content: {
                     algorithm: MEGOLM_ALGORITHM,
                 },
-                user_id: userId,
                 sender: userId,
                 state_key: "",
                 room_id: localRoom.roomId,
@@ -80,7 +78,6 @@ export async function createDmLocalRoom(client: MatrixClient, targets: Member[])
                 membership: KnownMembership.Join,
             },
             state_key: userId,
-            user_id: userId,
             sender: userId,
             room_id: localRoom.roomId,
         }),