From b77cc7edf960c7f49ed5181b9570b4e0afe73583 Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Fri, 14 Nov 2025 08:42:49 +0100
Subject: Handle some non-browser network errors, clean up some well known
 resolver stuff

---
 .../WellKnownResolver/WellKnownResolverService.cs    | 20 +++++++++-----------
 .../WellKnownResolvers/ClientWellKnownResolver.cs    |  2 --
 .../WellKnownResolvers/ServerWellKnownResolver.cs    |  5 -----
 3 files changed, 9 insertions(+), 18 deletions(-)

(limited to 'LibMatrix/Services')

diff --git a/LibMatrix/Services/WellKnownResolver/WellKnownResolverService.cs b/LibMatrix/Services/WellKnownResolver/WellKnownResolverService.cs
index 4c78347..c5e9d9c 100644
--- a/LibMatrix/Services/WellKnownResolver/WellKnownResolverService.cs
+++ b/LibMatrix/Services/WellKnownResolver/WellKnownResolverService.cs
@@ -34,17 +34,13 @@ public class WellKnownResolverService {
         WellKnownResolverConfiguration? config = null) {
         WellKnownRecords records = new();
         _logger.LogDebug($"Resolving well-knowns for {homeserver}");
-        if (includeClient && await _clientWellKnownResolver.TryResolveWellKnown(homeserver, config ?? _configuration) is { } clientResult) {
-            records.ClientWellKnown = clientResult;
-        }
-        
-        if (includeServer && await _serverWellKnownResolver.TryResolveWellKnown(homeserver, config ?? _configuration) is { } serverResult) {
-            records.ServerWellKnown = serverResult;
-        }
-        
-        if (includeSupport && await _supportWellKnownResolver.TryResolveWellKnown(homeserver, config ?? _configuration) is { } supportResult) {
-            records.SupportWellKnown = supportResult;
-        }
+        var clientTask = _clientWellKnownResolver.TryResolveWellKnown(homeserver, config ?? _configuration);
+        var serverTask = _serverWellKnownResolver.TryResolveWellKnown(homeserver, config ?? _configuration);
+        var supportTask = _supportWellKnownResolver.TryResolveWellKnown(homeserver, config ?? _configuration);
+
+        if (includeClient && await clientTask is { } clientResult) records.ClientWellKnown = clientResult;
+        if (includeServer && await serverTask is { } serverResult) records.ServerWellKnown = serverResult;
+        if (includeSupport && await supportTask is { } supportResult) records.SupportWellKnown = supportResult;
 
         return records;
     }
@@ -75,8 +71,10 @@ public class WellKnownResolverService {
     public struct WellKnownResolutionWarning {
         public WellKnownResolutionWarningType Type { get; set; }
         public string Message { get; set; }
+
         [JsonIgnore]
         public Exception? Exception { get; set; }
+
         public string? ExceptionMessage => Exception?.Message;
 
         [JsonConverter(typeof(JsonStringEnumConverter))]
diff --git a/LibMatrix/Services/WellKnownResolver/WellKnownResolvers/ClientWellKnownResolver.cs b/LibMatrix/Services/WellKnownResolver/WellKnownResolvers/ClientWellKnownResolver.cs
index f8de38d..f52b217 100644
--- a/LibMatrix/Services/WellKnownResolver/WellKnownResolvers/ClientWellKnownResolver.cs
+++ b/LibMatrix/Services/WellKnownResolver/WellKnownResolvers/ClientWellKnownResolver.cs
@@ -14,8 +14,6 @@ public class ClientWellKnownResolver(ILogger<ClientWellKnownResolver> logger, We
         StoreNulls = false
     };
 
-    private static readonly MatrixHttpClient HttpClient = new();
-
     public Task<WellKnownResolverService.WellKnownResolutionResult<ClientWellKnown>> TryResolveWellKnown(string homeserver, WellKnownResolverConfiguration? config = null) {
         config ??= configuration;
         return ClientWellKnownCache.TryGetOrAdd(homeserver, async () => {
diff --git a/LibMatrix/Services/WellKnownResolver/WellKnownResolvers/ServerWellKnownResolver.cs b/LibMatrix/Services/WellKnownResolver/WellKnownResolvers/ServerWellKnownResolver.cs
index a99185c..a48d846 100644
--- a/LibMatrix/Services/WellKnownResolver/WellKnownResolvers/ServerWellKnownResolver.cs
+++ b/LibMatrix/Services/WellKnownResolver/WellKnownResolvers/ServerWellKnownResolver.cs
@@ -1,6 +1,5 @@
 using System.Text.Json.Serialization;
 using ArcaneLibs.Collections;
-using LibMatrix.Extensions;
 using Microsoft.Extensions.Logging;
 using WellKnownType = LibMatrix.Services.WellKnownResolver.WellKnownResolvers.ServerWellKnown;
 using ResultType =
@@ -14,8 +13,6 @@ public class ServerWellKnownResolver(ILogger<ServerWellKnownResolver> logger, We
         StoreNulls = false
     };
 
-    private static readonly MatrixHttpClient HttpClient = new();
-
     public Task<WellKnownResolverService.WellKnownResolutionResult<ServerWellKnown>> TryResolveWellKnown(string homeserver, WellKnownResolverConfiguration? config = null) {
         config ??= configuration;
         return ClientWellKnownCache.TryGetOrAdd(homeserver, async () => {
@@ -25,13 +22,11 @@ public class ServerWellKnownResolver(ILogger<ServerWellKnownResolver> logger, We
                 await TryGetWellKnownFromUrl($"https://{homeserver}/.well-known/matrix/server", WellKnownResolverService.WellKnownSource.Https);
             if (result.Content != null) return result;
 
-
             return result;
         });
     }
 }
 
-
 public class ServerWellKnown {
     [JsonPropertyName("m.server")]
     public string Homeserver { get; set; }
-- 
cgit 1.5.1