about summary refs log tree commit diff
path: root/MatrixUtils.Web/Pages
diff options
context:
space:
mode:
authorRory& <root@rory.gay>2024-01-24 02:31:56 +0100
committerRory& <root@rory.gay>2024-01-24 17:05:25 +0100
commit03313562d21d5db9bf6a14ebbeab80e06c883d3a (patch)
treee000546a2ee8e6a886a7ed9fd01ad674178fb7cb /MatrixUtils.Web/Pages
parentMake RMU installable (diff)
downloadMatrixUtils-03313562d21d5db9bf6a14ebbeab80e06c883d3a.tar.xz
MRU->RMU, fixes, cleanup
Diffstat (limited to '')
-rw-r--r--MatrixUtils.Web/Pages/About.razor (renamed from MatrixRoomUtils.Web/Pages/About.razor)0
-rw-r--r--MatrixUtils.Web/Pages/Dev/DevOptions.razor (renamed from MatrixRoomUtils.Web/Pages/Dev/DevOptions.razor)6
-rw-r--r--MatrixUtils.Web/Pages/Dev/DevUtilities.razor (renamed from MatrixRoomUtils.Web/Pages/Dev/DevUtilities.razor)29
-rw-r--r--MatrixUtils.Web/Pages/Dev/ModalTest.razor (renamed from MatrixRoomUtils.Web/Pages/Dev/ModalTest.razor)0
-rw-r--r--MatrixUtils.Web/Pages/HSAdmin/HSAdmin.razor (renamed from MatrixRoomUtils.Web/Pages/HSAdmin/HSAdmin.razor)4
-rw-r--r--MatrixUtils.Web/Pages/HSAdmin/RoomQuery.razor (renamed from MatrixRoomUtils.Web/Pages/HSAdmin/RoomQuery.razor)2
-rw-r--r--MatrixUtils.Web/Pages/HSAdmin/RoomQuery.razor.css (renamed from MatrixRoomUtils.Web/Pages/HSAdmin/RoomQuery.razor.css)0
-rw-r--r--MatrixUtils.Web/Pages/Index.razor (renamed from MatrixRoomUtils.Web/Pages/Index.razor)14
-rw-r--r--MatrixUtils.Web/Pages/Index.razor.css (renamed from MatrixRoomUtils.Web/Pages/Index.razor.css)0
-rw-r--r--MatrixUtils.Web/Pages/InvalidSession.razor (renamed from MatrixRoomUtils.Web/Pages/InvalidSession.razor)16
-rw-r--r--MatrixUtils.Web/Pages/LoginPage.razor (renamed from MatrixRoomUtils.Web/Pages/LoginPage.razor)8
-rw-r--r--MatrixUtils.Web/Pages/ModerationUtilities/UserRoomHistory.razor (renamed from MatrixRoomUtils.Web/Pages/ModerationUtilities/UserRoomHistory.razor)8
-rw-r--r--MatrixUtils.Web/Pages/Rooms/Create.razor (renamed from MatrixRoomUtils.Web/Pages/Rooms/Create.razor)6
-rw-r--r--MatrixUtils.Web/Pages/Rooms/Index.razor (renamed from MatrixRoomUtils.Web/Pages/Rooms/Index.razor)4
-rw-r--r--MatrixUtils.Web/Pages/Rooms/PolicyList.razor (renamed from MatrixRoomUtils.Web/Pages/Rooms/PolicyList.razor)4
-rw-r--r--MatrixUtils.Web/Pages/Rooms/Space.razor (renamed from MatrixRoomUtils.Web/Pages/Rooms/Space.razor)2
-rw-r--r--MatrixUtils.Web/Pages/Rooms/StateEditor.razor (renamed from MatrixRoomUtils.Web/Pages/Rooms/StateEditor.razor)4
-rw-r--r--MatrixUtils.Web/Pages/Rooms/StateViewer.razor (renamed from MatrixRoomUtils.Web/Pages/Rooms/StateViewer.razor)4
-rw-r--r--MatrixUtils.Web/Pages/Rooms/Timeline.razor (renamed from MatrixRoomUtils.Web/Pages/Rooms/Timeline.razor)4
-rw-r--r--MatrixUtils.Web/Pages/ServerInfo.razor (renamed from MatrixRoomUtils.Web/Pages/ServerInfo.razor)0
-rw-r--r--MatrixUtils.Web/Pages/Tools/CopyPowerlevel.razor (renamed from MatrixRoomUtils.Web/Pages/Tools/CopyPowerlevel.razor)8
-rw-r--r--MatrixUtils.Web/Pages/Tools/KnownHomeserverList.razor (renamed from MatrixRoomUtils.Web/Pages/Tools/KnownHomeserverList.razor)4
-rw-r--r--MatrixUtils.Web/Pages/Tools/MassJoinRoom.razor (renamed from MatrixRoomUtils.Web/Pages/Tools/MassJoinRoom.razor)8
-rw-r--r--MatrixUtils.Web/Pages/Tools/MediaLocator.razor (renamed from MatrixRoomUtils.Web/Pages/Tools/MediaLocator.razor)2
-rw-r--r--MatrixUtils.Web/Pages/Tools/SpaceDebug.razor (renamed from MatrixRoomUtils.Web/Pages/Tools/SpaceDebug.razor)4
-rw-r--r--MatrixUtils.Web/Pages/Tools/ToolsIndex.razor8
-rw-r--r--MatrixUtils.Web/Pages/User/DMManager.razor (renamed from MatrixRoomUtils.Web/Pages/User/DMManager.razor)4
-rw-r--r--MatrixUtils.Web/Pages/User/DMSpace.razor (renamed from MatrixRoomUtils.Web/Pages/User/DMSpace.razor)8
-rw-r--r--MatrixUtils.Web/Pages/User/DMSpaceStages/DMSpaceStage0.razor (renamed from MatrixRoomUtils.Web/Pages/User/DMSpaceStages/DMSpaceStage0.razor)0
-rw-r--r--MatrixUtils.Web/Pages/User/DMSpaceStages/DMSpaceStage1.razor (renamed from MatrixRoomUtils.Web/Pages/User/DMSpaceStages/DMSpaceStage1.razor)4
-rw-r--r--MatrixUtils.Web/Pages/User/DMSpaceStages/DMSpaceStage2.razor (renamed from MatrixRoomUtils.Web/Pages/User/DMSpaceStages/DMSpaceStage2.razor)6
-rw-r--r--MatrixUtils.Web/Pages/User/DMSpaceStages/DMSpaceStage3.razor (renamed from MatrixRoomUtils.Web/Pages/User/DMSpaceStages/DMSpaceStage3.razor)6
-rw-r--r--MatrixUtils.Web/Pages/User/Profile.razor (renamed from MatrixRoomUtils.Web/Pages/User/Profile.razor)2
33 files changed, 92 insertions, 87 deletions
diff --git a/MatrixRoomUtils.Web/Pages/About.razor b/MatrixUtils.Web/Pages/About.razor

