From 14bcb748a853f7cd2afce40477bd2b0cb14ad7e6 Mon Sep 17 00:00:00 2001 From: TheArcaneBrony Date: Sat, 23 Dec 2023 08:54:11 +0100 Subject: User impersonation support (appservice identity assertion), non-AsyncEnumerable room member lookup --- LibMatrix/RoomTypes/GenericRoom.cs | 27 ++++++++++++++++++++++++--- LibMatrix/RoomTypes/SpaceRoom.cs | 2 +- 2 files changed, 25 insertions(+), 4 deletions(-) (limited to 'LibMatrix/RoomTypes') diff --git a/LibMatrix/RoomTypes/GenericRoom.cs b/LibMatrix/RoomTypes/GenericRoom.cs index 0cedf29..786dd01 100644 --- a/LibMatrix/RoomTypes/GenericRoom.cs +++ b/LibMatrix/RoomTypes/GenericRoom.cs @@ -168,7 +168,7 @@ public class GenericRoom { return await res.Content.ReadFromJsonAsync() ?? throw new Exception("Failed to join room?"); } - public async IAsyncEnumerable GetMembersAsync(bool joinedOnly = true) { + public async IAsyncEnumerable GetMembersEnumerableAsync(bool joinedOnly = true) { var sw = Stopwatch.StartNew(); var res = await Homeserver.ClientHttpClient.GetAsync($"/_matrix/client/v3/rooms/{RoomId}/members"); Console.WriteLine($"Members call responded in {sw.GetElapsedAndRestart()}"); @@ -186,6 +186,27 @@ public class GenericRoom { Console.WriteLine($"Members call iterated in {sw.GetElapsedAndRestart()}"); } + + public async Task> GetMembersListAsync(bool joinedOnly = true) { + var sw = Stopwatch.StartNew(); + var res = await Homeserver.ClientHttpClient.GetAsync($"/_matrix/client/v3/rooms/{RoomId}/members"); + Console.WriteLine($"Members call responded in {sw.GetElapsedAndRestart()}"); + // var resText = await res.Content.ReadAsStringAsync(); + Console.WriteLine($"Members call response read in {sw.GetElapsedAndRestart()}"); + var result = await JsonSerializer.DeserializeAsync(await res.Content.ReadAsStreamAsync(), new JsonSerializerOptions() { + TypeInfoResolver = ChunkedStateEventResponseSerializerContext.Default, + }); + Console.WriteLine($"Members call deserialised in {sw.GetElapsedAndRestart()}"); + var members = new List(); + foreach (var resp in result.Chunk) { + if (resp?.Type != "m.room.member") continue; + if (joinedOnly && (resp.TypedContent as RoomMemberEventContent)?.Membership is not "join") continue; + members.Add(resp); + } + + Console.WriteLine($"Members call iterated in {sw.GetElapsedAndRestart()}"); + return members; + } #region Utility shortcuts @@ -232,7 +253,7 @@ public class GenericRoom { } catch { try { - var members = GetMembersAsync(); + var members = GetMembersEnumerableAsync(); var memberList = new List(); int memberCount = 0; await foreach (var member in members) @@ -373,7 +394,7 @@ public class GenericRoom { return await mxaeHomeserver.ClientHttpClient.GetFromJsonAsync>>( $"/_matrix/client/v3/rooms/{RoomId}/members_by_homeserver?joined_only={joinedOnly}"); Dictionary> roomHomeservers = new(); - var members = GetMembersAsync(); + var members = GetMembersEnumerableAsync(); await foreach (var member in members) { string memberHs = member.StateKey.Split(':', 2)[1]; roomHomeservers.TryAdd(memberHs, new()); diff --git a/LibMatrix/RoomTypes/SpaceRoom.cs b/LibMatrix/RoomTypes/SpaceRoom.cs index 6ebd62f..bf16efb 100644 --- a/LibMatrix/RoomTypes/SpaceRoom.cs +++ b/LibMatrix/RoomTypes/SpaceRoom.cs @@ -15,7 +15,7 @@ public class SpaceRoom(AuthenticatedHomeserverGeneric homeserver, string roomId) } public async Task AddChildAsync(GenericRoom room) { - var members = room.GetMembersAsync(true); + var members = room.GetMembersEnumerableAsync(true); Dictionary memberCountByHs = new(); await foreach (var member in members) { var server = member.StateKey.Split(':')[1]; -- cgit 1.4.1