From 3558ba25896876b0c546f4c2decbb0671187745b Mon Sep 17 00:00:00 2001 From: Rory& Date: Fri, 14 Nov 2025 10:48:26 +0100 Subject: StateEvent -> MatrixEvent --- LibMatrix/Helpers/RoomBuilder.cs | 8 ++++---- LibMatrix/Helpers/RoomUpgradeBuilder.cs | 4 ++-- LibMatrix/Helpers/SyncHelper.cs | 10 +++++----- .../Helpers/SyncProcessors/Msc4222EmulationSyncProcessor.cs | 8 ++++---- LibMatrix/Helpers/SyncStateResolver.cs | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) (limited to 'LibMatrix/Helpers') diff --git a/LibMatrix/Helpers/RoomBuilder.cs b/LibMatrix/Helpers/RoomBuilder.cs index 6e24103..a292f33 100644 --- a/LibMatrix/Helpers/RoomBuilder.cs +++ b/LibMatrix/Helpers/RoomBuilder.cs @@ -44,12 +44,12 @@ public class RoomBuilder { /// /// State events to be sent *before* room access is configured. Keep this small! /// - public List ImportantState { get; set; } = []; + public List ImportantState { get; set; } = []; /// /// State events to be sent *after* room access is configured, but before invites are sent. /// - public List InitialState { get; set; } = []; + public List InitialState { get; set; } = []; /// /// Users to invite, with optional reason @@ -86,7 +86,7 @@ public class RoomBuilder { { RoomPolicyServerEventContent.EventId, 100 }, { RoomPinnedEventContent.EventId, 50 }, // recommended extensions - { "im.vector.modular.widgets", 50}, + { "im.vector.modular.widgets", 50 }, // { "m.reaction", 0 }, // we probably don't want these to end up as room state // - prevent calls { "io.element.voice_broadcast_info", 50 }, @@ -197,7 +197,7 @@ public class RoomBuilder { await Task.WhenAll(inviteTasks); } - private async Task SetStatesAsync(GenericRoom room, List state) { + private async Task SetStatesAsync(GenericRoom room, List state) { if (state.Count == 0) return; await room.BulkSendEventsAsync(state); // We chunk this up to try to avoid hitting reverse proxy timeouts diff --git a/LibMatrix/Helpers/RoomUpgradeBuilder.cs b/LibMatrix/Helpers/RoomUpgradeBuilder.cs index 85a5e36..ced0ef3 100644 --- a/LibMatrix/Helpers/RoomUpgradeBuilder.cs +++ b/LibMatrix/Helpers/RoomUpgradeBuilder.cs @@ -107,7 +107,7 @@ public class RoomUpgradeBuilder : RoomBuilder { Console.WriteLine($"Imported {total} state events from old room {OldRoom.RoomId} in {sw.ElapsedMilliseconds}ms"); } - private StateEventResponse UpgradeUnstableValues(StateEventResponse evt) { + private MatrixEventResponse UpgradeUnstableValues(MatrixEventResponse evt) { if (evt.IsLegacyType) { var oldType = evt.Type; evt.Type = evt.MappedType.GetCustomAttributes().FirstOrDefault(x => !x.Legacy)!.EventName; @@ -124,7 +124,7 @@ public class RoomUpgradeBuilder : RoomBuilder { return evt; } - private void ImportPolicyEventAsync(StateEventResponse evt) { + private void ImportPolicyEventAsync(MatrixEventResponse evt) { var msc4321Options = UpgradeOptions.Msc4321PolicyListUpgradeOptions; if (msc4321Options is { Enable: true, UpgradeType: Msc4321PolicyListUpgradeOptions.Msc4321PolicyListUpgradeType.Transition }) return; // this upgrade type doesnt copy policies diff --git a/LibMatrix/Helpers/SyncHelper.cs b/LibMatrix/Helpers/SyncHelper.cs index c8e2928..ebe653c 100644 --- a/LibMatrix/Helpers/SyncHelper.cs +++ b/LibMatrix/Helpers/SyncHelper.cs @@ -298,9 +298,9 @@ public class SyncHelper(AuthenticatedHomeserverGeneric homeserver, ILogger? logg if (syncResponse.Rooms is { Join.Count: > 0 }) foreach (var updatedRoom in syncResponse.Rooms.Join) { if (updatedRoom.Value.Timeline is null) continue; - foreach (var stateEventResponse in updatedRoom.Value.Timeline.Events ?? []) { - stateEventResponse.RoomId = updatedRoom.Key; - var tasks = TimelineEventHandlers.Select(x => x(stateEventResponse)).ToList(); + foreach (var MatrixEventResponse in updatedRoom.Value.Timeline.Events ?? []) { + MatrixEventResponse.RoomId = updatedRoom.Key; + var tasks = TimelineEventHandlers.Select(x => x(MatrixEventResponse)).ToList(); await Task.WhenAll(tasks); } } @@ -319,12 +319,12 @@ public class SyncHelper(AuthenticatedHomeserverGeneric homeserver, ILogger? logg /// /// Event fired when a timeline event is received /// - public List> TimelineEventHandlers { get; } = new(); + public List> TimelineEventHandlers { get; } = new(); /// /// Event fired when an account data event is received /// - public List> AccountDataReceivedHandlers { get; } = new(); + public List> AccountDataReceivedHandlers { get; } = new(); /// /// Event fired when an exception is thrown diff --git a/LibMatrix/Helpers/SyncProcessors/Msc4222EmulationSyncProcessor.cs b/LibMatrix/Helpers/SyncProcessors/Msc4222EmulationSyncProcessor.cs index be8aa8d..c887f6e 100644 --- a/LibMatrix/Helpers/SyncProcessors/Msc4222EmulationSyncProcessor.cs +++ b/LibMatrix/Helpers/SyncProcessors/Msc4222EmulationSyncProcessor.cs @@ -8,11 +8,11 @@ using Microsoft.Extensions.Logging; namespace LibMatrix.Helpers.SyncProcessors; public class Msc4222EmulationSyncProcessor(AuthenticatedHomeserverGeneric homeserver, ILogger? logger) { - private static bool StateEventsMatch(StateEventResponse a, StateEventResponse b) { + private static bool StateEventsMatch(MatrixEventResponse a, MatrixEventResponse b) { return a.Type == b.Type && a.StateKey == b.StateKey; } - private static bool StateEventIsNewer(StateEventResponse a, StateEventResponse b) { + private static bool StateEventIsNewer(MatrixEventResponse a, MatrixEventResponse b) { return StateEventsMatch(a, b) && a.OriginServerTs < b.OriginServerTs; } @@ -76,7 +76,7 @@ public class Msc4222EmulationSyncProcessor(AuthenticatedHomeserverGeneric homese Events = [] }; - var oldState = new List(); + var oldState = new List(); if (data.State is { Events.Count: > 0 }) { oldState.ReplaceBy(data.State.Events, StateEventIsNewer); } @@ -160,7 +160,7 @@ public class Msc4222EmulationSyncProcessor(AuthenticatedHomeserverGeneric homese logger?.LogWarning("Msc4222Emulation: Failed to get full state for room {roomId}, state may be incomplete!\n{exception}", roomId, e); } - var oldState = new List(); + var oldState = new List(); if (data.State is { Events.Count: > 0 }) { oldState.ReplaceBy(data.State.Events, StateEventIsNewer); } diff --git a/LibMatrix/Helpers/SyncStateResolver.cs b/LibMatrix/Helpers/SyncStateResolver.cs index f111c79..17c1a41 100644 --- a/LibMatrix/Helpers/SyncStateResolver.cs +++ b/LibMatrix/Helpers/SyncStateResolver.cs @@ -625,7 +625,7 @@ public class SyncStateResolver(AuthenticatedHomeserverGeneric homeserver, ILogge return oldState; } - private static EventList? MergeEventListBy(EventList? oldState, EventList? newState, Func comparer) { + private static EventList? MergeEventListBy(EventList? oldState, EventList? newState, Func comparer) { if (newState is null) return oldState; if (oldState is null) { return newState; -- cgit 1.5.1