4 files changed, 201 insertions, 33 deletions
diff --git a/Tests/LibMatrix.HomeserverEmulator/Controllers/Users/AccountDataController.cs b/Tests/LibMatrix.HomeserverEmulator/Controllers/Users/AccountDataController.cs
new file mode 100644
index 0000000..8cd5c75
--- /dev/null
+++ b/Tests/LibMatrix.HomeserverEmulator/Controllers/Users/AccountDataController.cs
@@ -0,0 +1,81 @@
+using System.Text.Json.Nodes;
+using ArcaneLibs.Extensions;
+using LibMatrix.EventTypes.Spec.State;
+using LibMatrix.Filters;
+using LibMatrix.HomeserverEmulator.Services;
+using LibMatrix.Responses;
+using Microsoft.AspNetCore.Mvc;
+
+namespace LibMatrix.HomeserverEmulator.Controllers;
+
+[ApiController]
+[Route("/_matrix/client/{version}/")]
+public class AccountDataController(ILogger<AccountDataController> logger, TokenService tokenService, UserStore userStore, RoomStore roomStore) : ControllerBase {
+    [HttpGet("user/{mxid}/account_data/{type}")]
+    public async Task<object> GetAccountData(string type) {
+        var token = tokenService.GetAccessToken(HttpContext);
+        if (token is null)
+            throw new MatrixException() {
+                ErrorCode = "M_UNAUTHORIZED",
+                Error = "No token passed."
+            };
+
+        var user = await userStore.GetUserByToken(token, false);
+        if (user is null)
+            throw new MatrixException() {
+                ErrorCode = "M_UNAUTHORIZED",
+                Error = "Invalid token."
+            };
+        var value = user.AccountData.FirstOrDefault(x=>x.Type == type);
+        if (value is null)
+            throw new MatrixException() {
+                ErrorCode = "M_NOT_FOUND",
+                Error = "Key not found."
+            };
+        return value;
+    }
+    
+    [HttpPut("user/{mxid}/account_data/{type}")]
+    public async Task<object> SetAccountData(string type, [FromBody] JsonObject data) {
+        var token = tokenService.GetAccessToken(HttpContext);
+        if (token is null)
+            throw new MatrixException() {
+                ErrorCode = "M_UNAUTHORIZED",
+                Error = "No token passed."
+            };
+
+        var user = await userStore.GetUserByToken(token, false);
+        if (user is null)
+            throw new MatrixException() {
+                ErrorCode = "M_UNAUTHORIZED",
+                Error = "Invalid token."
+            };
+        
+        user.AccountData.Where(x=>x.Type == type).ToList().ForEach(response => user.AccountData.Remove(response));
+        
+        user.AccountData.Add(new() {
+            Type = type,
+            RawContent = data
+        });
+        return data;
+    }
+    
+    // specialised account data...
+    [HttpGet("pushrules")]
+    public async Task<object> GetPushRules() {
+        var token = tokenService.GetAccessToken(HttpContext);
+        if (token is null)
+            throw new MatrixException() {
+                ErrorCode = "M_UNAUTHORIZED",
+                Error = "No token passed."
+            };
+
+        var user = await userStore.GetUserByToken(token, false);
+        if (user is null)
+            throw new MatrixException() {
+                ErrorCode = "M_UNAUTHORIZED",
+                Error = "Invalid token."
+            };
+        return new { };
+    }
+}
\ No newline at end of file
diff --git a/Tests/LibMatrix.HomeserverEmulator/Controllers/Users/FilterController.cs b/Tests/LibMatrix.HomeserverEmulator/Controllers/Users/FilterController.cs
new file mode 100644
index 0000000..ecbccd4
--- /dev/null
+++ b/Tests/LibMatrix.HomeserverEmulator/Controllers/Users/FilterController.cs
@@ -0,0 +1,58 @@
+using System.Text.Json.Nodes;
+using ArcaneLibs.Extensions;
+using LibMatrix.EventTypes.Spec.State;
+using LibMatrix.Filters;
+using LibMatrix.HomeserverEmulator.Services;
+using LibMatrix.Responses;
+using Microsoft.AspNetCore.Mvc;
+
+namespace LibMatrix.HomeserverEmulator.Controllers;
+
+[ApiController]
+[Route("/_matrix/client/{version}/")]
+public class FilterController(ILogger<FilterController> logger, TokenService tokenService, UserStore userStore, RoomStore roomStore) : ControllerBase {
+    [HttpPost("user/{mxid}/filter")]
+    public async Task<object> CreateFilter(string mxid, [FromBody] SyncFilter filter) {
+        var token = tokenService.GetAccessToken(HttpContext);
+        if (token is null)
+            throw new MatrixException() {
+                ErrorCode = "M_UNAUTHORIZED",
+                Error = "No token passed."
+            };
+
+        var user = await userStore.GetUserByToken(token, false);
+        if (user is null)
+            throw new MatrixException() {
+                ErrorCode = "M_UNAUTHORIZED",
+                Error = "Invalid token."
+            };
+        var filterId = Guid.NewGuid().ToString();
+        user.Filters[filterId] = filter;
+        return new {
+            filter_id = filterId
+        };
+    }
+    
+    [HttpGet("user/{mxid}/filter/{filterId}")]
+    public async Task<SyncFilter> GetFilter(string mxid, string filterId) {
+        var token = tokenService.GetAccessToken(HttpContext);
+        if (token is null)
+            throw new MatrixException() {
+                ErrorCode = "M_UNAUTHORIZED",
+                Error = "No token passed."
+            };
+
+        var user = await userStore.GetUserByToken(token, false);
+        if (user is null)
+            throw new MatrixException() {
+                ErrorCode = "M_UNAUTHORIZED",
+                Error = "Invalid token."
+            };
+        if (!user.Filters.ContainsKey(filterId))
+            throw new MatrixException() {
+                ErrorCode = "M_NOT_FOUND",
+                Error = "Filter not found."
+            };
+        return user.Filters[filterId];
+    }
+}
\ No newline at end of file
diff --git a/Tests/LibMatrix.HomeserverEmulator/Controllers/Users/ProfileController.cs b/Tests/LibMatrix.HomeserverEmulator/Controllers/Users/ProfileController.cs
new file mode 100644
index 0000000..c717ba5
--- /dev/null
+++ b/Tests/LibMatrix.HomeserverEmulator/Controllers/Users/ProfileController.cs
@@ -0,0 +1,52 @@
+using System.Text.Json.Nodes;
+using ArcaneLibs.Extensions;
+using LibMatrix.EventTypes.Spec.State;
+using LibMatrix.Filters;
+using LibMatrix.HomeserverEmulator.Services;
+using LibMatrix.Responses;
+using Microsoft.AspNetCore.Mvc;
+
+namespace LibMatrix.HomeserverEmulator.Controllers;
+
+[ApiController]
+[Route("/_matrix/client/{version}/")]
+public class ProfileController(ILogger<ProfileController> logger, TokenService tokenService, UserStore userStore, RoomStore roomStore) : ControllerBase {
+    [HttpGet("profile/{userId}")]
+    public async Task<IDictionary<string, object>> GetProfile(string userId) {
+        var user = await userStore.GetUserById(userId, false);
+        if (user is null)
+            throw new MatrixException() {
+                ErrorCode = "M_NOT_FOUND",
+                Error = "User not found."
+            };
+        return user.Profile;
+    }
+
+    [HttpGet("profile/{userId}/{key}")]
+    public async Task<object> GetProfile(string userId, string key) {
+        var user = await userStore.GetUserById(userId, false);
+        if (user is null)
+            throw new MatrixException() {
+                ErrorCode = "M_NOT_FOUND",
+                Error = "User not found."
+            };
+        if (!user.Profile.TryGetValue(key, out var value))
+            throw new MatrixException() {
+                ErrorCode = "M_NOT_FOUND",
+                Error = "Key not found."
+            };
+        return value;
+    }
+
+    [HttpPut("profile/{userId}/{key}")]
+    public async Task<object> SetProfile(string userId, string key, [FromBody] JsonNode value) {
+        var user = await userStore.GetUserById(userId, false);
+        if (user is null)
+            throw new MatrixException() {
+                ErrorCode = "M_NOT_FOUND",
+                Error = "User not found."
+            };
+        user.Profile[key] = value[key];
+        return value;
+    }
+}
\ No newline at end of file
diff --git a/Tests/LibMatrix.HomeserverEmulator/Controllers/UserController.cs b/Tests/LibMatrix.HomeserverEmulator/Controllers/Users/UserController.cs
index d763b26..eb2b879 100644
--- a/Tests/LibMatrix.HomeserverEmulator/Controllers/UserController.cs
+++ b/Tests/LibMatrix.HomeserverEmulator/Controllers/Users/UserController.cs
@@ -1,5 +1,7 @@
 using System.Text.Json.Nodes;
 using ArcaneLibs.Extensions;
