From 44bfb17b1da1bd24140da7d9dcff56fa6fce45e4 Mon Sep 17 00:00:00 2001 From: Rory& Date: Tue, 18 Mar 2025 11:55:06 +0100 Subject: Refactor room specialisations to be functions, make http logging configurable --- .../Spec/State/Policy/PolicyRuleStateEventContent.cs | 2 +- LibMatrix/Extensions/MatrixHttpClient.Single.cs | 2 +- Tests/LibMatrix.Tests/Abstractions/RoomAbstraction.cs | 2 +- Tests/LibMatrix.Tests/Tests/RoomTests/SpaceTests.cs | 6 +++--- .../LibMatrix.Utilities.Bot/Services/InviteListenerHostedService.cs | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/LibMatrix.EventTypes/Spec/State/Policy/PolicyRuleStateEventContent.cs b/LibMatrix.EventTypes/Spec/State/Policy/PolicyRuleStateEventContent.cs index 86950e5..27d505c 100644 --- a/LibMatrix.EventTypes/Spec/State/Policy/PolicyRuleStateEventContent.cs +++ b/LibMatrix.EventTypes/Spec/State/Policy/PolicyRuleStateEventContent.cs @@ -32,7 +32,7 @@ public class RoomPolicyRuleEventContent : PolicyRuleEventContent { } public abstract class PolicyRuleEventContent : EventContent { - public PolicyRuleEventContent() => Console.WriteLine($"init policy {GetType().Name}"); + // public PolicyRuleEventContent() => Console.WriteLine($"init policy {GetType().Name}"); private string? _reason; /// diff --git a/LibMatrix/Extensions/MatrixHttpClient.Single.cs b/LibMatrix/Extensions/MatrixHttpClient.Single.cs index 24633c5..afbe52f 100644 --- a/LibMatrix/Extensions/MatrixHttpClient.Single.cs +++ b/LibMatrix/Extensions/MatrixHttpClient.Single.cs @@ -51,7 +51,7 @@ public class MatrixHttpClient { internal SemaphoreSlim _rateLimitSemaphore { get; } = new(1, 1); #endif - private const bool LogRequests = true; + public static bool LogRequests = true; public Dictionary AdditionalQueryParameters { get; set; } = new(); public Uri? BaseAddress { get; set; } diff --git a/Tests/LibMatrix.Tests/Abstractions/RoomAbstraction.cs b/Tests/LibMatrix.Tests/Abstractions/RoomAbstraction.cs index 13c5f58..b1176ca 100644 --- a/Tests/LibMatrix.Tests/Abstractions/RoomAbstraction.cs +++ b/Tests/LibMatrix.Tests/Abstractions/RoomAbstraction.cs @@ -96,7 +96,7 @@ public static class RoomAbstraction { }); } - var testSpace = (await hs.CreateRoom(crq)).AsSpace; + var testSpace = (await hs.CreateRoom(crq)).AsSpace(); await testSpace.SendStateEventAsync("gay.rory.libmatrix.unit_test_room", new object()); diff --git a/Tests/LibMatrix.Tests/Tests/RoomTests/SpaceTests.cs b/Tests/LibMatrix.Tests/Tests/RoomTests/SpaceTests.cs index 148fb70..be8076a 100644 --- a/Tests/LibMatrix.Tests/Tests/RoomTests/SpaceTests.cs +++ b/Tests/LibMatrix.Tests/Tests/RoomTests/SpaceTests.cs @@ -23,7 +23,7 @@ public class SpaceTests : TestBed { Name = "Test space" }; crq.CreationContent["type"] = SpaceRoom.TypeName; - var space = (await hs.CreateRoom(crq)).AsSpace; + var space = (await hs.CreateRoom(crq)).AsSpace(); var child = await hs.CreateRoom(new CreateRoomRequest() { Name = "Test child" @@ -45,7 +45,7 @@ public class SpaceTests : TestBed { Name = "Test space" }; crq.CreationContent["type"] = SpaceRoom.TypeName; - var space = (await hs.CreateRoom(crq)).AsSpace; + var space = (await hs.CreateRoom(crq)).AsSpace(); var child = await hs.CreateRoom(new CreateRoomRequest() { Name = "Test child" @@ -83,7 +83,7 @@ public class SpaceTests : TestBed { }).ToList() }; crq.CreationContent["type"] = SpaceRoom.TypeName; - var space = (await hs.CreateRoom(crq)).AsSpace; + var space = (await hs.CreateRoom(crq)).AsSpace(); var children = space.GetChildrenAsync().ToBlockingEnumerable().ToList(); Assert.NotNull(children); diff --git a/Utilities/LibMatrix.Utilities.Bot/Services/InviteListenerHostedService.cs b/Utilities/LibMatrix.Utilities.Bot/Services/InviteListenerHostedService.cs index a9e4577..8ddcded 100644 --- a/Utilities/LibMatrix.Utilities.Bot/Services/InviteListenerHostedService.cs +++ b/Utilities/LibMatrix.Utilities.Bot/Services/InviteListenerHostedService.cs @@ -17,7 +17,7 @@ public class InviteHandlerHostedService( ) : IHostedService { private Task? _listenerTask; - private SyncHelper syncHelper = new SyncHelper(hs, logger) { + private SyncHelper syncHelper = new(hs, logger) { Timeout = listenerSyncConfiguration.Timeout ?? 30_000, MinimumDelay = listenerSyncConfiguration.MinimumSyncTime ?? new(0), SetPresence = listenerSyncConfiguration.Presence ?? "online" -- cgit 1.5.1