Synapse admin fixes, server resolution fixes HEAD master

2 files changed, 4 insertions, 22 deletions

diff --git a/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Filters/SynapseAdminLocalUserQueryFilter.cs b/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Filters/SynapseAdminLocalUserQueryFilter.cs

index 62b291b..5a4acf7 100644
--- a/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Filters/SynapseAdminLocalUserQueryFilter.cs
+++ b/LibMatrix/Homeservers/ImplementationDetails/Synapse/Models/Filters/SynapseAdminLocalUserQueryFilter.cs
@@ -1,27 +1,5 @@
 namespace LibMatrix.Homeservers.ImplementationDetails.Synapse.Models.Filters;
 
 public class SynapseAdminLocalUserQueryFilter {
-    public string UserIdContains { get; set; } = "";
-    public string NameContains { get; set; } = "";
-    public string CanonicalAliasContains { get; set; } = "";
-    public string VersionContains { get; set; } = "";
-    public string CreatorContains { get; set; } = "";
-    public string EncryptionContains { get; set; } = "";
-    public string JoinRulesContains { get; set; } = "";
-    public string GuestAccessContains { get; set; } = "";
-    public string HistoryVisibilityContains { get; set; } = "";
 
-    public bool Federatable { get; set; } = true;
-    public bool Public { get; set; } = true;
-
-    public int JoinedMembersGreaterThan { get; set; }
-    public int JoinedMembersLessThan { get; set; } = int.MaxValue;
-
-    public int JoinedLocalMembersGreaterThan { get; set; }
-    public int JoinedLocalMembersLessThan { get; set; } = int.MaxValue;
-    public int StateEventsGreaterThan { get; set; }
-    public int StateEventsLessThan { get; set; } = int.MaxValue;
-
-    public bool CheckFederation { get; set; }
-    public bool CheckPublic { get; set; }
 }
\ No newline at end of file
diff --git a/LibMatrix/Homeservers/ImplementationDetails/Synapse/SynapseAdminApiClient.cs b/LibMatrix/Homeservers/ImplementationDetails/Synapse/SynapseAdminApiClient.cs

index 777c04a..cee3d8d 100644
--- a/LibMatrix/Homeservers/ImplementationDetails/Synapse/SynapseAdminApiClient.cs
+++ b/LibMatrix/Homeservers/ImplementationDetails/Synapse/SynapseAdminApiClient.cs
@@ -183,6 +183,7 @@ public class SynapseAdminApiClient(AuthenticatedHomeserverSynapse authenticatedH
 #region Users
 
     public async IAsyncEnumerable<SynapseAdminUserListResult.SynapseAdminUserListResultUser> SearchUsersAsync(int limit = int.MaxValue, int chunkLimit = 250,
+        string orderBy = "name", string dir = "f",
         SynapseAdminLocalUserQueryFilter? localFilter = null) {
         // TODO: implement filters
         string? from = null;
@@ -190,6 +191,9 @@ public class SynapseAdminApiClient(AuthenticatedHomeserverSynapse authenticatedH
             var url = new Uri("/_synapse/admin/v3/users", UriKind.Relative);
             url = url.AddQuery("limit", Math.Min(limit, chunkLimit).ToString());
             if (!string.IsNullOrWhiteSpace(from)) url = url.AddQuery("from", from);
+            if (!string.IsNullOrWhiteSpace(orderBy)) url = url.AddQuery("order_by", orderBy);
+            if (!string.IsNullOrWhiteSpace(dir)) url = url.AddQuery("dir", dir);
+            
             Console.WriteLine($"--- ADMIN Querying User List with URL: {url} ---");
             // TODO: implement URI methods in http client
             var res = await authenticatedHomeserver.ClientHttpClient.GetFromJsonAsync<SynapseAdminUserListResult>(url.ToString());