about summary refs log tree commit diff
path: root/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models
diff options
context:
space:
mode:
authorRory& <root@rory.gay>2024-08-23 02:55:07 +0200
committerRory& <root@rory.gay>2024-08-23 02:55:07 +0200
commitf50ed7ccc4347907d3c5ec6b68e1b84c4e0a7a0e (patch)
treed77d1d1f30e0ea01051561d8caaadeed2fdcf439 /LibMatrix/Homeservers/ImplementationDetails/Synapse/Models
parentMinor cleanup (diff)
downloadLibMatrix-f50ed7ccc4347907d3c5ec6b68e1b84c4e0a7a0e.tar.xz
Synapse admin API stuff, a mass of other changes
Diffstat (limited to 'LibMatrix/Homeservers/ImplementationDetails/Synapse/Models')
-rw-r--r--LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Requests/SynapseAdminRegistrationTokenCreateRequest.cs31
-rw-r--r--LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Requests/SynapseAdminRoomDeleteRequest.cs (renamed from LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Requests/AdminRoomDeleteRequest.cs)2
-rw-r--r--LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/BackgroundUpdates.cs28
-rw-r--r--LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/Destinations.cs56
-rw-r--r--LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/EventReportListResult.cs169
-rw-r--r--LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/RegistrationTokenListResult.cs31
-rw-r--r--LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/RoomListResult.cs (renamed from LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/AdminRoomListResult.cs)6
-rw-r--r--LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/RoomMediaListResult.cs11
-rw-r--r--LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/SynapseAdminEventReportListResult.cs58
-rw-r--r--LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/SynapseCollectionResult.cs250
-rw-r--r--LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/UserListResult.cs (renamed from LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/AdminUserListResult.cs)21
11 files changed, 597 insertions, 66 deletions
diff --git a/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Requests/SynapseAdminRegistrationTokenCreateRequest.cs b/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Requests/SynapseAdminRegistrationTokenCreateRequest.cs
new file mode 100644
index 0000000..197fd5d
--- /dev/null
+++ b/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Requests/SynapseAdminRegistrationTokenCreateRequest.cs
@@ -0,0 +1,31 @@
+using System.Text.Json.Serialization;
+
+namespace LibMatrix.Homeservers.ImplementationDetails.Synapse.Models.Responses;
+
+public class SynapseAdminRegistrationTokenUpdateRequest {
+    [JsonPropertyName("uses_allowed")]
+    public int? UsesAllowed { get; set; }
+
+    [JsonPropertyName("expiry_time")]
+    public long? ExpiryTime { get; set; }
+
+    [JsonIgnore]
+    public DateTime? ExpiresAt {
+        get => ExpiryTime.HasValue ? DateTimeOffset.FromUnixTimeMilliseconds(ExpiryTime.Value).DateTime : null;
+        set => ExpiryTime = value.HasValue ? new DateTimeOffset(value.Value).ToUnixTimeMilliseconds() : null;
+    }
+
+    [JsonIgnore]
+    public TimeSpan? ExpiresAfter {
+        get => ExpiryTime.HasValue ? DateTimeOffset.FromUnixTimeMilliseconds(ExpiryTime.Value).DateTime - DateTimeOffset.Now : null;
+        set => ExpiryTime = value.HasValue ? (DateTimeOffset.Now + value.Value).ToUnixTimeMilliseconds() : null;
+    }
+}
+
+public class SynapseAdminRegistrationTokenCreateRequest : SynapseAdminRegistrationTokenUpdateRequest {
+    [JsonPropertyName("token")]
+    public string? Token { get; set; }
+
+    [JsonPropertyName("length")]
+    public int? Length { get; set; }
+}
\ No newline at end of file
diff --git a/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Requests/AdminRoomDeleteRequest.cs b/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Requests/SynapseAdminRoomDeleteRequest.cs
index f4c927a..67a3104 100644
--- a/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Requests/AdminRoomDeleteRequest.cs
+++ b/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Requests/SynapseAdminRoomDeleteRequest.cs
@@ -2,7 +2,7 @@ using System.Text.Json.Serialization;
 
 namespace LibMatrix.Homeservers.ImplementationDetails.Synapse.Models.Requests;
 
