The rest of warning cleanup so far.

3 files changed, 11 insertions, 9 deletions

diff --git a/LibMatrix/Extensions/CanonicalJsonSerializer.cs b/LibMatrix/Extensions/CanonicalJsonSerializer.cs

index c9d38cd..55a4b1a 100644
--- a/LibMatrix/Extensions/CanonicalJsonSerializer.cs
+++ b/LibMatrix/Extensions/CanonicalJsonSerializer.cs
@@ -8,7 +8,7 @@ namespace LibMatrix.Extensions;
 
 public static class CanonicalJsonSerializer {
     // TODO: Alphabetise dictionaries
-    private static JsonSerializerOptions _options => new() {
+    private static JsonSerializerOptions JsonOptions => new() {
         WriteIndented = false,
         Encoder = UnicodeJsonEncoder.Singleton,
     };
@@ -19,7 +19,7 @@ public static class CanonicalJsonSerializer {
         .ToFrozenSet();
 
     private static JsonSerializerOptions MergeOptions(JsonSerializerOptions? inputOptions) {
-        var newOptions = _options;
+        var newOptions = JsonOptions;
         if (inputOptions == null)
             return newOptions;
         
@@ -43,7 +43,7 @@ public static class CanonicalJsonSerializer {
     public static String Serialize<TValue>(TValue value, JsonSerializerOptions? options = null) {
         var newOptions = MergeOptions(options);
 
-        return System.Text.Json.JsonSerializer.SerializeToNode(value, options) // We want to allow passing custom converters for eg. double/float -> string here...
+        return JsonSerializer.SerializeToNode(value, options) // We want to allow passing custom converters for eg. double/float -> string here...
             .SortProperties()!
             .CanonicalizeNumbers()!
             .ToJsonString(newOptions);
@@ -53,13 +53,14 @@ public static class CanonicalJsonSerializer {
         
     }
 
-    public static String Serialize(object value, Type inputType, JsonSerializerOptions? options = null) => JsonSerializer.Serialize(value, inputType, _options);
+    public static String Serialize(object value, Type inputType, JsonSerializerOptions? options = null) => JsonSerializer.Serialize(value, inputType, JsonOptions);
     // public static String Serialize<TValue>(TValue value, JsonTypeInfo<TValue> jsonTypeInfo) => JsonSerializer.Serialize(value, jsonTypeInfo, _options);
     // public static String Serialize(Object value, JsonTypeInfo jsonTypeInfo) 
 
 #endregion
 
-    private static partial class JsonExtensions {
+    // ReSharper disable once UnusedType.Local
+    private static class JsonExtensions {
         public static Action<JsonTypeInfo> AlphabetizeProperties(Type type) {
             return typeInfo => {
                 if (typeInfo.Kind != JsonTypeInfoKind.Object || !type.IsAssignableFrom(typeInfo.Type))
diff --git a/LibMatrix/Extensions/JsonElementExtensions.cs b/LibMatrix/Extensions/JsonElementExtensions.cs

index c4ed743..dfec95b 100644
--- a/LibMatrix/Extensions/JsonElementExtensions.cs
+++ b/LibMatrix/Extensions/JsonElementExtensions.cs
@@ -126,6 +126,7 @@ public static class JsonElementExtensions {
             $"Encountered dictionary {field.Name} with key type {keyType.Name} and value type {valueType.Name}!");
 
         return field.Value.EnumerateObject()
+            // TODO: use key.Value?
             .Where(key => !valueType.IsPrimitive && valueType != typeof(string))
             .Aggregate(false, (current, key) =>
                 current | key.FindExtraJsonPropertyFieldsByValueKind(containerType, valueType)
diff --git a/LibMatrix/Extensions/MatrixHttpClient.Single.cs b/LibMatrix/Extensions/MatrixHttpClient.Single.cs

index 895217d..56925fb 100644
--- a/LibMatrix/Extensions/MatrixHttpClient.Single.cs
+++ b/LibMatrix/Extensions/MatrixHttpClient.Single.cs
@@ -76,7 +76,7 @@ public class MatrixHttpClient {
         Console.WriteLine($"Sending {request.Method} {BaseAddress}{request.RequestUri} ({Util.BytesToString(request.GetContentLength())})");
 
         if (request.RequestUri is null) throw new NullReferenceException("RequestUri is null");
-        if (!request.RequestUri.IsAbsoluteUri) request.RequestUri = new Uri(BaseAddress, request.RequestUri);
+        if (!request.RequestUri.IsAbsoluteUri) request.RequestUri = new Uri(BaseAddress ?? throw new InvalidOperationException("Relative URI passed, but no BaseAddress is specified!"), request.RequestUri);
         foreach (var (key, value) in AdditionalQueryParameters) request.RequestUri = request.RequestUri.AddQuery(key, value);
         foreach (var (key, value) in DefaultRequestHeaders) {
             if (request.Headers.Contains(key)) continue;
@@ -126,7 +126,7 @@ public class MatrixHttpClient {
         if (!content.StartsWith('{')) throw new InvalidDataException("Encountered invalid data:\n" + content);
         //we have a matrix error
 
-        MatrixException? ex = null;
+        MatrixException? ex;
         try {
             ex = JsonSerializer.Deserialize<MatrixException>(content);
         }
@@ -140,7 +140,7 @@ public class MatrixHttpClient {
         Debug.Assert(ex != null, nameof(ex) + " != null");
         ex.RawContent = content;
         // Console.WriteLine($"Failed to send request: {ex}");
-        if (ex?.RetryAfterMs is null) throw ex!;
+        if (ex.RetryAfterMs is null) throw ex!;
         //we have a ratelimit error
         await Task.Delay(ex.RetryAfterMs.Value, cancellationToken);
         request.ResetSendStatus();
@@ -179,7 +179,7 @@ public class MatrixHttpClient {
     }
 
     // GetStreamAsync
-    public new async Task<Stream> GetStreamAsync(string requestUri, CancellationToken cancellationToken = default) {
+    public async Task<Stream> GetStreamAsync(string requestUri, CancellationToken cancellationToken = default) {
         var request = new HttpRequestMessage(HttpMethod.Get, requestUri);
         request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
         var response = await SendAsync(request, cancellationToken);