From c643bdcfce997fe207b35f8b3a9d6e20657cf8e0 Mon Sep 17 00:00:00 2001
From: Aine <aine@etke.cc>
Date: Mon, 16 Dec 2024 12:53:42 +0200
Subject: [PATCH] correctly handle MXIDs with not just-domain server names;
 update testdata config to include that case by default; fixes #239

---
 src/utils/mxid.ts                | 5 +++++
 testdata/synapse/homeserver.yaml | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/utils/mxid.ts b/src/utils/mxid.ts
index 900a428..1f5ec7a 100644
--- a/src/utils/mxid.ts
+++ b/src/utils/mxid.ts
@@ -44,6 +44,11 @@ export function generateRandomMXID(): string {
 export function returnMXID(input: string | Identifier): string {
   const homeserver = localStorage.getItem("home_server");
 
+  // when homeserver is not (just) a domain name, but a domain:port or even an IPv6 address
+  if (input.endsWith(homeserver) && input.startsWith("@")) {
+    return input as string; // Already a valid MXID
+  }
+
   // Check if the input already looks like a valid MXID (i.e., starts with "@" and contains ":")
   if (isMXID(input)) {
     return input as string; // Already a valid MXID
diff --git a/testdata/synapse/homeserver.yaml b/testdata/synapse/homeserver.yaml
index e1dfd62..392d444 100644
--- a/testdata/synapse/homeserver.yaml
+++ b/testdata/synapse/homeserver.yaml
@@ -149,7 +149,7 @@ saml2_config:
   sp_config: null
   user_mapping_provider:
     config: null
-server_name: synapse
+server_name: synapse:8008
 signing_key_path: /config/synapse.signing.key
 spam_checker: []
 sso: null