From 36648a023719061a999d8d5f4d2efc43f3dd15a5 Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Sat, 15 Mar 2025 18:33:49 +0100
Subject: Extend invite listener API

---
 LibMatrix/Extensions/MatrixHttpClient.Single.cs                |  2 +-
 LibMatrix/Helpers/SyncHelper.cs                                |  4 +++-
 .../Homeservers/Extensions/NamedCaches/NamedFilterCache.cs     | 10 +++++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'LibMatrix')

diff --git a/LibMatrix/Extensions/MatrixHttpClient.Single.cs b/LibMatrix/Extensions/MatrixHttpClient.Single.cs
index 4594f7d..24633c5 100644
--- a/LibMatrix/Extensions/MatrixHttpClient.Single.cs
+++ b/LibMatrix/Extensions/MatrixHttpClient.Single.cs
@@ -94,7 +94,7 @@ public class MatrixHttpClient {
         request.Options.Set(new HttpRequestOptionsKey<bool>("WebAssemblyEnableStreamingResponse"), true);
 
         if (LogRequests)
-            Console.WriteLine("Sending " + request.Summarise(includeHeaders: true, includeQuery: true, includeContentIfText: true, hideHeaders: ["Accept"]));
+            Console.WriteLine("Sending " + request.Summarise(includeHeaders: true, includeQuery: true, includeContentIfText: false, hideHeaders: ["Accept"]));
 
         HttpResponseMessage? responseMessage;
         try {
diff --git a/LibMatrix/Helpers/SyncHelper.cs b/LibMatrix/Helpers/SyncHelper.cs
index adcc714..4cbe73f 100644
--- a/LibMatrix/Helpers/SyncHelper.cs
+++ b/LibMatrix/Helpers/SyncHelper.cs
@@ -73,6 +73,8 @@ public class SyncHelper(AuthenticatedHomeserverGeneric homeserver, ILogger? logg
         else if (Filter is not null)
             _filterId = (await homeserver.UploadFilterAsync(Filter)).FilterId;
         else _filterId = null;
+        
+        _filterIsDirty = false;
     }
 
     public async Task<SyncResponse?> SyncAsync(CancellationToken? cancellationToken = null) {
@@ -115,7 +117,7 @@ public class SyncHelper(AuthenticatedHomeserverGeneric homeserver, ILogger? logg
         // logger?.LogInformation("SyncHelper: Calling: {}", url);
 
         try {
-            SyncResponse? resp = null;
+            SyncResponse? resp;
             if (UseInternalStreamingSync) {
                 resp = await homeserver.ClientHttpClient.GetFromJsonAsync<SyncResponse>(url, cancellationToken: cancellationToken ?? CancellationToken.None);
                 logger?.LogInformation("Got sync response: ~{} bytes, {} elapsed", resp.ToJson(false, true, true).Length, sw.Elapsed);
diff --git a/LibMatrix/Homeservers/Extensions/NamedCaches/NamedFilterCache.cs b/LibMatrix/Homeservers/Extensions/NamedCaches/NamedFilterCache.cs
index 76533a4..e3c5943 100644
--- a/LibMatrix/Homeservers/Extensions/NamedCaches/NamedFilterCache.cs
+++ b/LibMatrix/Homeservers/Extensions/NamedCaches/NamedFilterCache.cs
@@ -1,3 +1,5 @@
+using System.Text.Json.Nodes;
+using ArcaneLibs.Extensions;
 using LibMatrix.Filters;
 using LibMatrix.Utilities;
 
@@ -16,7 +18,13 @@ public class NamedFilterCache(AuthenticatedHomeserverGeneric hs) : NamedCache<st
     public async Task<string> GetOrSetValueAsync(string key, SyncFilter? filter = null) {
         var existingValue = await GetValueAsync(key);
         if (existingValue != null) {
-            return existingValue;
+            try {
+                var existingFilter = await hs.GetFilterAsync(existingValue);
+                return existingValue;
+            }
+            catch {
+                // ignored
+            }
         }
 
         if (filter is null) {
-- 
cgit 1.5.1