MRU->RMU, fixes, cleanup

3 files changed, 16 insertions, 19 deletions

diff --git a/MatrixRoomUtils.Web/Pages/Dev/DevOptions.razor b/MatrixUtils.Web/Pages/Dev/DevOptions.razor

index a1e928f..6ca0b53 100644
--- a/MatrixRoomUtils.Web/Pages/Dev/DevOptions.razor
+++ b/MatrixUtils.Web/Pages/Dev/DevOptions.razor
@@ -35,9 +35,9 @@
 
 @code {
 
-    private MRUStorageWrapper.Settings? userSettings { get; set; }
+    private RMUStorageWrapper.Settings? userSettings { get; set; }
     protected override async Task OnInitializedAsync() {
-        // userSettings = await TieredStorage.DataStorageProvider.LoadObjectAsync<MRUStorageWrapper.Settings>("mru.settings");
+        // userSettings = await TieredStorage.DataStorageProvider.LoadObjectAsync<RMUStorageWrapper.Settings>("rmu.settings");
         
         await base.OnInitializedAsync();
     }
@@ -45,7 +45,7 @@
     private async Task LogStuff() {
         await Task.Delay(100);
         Console.WriteLine($"Settings: {userSettings.ToJson()}");
-        await TieredStorage.DataStorageProvider.SaveObjectAsync("mru.settings", userSettings);
+        await TieredStorage.DataStorageProvider.SaveObjectAsync("rmu.settings", userSettings);
     }
 
     private async Task ExportLocalStorage() {
diff --git a/MatrixRoomUtils.Web/Pages/Dev/DevUtilities.razor b/MatrixUtils.Web/Pages/Dev/DevUtilities.razor

index 27fe35e..a6a4a82 100644
--- a/MatrixRoomUtils.Web/Pages/Dev/DevUtilities.razor
+++ b/MatrixUtils.Web/Pages/Dev/DevUtilities.razor
@@ -3,7 +3,7 @@
 @using ArcaneLibs.Extensions
 @using LibMatrix.Extensions
 @using LibMatrix.Homeservers
-@using MatrixRoomUtils.Abstractions
+@using MatrixUtils.Abstractions
 @inject ILocalStorageService LocalStorage
 @inject NavigationManager NavigationManager
 <h3>Debug Tools</h3>
@@ -26,11 +26,11 @@ else {
 <details open>
     <summary>Send GET request to URL</summary>
     <div class="input-group">
-        <input type="text" class="form-control" @bind-value="get_request_url" placeholder="URL">
+        <input type="text" class="form-control" @bind-value="GetRequestUrl" placeholder="URL">
         <button class="btn btn-outline-secondary" type="button" @onclick="SendGetRequest">Send</button>
     </div>
     <br/>
-    <pre>@get_request_result</pre>
+    <pre>@GetRequestResult</pre>
 </details>
 
 <div style="margin-bottom: 4em;"></div>
@@ -42,38 +42,35 @@ else {
 
     protected override async Task OnInitializedAsync() {
         await base.OnInitializedAsync();
-        hs = await MRUStorage.GetCurrentSessionOrNavigate();
+        hs = await RMUStorage.GetCurrentSessionOrNavigate();
         if (hs == null) return;
         Rooms = (await hs.GetJoinedRooms()).Select(x => x.RoomId).ToList();
         Console.WriteLine("Fetched joined rooms!");
     }
 
     //send req
-    string get_request_url { get; set; } = "";
-    string get_request_result { get; set; } = "";
+    string GetRequestUrl { get; set; } = "";
+    string GetRequestResult { get; set; } = "";
 
     private async Task SendGetRequest() {
-        var field = typeof(RemoteHomeserver).GetRuntimeFields().First(x => x.ToString().Contains("<_httpClient>k__BackingField"));
-        var hs = await MRUStorage.GetCurrentSessionOrNavigate();
-        if (hs == null) return;
-        var httpClient = field.GetValue(hs) as MatrixHttpClient;
+        var httpClient = hs?.ClientHttpClient;
         try {
-            var res = await httpClient.GetAsync(get_request_url);
+            var res = await httpClient.GetAsync(GetRequestUrl);
             if (res.IsSuccessStatusCode) {
                 if (res.Content.Headers.ContentType.MediaType == "application/json")
-                    get_request_result = (await res.Content.ReadFromJsonAsync<object>()).ToJson();
+                    GetRequestResult = (await res.Content.ReadFromJsonAsync<object>()).ToJson();
                 else
-                    get_request_result = await res.Content.ReadAsStringAsync();
+                    GetRequestResult = await res.Content.ReadAsStringAsync();
                 StateHasChanged();
                 return;
             }
             if (res.Content.Headers.ContentType.MediaType == "application/json")
-                get_request_result = $"Error: {res.StatusCode}\n" + (await res.Content.ReadFromJsonAsync<object>()).ToJson();
+                GetRequestResult = $"Error: {res.StatusCode}\n" + (await res.Content.ReadFromJsonAsync<object>()).ToJson();
             else
-                get_request_result = $"Error: {res.StatusCode}\n" + await res.Content.ReadAsStringAsync();
+                GetRequestResult = $"Error: {res.StatusCode}\n" + await res.Content.ReadAsStringAsync();
         }
         catch (Exception e) {
-            get_request_result = $"Error: {e}";
+            GetRequestResult = $"Error: {e}";
         }
         StateHasChanged();
     }
diff --git a/MatrixRoomUtils.Web/Pages/Dev/ModalTest.razor b/MatrixUtils.Web/Pages/Dev/ModalTest.razor

index 4a0487f..4a0487f 100644
--- a/MatrixRoomUtils.Web/Pages/Dev/ModalTest.razor
+++ b/MatrixUtils.Web/Pages/Dev/ModalTest.razor