Refactor session store (WIP)

3 files changed, 9 insertions, 9 deletions

diff --git a/MatrixUtils.Web/Pages/Tools/Info/KnownHomeserverList.razor b/MatrixUtils.Web/Pages/Tools/Info/KnownHomeserverList.razor

index 296852a..acad827 100644
--- a/MatrixUtils.Web/Pages/Tools/Info/KnownHomeserverList.razor
+++ b/MatrixUtils.Web/Pages/Tools/Info/KnownHomeserverList.razor
@@ -36,7 +36,7 @@
     int RoomCount { get; set; } = 0;
 
     protected override async Task OnInitializedAsync() {
-        hs = await RmuStorage.GetCurrentSessionOrNavigate();
+        hs = await sessionStore.GetCurrentHomeserver(navigateOnFailure: true);
         if (hs is null) return;
         var ss = new SemaphoreSlim(32, 32);
         var rooms = await hs.GetJoinedRooms();
diff --git a/MatrixUtils.Web/Pages/Tools/Info/PolicyListActivity.razor b/MatrixUtils.Web/Pages/Tools/Info/PolicyListActivity.razor

index 4506c39..f8d1d31 100644
--- a/MatrixUtils.Web/Pages/Tools/Info/PolicyListActivity.razor
+++ b/MatrixUtils.Web/Pages/Tools/Info/PolicyListActivity.razor
@@ -38,7 +38,7 @@ else
     protected override async Task OnInitializedAsync() {
         var sw = Stopwatch.StartNew();
         await base.OnInitializedAsync();
-        Homeserver = (await RmuStorage.GetCurrentSessionOrNavigate())!;
+        Homeserver = (await sessionStore.GetCurrentHomeserver(navigateOnFailure: true))!;
         if (Homeserver is null) return;
 
         var rooms = await Homeserver.GetJoinedRooms();
diff --git a/MatrixUtils.Web/Pages/Tools/Info/SessionCount.razor b/MatrixUtils.Web/Pages/Tools/Info/SessionCount.razor

index 1adb440..ce3513b 100644
--- a/MatrixUtils.Web/Pages/Tools/Info/SessionCount.razor
+++ b/MatrixUtils.Web/Pages/Tools/Info/SessionCount.razor
@@ -73,20 +73,20 @@
 
     protected override async Task OnInitializedAsync() {
         log.CollectionChanged += (sender, args) => StateHasChanged();
-        var hs = await RmuStorage.GetCurrentSessionOrNavigate();
+        var hs = await sessionStore.GetCurrentHomeserver(navigateOnFailure: true);
         if (hs is null) return;
         rooms.CollectionChanged += (sender, args) => StateHasChanged();
-        var sessions = await RmuStorage.GetAllTokens();
+        var sessions = await sessionStore.GetAllSessions();
         foreach (var userAuth in sessions) {
-            var session = await RmuStorage.GetSession(userAuth);
-            if (session is not null) {
-                var sessionRooms = await session.GetJoinedRooms();
+            var homeserver = await sessionStore.GetHomeserver(userAuth.Key);
+            if (homeserver is not null) {
+                var sessionRooms = await homeserver.GetJoinedRooms();
                 foreach (var room in sessionRooms) {
                     rooms.Add(room);
                 }
 
                 StateHasChanged();
-                log.Add($"Got {sessionRooms.Count} rooms for {userAuth.UserId}");
+                log.Add($"Got {sessionRooms.Count} rooms for {userAuth.Value.Auth.UserId}");
             }
         }
 
@@ -106,7 +106,7 @@
 
         log.Add($"Done fetching members!");
 
-        UserIDs.RemoveAll(x => sessions.Any(y => y.UserId == x));
+        UserIDs.RemoveAll(x => sessions.Any(y => y.Value.Auth.UserId == x));
 
         StateHasChanged();
         Console.WriteLine("Rerendered!");