From d7a98fe3923f756d67784c5ecdb2a908c24731cf Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 12 May 2023 13:46:49 +0100
Subject: [PATCH] Handle trailing dot FQDNs for domain-specific config.json
 files (#25351)

---
 src/vector/getconfig.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/vector/getconfig.ts b/src/vector/getconfig.ts
index 17a897809d..39a4ff6850 100644
--- a/src/vector/getconfig.ts
+++ b/src/vector/getconfig.ts
@@ -21,7 +21,13 @@ import type { IConfigOptions } from "matrix-react-sdk/src/IConfigOptions";
 export async function getVectorConfig(relativeLocation = ""): Promise<IConfigOptions | undefined> {
     if (relativeLocation !== "" && !relativeLocation.endsWith("/")) relativeLocation += "/";
 
-    const specificConfigPromise = getConfig(`${relativeLocation}config.${window.location.hostname}.json`);
+    // Handle trailing dot FQDNs
+    let domain = window.location.hostname.trimEnd();
+    if (domain[domain.length - 1] === ".") {
+        domain = domain.slice(0, -1);
+    }
+
+    const specificConfigPromise = getConfig(`${relativeLocation}config.${domain}.json`);
     const generalConfigPromise = getConfig(relativeLocation + "config.json");
 
     try {