-public class AdminRoomDeleteRequest {
+public class SynapseAdminRoomDeleteRequest {
     [JsonPropertyName("new_room_user_id")]
     public string? NewRoomUserId { get; set; }
 
diff --git a/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/BackgroundUpdates.cs b/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/BackgroundUpdates.cs
new file mode 100644
index 0000000..2394b98
--- /dev/null
+++ b/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/BackgroundUpdates.cs
@@ -0,0 +1,28 @@
+using System.Text.Json.Serialization;
+
+namespace LibMatrix.Homeservers.ImplementationDetails.Synapse.Models.Responses;
+
+public class SynapseAdminBackgroundUpdateStatusResponse {
+    [JsonPropertyName("enabled")]
+    public bool Enabled { get; set; }
+
+    [JsonPropertyName("current_updates")]
+    public Dictionary<string, BackgroundUpdateInfo> CurrentUpdates { get; set; }
+
+    public class BackgroundUpdateInfo {
+        [JsonPropertyName("name")]
+        public string Name { get; set; }
+
+        [JsonPropertyName("total_item_count")]
+        public int TotalItemCount { get; set; }
+
+        [JsonPropertyName("total_duration_ms")]
+        public double TotalDurationMs { get; set; }
+
+        [JsonPropertyName("average_items_per_ms")]
+        public double AverageItemsPerMs { get; set; }
+
+        [JsonIgnore]
+        public TimeSpan TotalDuration => TimeSpan.FromMilliseconds(TotalDurationMs);
+    }
+}
\ No newline at end of file
diff --git a/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/Destinations.cs b/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/Destinations.cs
new file mode 100644
index 0000000..646a4b5
--- /dev/null
+++ b/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/Destinations.cs
@@ -0,0 +1,56 @@
+using System.Text.Json.Serialization;
+
+namespace LibMatrix.Homeservers.ImplementationDetails.Synapse.Models.Responses;
+
+public class SynapseAdminDestinationListResult : SynapseNextTokenTotalCollectionResult {
+    [JsonPropertyName("destinations")]
+    public List<SynapseAdminDestinationListResultDestination> Destinations { get; set; } = new();
+
+    public class SynapseAdminDestinationListResultDestination {
+        [JsonPropertyName("destination")]
+        public string Destination { get; set; }
+
+        [JsonPropertyName("retry_last_ts")]
+        public long RetryLastTs { get; set; }
+
+        [JsonPropertyName("retry_interval")]
+        public long RetryInterval { get; set; }
+
+        [JsonPropertyName("failure_ts")]
+        public long? FailureTs { get; set; }
+
+        [JsonPropertyName("last_successful_stream_ordering")]
+        public long? LastSuccessfulStreamOrdering { get; set; }
+
+        [JsonIgnore]
+        public DateTime? FailureTsDateTime {
+            get => FailureTs.HasValue ? DateTimeOffset.FromUnixTimeMilliseconds(FailureTs.Value).DateTime : null;
+            set => FailureTs = value.HasValue ? new DateTimeOffset(value.Value).ToUnixTimeMilliseconds() : null;
+        }
+
+        [JsonIgnore]
+        public DateTime? RetryLastTsDateTime {
+            get => DateTimeOffset.FromUnixTimeMilliseconds(RetryLastTs).DateTime;
+            set => RetryLastTs = new DateTimeOffset(value.Value).ToUnixTimeMilliseconds();
+        }
+
+        [JsonIgnore]
+        public TimeSpan RetryIntervalTimeSpan {
+            get => TimeSpan.FromMilliseconds(RetryInterval);
+            set => RetryInterval = (long)value.TotalMilliseconds;
+        }
+    }
+}
+
+public class SynapseAdminDestinationRoomListResult : SynapseNextTokenTotalCollectionResult {
+    [JsonPropertyName("rooms")]
+    public List<SynapseAdminDestinationRoomListResultRoom> Rooms { get; set; } = new();
+
+    public class SynapseAdminDestinationRoomListResultRoom {
+        [JsonPropertyName("room_id")]
+        public string RoomId { get; set; }
+
+        [JsonPropertyName("stream_ordering")]
+        public int StreamOrdering { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/EventReportListResult.cs b/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/EventReportListResult.cs
new file mode 100644
index 0000000..10fc039
--- /dev/null
+++ b/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/EventReportListResult.cs
@@ -0,0 +1,169 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
+using ArcaneLibs;
+using ArcaneLibs.Attributes;
+using ArcaneLibs.Extensions;
+using LibMatrix.EventTypes;
+using LibMatrix.Extensions;
+
+namespace LibMatrix.Homeservers.ImplementationDetails.Synapse.Models.Responses;
+
+public class SynapseAdminEventReportListResult : SynapseNextTokenTotalCollectionResult {
+    [JsonPropertyName("event_reports")]
+    public List<SynapseAdminEventReportListResultReport> Reports { get; set; } = new();
+
+    public class SynapseAdminEventReportListResultReport {
+        [JsonPropertyName("event_id")]
+        public string EventId { get; set; }
+
+        [JsonPropertyName("id")]
+        public string Id { get; set; }
+
+        [JsonPropertyName("reason")]
+        public string? Reason { get; set; }
+
+        [JsonPropertyName("score")]
+        public int? Score { get; set; }
+
+        [JsonPropertyName("received_ts")]
+        public long ReceivedTs { get; set; }
+
+        [JsonPropertyName("canonical_alias")]
+        public string? CanonicalAlias { get; set; }
+
+        [JsonPropertyName("room_id")]
+        public string RoomId { get; set; }
+
+        [JsonPropertyName("name")]
+        public string? Name { get; set; }
+
+        [JsonPropertyName("sender")]
+        public string Sender { get; set; }
+
+        [JsonPropertyName("user_id")]
+        public string UserId { get; set; }
+
+        [JsonIgnore]
+        public DateTime ReceivedTsDateTime {
+            get => DateTimeOffset.FromUnixTimeMilliseconds(ReceivedTs).DateTime;
+            set => ReceivedTs = new DateTimeOffset(value).ToUnixTimeMilliseconds();
+        }
+    }
+
+    public class SynapseAdminEventReportListResultReportWithDetails : SynapseAdminEventReportListResultReport {
+        [JsonPropertyName("event_json")]
+        public SynapseEventJson EventJson { get; set; }
+
+        public class SynapseEventJson {
+            [JsonPropertyName("auth_events")]
+            public List<string> AuthEvents { get; set; }
+
+            [JsonPropertyName("content")]
+            public JsonObject? RawContent { get; set; }
+
+            [JsonPropertyName("depth")]
+            public int Depth { get; set; }
+
+            [JsonPropertyName("hashes")]
+            public Dictionary<string, string> Hashes { get; set; }
+
+            [JsonPropertyName("origin")]
+            public string Origin { get; set; }
+
+            [JsonPropertyName("origin_server_ts")]
+            public long OriginServerTs { get; set; }
+
+            [JsonPropertyName("prev_events")]
+            public List<string> PrevEvents { get; set; }
+
+            [JsonPropertyName("prev_state")]
+            public List<object> PrevState { get; set; }
+
+            [JsonPropertyName("room_id")]
+            public string RoomId { get; set; }
+
+            [JsonPropertyName("sender")]
+            public string Sender { get; set; }
+
+            [JsonPropertyName("signatures")]
+            public Dictionary<string, Dictionary<string, string>> Signatures { get; set; }
+
+            [JsonPropertyName("type")]
+            public string Type { get; set; }
+
+            [JsonPropertyName("unsigned")]
+            public JsonObject? Unsigned { get; set; }
+
+            // Extra... copied from StateEventResponse
+
+            [JsonIgnore]
+            public Type MappedType => StateEvent.GetStateEventType(Type);
+
+            [JsonIgnore]
+            public bool IsLegacyType => MappedType.GetCustomAttributes<MatrixEventAttribute>().FirstOrDefault(x => x.EventName == Type)?.Legacy ?? false;
+
+            [JsonIgnore]
+            public string FriendlyTypeName => MappedType.GetFriendlyNameOrNull() ?? Type;
+
+            [JsonIgnore]
+            public string FriendlyTypeNamePlural => MappedType.GetFriendlyNamePluralOrNull() ?? Type;
+
+            private static readonly JsonSerializerOptions TypedContentSerializerOptions = new() {
+                Converters = {
+                    new JsonFloatStringConverter(),
+                    new JsonDoubleStringConverter(),
+                    new JsonDecimalStringConverter()
+                }
+            };
+
+            [JsonIgnore]
+            [SuppressMessage("ReSharper", "PropertyCanBeMadeInitOnly.Global")]
+            public EventContent? TypedContent {
+                get {
+                    ClassCollector<EventContent>.ResolveFromAllAccessibleAssemblies();
+                    // if (Type == "m.receipt") {
+                    // return null;
+                    // }
+                    try {
+                        var mappedType = StateEvent.GetStateEventType(Type);
+                        if (mappedType == typeof(UnknownEventContent))
+                            Console.WriteLine($"Warning: unknown event type '{Type}'");
+                        var deserialisedContent = (EventContent)RawContent.Deserialize(mappedType, TypedContentSerializerOptions)!;
+                        return deserialisedContent;
+                    }
+                    catch (JsonException e) {
+                        Console.WriteLine(e);
+                        Console.WriteLine("Content:\n" + (RawContent?.ToJson() ?? "null"));
+                    }
+
+                    return null;
+                }
+                set {
+                    if (value is null)
+                        RawContent?.Clear();
+                    else
+                        RawContent = JsonSerializer.Deserialize<JsonObject>(JsonSerializer.Serialize(value, value.GetType(),
+                            new JsonSerializerOptions() { DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull }));
+                }
+            }
+
+            //debug
+            [JsonIgnore]
+            public string InternalSelfTypeName {
+                get {
+                    var res = GetType().Name switch {
+                        "StateEvent`1" => "StateEvent",
+                        _ => GetType().Name
+                    };
+                    return res;
+                }
+            }
+
+            [JsonIgnore]
+            public string InternalContentTypeName => TypedContent?.GetType().Name ?? "null";
+        }
+    }
+}
\ No newline at end of file
diff --git a/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/RegistrationTokenListResult.cs b/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/RegistrationTokenListResult.cs
new file mode 100644
index 0000000..fa92ef9
--- /dev/null
+++ b/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/RegistrationTokenListResult.cs
@@ -0,0 +1,31 @@
+using System.Text.Json.Serialization;
+
+namespace LibMatrix.Homeservers.ImplementationDetails.Synapse.Models.Responses;
+
+public class SynapseAdminRegistrationTokenListResult {
+    [JsonPropertyName("registration_tokens")]
+    public List<SynapseAdminRegistrationTokenListResultToken> RegistrationTokens { get; set; } = new();
+
+    public class SynapseAdminRegistrationTokenListResultToken {
+        [JsonPropertyName("token")]
+        public string Token { get; set; }
+
+        [JsonPropertyName("uses_allowed")]
+        public int? UsesAllowed { get; set; }
+
+        [JsonPropertyName("pending")]
+        public int Pending { get; set; }
+
+        [JsonPropertyName("completed")]
+        public int Completed { get; set; }
+
+        [JsonPropertyName("expiry_time")]
+        public long? ExpiryTime { get; set; }
+
+        [JsonIgnore]
+        public DateTime? ExpiryTimeDateTime {
+            get => ExpiryTime.HasValue ? DateTimeOffset.FromUnixTimeMilliseconds(ExpiryTime.Value).DateTime : null;
+            set => ExpiryTime = value.HasValue ? new DateTimeOffset(value.Value).ToUnixTimeMilliseconds() : null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/AdminRoomListResult.cs b/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/RoomListResult.cs
index c9d7e52..d84c89b 100644
--- a/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/AdminRoomListResult.cs
+++ b/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/RoomListResult.cs
@@ -2,7 +2,7 @@ using System.Text.Json.Serialization;
 
 namespace LibMatrix.Homeservers.ImplementationDetails.Synapse.Models.Responses;
 
-public class AdminRoomListResult {
+public class SynapseAdminRoomListResult {
     [JsonPropertyName("offset")]
     public int Offset { get; set; }
 
@@ -16,9 +16,9 @@ public class AdminRoomListResult {
     public int? PrevBatch { get; set; }
 
     [JsonPropertyName("rooms")]
-    public List<AdminRoomListResultRoom> Rooms { get; set; } = new();
+    public List<SynapseAdminRoomListResultRoom> Rooms { get; set; } = new();
 
-    public class AdminRoomListResultRoom {
+    public class SynapseAdminRoomListResultRoom {
         [JsonPropertyName("room_id")]
         public required string RoomId { get; set; }
 
diff --git a/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/RoomMediaListResult.cs b/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/RoomMediaListResult.cs
new file mode 100644
index 0000000..97e85ad
--- /dev/null
+++ b/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/RoomMediaListResult.cs
@@ -0,0 +1,11 @@
+using System.Text.Json.Serialization;
+
+namespace LibMatrix.Homeservers.ImplementationDetails.Synapse.Models.Responses;
+
+public class SynapseAdminRoomMediaListResult {
+    [JsonPropertyName("local")]
+    public List<string> Local { get; set; } = new();
+
+    [JsonPropertyName("remote")]
+    public List<string> Remote { get; set; } = new();
+}
\ No newline at end of file
diff --git a/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/SynapseAdminEventReportListResult.cs b/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/SynapseAdminEventReportListResult.cs
deleted file mode 100644
index 030108a..0000000
--- a/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/SynapseAdminEventReportListResult.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System.Text.Json.Serialization;
-
-namespace LibMatrix.Homeservers.ImplementationDetails.Synapse.Models.Responses;
-
-public class SynapseAdminEventReportListResult {
-    [JsonPropertyName("offset")]
-    public int Offset { get; set; }
-
-    [JsonPropertyName("total")]
-    public int Total { get; set; }
-
-    [JsonPropertyName("next_token")]
-    public string? NextToken { get; set; }
-
-    [JsonPropertyName("event_reports")]
-    public List<SynapseAdminEventReportListResultReport> Reports { get; set; } = new();
-
-    public class SynapseAdminEventReportListResultReport {
-        [JsonPropertyName("name")]
-        public string Name { get; set; }
-
-        [JsonPropertyName("is_guest")]
-        public bool? IsGuest { get; set; }
-
-        [JsonPropertyName("admin")]
-        public bool? Admin { get; set; }
-
-        [JsonPropertyName("user_type")]
-        public string? UserType { get; set; }
-
-        [JsonPropertyName("deactivated")]
-        public bool Deactivated { get; set; }
-
-        [JsonPropertyName("erased")]
-        public bool Erased { get; set; }
-
-        [JsonPropertyName("shadow_banned")]
-        public bool ShadowBanned { get; set; }
-
-        [JsonPropertyName("displayname")]
-        public string? DisplayName { get; set; }
-
-        [JsonPropertyName("avatar_url")]
-        public string? AvatarUrl { get; set; }
-
-        [JsonPropertyName("creation_ts")]
-        public long CreationTs { get; set; }
-
-        [JsonPropertyName("last_seen_ts")]
-        public long? LastSeenTs { get; set; }
-
-        [JsonPropertyName("locked")]
-        public bool Locked { get; set; }
-
-        [JsonPropertyName("approved")]
-        public bool Approved { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/SynapseCollectionResult.cs b/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/SynapseCollectionResult.cs
new file mode 100644
index 0000000..36a5596
--- /dev/null
+++ b/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/SynapseCollectionResult.cs
@@ -0,0 +1,250 @@
+using System.Buffers;
+using System.Text;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using ArcaneLibs.Extensions;
+
+namespace LibMatrix.Homeservers.ImplementationDetails.Synapse.Models.Responses;
+
+public class SynapseNextTokenTotalCollectionResult {
+    [JsonPropertyName("total")]
+    public int Total { get; set; }
+
+    [JsonPropertyName("next_token")]
+    public string? NextToken { get; set; }
+}
+
+// [JsonConverter(typeof(SynapseCollectionJsonConverter<>))]
+public class SynapseCollectionResult<T>(string chunkKey = "chunk", string prevTokenKey = "prev_token", string nextTokenKey = "next_token", string totalKey = "total") {
+    public int? Total { get; set; }
+    public string? PrevToken { get; set; }
+    public string? NextToken { get; set; }
+    public List<T> Chunk { get; set; } = [];
+
+    // TODO: figure out how to provide an IAsyncEnumerable<T> for this
+    // https://learn.microsoft.com/en-us/dotnet/standard/serialization/system-text-json/use-utf8jsonreader#read-from-a-stream-using-utf8jsonreader
+
+    // public async IAsyncEnumerable<T> FromJsonAsync(Stream stream) {
+    //
+    // }
+
+    public SynapseCollectionResult<T> FromJson(Stream stream, Action<T> action) {
+        byte[] buffer = new byte[4096];
+        _ = stream.Read(buffer);
+        var reader = new Utf8JsonReader(buffer, isFinalBlock: false, state: default);
+
+        try {
+            FromJsonInternal(stream, ref buffer, ref reader, action);
+        }
+        catch (JsonException e) {
+            Console.WriteLine($"Caught a JsonException: {e}");
+            int hexdumpWidth = 64;
+            Console.WriteLine($"Check hexdump line {reader.BytesConsumed / hexdumpWidth} index {reader.BytesConsumed % hexdumpWidth}");
+            buffer.HexDump(64);
+        }
+        finally { }
+
+        return this;
+    }
+
+    private void FromJsonInternal(Stream stream, ref byte[] buffer, ref Utf8JsonReader reader, Action<T> action) {
+        while (!reader.IsFinalBlock) {
+            while (!reader.Read()) {
+                GetMoreBytesFromStream(stream, ref buffer, ref reader);
+            }
+
+            if (reader.TokenType == JsonTokenType.PropertyName) {
+                var propName = reader.GetString();
+                Console.WriteLine($"SynapseCollectionResult: encountered property name: {propName}");
+
+                while (!reader.Read()) {
+                    GetMoreBytesFromStream(stream, ref buffer, ref reader);
+                }
+
+                Console.WriteLine($"{reader.BytesConsumed}/{stream.Position} {reader.TokenType}");
+
+                if (propName == totalKey && reader.TokenType == JsonTokenType.Number) {
+                    Total = reader.GetInt32();
+                }
+                else if (propName == prevTokenKey && reader.TokenType == JsonTokenType.String) {
+                    PrevToken = reader.GetString();
+                }
+                else if (propName == nextTokenKey && reader.TokenType == JsonTokenType.String) {
+                    NextToken = reader.GetString();
+                }
+                else if (propName == chunkKey) {
+                    if (reader.TokenType == JsonTokenType.StartArray) {
+                        while (reader.Read() && reader.TokenType != JsonTokenType.EndArray) {
+                            // if (reader.TokenType == JsonTokenType.EndArray) {
+                            // break;
+                            // }
+                            // Console.WriteLine($"Encountered token in chunk: {reader.TokenType}");
+                            // var _buf = reader.ValueSequence.ToArray();
+                            // try {
+                            //     var item = JsonSerializer.Deserialize<T>(_buf);
+                            //     action(item);
+                            //     Chunk.Add(item);
+                            // }
+                            // catch(JsonException e) {
+                            //     Console.WriteLine($"Caught a JsonException: {e}");
+                            //     int hexdumpWidth = 64;
+                            //
+                            //     // Console.WriteLine($"Check hexdump line {reader.BytesConsumed / hexdumpWidth} index {reader.BytesConsumed % hexdumpWidth}");
+                            //     Console.WriteLine($"Buffer length: {_buf.Length}");
+                            //     _buf.HexDump(64);
+                            //     throw;
+                            // }
+                            var item = ReadItem(stream, ref buffer, ref reader);
+                            action(item);
+                            Chunk.Add(item);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private T ReadItem(Stream stream, ref byte[] buffer, ref Utf8JsonReader reader) {
+        while (!reader.Read()) {
+            GetMoreBytesFromStream(stream, ref buffer, ref reader);
+        }
+
+        // handle nullable types
+        if (typeof(T).IsGenericType && typeof(T).GetGenericTypeDefinition() == typeof(Nullable<>)) {
+            if (reader.TokenType == JsonTokenType.Null) {
+                return default(T);
+            }
+        }
+
+        // if(typeof(T) == typeof(string)) {
+        //     return (T)(object)reader.GetString();
+        // }
+        // else if(typeof(T) == typeof(int)) {
+        //     return (T)(object)reader.GetInt32();
+        // }
+        // else {
+        //     var _buf = reader.ValueSequence.ToArray();
+        //     return JsonSerializer.Deserialize<T>(_buf);
+        // }
+
+        // default branch uses "object?" cast to avoid compiler error
+        // add more branches here as nessesary
+        // reader.Read();
+        var call = typeof(T) switch {
+            Type t when t == typeof(string) => reader.GetString(),
+            _ => ReadObject<T>(stream, ref buffer, ref reader)
+        };
+
+        object ReadObject<T>(Stream stream, ref byte[] buffer, ref Utf8JsonReader reader) {
+            if (reader.TokenType != JsonTokenType.PropertyName) {
+                throw new JsonException();
+            }
+
+            List<byte> objBuffer = [(byte)'{', ..reader.ValueSequence.ToArray()];
+            var currentDepth = reader.CurrentDepth;
+            while (reader.CurrentDepth >= currentDepth) {
+                while (!reader.Read()) {
+                    GetMoreBytesFromStream(stream, ref buffer, ref reader);
+                }
+
+                if (reader.TokenType == JsonTokenType.EndObject && reader.CurrentDepth == currentDepth) {
+                    break;
+                }
+
+                objBuffer.AddRange(reader.ValueSpan);
+            }
+
+            return JsonSerializer.Deserialize<T>(objBuffer.ToArray());
+        }
+
+        return (T)call;
+
+        // return JsonSerializer.Deserialize<T>(ref reader);
+    }
+
+    private static void GetMoreBytesFromStream(Stream stream, ref byte[] buffer, ref Utf8JsonReader reader) {
+        int bytesRead;
+        if (reader.BytesConsumed < buffer.Length) {
+            ReadOnlySpan<byte> leftover = buffer.AsSpan((int)reader.BytesConsumed);
+
+            if (leftover.Length == buffer.Length) {
+                Array.Resize(ref buffer, buffer.Length * 2);
+                Console.WriteLine($"Increased buffer size to {buffer.Length}");
+            }
+
+            leftover.CopyTo(buffer);
+            bytesRead = stream.Read(buffer.AsSpan(leftover.Length));
+        }
+        else {
+            bytesRead = stream.Read(buffer);
+        }
+
+        // Console.WriteLine($"String in buffer is: {Encoding.UTF8.GetString(buffer)}");
+        reader = new Utf8JsonReader(buffer, isFinalBlock: bytesRead == 0, reader.CurrentState);
+    }
+}
+
+public partial class SynapseCollectionJsonConverter<T> : JsonConverter<SynapseCollectionResult<T>> {
+    public override SynapseCollectionResult<T>? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
+        if (reader.TokenType != JsonTokenType.StartObject) {
+            throw new JsonException();
+        }
+
+        var result = new SynapseCollectionResult<T>();
+        while (reader.Read()) {
+            if (reader.TokenType == JsonTokenType.EndObject) {
+                break;
+            }
+
+            if (reader.TokenType != JsonTokenType.PropertyName) {
+                throw new JsonException();
+            }
+
+            var propName = reader.GetString();
+            reader.Read();
+            if (propName == "total") {
+                result.Total = reader.GetInt32();
+            }
+            else if (propName == "prev_token") {
+                result.PrevToken = reader.GetString();
+            }
+            else if (propName == "next_token") {
+                result.NextToken = reader.GetString();
+            }
+            else if (propName == "chunk") {
+                if (reader.TokenType != JsonTokenType.StartArray) {
+                    throw new JsonException();
+                }
+
+                while (reader.Read()) {
+                    if (reader.TokenType == JsonTokenType.EndArray) {
+                        break;
+                    }
+
+                    var item = JsonSerializer.Deserialize<T>(ref reader, options);
+                    result.Chunk.Add(item);
+                }
+            }
+        }
+
+        return result;
+    }
+
+    public override void Write(Utf8JsonWriter writer, SynapseCollectionResult<T> value, JsonSerializerOptions options) {
+        writer.WriteStartObject();
+        if (value.Total is not null)
+            writer.WriteNumber("total", value.Total ?? 0);
+        if (value.PrevToken is not null)
+            writer.WriteString("prev_token", value.PrevToken);
+        if (value.NextToken is not null)
+            writer.WriteString("next_token", value.NextToken);
+
+        writer.WriteStartArray("chunk");
+        foreach (var item in value.Chunk) {
+            JsonSerializer.Serialize(writer, item, options);
+        }
+
+        writer.WriteEndArray();
+        writer.WriteEndObject();
+    }
+}
\ No newline at end of file
diff --git a/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/AdminUserListResult.cs b/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/UserListResult.cs
index 9b0c481..3132906 100644
--- a/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/AdminUserListResult.cs
+++ b/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Responses/UserListResult.cs
@@ -2,7 +2,7 @@ using System.Text.Json.Serialization;
 
 namespace LibMatrix.Homeservers.ImplementationDetails.Synapse.Models.Responses;
 
-public class AdminUserListResult {
+public class SynapseAdminUserListResult {
     [JsonPropertyName("offset")]
     public int Offset { get; set; }
 
@@ -13,9 +13,9 @@ public class AdminUserListResult {
     public string? NextToken { get; set; }
 
     [JsonPropertyName("users")]
-    public List<AdminUserListResultUser> Users { get; set; } = new();
+    public List<SynapseAdminUserListResultUser> Users { get; set; } = new();
 
-    public class AdminUserListResultUser {
+    public class SynapseAdminUserListResultUser {
         [JsonPropertyName("name")]
         public string Name { get; set; }
 
@@ -52,7 +52,20 @@ public class AdminUserListResult {
         [JsonPropertyName("locked")]
         public bool Locked { get; set; }
 
+        // Requires enabling MSC3866
         [JsonPropertyName("approved")]
-        public bool Approved { get; set; }
+        public bool? Approved { get; set; }
+
+        [JsonIgnore]
+        public DateTime CreationTsDateTime {
+            get => DateTimeOffset.FromUnixTimeMilliseconds(CreationTs).DateTime;
+            set => CreationTs = new DateTimeOffset(value).ToUnixTimeMilliseconds();
+        }
+
+        [JsonIgnore]
+        public DateTime? LastSeenTsDateTime {
+            get => LastSeenTs.HasValue ? DateTimeOffset.FromUnixTimeMilliseconds(LastSeenTs.Value).DateTime : null;
+            set => LastSeenTs = value.HasValue ? new DateTimeOffset(value.Value).ToUnixTimeMilliseconds() : null;
+        }
     }
 }
\ No newline at end of file