From 0c46901fbccb994e8ac9086536055819f2a2146b Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Sat, 11 Jan 2025 20:14:53 +0100
Subject: Trim trailing slashes from well-known URIs

---
 LibMatrix/Services/HomeserverResolverService.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'LibMatrix')

diff --git a/LibMatrix/Services/HomeserverResolverService.cs b/LibMatrix/Services/HomeserverResolverService.cs
index f899230..d599bc6 100644
--- a/LibMatrix/Services/HomeserverResolverService.cs
+++ b/LibMatrix/Services/HomeserverResolverService.cs
@@ -45,7 +45,7 @@ public class HomeserverResolverService {
 
             // try {
             if (client != null)
-                res.Client = await client ?? throw new Exception($"Could not resolve client URL for {homeserver}.");
+                res.Client = (await client)?.TrimEnd('/') ?? throw new Exception($"Could not resolve client URL for {homeserver}.");
             // }
             // catch (Exception e) {
             // _logger.LogError(e, "Error resolving client well-known for {hs}", homeserver);
@@ -53,7 +53,7 @@ public class HomeserverResolverService {
 
             // try {
             if (server != null)
-                res.Server = await server ?? throw new Exception($"Could not resolve server URL for {homeserver}.");
+                res.Server = (await server)?.TrimEnd('/') ?? throw new Exception($"Could not resolve server URL for {homeserver}.");
             // }
             // catch (Exception e) {
             // _logger.LogError(e, "Error resolving server well-known for {hs}", homeserver);
-- 
cgit 1.5.1