From 5e3a16e1f94ad66be78e6cf4cd136d44cb40307a Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Fri, 22 Mar 2024 16:39:38 +0000
Subject: Changes

---
 LibMatrix                                                          | 2 +-
 MatrixUtils.Web/Pages/Rooms/Index.razor                            | 3 ++-
 .../Pages/Rooms/Index2Components/RoomsIndex2SyncContainer.razor    | 7 ++++---
 MxApiExtensions                                                    | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/LibMatrix b/LibMatrix
index 98409a7..2b566a3 160000
--- a/LibMatrix
+++ b/LibMatrix
@@ -1 +1 @@
-Subproject commit 98409a7ee34a2796cd5f760c962fee8567e8c6bb
+Subproject commit 2b566a31b68f14d51faae61cbfbe359d0691a890
diff --git a/MatrixUtils.Web/Pages/Rooms/Index.razor b/MatrixUtils.Web/Pages/Rooms/Index.razor
index d7a3569..c44e23f 100644
--- a/MatrixUtils.Web/Pages/Rooms/Index.razor
+++ b/MatrixUtils.Web/Pages/Rooms/Index.razor
@@ -73,7 +73,8 @@
         // SemaphoreSlim _semaphore = new(160, 160);
         GlobalProfile = await Homeserver.GetProfileAsync(Homeserver.WhoAmI.UserId);
 
-        var filter = await Homeserver.GetOrUploadNamedFilterIdAsync(CommonSyncFilters.GetBasicRoomInfo);
+        // var filter = await Homeserver.NamedCaches.FilterCache.GetOrSetValueAsync(CommonSyncFilters.GetBasicRoomInfo);
+        var filter = await Homeserver.NamedCaches.FilterCache.GetOrSetValueAsync(CommonSyncFilters.GetBasicRoomInfo);
         var filterData = await Homeserver.GetFilterAsync(filter);
         
         // Rooms = new ObservableCollection<RoomInfo>(rooms.Select(room => new RoomInfo(room)));
diff --git a/MatrixUtils.Web/Pages/Rooms/Index2Components/RoomsIndex2SyncContainer.razor b/MatrixUtils.Web/Pages/Rooms/Index2Components/RoomsIndex2SyncContainer.razor
index bbc63eb..1fb3f89 100644
--- a/MatrixUtils.Web/Pages/Rooms/Index2Components/RoomsIndex2SyncContainer.razor
+++ b/MatrixUtils.Web/Pages/Rooms/Index2Components/RoomsIndex2SyncContainer.razor
@@ -49,7 +49,8 @@
         var syncHelpers = new Dictionary<string, SyncHelper>() {
             ["Main"] = new SyncHelper(Data.Homeserver, logger) {
                 Timeout = 30000,
-                FilterId = await Data.Homeserver.GetOrUploadNamedFilterIdAsync(CommonSyncFilters.GetBasicRoomInfo),
+                FilterId = await Data.Homeserver.NamedCaches.FilterCache.GetOrSetValueAsync(CommonSyncFilters.GetBasicRoomInfo),
+                // FilterId = await Data.Homeserver.NamedCaches.FilterCache.GetOrSetValueAsync(CommonSyncFilters.GetBasicRoomInfo),
                 // MinimumDelay = TimeSpan.FromMilliseconds(5000)
             }
         };
@@ -59,13 +60,13 @@
             status.Status = "Initial sync indicates that server supports filters, starting helpers!";
             syncHelpers.Add("SpaceRelations", new SyncHelper(Data.Homeserver, logger) {
                 Timeout = 30000,
-                FilterId = await Data.Homeserver.GetOrUploadNamedFilterIdAsync(CommonSyncFilters.GetSpaceRelations),
+                FilterId = await Data.Homeserver.NamedCaches.FilterCache.GetOrSetValueAsync(CommonSyncFilters.GetSpaceRelations),
                 // MinimumDelay = TimeSpan.FromMilliseconds(5000)
             });
 
             syncHelpers.Add("Profile", new SyncHelper(Data.Homeserver, logger) {
                 Timeout = 30000,
-                FilterId = await Data.Homeserver.GetOrUploadNamedFilterIdAsync(CommonSyncFilters.GetOwnMemberEvents),
+                FilterId = await Data.Homeserver.NamedCaches.FilterCache.GetOrSetValueAsync(CommonSyncFilters.GetOwnMemberEvents),
                 // MinimumDelay = TimeSpan.FromMilliseconds(5000)
             });
         }
diff --git a/MxApiExtensions b/MxApiExtensions
index 2d21596..3c0c7b2 160000
--- a/MxApiExtensions
+++ b/MxApiExtensions
@@ -1 +1 @@
-Subproject commit 2d21596eec41cf1669f8064278b3273dc4f4c366
+Subproject commit 3c0c7b2e56a24bda06b8c567e5608546898c99d7
-- 
cgit 1.4.1