From e8196ca2e7532cccae2fdecce3dff14294f66750 Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Sat, 8 Feb 2025 21:08:22 +0100
Subject: Various changes

---
 .../Pages/Tools/Info/KnownHomeserverList.razor     | 46 +++++++++++++++++++---
 MatrixUtils.Web/Pages/Tools/InviteCounter.razor    | 22 +++++------
 2 files changed, 51 insertions(+), 17 deletions(-)

(limited to 'MatrixUtils.Web/Pages/Tools')

diff --git a/MatrixUtils.Web/Pages/Tools/Info/KnownHomeserverList.razor b/MatrixUtils.Web/Pages/Tools/Info/KnownHomeserverList.razor
index 90b652a..296852a 100644
--- a/MatrixUtils.Web/Pages/Tools/Info/KnownHomeserverList.razor
+++ b/MatrixUtils.Web/Pages/Tools/Info/KnownHomeserverList.razor
@@ -1,45 +1,73 @@
-@page "/Tools/KnownHomeserverList"
+@page "/Tools/Info/KnownHomeserverList"
 @using ArcaneLibs.Extensions
+@using LibMatrix.RoomTypes
+@using SpawnDev.BlazorJS.WebWorkers
+@inject WebWorkerService workerService
 <h3>Known Homeserver List</h3>
 <hr/>
 
 @if (!IsFinished) {
     <p>
-        <b>Loading...</b>
+        <b>Loading... @RoomCount rooms remaining to process...</b>
     </p>
 }
 
