1 files changed, 22 insertions, 37 deletions

diff --git a/MatrixRoomUtils.Web/Pages/RoomState/RoomStateViewerPage.razor b/MatrixRoomUtils.Web/Pages/RoomState/RoomStateViewerPage.razor
index c7f9f3c..bfd4d10 100644
--- a/MatrixRoomUtils.Web/Pages/RoomState/RoomStateViewerPage.razor
+++ b/MatrixRoomUtils.Web/Pages/RoomState/RoomStateViewerPage.razor
@@ -1,7 +1,7 @@
 @page "/RoomStateViewer/{RoomId}"
+@using MatrixRoomUtils.Core.Extensions
 @using System.Net.Http.Headers
 @using System.Text.Json
-@using MatrixRoomUtils.Core.Extensions
 @inject ILocalStorageService LocalStorage
 @inject NavigationManager NavigationManager
 <h3>Room state viewer - Viewing @RoomId</h3>
@@ -19,8 +19,7 @@
     </tr>
     </thead>
     <tbody>
-    @foreach (var stateEvent in FilteredEvents.Where(x => x.state_key == "").OrderBy(x => x.origin_server_ts))
-    {
+    @foreach (var stateEvent in FilteredEvents.Where(x => x.state_key == "").OrderBy(x => x.origin_server_ts)) {
         <tr>
             <td>@stateEvent.type</td>
             <td style="max-width: fit-Content;">
@@ -31,8 +30,7 @@
     </tbody>
 </table>
 
-@foreach (var group in FilteredEvents.GroupBy(x => x.state_key).OrderBy(x => x.Key).Where(x => x.Key != ""))
-{
+@foreach (var group in FilteredEvents.GroupBy(x => x.state_key).OrderBy(x => x.Key).Where(x => x.Key != "")) {
     <details>
         <summary>@group.Key</summary>
         <table class="table table-striped table-hover" style="width: fit-Content;">
@@ -43,8 +41,7 @@
             </tr>
             </thead>
             <tbody>
-            @foreach (var stateEvent in group.OrderBy(x => x.origin_server_ts))
-            {
+            @foreach (var stateEvent in group.OrderBy(x => x.origin_server_ts)) {
                 <tr>
                     <td>@stateEvent.type</td>
                     <td style="max-width: fit-Content;">
@@ -72,12 +69,10 @@
     public List<PreRenderedStateEvent> Events { get; set; } = new();
     public string status = "";
 
-    protected override async Task OnInitializedAsync()
-    {
+    protected override async Task OnInitializedAsync() {
         await LocalStorageWrapper.LoadFromLocalStorage(LocalStorage);
         await base.OnInitializedAsync();
-        if (RuntimeCache.CurrentHomeServer == null)
-        {
+        if (RuntimeCache.CurrentHomeServer == null) {
             NavigationManager.NavigateTo("/Login");
             return;
         }
@@ -85,56 +80,50 @@
         await LoadStatesAsync();
         Console.WriteLine("Policy list editor initialized!");
     }
+
     private DateTime _lastUpdate = DateTime.Now;
 
-    private async Task LoadStatesAsync()
-    {
-        int StateLoaded = 0;
-        //TODO: can we improve this?
+    private async Task LoadStatesAsync() {
+        var StateLoaded = 0;
+    //TODO: can we improve this?
         using var client = new HttpClient();
         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", RuntimeCache.CurrentHomeServer.AccessToken);
-    var response = await client.GetAsync($"{RuntimeCache.CurrentHomeServer.FullHomeServerDomain}/_matrix/client/r0/rooms/{RoomId}/state");
-        // var response = await client.GetAsync($"http://localhost:5117/matrix-hq-state.json");
+        var response = await client.GetAsync($"{RuntimeCache.CurrentHomeServer.FullHomeServerDomain}/_matrix/client/r0/rooms/{RoomId}/state");
+    // var response = await client.GetAsync($"http://localhost:5117/matrix-hq-state.json");
     //var _events = await response.Content.ReadFromJsonAsync<Queue<StateEventStruct>>();
         var _data = await response.Content.ReadAsStreamAsync();
         var __events = JsonSerializer.DeserializeAsyncEnumerable<StateEventStruct>(_data);
-        await foreach (var _ev in __events)
-        {
-            var e = new PreRenderedStateEvent()
-            {
+        await foreach (var _ev in __events) {
+            var e = new PreRenderedStateEvent {
                 type = _ev.type,
                 state_key = _ev.state_key,
                 origin_server_ts = _ev.origin_server_ts,
-                content = _ev.content.ToJson(indent: true, ignoreNull: true),
+                content = _ev.content.ToJson(true, true)
             };
             Events.Add(e);
-            if (string.IsNullOrEmpty(e.state_key))
-            {
+            if (string.IsNullOrEmpty(e.state_key)) {
                 FilteredEvents.Add(e);
             }
             StateLoaded++;
-            if ((DateTime.Now - _lastUpdate).TotalMilliseconds > 100)
-            {
+            if ((DateTime.Now - _lastUpdate).TotalMilliseconds > 100) {
                 _lastUpdate = DateTime.Now;
                 status = $"Loaded {StateLoaded} state events";
                 StateHasChanged();
                 await Task.Delay(0);
             }
-            
         }
 
         StateHasChanged();
     }
 
-    private async Task RebuildFilteredData()
-    {
+    private async Task RebuildFilteredData() {
         status = "Rebuilding filtered data...";
         StateHasChanged();
         await Task.Delay(1);
         var _FilteredEvents = Events;
         if (!ShowMembershipEvents)
             _FilteredEvents = _FilteredEvents.Where(x => x.type != "m.room.member").ToList();
-        
+
         status = "Done, rerendering!";
         StateHasChanged();
         await Task.Delay(1);
@@ -142,9 +131,7 @@
         StateHasChanged();
     }
 
-
-    public struct PreRenderedStateEvent
-    {
+    public struct PreRenderedStateEvent {
         public string content { get; set; }
         public long origin_server_ts { get; set; }
         public string state_key { get; set; }
@@ -155,11 +142,9 @@
     // public string ReplacesState { get; set; }
     }
 
-    public bool ShowMembershipEvents
-    {
+    public bool ShowMembershipEvents {
         get => _showMembershipEvents;
-        set
-        {
+        set {
             _showMembershipEvents = value;
             RebuildFilteredData();
         }