From 3558ba25896876b0c546f4c2decbb0671187745b Mon Sep 17 00:00:00 2001 From: Rory& Date: Fri, 14 Nov 2025 10:48:26 +0100 Subject: StateEvent -> MatrixEvent --- .../Synapse/Models/Responses/EventReportListResult.cs | 6 +++--- .../Synapse/Models/Responses/RoomListResult.cs | 12 ++++++------ .../Synapse/Models/Responses/SynapseAdminRoomStateResult.cs | 2 +- .../ImplementationDetails/Synapse/SynapseAdminApiClient.cs | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) (limited to 'LibMatrix/Homeservers/ImplementationDetails') diff --git a/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/EventReportListResult.cs b/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/EventReportListResult.cs index 10fc039..0f3ee56 100644 --- a/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/EventReportListResult.cs +++ b/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/EventReportListResult.cs @@ -97,10 +97,10 @@ public class SynapseAdminEventReportListResult : SynapseNextTokenTotalCollection [JsonPropertyName("unsigned")] public JsonObject? Unsigned { get; set; } - // Extra... copied from StateEventResponse + // Extra... copied from MatrixEventResponse [JsonIgnore] - public Type MappedType => StateEvent.GetStateEventType(Type); + public Type MappedType => MatrixEvent.GetEventType(Type); [JsonIgnore] public bool IsLegacyType => MappedType.GetCustomAttributes().FirstOrDefault(x => x.EventName == Type)?.Legacy ?? false; @@ -128,7 +128,7 @@ public class SynapseAdminEventReportListResult : SynapseNextTokenTotalCollection // return null; // } try { - var mappedType = StateEvent.GetStateEventType(Type); + var mappedType = MatrixEvent.GetEventType(Type); if (mappedType == typeof(UnknownEventContent)) Console.WriteLine($"Warning: unknown event type '{Type}'"); var deserialisedContent = (EventContent)RawContent.Deserialize(mappedType, TypedContentSerializerOptions)!; diff --git a/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/RoomListResult.cs b/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/RoomListResult.cs index 3bc1f47..7006c07 100644 --- a/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/RoomListResult.cs +++ b/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/RoomListResult.cs @@ -63,15 +63,15 @@ public class SynapseAdminRoomListResult { public int StateEvents { get; set; } [JsonPropertyName("gay.rory.synapse_admin_extensions.tombstone")] - public StateEventResponse? TombstoneEvent { get; set; } + public MatrixEventResponse? TombstoneEvent { get; set; } [JsonPropertyName("gay.rory.synapse_admin_extensions.create")] - public StateEventResponse? CreateEvent { get; set; } + public MatrixEventResponse? CreateEvent { get; set; } [JsonPropertyName("gay.rory.synapse_admin_extensions.topic")] - public StateEventResponse? TopicEvent { get; set; } + public MatrixEventResponse? TopicEvent { get; set; } - public async Task GetCreateEventAsync(AuthenticatedHomeserverSynapse hs) { + public async Task GetCreateEventAsync(AuthenticatedHomeserverSynapse hs) { if (CreateEvent != null) return CreateEvent; try { @@ -85,7 +85,7 @@ public class SynapseAdminRoomListResult { return null; } - public async Task GetTombstoneEventAsync(AuthenticatedHomeserverSynapse hs) { + public async Task GetTombstoneEventAsync(AuthenticatedHomeserverSynapse hs) { if (TombstoneEvent != null) return TombstoneEvent; try { @@ -99,7 +99,7 @@ public class SynapseAdminRoomListResult { return null; } - public async Task GetTopicEventAsync(AuthenticatedHomeserverSynapse hs) { + public async Task GetTopicEventAsync(AuthenticatedHomeserverSynapse hs) { if (TopicEvent != null) return TopicEvent; try { diff --git a/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/SynapseAdminRoomStateResult.cs b/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/SynapseAdminRoomStateResult.cs index ae36d4e..d9d5f1a 100644 --- a/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/SynapseAdminRoomStateResult.cs +++ b/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/SynapseAdminRoomStateResult.cs @@ -4,5 +4,5 @@ namespace LibMatrix.Homeservers.ImplementationDetails.Synapse.Models.Responses; public class SynapseAdminRoomStateResult { [JsonPropertyName("state")] - public required List Events { get; set; } + public required List Events { get; set; } } \ No newline at end of file diff --git a/LibMatrix/Homeservers/ImplementationDetails/Synapse/SynapseAdminApiClient.cs b/LibMatrix/Homeservers/ImplementationDetails/Synapse/SynapseAdminApiClient.cs index 6d09006..f839e20 100644 --- a/LibMatrix/Homeservers/ImplementationDetails/Synapse/SynapseAdminApiClient.cs +++ b/LibMatrix/Homeservers/ImplementationDetails/Synapse/SynapseAdminApiClient.cs @@ -174,13 +174,13 @@ public class SynapseAdminApiClient(AuthenticatedHomeserverSynapse authenticatedH } var parallelisationLimit = new SemaphoreSlim(32, 32); - List> tasks = []; + List> tasks = []; - async Task<(SynapseAdminRoomListResult.SynapseAdminRoomListResultRoom room, StateEventResponse?[] tasks)> fillTask( + async Task<(SynapseAdminRoomListResult.SynapseAdminRoomListResultRoom room, MatrixEventResponse?[] tasks)> fillTask( SynapseAdminRoomListResult.SynapseAdminRoomListResultRoom room) { if (serverSupportsQueryEventsV2) return (room, []); - var fillTasks = await Task.WhenAll(((Task?[]) [ + var fillTasks = await Task.WhenAll(((Task?[]) [ fetchTombstones && room.TombstoneEvent is null ? parallelisationLimit.RunWithLockAsync(() => room.GetTombstoneEventAsync(authenticatedHomeserver)) : null!, @@ -201,7 +201,7 @@ public class SynapseAdminApiClient(AuthenticatedHomeserverSynapse authenticatedH tasks.AddRange( serverSupportsQueryEventsV2 - ? keep.Select(x => Task.FromResult((x, (StateEventResponse?[])[]))) + ? keep.Select(x => Task.FromResult((x, (MatrixEventResponse?[])[]))) : keep.Select(fillTask) ); -- cgit 1.5.1