-@foreach (var (homeserver, members) in counts.OrderByDescending(x => x.Value)) {
-    <p>@homeserver - @members</p>
+@{
+    var shownCounts = counts.OrderByDescending(x => x.Value).AsEnumerable();
+    if (!IsFinished && counts.Count > 500) {
+        shownCounts = shownCounts.Where(x => x.Value > 5);
+    }
+}
+@foreach (var (homeserver, members) in shownCounts.ToList()) {
+    <p>@homeserver - @members users</p>
 }
 <hr/>
 
 @code {
     Dictionary<string, List<string>> homeservers { get; set; } = new();
+
     Dictionary<string, int> counts { get; set; } = new();
+
     // List<HomeserverInfo> Homeservers = new();
     bool IsFinished { get; set; }
+
     // HomeserverInfoQueryProgress QueryProgress { get; set; } = new();
     AuthenticatedHomeserverGeneric? hs { get; set; }
+    int RoomCount { get; set; } = 0;
 
     protected override async Task OnInitializedAsync() {
         hs = await RmuStorage.GetCurrentSessionOrNavigate();
         if (hs is null) return;
-        var fetchTasks = (await hs.GetJoinedRooms()).Select(x=>x.GetMembersByHomeserverAsync()).ToAsyncEnumerable();
+        var ss = new SemaphoreSlim(32, 32);
+        var rooms = await hs.GetJoinedRooms();
+        RoomCount = rooms.Count;
+        var fetchTasks = rooms.Select(roomId => workerService.TaskPool.Invoke(() => InternalGetMembersByHomeserver(hs.WellKnownUris.Client, hs.AccessToken, roomId.RoomId))).ToList().ToAsyncEnumerable();
+        // var fetchTasks = rooms.Select(async x => {
+            // await ss.WaitAsync();
+            // var res = await x.GetMembersByHomeserverAsync();
+            // ss.Release();
+            // return res;
+        // }).ToAsyncEnumerable();
         await foreach (var result in fetchTasks) {
             foreach (var (resHomeserver, resMembers) in result) {
                 if (!homeservers.TryAdd(resHomeserver, resMembers)) {
                     homeservers[resHomeserver].AddRange(resMembers);
                 }
+
                 counts[resHomeserver] = homeservers[resHomeserver].Count;
             }
-            // StateHasChanged();
+
+            RoomCount--;
+            StateHasChanged();
             // await Task.Delay(250);
+            await Task.Yield();
         }
 
         foreach (var resHomeserver in homeservers.Keys) {
             homeservers[resHomeserver] = homeservers[resHomeserver].Distinct().ToList();
             counts[resHomeserver] = homeservers[resHomeserver].Count;
+            StateHasChanged();
+            await Task.Yield();
         }
 
         IsFinished = true;
@@ -48,4 +76,10 @@
         await base.OnInitializedAsync();
     }
 
+    private static async Task<Dictionary<string, List<string>>> InternalGetMembersByHomeserver(string homeserverBaseUrl, string accessToken, string roomId) {
+        var hs = new AuthenticatedHomeserverGeneric(homeserverBaseUrl, new() { Client = homeserverBaseUrl }, null, accessToken);
+        var room = hs.GetRoom(roomId);
+        return await room.GetMembersByHomeserverAsync();
+    }
+
 }
\ No newline at end of file
diff --git a/MatrixUtils.Web/Pages/Tools/InviteCounter.razor b/MatrixUtils.Web/Pages/Tools/InviteCounter.razor
index e2a0393..fa94f18 100644
--- a/MatrixUtils.Web/Pages/Tools/InviteCounter.razor
+++ b/MatrixUtils.Web/Pages/Tools/InviteCounter.razor
@@ -1,6 +1,8 @@
 @page "/Tools/InviteCounter"
 @using System.Collections.ObjectModel
+@using ArcaneLibs.Extensions
 @using LibMatrix.EventTypes.Spec.State.RoomInfo
+@using LibMatrix.Filters
 <h3>User Trace</h3>
 <hr/>
 
@@ -13,7 +15,7 @@
 
 <details>
     <summary>Results</summary>
-    @foreach (var (userId, events) in invites.OrderByDescending(x=>x.Value).ToList()) {
+    @foreach (var (userId, events) in invites.OrderByDescending(x => x.Value).ToList()) {
         <p>@userId: @events</p>
     }
 </details>
@@ -27,16 +29,15 @@
     private ObservableCollection<string> log { get; set; } = new();
     private Dictionary<string, int> invites { get; set; } = new();
     private AuthenticatedHomeserverGeneric hs { get; set; }
-    
+
     [Parameter, SupplyParameterFromQuery(Name = "room")]
     public string roomId { get; set; }
-    
 
     protected override async Task OnInitializedAsync() {
         log.CollectionChanged += (sender, args) => StateHasChanged();
         hs = await RmuStorage.GetCurrentSessionOrNavigate();
         if (hs is null) return;
-       
+
         StateHasChanged();
         Console.WriteLine("Rerendered!");
         await base.OnInitializedAsync();
@@ -44,22 +45,21 @@
 
     private async Task<string> Execute() {
         var room = hs.GetRoom(roomId);
-        var events = room.GetManyMessagesAsync(limit: int.MaxValue);
+        var filter = new SyncFilter.EventFilter(types: ["m.room.member"]);
+        var events = room.GetManyMessagesAsync(limit: int.MaxValue, filter: filter.ToJson(indent: false, ignoreNull: true));
         await foreach (var resp in events) {
             var all = resp.State.Concat(resp.Chunk);
             foreach (var evt in all) {
-                if(evt.Type != RoomMemberEventContent.EventId) continue;
+                if (evt.Type != RoomMemberEventContent.EventId) continue;
                 var content = evt.TypedContent as RoomMemberEventContent;
-                if(content.Membership != "invite") continue;
-                if(!invites.ContainsKey(evt.Sender)) invites[evt.Sender] = 0;
+                if (content.Membership != "invite") continue;
+                if (!invites.ContainsKey(evt.Sender)) invites[evt.Sender] = 0;
                 invites[evt.Sender]++;
             }
 
             log.Add($"{resp.State.Count} state, {resp.Chunk.Count} timeline");
         }
-        
-        
-        
+
         StateHasChanged();
 
         return "";
-- 
cgit 1.5.1