dotnet 10, synapse admin room list improvements HEAD master

3 files changed, 15 insertions, 13 deletions

diff --git a/MatrixUtils.Web/Pages/Labs/DMSpace/DMSpaceStages/DMSpaceStage1.razor b/MatrixUtils.Web/Pages/Labs/DMSpace/DMSpaceStages/DMSpaceStage1.razor

index 360548d..7199934 100644
--- a/MatrixUtils.Web/Pages/Labs/DMSpace/DMSpaceStages/DMSpaceStage1.razor
+++ b/MatrixUtils.Web/Pages/Labs/DMSpace/DMSpaceStages/DMSpaceStage1.razor
@@ -26,7 +26,7 @@
             <InputCheckbox @bind-Value="SetupData.DmSpaceInfo.LayerByUser"></InputCheckbox>
             Create sub-spaces per user
         </p>
-        
+
         <br/>
         <LinkButton OnClickAsync="@Disband" Color="#FF0000">Disband</LinkButton>
         <LinkButton OnClickAsync="@Execute">Next</LinkButton>
@@ -78,7 +78,7 @@ else {
             userRooms.Add(room);
         }
 
-        var roomChecks = userRooms.Select(GetFeasibleSpaces).ToAsyncEnumerable();
+        var roomChecks = userRooms.Select(GetFeasibleSpaces).ToAsyncResultEnumerable();
         await foreach (var room in roomChecks)
             if (room.HasValue)
                 spaces.TryAdd(room.Value.id, room.Value.roomInfo);
@@ -109,8 +109,8 @@ else {
     public async Task<(string id, RoomInfo roomInfo)?> GetFeasibleSpaces(GenericRoom room) {
         try {
             var ri = new RoomInfo(room);
-            
-            await foreach(var evt in room.GetFullStateAsync())
+
+            await foreach (var evt in room.GetFullStateAsync())
                 ri.StateEvents.Add(evt);
 
             var powerLevels = (await ri.GetStateEvent(RoomPowerLevelEventContent.EventId)).TypedContent as RoomPowerLevelEventContent;
@@ -118,7 +118,7 @@ else {
                 Console.WriteLine($"No permission to send m.space.child in {room.RoomId}...");
                 return null;
             }
-            
+
             Status = $"Found viable space: {ri.RoomName}";
             if (!string.IsNullOrWhiteSpace(SetupData.DmSpaceConfiguration!.DMSpaceId)) {
                 if (await room.GetStateOrNullAsync<DMSpaceInfo>(DMSpaceInfo.EventId) is { } dsi) {
diff --git a/MatrixUtils.Web/Pages/Labs/DMSpace/DMSpaceStages/DMSpaceStage2.razor b/MatrixUtils.Web/Pages/Labs/DMSpace/DMSpaceStages/DMSpaceStage2.razor

index 25d1629..ed65e94 100644
--- a/MatrixUtils.Web/Pages/Labs/DMSpace/DMSpaceStages/DMSpaceStage2.razor
+++ b/MatrixUtils.Web/Pages/Labs/DMSpace/DMSpaceStages/DMSpaceStage2.razor
@@ -38,7 +38,9 @@ else {
 }
 @foreach (var (room, usersList) in duplicateDmRooms) {
     <ModalWindow Title="Duplicate room found" X="_offset += 30" Y="_offset">
-        <p>Found room assigned to multiple users: <RoomListItem RoomInfo="@room"></RoomListItem></p>
+        <p>Found room assigned to multiple users:
+            <RoomListItem RoomInfo="@room"></RoomListItem>
+        </p>
         <p>Users:</p>
         @foreach (var userProfileResponse in usersList) {
             <LinkButton OnClickAsync="@(() => SetRoomAssignment(room.Room.RoomId, userProfileResponse.Id))">
@@ -141,12 +143,12 @@ else {
             }
 
             var roomList = new List<RoomInfo>();
-            var tasks = rooms.Select(x => GetRoomInfo(hs.GetRoom(x))).ToAsyncEnumerable();
+            var tasks = rooms.Select(x => GetRoomInfo(hs.GetRoom(x))).ToAsyncResultEnumerable();
             await foreach (var result in tasks)
                 roomList.Add(result);
             return (userProfile, roomList);
             // StateHasChanged();
-        }).ToAsyncEnumerable();
+        }).ToAsyncResultEnumerable();
         await foreach (var res in results) {
             SetupData.DMRooms.Add(res.userProfile, res.roomList);
             // Status = $"Listed {dmRooms.Count} users";
@@ -181,8 +183,8 @@ else {
         await roomInfo.FetchAllStateAsync();
         roomMembers[roomInfo] = new();
         // roomInfo.CreationEventContent = await room.GetCreateEventAsync();
-        
-        if(roomInfo.RoomName == room.RoomId)
+
+        if (roomInfo.RoomName == room.RoomId)
             try {
                 roomInfo.RoomName = await room.GetNameOrFallbackAsync();
             }
@@ -192,7 +194,7 @@ else {
         await foreach (var member in membersEnum)
             if (member.TypedContent is RoomMemberEventContent memberEvent)
                 roomMembers[roomInfo].Add(new() { DisplayName = memberEvent.DisplayName, AvatarUrl = memberEvent.AvatarUrl, Id = member.StateKey });
-        
+
         try {
             string? roomIcon = (await room.GetAvatarUrlAsync())?.Url;
             if (room is not null)
diff --git a/MatrixUtils.Web/Pages/Labs/DMSpace/DMSpaceStages/DMSpaceStage3.razor b/MatrixUtils.Web/Pages/Labs/DMSpace/DMSpaceStages/DMSpaceStage3.razor

index 2bed22e..686894c 100644
--- a/MatrixUtils.Web/Pages/Labs/DMSpace/DMSpaceStages/DMSpaceStage3.razor
+++ b/MatrixUtils.Web/Pages/Labs/DMSpace/DMSpaceStages/DMSpaceStage3.razor
@@ -115,11 +115,11 @@ else {
         //         };
         //     }
         //     var roomList = new List<RoomInfo>();
-        //     var tasks = rooms.Select(x => GetRoomInfo(hs.GetRoom(x))).ToAsyncEnumerable();
+        //     var tasks = rooms.Select(x => GetRoomInfo(hs.GetRoom(x))).ToAsyncResultEnumerable();
         //     await foreach (var result in tasks)
         //         roomList.Add(result);
         //     return (userProfile, roomList);
-        // }).ToAsyncEnumerable();
+        // }).ToAsyncResultEnumerable();
         // await foreach (var res in results) {
         //     dmRooms.Add(new RoomInfo() {
         //         Room = dmSpaceRoom,