From d04269ea2bc944099d95a32aada7bcd4639969b2 Mon Sep 17 00:00:00 2001 From: Rory& Date: Mon, 29 Jul 2024 22:44:44 +0200 Subject: Some cleanup, fixes --- LibMatrix/Helpers/SyncStateResolver.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'LibMatrix/Helpers/SyncStateResolver.cs') diff --git a/LibMatrix/Helpers/SyncStateResolver.cs b/LibMatrix/Helpers/SyncStateResolver.cs index 72d600d..0529e50 100644 --- a/LibMatrix/Helpers/SyncStateResolver.cs +++ b/LibMatrix/Helpers/SyncStateResolver.cs @@ -37,7 +37,7 @@ public class SyncStateResolver(AuthenticatedHomeserverGeneric homeserver, ILogge oldState.NextBatch = newState.NextBatch ?? oldState.NextBatch; oldState.AccountData ??= new EventList(); - oldState.AccountData.Events ??= new List(); + oldState.AccountData.Events ??= []; if (newState.AccountData?.Events is not null) oldState.AccountData.Events.MergeStateEventLists(newState.AccountData?.Events ?? new List()); @@ -55,16 +55,18 @@ public class SyncStateResolver(AuthenticatedHomeserverGeneric homeserver, ILogge oldState.Rooms = MergeRoomsDataStructure(oldState.Rooms, newState.Rooms); oldState.ToDevice ??= new EventList(); - oldState.ToDevice.Events ??= new List(); + oldState.ToDevice.Events ??= []; if (newState.ToDevice?.Events is not null) oldState.ToDevice.Events.MergeStateEventLists(newState.ToDevice?.Events ?? new List()); oldState.DeviceLists ??= new SyncResponse.DeviceListsDataStructure(); + oldState.DeviceLists.Changed ??= []; + oldState.DeviceLists.Left ??= []; if (newState.DeviceLists?.Changed is not null) - foreach (var s in oldState.DeviceLists.Changed!) + foreach (var s in newState.DeviceLists.Changed!) oldState.DeviceLists.Changed.Add(s); if (newState.DeviceLists?.Left is not null) - foreach (var s in oldState.DeviceLists.Left!) + foreach (var s in newState.DeviceLists.Left!) oldState.DeviceLists.Left.Add(s); return oldState; -- cgit 1.4.1