+using LibMatrix.EventTypes.Spec.State;
+using LibMatrix.Filters;
 using LibMatrix.HomeserverEmulator.Services;
 using LibMatrix.Responses;
 using Microsoft.AspNetCore.Mvc;
@@ -8,17 +10,17 @@ namespace LibMatrix.HomeserverEmulator.Controllers;
 
 [ApiController]
 [Route("/_matrix/client/{version}/")]
-public class UserController(ILogger<UserController> logger, TokenService tokenService, UserStore userStore) : ControllerBase {
+public class UserController(ILogger<UserController> logger, TokenService tokenService, UserStore userStore, RoomStore roomStore) : ControllerBase {
     [HttpGet("account/whoami")]
     public async Task<WhoAmIResponse> Login() {
-        var token = tokenService.GetAccessToken();
+        var token = tokenService.GetAccessToken(HttpContext);
         if (token is null)
             throw new MatrixException() {
                 ErrorCode = "M_UNAUTHORIZED",
                 Error = "No token passed."
             };
 
-        var user = await userStore.GetUserByToken(token, Random.Shared.Next(101) <= 10, tokenService.GenerateServerName());
+        var user = await userStore.GetUserByToken(token, Random.Shared.Next(101) <= 10, tokenService.GenerateServerName(HttpContext));
         if (user is null)
             throw new MatrixException() {
                 ErrorCode = "M_UNKNOWN_TOKEN",
@@ -29,37 +31,10 @@ public class UserController(ILogger<UserController> logger, TokenService tokenSe
         };
         return whoAmIResponse;
     }
-    
-    [HttpGet("profile/{userId}")]
-    public async Task<Dictionary<string, object>> GetProfile(string userId) {
-        var user = await userStore.GetUserById(userId, false);
-        if (user is null)
-            throw new MatrixException() {
-                ErrorCode = "M_NOT_FOUND",
-                Error = "User not found."
-            };
-        return user.Profile;
-    }
-    
-    [HttpGet("profile/{userId}/{key}")]
-    public async Task<object> GetProfile(string userId, string key) {
-        var user = await userStore.GetUserById(userId, false);
-        if (user is null)
-            throw new MatrixException() {
-                ErrorCode = "M_NOT_FOUND",
-                Error = "User not found."
-            };
-        if (!user.Profile.TryGetValue(key, out var value))
-            throw new MatrixException() {
-                ErrorCode = "M_NOT_FOUND",
-                Error = "Key not found."
-            };
-        return value;
-    }
-    
+
     [HttpGet("joined_rooms")]
     public async Task<object> GetJoinedRooms() {
-        var token = tokenService.GetAccessToken();
+        var token = tokenService.GetAccessToken(HttpContext);
         if (token is null)
             throw new MatrixException() {
                 ErrorCode = "M_UNAUTHORIZED",
@@ -75,7 +50,9 @@ public class UserController(ILogger<UserController> logger, TokenService tokenSe
         // return user.JoinedRooms;
 
         return new {
-            joined_rooms = user.JoinedRooms
+            joined_rooms = roomStore._rooms.Where(r =>
+                r.State.Any(s => s.StateKey == user.UserId && s.Type == RoomMemberEventContent.EventId && (s.TypedContent as RoomMemberEventContent).Membership == "join")
+            ).Select(r => r.RoomId).ToList()
         };
     }
 }
\ No newline at end of file