index 18d7c3f..18d7c3f 100644 --- a/MatrixRoomUtils.Web/Pages/About.razor +++ b/MatrixUtils.Web/Pages/About.razor
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
diff --git a/MatrixRoomUtils.Web/Pages/HSAdmin/HSAdmin.razor b/MatrixUtils.Web/Pages/HSAdmin/HSAdmin.razor
index d1a2df5..6499f57 100644 --- a/MatrixRoomUtils.Web/Pages/HSAdmin/HSAdmin.razor +++ b/MatrixUtils.Web/Pages/HSAdmin/HSAdmin.razor
@@ -14,7 +14,7 @@ else { <a href="/HSAdmin/RoomQuery">Query rooms</a> } else { - <p>Homeserver type @Homeserver.GetType().Name does not have any administration tools in MRU.</p> + <p>Homeserver type @Homeserver.GetType().Name does not have any administration tools in RMU.</p> <p>Server info:</p> <pre>@ServerVersionResponse?.ToJson(ignoreNull: true)</pre> } @@ -25,7 +25,7 @@ else { public ServerVersionResponse? ServerVersionResponse { get; set; } protected override async Task OnInitializedAsync() { - Homeserver = await MRUStorage.GetCurrentSessionOrNavigate(); + Homeserver = await RMUStorage.GetCurrentSessionOrNavigate(); if (Homeserver is null) return; ServerVersionResponse = await (Homeserver.FederationClient?.GetServerVersionAsync() ?? Task.FromResult<ServerVersionResponse?>(null)); await base.OnInitializedAsync(); diff --git a/MatrixRoomUtils.Web/Pages/HSAdmin/RoomQuery.razor b/MatrixUtils.Web/Pages/HSAdmin/RoomQuery.razor
index 7e4058b..10628ad 100644 --- a/MatrixRoomUtils.Web/Pages/HSAdmin/RoomQuery.razor +++ b/MatrixUtils.Web/Pages/HSAdmin/RoomQuery.razor
@@ -167,7 +167,7 @@ private async Task Search() { Results.Clear(); - var hs = await MRUStorage.GetCurrentSessionOrNavigate(); + var hs = await RMUStorage.GetCurrentSessionOrNavigate(); if (hs is AuthenticatedHomeserverSynapse synapse) { var searchRooms = synapse.Admin.SearchRoomsAsync(orderBy: OrderBy!, dir: Ascending ? "f" : "b", searchTerm: SearchTerm, localFilter: Filter).GetAsyncEnumerator(); while (await searchRooms.MoveNextAsync()) { diff --git a/MatrixRoomUtils.Web/Pages/HSAdmin/RoomQuery.razor.css b/MatrixUtils.Web/Pages/HSAdmin/RoomQuery.razor.css
index e69de29..e69de29 100644 --- a/MatrixRoomUtils.Web/Pages/HSAdmin/RoomQuery.razor.css +++ b/MatrixUtils.Web/Pages/HSAdmin/RoomQuery.razor.css
diff --git a/MatrixRoomUtils.Web/Pages/Index.razor b/MatrixUtils.Web/Pages/Index.razor
index 250dc2d..9c1bab6 100644 --- a/MatrixRoomUtils.Web/Pages/Index.razor +++ b/MatrixUtils.Web/Pages/Index.razor
@@ -4,7 +4,7 @@ @using LibMatrix @using LibMatrix.Homeservers @using ArcaneLibs.Extensions -@using MatrixRoomUtils.Web.Pages.Dev +@using MatrixUtils.Web.Pages.Dev <PageTitle>Index</PageTitle> @@ -104,10 +104,10 @@ Small collection of tools to do not-so-everyday things. protected override async Task OnInitializedAsync() { Console.WriteLine("Index.OnInitializedAsync"); - _currentSession = await MRUStorage.GetCurrentToken(); + _currentSession = await RMUStorage.GetCurrentToken(); _sessions.Clear(); _offlineSessions.Clear(); - var tokens = await MRUStorage.GetAllTokens(); + var tokens = await RMUStorage.GetAllTokens(); var profileTasks = tokens.Select(async token => { UserInfo userInfo = new(); AuthenticatedHomeserverGeneric hs; @@ -171,16 +171,16 @@ Small collection of tools to do not-so-everyday things. Console.WriteLine(e); } - await MRUStorage.RemoveToken(auth); - if ((await MRUStorage.GetCurrentToken())?.AccessToken == auth.AccessToken) - await MRUStorage.SetCurrentToken((await MRUStorage.GetAllTokens() ?? throw new InvalidOperationException()).FirstOrDefault()); + await RMUStorage.RemoveToken(auth); + if ((await RMUStorage.GetCurrentToken())?.AccessToken == auth.AccessToken) + await RMUStorage.SetCurrentToken((await RMUStorage.GetAllTokens() ?? throw new InvalidOperationException()).FirstOrDefault()); await OnInitializedAsync(); } private async Task SwitchSession(UserAuth auth) { Console.WriteLine($"Switching to {auth.Homeserver} {auth.UserId} via {auth.Proxy}"); - await MRUStorage.SetCurrentToken(auth); + await RMUStorage.SetCurrentToken(auth); await OnInitializedAsync(); } diff --git a/MatrixRoomUtils.Web/Pages/Index.razor.css b/MatrixUtils.Web/Pages/Index.razor.css
index c6b7bd7..c6b7bd7 100644 --- a/MatrixRoomUtils.Web/Pages/Index.razor.css +++ b/MatrixUtils.Web/Pages/Index.razor.css
diff --git a/MatrixRoomUtils.Web/Pages/InvalidSession.razor b/MatrixUtils.Web/Pages/InvalidSession.razor
index 7d4769c..e1a72ea 100644 --- a/MatrixRoomUtils.Web/Pages/InvalidSession.razor +++ b/MatrixUtils.Web/Pages/InvalidSession.razor
@@ -40,7 +40,7 @@ else { private MatrixException? _loginException { get; set; } protected override async Task OnInitializedAsync() { - var tokens = await MRUStorage.GetAllTokens(); + var tokens = await RMUStorage.GetAllTokens(); if (tokens is null || tokens.Count == 0) { NavigationManager.NavigateTo("/Login"); return; @@ -56,9 +56,9 @@ else { } private async Task RemoveUser() { - await MRUStorage.RemoveToken(_login!); - if ((await MRUStorage.GetCurrentToken())!.AccessToken == _login!.AccessToken) - await MRUStorage.SetCurrentToken((await MRUStorage.GetAllTokens())?.FirstOrDefault()); + await RMUStorage.RemoveToken(_login!); + if ((await RMUStorage.GetCurrentToken())!.AccessToken == _login!.AccessToken) + await RMUStorage.SetCurrentToken((await RMUStorage.GetAllTokens())?.FirstOrDefault()); await OnInitializedAsync(); } @@ -70,7 +70,7 @@ else { private async Task SwitchSession(UserAuth auth) { Console.WriteLine($"Switching to {auth.Homeserver} {auth.AccessToken} {auth.UserId}"); - await MRUStorage.SetCurrentToken(auth); + await RMUStorage.SetCurrentToken(auth); await OnInitializedAsync(); } @@ -85,9 +85,9 @@ else { Console.WriteLine($"Obtained access token for {result.UserId}!"); await RemoveUser(); - await MRUStorage.AddToken(result); - if (result.UserId == (await MRUStorage.GetCurrentToken())?.UserId) - await MRUStorage.SetCurrentToken(result); + await RMUStorage.AddToken(result); + if (result.UserId == (await RMUStorage.GetCurrentToken())?.UserId) + await RMUStorage.SetCurrentToken(result); NavigationManager.NavigateTo("/"); } catch (MatrixException e) { diff --git a/MatrixRoomUtils.Web/Pages/LoginPage.razor b/MatrixUtils.Web/Pages/LoginPage.razor
index b6f244d..ec4f57d 100644 --- a/MatrixRoomUtils.Web/Pages/LoginPage.razor +++ b/MatrixUtils.Web/Pages/LoginPage.razor
@@ -111,8 +111,8 @@ Console.WriteLine($"Obtained access token for {result.UserId}!"); - await MRUStorage.AddToken(result); - LoggedInSessions = await MRUStorage.GetAllTokens(); + await RMUStorage.AddToken(result); + LoggedInSessions = await RMUStorage.GetAllTokens(); } catch (Exception e) { Console.WriteLine($"Failed to login to {record.Homeserver} as {record.Username}!"); @@ -124,7 +124,7 @@ } private async Task FileChanged(InputFileChangeEventArgs obj) { - LoggedInSessions = await MRUStorage.GetAllTokens(); + LoggedInSessions = await RMUStorage.GetAllTokens(); Console.WriteLine(JsonSerializer.Serialize(obj, new JsonSerializerOptions { WriteIndented = true })); @@ -142,7 +142,7 @@ } private async Task AddRecord() { - LoggedInSessions = await MRUStorage.GetAllTokens(); + LoggedInSessions = await RMUStorage.GetAllTokens(); records.Add(newRecordInput); newRecordInput = new(); } diff --git a/MatrixRoomUtils.Web/Pages/ModerationUtilities/UserRoomHistory.razor b/MatrixUtils.Web/Pages/ModerationUtilities/UserRoomHistory.razor
index 506a8a1..5ba83e4 100644 --- a/MatrixRoomUtils.Web/Pages/ModerationUtilities/UserRoomHistory.razor +++ b/MatrixUtils.Web/Pages/ModerationUtilities/UserRoomHistory.razor
@@ -4,7 +4,7 @@ @using LibMatrix.EventTypes.Spec.State @using LibMatrix.RoomTypes @using ArcaneLibs.Extensions -@using MatrixRoomUtils.Abstractions +@using MatrixUtils.Abstractions <h3>UserRoomHistory</h3> <span>Enter mxid: </span> @@ -46,11 +46,11 @@ else { private AuthenticatedHomeserverGeneric? currentHs { get; set; } protected override async Task OnInitializedAsync() { - var hs = await MRUStorage.GetCurrentSessionOrNavigate(); + var hs = await RMUStorage.GetCurrentSessionOrNavigate(); if (hs is null) return; - var sessions = await MRUStorage.GetAllTokens(); + var sessions = await RMUStorage.GetAllTokens(); foreach (var userAuth in sessions) { - var session = await MRUStorage.GetSession(userAuth); + var session = await RMUStorage.GetSession(userAuth); if (session is not null) { hss.Add(session); StateHasChanged(); diff --git a/MatrixRoomUtils.Web/Pages/Rooms/Create.razor b/MatrixUtils.Web/Pages/Rooms/Create.razor
index e477f4c..35b2ffb 100644 --- a/MatrixRoomUtils.Web/Pages/Rooms/Create.razor +++ b/MatrixUtils.Web/Pages/Rooms/Create.razor
@@ -7,7 +7,7 @@ @using LibMatrix.EventTypes.Spec.State.RoomInfo @using LibMatrix.Homeservers @using LibMatrix.Responses -@using MatrixRoomUtils.Web.Classes.RoomCreationTemplates +@using MatrixUtils.Web.Classes.RoomCreationTemplates @* @* ReSharper disable once RedundantUsingDirective - Must not remove this, Rider marks this as "unused" when it's not */ *@ <h3>Room Manager - Create Room</h3> @@ -260,7 +260,7 @@ private RoomAvatarEventContent? roomAvatarEvent => creationEvent?["m.room.avatar"].TypedContent as RoomAvatarEventContent; protected override async Task OnInitializedAsync() { - Homeserver = await MRUStorage.GetCurrentSessionOrNavigate(); + Homeserver = await RMUStorage.GetCurrentSessionOrNavigate(); if (Homeserver is null) return; foreach (var x in Assembly.GetExecutingAssembly().GetTypes().Where(x => x.IsClass && !x.IsAbstract && x.GetInterfaces().Contains(typeof(IRoomCreationTemplate))).ToList()) { @@ -290,7 +290,7 @@ private async Task CreateRoom() { Console.WriteLine("Create room"); Console.WriteLine(creationEvent.ToJson()); - creationEvent.CreationContent.Add("rory.gay.created_using", "Rory&::MatrixRoomUtils (https://mru.rory.gay)"); + creationEvent.CreationContent.Add("rory.gay.created_using", "Rory&::MatrixUtils (https://rmu.rory.gay)"); try { var id = await Homeserver.CreateRoom(creationEvent); } diff --git a/MatrixRoomUtils.Web/Pages/Rooms/Index.razor b/MatrixUtils.Web/Pages/Rooms/Index.razor
index 6cabe82..0ec9487 100644 --- a/MatrixRoomUtils.Web/Pages/Rooms/Index.razor +++ b/MatrixUtils.Web/Pages/Rooms/Index.razor
@@ -6,7 +6,7 @@ @using System.Collections.ObjectModel @using System.Diagnostics @using ArcaneLibs.Extensions -@using MatrixRoomUtils.Abstractions +@using MatrixUtils.Abstractions @inject ILogger<Index> logger <h3>Room list</h3> @@ -93,7 +93,7 @@ // SyncHelper profileSyncHelper; protected override async Task OnInitializedAsync() { - Homeserver = await MRUStorage.GetCurrentSessionOrNavigate(); + Homeserver = await RMUStorage.GetCurrentSessionOrNavigate(); if (Homeserver is null) return; var rooms = await Homeserver.GetJoinedRooms(); // SemaphoreSlim _semaphore = new(160, 160); diff --git a/MatrixRoomUtils.Web/Pages/Rooms/PolicyList.razor b/MatrixUtils.Web/Pages/Rooms/PolicyList.razor
index b89d59c..bfc0375 100644 --- a/MatrixRoomUtils.Web/Pages/Rooms/PolicyList.razor +++ b/MatrixUtils.Web/Pages/Rooms/PolicyList.razor
@@ -10,7 +10,7 @@ @using ArcaneLibs.Attributes @using LibMatrix.EventTypes -@using MatrixRoomUtils.Web.Shared.PolicyEditorComponents +@using MatrixUtils.Web.Shared.PolicyEditorComponents <h3>Policy list editor - Editing @RoomId</h3> <hr/> @@ -170,7 +170,7 @@ else { protected override async Task OnInitializedAsync() { var sw = Stopwatch.StartNew(); await base.OnInitializedAsync(); - Homeserver = (await MRUStorage.GetCurrentSessionOrNavigate())!; + Homeserver = (await RMUStorage.GetCurrentSessionOrNavigate())!; if (Homeserver is null) return; Room = Homeserver.GetRoom(RoomId!); PowerLevels = (await Room.GetPowerLevelsAsync())!; diff --git a/MatrixRoomUtils.Web/Pages/Rooms/Space.razor b/MatrixUtils.Web/Pages/Rooms/Space.razor
index ce94d01..2dd84a1 100644 --- a/MatrixRoomUtils.Web/Pages/Rooms/Space.razor +++ b/MatrixUtils.Web/Pages/Rooms/Space.razor
@@ -31,7 +31,7 @@ private List<string> ServersInSpace { get; } = new(); protected override async Task OnInitializedAsync() { - var hs = await MRUStorage.GetCurrentSessionOrNavigate(); + var hs = await RMUStorage.GetCurrentSessionOrNavigate(); if (hs is null) return; Room = hs.GetRoom(RoomId.Replace('~', '.')); diff --git a/MatrixRoomUtils.Web/Pages/Rooms/StateEditor.razor b/MatrixUtils.Web/Pages/Rooms/StateEditor.razor
index 0e9d4f6..fc3a310 100644 --- a/MatrixRoomUtils.Web/Pages/Rooms/StateEditor.razor +++ b/MatrixUtils.Web/Pages/Rooms/StateEditor.razor
@@ -45,7 +45,7 @@ protected override async Task OnInitializedAsync() { await base.OnInitializedAsync(); - var hs = await MRUStorage.GetCurrentSessionOrNavigate(); + var hs = await RMUStorage.GetCurrentSessionOrNavigate(); if (hs is null) return; RoomId = RoomId.Replace('~', '.'); await LoadStatesAsync(); @@ -55,7 +55,7 @@ private DateTime _lastUpdate = DateTime.Now; private async Task LoadStatesAsync() { - var hs = await MRUStorage.GetCurrentSessionOrNavigate(); + var hs = await RMUStorage.GetCurrentSessionOrNavigate(); var StateLoaded = 0; var response = (hs.GetRoom(RoomId)).GetFullStateAsync(); diff --git a/MatrixRoomUtils.Web/Pages/Rooms/StateViewer.razor b/MatrixUtils.Web/Pages/Rooms/StateViewer.razor
index 2d0e0b0..fabc33c 100644 --- a/MatrixRoomUtils.Web/Pages/Rooms/StateViewer.razor +++ b/MatrixUtils.Web/Pages/Rooms/StateViewer.razor
@@ -70,7 +70,7 @@ protected override async Task OnInitializedAsync() { await base.OnInitializedAsync(); - var hs = await MRUStorage.GetCurrentSessionOrNavigate(); + var hs = await RMUStorage.GetCurrentSessionOrNavigate(); if (hs is null) return; await LoadStatesAsync(); Console.WriteLine("Policy list editor initialized!"); @@ -80,7 +80,7 @@ private async Task LoadStatesAsync() { var StateLoaded = 0; - var hs = await MRUStorage.GetCurrentSessionOrNavigate(); + var hs = await RMUStorage.GetCurrentSessionOrNavigate(); if (hs is null) return; var response = (hs.GetRoom(RoomId)).GetFullStateAsync(); await foreach (var _ev in response) { diff --git a/MatrixRoomUtils.Web/Pages/Rooms/Timeline.razor b/MatrixUtils.Web/Pages/Rooms/Timeline.razor
index 01bf555..8d0f731 100644 --- a/MatrixRoomUtils.Web/Pages/Rooms/Timeline.razor +++ b/MatrixUtils.Web/Pages/Rooms/Timeline.razor
@@ -1,5 +1,5 @@ @page "/Rooms/{RoomId}/Timeline" -@using MatrixRoomUtils.Web.Shared.TimelineComponents +@using MatrixUtils.Web.Shared.TimelineComponents @using LibMatrix @using LibMatrix.EventTypes.Spec @using LibMatrix.EventTypes.Spec.State @@ -28,7 +28,7 @@ protected override async Task OnInitializedAsync() { Console.WriteLine("RoomId: " + RoomId); - Homeserver = await MRUStorage.GetCurrentSessionOrNavigate(); + Homeserver = await RMUStorage.GetCurrentSessionOrNavigate(); if (Homeserver is null) return; var room = Homeserver.GetRoom(RoomId); MessagesResponse? msgs = null; diff --git a/MatrixRoomUtils.Web/Pages/ServerInfo.razor b/MatrixUtils.Web/Pages/ServerInfo.razor
index 71a1980..71a1980 100644 --- a/MatrixRoomUtils.Web/Pages/ServerInfo.razor +++ b/MatrixUtils.Web/Pages/ServerInfo.razor
diff --git a/MatrixRoomUtils.Web/Pages/Tools/CopyPowerlevel.razor b/MatrixUtils.Web/Pages/Tools/CopyPowerlevel.razor
index bcbc974..31f3f23 100644 --- a/MatrixRoomUtils.Web/Pages/Tools/CopyPowerlevel.razor +++ b/MatrixUtils.Web/Pages/Tools/CopyPowerlevel.razor
@@ -1,4 +1,4 @@ -@page "/CopyPowerlevel" +@page "/Tools/CopyPowerlevel" @using System.Diagnostics @using ArcaneLibs.Extensions @using LibMatrix @@ -25,11 +25,11 @@ List<AuthenticatedHomeserverGeneric> hss { get; set; } = new(); protected override async Task OnInitializedAsync() { - var hs = await MRUStorage.GetCurrentSessionOrNavigate(); + var hs = await RMUStorage.GetCurrentSessionOrNavigate(); if (hs is null) return; - var sessions = await MRUStorage.GetAllTokens(); + var sessions = await RMUStorage.GetAllTokens(); foreach (var userAuth in sessions) { - var session = await MRUStorage.GetSession(userAuth); + var session = await RMUStorage.GetSession(userAuth); if (session is not null) { hss.Add(session); StateHasChanged(); diff --git a/MatrixRoomUtils.Web/Pages/Tools/KnownHomeserverList.razor b/MatrixUtils.Web/Pages/Tools/KnownHomeserverList.razor
index dbf2f5f..f73215d 100644 --- a/MatrixRoomUtils.Web/Pages/Tools/KnownHomeserverList.razor +++ b/MatrixUtils.Web/Pages/Tools/KnownHomeserverList.razor
@@ -1,4 +1,4 @@ -@page "/KnownHomeserverList" +@page "/Tools/KnownHomeserverList" @using System.Diagnostics @using ArcaneLibs.Extensions @using LibMatrix.Homeservers @@ -26,7 +26,7 @@ AuthenticatedHomeserverGeneric? hs { get; set; } protected override async Task OnInitializedAsync() { - hs = await MRUStorage.GetCurrentSessionOrNavigate(); + hs = await RMUStorage.GetCurrentSessionOrNavigate(); if (hs is null) return; var fetchTasks = (await hs.GetJoinedRooms()).Select(x=>x.GetMembersByHomeserverAsync()).ToAsyncEnumerable(); await foreach (var result in fetchTasks) { diff --git a/MatrixRoomUtils.Web/Pages/Tools/MassJoinRoom.razor b/MatrixUtils.Web/Pages/Tools/MassJoinRoom.razor
index 816b7db..6efb0ae 100644 --- a/MatrixRoomUtils.Web/Pages/Tools/MassJoinRoom.razor +++ b/MatrixUtils.Web/Pages/Tools/MassJoinRoom.razor
@@ -1,4 +1,4 @@ -@page "/MassRoomJoin" +@page "/Tools/MassRoomJoin" @using System.Diagnostics @using ArcaneLibs.Extensions @using LibMatrix @@ -28,11 +28,11 @@ string roomId { get; set; } protected override async Task OnInitializedAsync() { - var hs = await MRUStorage.GetCurrentSessionOrNavigate(); + var hs = await RMUStorage.GetCurrentSessionOrNavigate(); if (hs is null) return; - var sessions = await MRUStorage.GetAllTokens(); + var sessions = await RMUStorage.GetAllTokens(); foreach (var userAuth in sessions) { - var session = await MRUStorage.GetSession(userAuth); + var session = await RMUStorage.GetSession(userAuth); if (session is not null) { hss.Add(session); StateHasChanged(); diff --git a/MatrixRoomUtils.Web/Pages/Tools/MediaLocator.razor b/MatrixUtils.Web/Pages/Tools/MediaLocator.razor
index 20aa639..38c9b71 100644 --- a/MatrixRoomUtils.Web/Pages/Tools/MediaLocator.razor +++ b/MatrixUtils.Web/Pages/Tools/MediaLocator.razor
@@ -1,4 +1,4 @@ -@page "/MediaLocator" +@page "/Tools/MediaLocator" @using LibMatrix.Homeservers @inject HttpClient Http <h3>Media locator</h3> diff --git a/MatrixRoomUtils.Web/Pages/Tools/SpaceDebug.razor b/MatrixUtils.Web/Pages/Tools/SpaceDebug.razor
index 5b4815d..5d9b8eb 100644 --- a/MatrixRoomUtils.Web/Pages/Tools/SpaceDebug.razor +++ b/MatrixUtils.Web/Pages/Tools/SpaceDebug.razor
@@ -1,4 +1,4 @@ -@page "/SpaceDebug" +@page "/Tools/SpaceDebug" @using LibMatrix.Filters @using LibMatrix.Helpers <h3>SpaceDebug</h3> @@ -45,7 +45,7 @@ protected override async Task OnInitializedAsync() { Status = "Getting homeserver..."; - var hs = await MRUStorage.GetCurrentSessionOrNavigate(); + var hs = await RMUStorage.GetCurrentSessionOrNavigate(); if (hs is null) return; var syncHelper = new SyncHelper(hs) { diff --git a/MatrixUtils.Web/Pages/Tools/ToolsIndex.razor b/MatrixUtils.Web/Pages/Tools/ToolsIndex.razor new file mode 100644
index 0000000..f4092d7 --- /dev/null +++ b/MatrixUtils.Web/Pages/Tools/ToolsIndex.razor
@@ -0,0 +1,8 @@ +@page "/Tools" +<h3>Other tools</h3> + +<a href="/Tools/CopyPowerlevel">Copy highest powerlevel across all session</a><br/> +<a href="/Tools/KnownHomeserverList">Find all homeservers you share a room with</a><br/> +<a href="/Tools/MassRoomJoin">Join room across all session</a><br/> +<a href="/Tools/MediaLocator">Locate lost media</a><br/> +<a href="/Tools/SpaceDebug">Debug space relationships</a><br/> diff --git a/MatrixRoomUtils.Web/Pages/User/DMManager.razor b/MatrixUtils.Web/Pages/User/DMManager.razor
index a327793..df5cd6b 100644 --- a/MatrixRoomUtils.Web/Pages/User/DMManager.razor +++ b/MatrixUtils.Web/Pages/User/DMManager.razor
@@ -1,7 +1,7 @@ @page "/User/DirectMessages" @using LibMatrix.EventTypes.Spec.State @using LibMatrix.Responses -@using MatrixRoomUtils.Abstractions +@using MatrixUtils.Abstractions <h3>Direct Messages</h3> <hr/> @@ -28,7 +28,7 @@ } protected override async Task OnInitializedAsync() { - Homeserver = await MRUStorage.GetCurrentSessionOrNavigate(); + Homeserver = await RMUStorage.GetCurrentSessionOrNavigate(); if (Homeserver is null) return; Status = "Loading global profile..."; if (Homeserver.WhoAmI?.UserId is null) return; diff --git a/MatrixRoomUtils.Web/Pages/User/DMSpace.razor b/MatrixUtils.Web/Pages/User/DMSpace.razor
index 21cc264..3751629 100644 --- a/MatrixRoomUtils.Web/Pages/User/DMSpace.razor +++ b/MatrixUtils.Web/Pages/User/DMSpace.razor
@@ -1,9 +1,9 @@ @page "/User/DMSpace/Setup" @using LibMatrix.Homeservers @using LibMatrix -@using MatrixRoomUtils.LibDMSpace -@using MatrixRoomUtils.LibDMSpace.StateEvents -@using MatrixRoomUtils.Web.Pages.User.DMSpaceStages +@using MatrixUtils.LibDMSpace +@using MatrixUtils.LibDMSpace.StateEvents +@using MatrixUtils.Web.Pages.User.DMSpaceStages <h3>DM Space Management</h3> <hr/> <CascadingValue Value="@DmSpace"> @@ -54,7 +54,7 @@ NavigationManager.NavigateTo("/User/DMSpace", true); } DmSpace = this; - Homeserver ??= await MRUStorage.GetCurrentSessionOrNavigate(); + Homeserver ??= await RMUStorage.GetCurrentSessionOrNavigate(); if (Homeserver is null) return; try { DmSpaceConfiguration = await Homeserver.GetAccountDataAsync<DMSpaceConfiguration>("gay.rory.dm_space"); diff --git a/MatrixRoomUtils.Web/Pages/User/DMSpaceStages/DMSpaceStage0.razor b/MatrixUtils.Web/Pages/User/DMSpaceStages/DMSpaceStage0.razor
index 49fd5b4..49fd5b4 100644 --- a/MatrixRoomUtils.Web/Pages/User/DMSpaceStages/DMSpaceStage0.razor +++ b/MatrixUtils.Web/Pages/User/DMSpaceStages/DMSpaceStage0.razor
diff --git a/MatrixRoomUtils.Web/Pages/User/DMSpaceStages/DMSpaceStage1.razor b/MatrixUtils.Web/Pages/User/DMSpaceStages/DMSpaceStage1.razor
index 5958fc5..6131617 100644 --- a/MatrixRoomUtils.Web/Pages/User/DMSpaceStages/DMSpaceStage1.razor +++ b/MatrixUtils.Web/Pages/User/DMSpaceStages/DMSpaceStage1.razor
@@ -2,8 +2,8 @@ @using LibMatrix.RoomTypes @using LibMatrix @using LibMatrix.Responses -@using MatrixRoomUtils.LibDMSpace -@using MatrixRoomUtils.LibDMSpace.StateEvents +@using MatrixUtils.LibDMSpace +@using MatrixUtils.LibDMSpace.StateEvents @using Microsoft.Extensions.Primitives @using ArcaneLibs.Extensions <b> diff --git a/MatrixRoomUtils.Web/Pages/User/DMSpaceStages/DMSpaceStage2.razor b/MatrixUtils.Web/Pages/User/DMSpaceStages/DMSpaceStage2.razor
index 60c68ac..5a53347 100644 --- a/MatrixRoomUtils.Web/Pages/User/DMSpaceStages/DMSpaceStage2.razor +++ b/MatrixUtils.Web/Pages/User/DMSpaceStages/DMSpaceStage2.razor
@@ -3,11 +3,11 @@ @using LibMatrix @using LibMatrix.EventTypes.Spec.State @using LibMatrix.Responses -@using MatrixRoomUtils.LibDMSpace -@using MatrixRoomUtils.LibDMSpace.StateEvents +@using MatrixUtils.LibDMSpace +@using MatrixUtils.LibDMSpace.StateEvents @using ArcaneLibs.Extensions @using System.Text.Json.Serialization -@using MatrixRoomUtils.Abstractions +@using MatrixUtils.Abstractions <b> <u>DM Space setup tool - stage 2: Fix DM room attribution</u> </b> diff --git a/MatrixRoomUtils.Web/Pages/User/DMSpaceStages/DMSpaceStage3.razor b/MatrixUtils.Web/Pages/User/DMSpaceStages/DMSpaceStage3.razor
index 42573e6..9307f6a 100644 --- a/MatrixRoomUtils.Web/Pages/User/DMSpaceStages/DMSpaceStage3.razor +++ b/MatrixUtils.Web/Pages/User/DMSpaceStages/DMSpaceStage3.razor
@@ -3,11 +3,11 @@ @using LibMatrix @using LibMatrix.EventTypes.Spec.State @using LibMatrix.Responses -@using MatrixRoomUtils.LibDMSpace -@using MatrixRoomUtils.LibDMSpace.StateEvents +@using MatrixUtils.LibDMSpace +@using MatrixUtils.LibDMSpace.StateEvents @using ArcaneLibs.Extensions @using System.Text.Json.Serialization -@using MatrixRoomUtils.Abstractions +@using MatrixUtils.Abstractions <b> <u>DM Space setup tool - stage 3: Preview space layout</u> diff --git a/MatrixRoomUtils.Web/Pages/User/Profile.razor b/MatrixUtils.Web/Pages/User/Profile.razor
index 73d7c6e..8cffaab 100644 --- a/MatrixRoomUtils.Web/Pages/User/Profile.razor +++ b/MatrixUtils.Web/Pages/User/Profile.razor
@@ -67,7 +67,7 @@ private Dictionary<string, string> RoomNames { get; set; } = new(); protected override async Task OnInitializedAsync() { - Homeserver = await MRUStorage.GetCurrentSessionOrNavigate(); + Homeserver = await RMUStorage.GetCurrentSessionOrNavigate(); if (Homeserver is null) return; Status = "Loading global profile..."; if (Homeserver.WhoAmI?.UserId is null) return;