From c5c3c3506ec10e373d5c0ebb15146e4ed4e36df5 Mon Sep 17 00:00:00 2001 From: TheArcaneBrony Date: Tue, 17 Oct 2023 17:11:49 +0200 Subject: Add profile management page --- MatrixRoomUtils.Web/Pages/Index.razor | 12 ++--- MatrixRoomUtils.Web/Pages/Rooms/Create.razor | 12 ++--- MatrixRoomUtils.Web/Pages/Rooms/Index.razor | 16 +++++-- MatrixRoomUtils.Web/Pages/Rooms/PolicyList.razor | 2 +- MatrixRoomUtils.Web/Pages/Rooms/Space.razor | 8 ++-- MatrixRoomUtils.Web/Pages/Rooms/StateEditor.razor | 1 + MatrixRoomUtils.Web/Pages/Rooms/StateViewer.razor | 1 + MatrixRoomUtils.Web/Pages/SpaceDebug.razor | 25 ++++++----- MatrixRoomUtils.Web/Pages/User/Manage.razor | 55 +++++++++++++++++++++++ 9 files changed, 101 insertions(+), 31 deletions(-) create mode 100644 MatrixRoomUtils.Web/Pages/User/Manage.razor (limited to 'MatrixRoomUtils.Web/Pages') diff --git a/MatrixRoomUtils.Web/Pages/Index.razor b/MatrixRoomUtils.Web/Pages/Index.razor index 845bbb9..834c373 100644 --- a/MatrixRoomUtils.Web/Pages/Index.razor +++ b/MatrixRoomUtils.Web/Pages/Index.razor @@ -36,7 +36,7 @@ Small collection of tools to do not-so-everyday things.

- Manage + Manage Remove Log out

@@ -72,10 +72,7 @@ Small collection of tools to do not-so-everyday things. var profile = await hs.GetProfileAsync(hs.WhoAmI.UserId); userInfo.DisplayName = profile.DisplayName ?? hs.WhoAmI.UserId; Console.WriteLine(profile.ToJson()); - userInfo.AvatarUrl = await hsResolver.ResolveMediaUri(hs.FullHomeServerDomain, - profile.AvatarUrl - ?? "https://api.dicebear.com/6.x/identicon/svg?seed=" + hs.WhoAmI.UserId - ); + userInfo.AvatarUrl = string.IsNullOrWhiteSpace(profile.AvatarUrl) ? "https://api.dicebear.com/6.x/identicon/svg?seed=" + hs.WhoAmI.UserId : hs.ResolveMediaUri(profile.AvatarUrl); userInfo.RoomCount = (await roomCountTask).Count; _users.Add(token, userInfo); // StateHasChanged(); @@ -116,4 +113,9 @@ Small collection of tools to do not-so-everyday things. await MRUStorage.SetCurrentToken(auth); await OnInitializedAsync(); } + + private async Task ManageUser(UserAuth auth) { + await SwitchSession(auth); + NavigationManager.NavigateTo("/User/Manage"); + } } diff --git a/MatrixRoomUtils.Web/Pages/Rooms/Create.razor b/MatrixRoomUtils.Web/Pages/Rooms/Create.razor index 5202c40..3225862 100644 --- a/MatrixRoomUtils.Web/Pages/Rooms/Create.razor +++ b/MatrixRoomUtils.Web/Pages/Rooms/Create.razor @@ -90,7 +90,7 @@ Room icon: - +

@@ -135,7 +135,7 @@ } else {
- @((creationEvent["m.room.server_acls"].TypedContent as ServerACLEventContent).Allow.Count) allow rules + @((creationEvent["m.room.server_acls"].TypedContent as RoomServerACLEventContent).Allow.Count) allow rules @* *@
} @@ -145,7 +145,7 @@ } else {
- @((creationEvent["m.room.server_acls"].TypedContent as ServerACLEventContent).Deny.Count) deny rules + @((creationEvent["m.room.server_acls"].TypedContent as RoomServerACLEventContent).Deny.Count) deny rules @* *@
} @@ -255,9 +255,9 @@ private MatrixException? _matrixException { get; set; } - private HistoryVisibilityEventContent? historyVisibility => creationEvent?["m.room.history_visibility"].TypedContent as HistoryVisibilityEventContent; - private GuestAccessEventContent? guestAccessEvent => creationEvent?["m.room.guest_access"].TypedContent as GuestAccessEventContent; - private ServerACLEventContent? serverAcl => creationEvent?["m.room.server_acls"].TypedContent as ServerACLEventContent; + private RoomHistoryVisibilityEventContent? historyVisibility => creationEvent?["m.room.history_visibility"].TypedContent as RoomHistoryVisibilityEventContent; + private RoomGuestAccessEventContent? guestAccessEvent => creationEvent?["m.room.guest_access"].TypedContent as RoomGuestAccessEventContent; + private RoomServerACLEventContent? serverAcl => creationEvent?["m.room.server_acls"].TypedContent as RoomServerACLEventContent; private RoomAvatarEventContent? roomAvatarEvent => creationEvent?["m.room.avatar"].TypedContent as RoomAvatarEventContent; protected override async Task OnInitializedAsync() { diff --git a/MatrixRoomUtils.Web/Pages/Rooms/Index.razor b/MatrixRoomUtils.Web/Pages/Rooms/Index.razor index 99e8cbb..69a0ede 100644 --- a/MatrixRoomUtils.Web/Pages/Rooms/Index.razor +++ b/MatrixRoomUtils.Web/Pages/Rooms/Index.razor @@ -3,6 +3,7 @@ @using LibMatrix.Helpers @using LibMatrix.Responses @using LibMatrix.EventTypes.Spec.State +@using LibMatrix

Room list

@Status

@@ -58,10 +59,14 @@ GlobalProfile = await hs.GetProfileAsync(hs.WhoAmI.UserId); Status = "Syncing..."; - SyncResult? sync = null; + var syncHelper = new SyncHelper(hs) { + Timeout = 0, + Filter = filter + }; + // SyncResponse? sync = null; string? nextBatch = null; - while (sync is null or { Rooms.Join.Count: >= 1}) { - sync = await hs.SyncHelper.Sync(since: nextBatch, filter: filter, timeout: 0); + var syncs = syncHelper.EnumerateSyncAsync(); + await foreach (var sync in syncs) { nextBatch = sync?.NextBatch ?? nextBatch; if (sync is null) continue; Console.WriteLine($"Got sync, next batch: {nextBatch}!"); @@ -86,7 +91,12 @@ Status = $"Got {Rooms.Count} rooms so far! Next batch: {nextBatch}"; StateHasChanged(); await Task.Delay(100); + if (!syncHelper.IsInitialSync) break; } + // while (sync is null or { Rooms.Join.Count: >= 1}) { + // sync = await syncHelper.SyncAsync(since: nextBatch, filter: filter, timeout: 0); + + // } Console.WriteLine("Sync done!"); Status = "Sync complete!"; foreach (var roomInfo in Rooms) { diff --git a/MatrixRoomUtils.Web/Pages/Rooms/PolicyList.razor b/MatrixRoomUtils.Web/Pages/Rooms/PolicyList.razor index e6f436e..15220da 100644 --- a/MatrixRoomUtils.Web/Pages/Rooms/PolicyList.razor +++ b/MatrixRoomUtils.Web/Pages/Rooms/PolicyList.razor @@ -235,7 +235,7 @@ else { var server = servers.ContainsKey(hs) ? servers[hs] : new RemoteHomeServer(userId.Split(':')[1]); if (!servers.ContainsKey(hs)) servers.Add(hs, server); var profile = await server.GetProfileAsync(userId); - avatars.Add(userId, await hsResolver.ResolveMediaUri(server.FullHomeServerDomain, profile.AvatarUrl)); + avatars.Add(userId, await hsResolver.ResolveMediaUri(server.BaseUrl, profile.AvatarUrl)); servers.Add(userId, server); StateHasChanged(); } diff --git a/MatrixRoomUtils.Web/Pages/Rooms/Space.razor b/MatrixRoomUtils.Web/Pages/Rooms/Space.razor index 9474b21..d0236e2 100644 --- a/MatrixRoomUtils.Web/Pages/Rooms/Space.razor +++ b/MatrixRoomUtils.Web/Pages/Rooms/Space.razor @@ -3,6 +3,7 @@ @using LibMatrix.Responses @using LibMatrix.RoomTypes @using ArcaneLibs.Extensions +@using LibMatrix

Room manager - Viewing Space

@@ -93,10 +94,9 @@ // await base.OnInitializedAsync(); } - private Task JoinAllRooms() { - List tasks = Rooms.Select(room => room.JoinAsync(ServersInSpace.ToArray())).ToList(); - Task.WaitAll(tasks.ToArray()); - return Task.CompletedTask; + private async Task JoinAllRooms() { + List> tasks = Rooms.Select(room => room.JoinAsync(ServersInSpace.ToArray())).ToList(); + await Task.WhenAll(tasks); } } diff --git a/MatrixRoomUtils.Web/Pages/Rooms/StateEditor.razor b/MatrixRoomUtils.Web/Pages/Rooms/StateEditor.razor index f7a6106..e47ba11 100644 --- a/MatrixRoomUtils.Web/Pages/Rooms/StateEditor.razor +++ b/MatrixRoomUtils.Web/Pages/Rooms/StateEditor.razor @@ -2,6 +2,7 @@ @using LibMatrix.Extensions @using LibMatrix.Responses @using ArcaneLibs.Extensions +@using LibMatrix @inject ILocalStorageService LocalStorage @inject NavigationManager NavigationManager

Room state editor - Editing @RoomId

diff --git a/MatrixRoomUtils.Web/Pages/Rooms/StateViewer.razor b/MatrixRoomUtils.Web/Pages/Rooms/StateViewer.razor index 6e8fe2f..e9c5da1 100644 --- a/MatrixRoomUtils.Web/Pages/Rooms/StateViewer.razor +++ b/MatrixRoomUtils.Web/Pages/Rooms/StateViewer.razor @@ -2,6 +2,7 @@ @using LibMatrix.Extensions @using LibMatrix.Responses @using ArcaneLibs.Extensions +@using LibMatrix @inject ILocalStorageService LocalStorage @inject NavigationManager NavigationManager

Room state viewer - Viewing @RoomId

diff --git a/MatrixRoomUtils.Web/Pages/SpaceDebug.razor b/MatrixRoomUtils.Web/Pages/SpaceDebug.razor index 1ad6276..b07ba84 100644 --- a/MatrixRoomUtils.Web/Pages/SpaceDebug.razor +++ b/MatrixRoomUtils.Web/Pages/SpaceDebug.razor @@ -1,6 +1,7 @@ @page "/SpaceDebug" @using LibMatrix.RoomTypes @using LibMatrix.Filters +@using LibMatrix.Helpers

SpaceDebug

@@ -48,10 +49,8 @@ var hs = await MRUStorage.GetCurrentSessionOrNavigate(); if (hs is null) return; - Status = "Syncing..."; - string nextBatch = null; - while (nextBatch != "end") { - var sync = await hs.SyncHelper.Sync(since: nextBatch, filter: new SyncFilter() { + var syncHelper = new SyncHelper(hs) { + Filter = new SyncFilter() { Presence = new(0), Room = new() { AccountData = new(limit: 0), @@ -60,8 +59,13 @@ Timeline = new(limit: 0) }, AccountData = new(limit: 0) - }); + } + }; + + Status = "Syncing..."; + var syncs = syncHelper.EnumerateSyncAsync(); + await foreach (var sync in syncs) { if (sync is null) { Status = "Sync failed"; continue; @@ -69,23 +73,20 @@ if (sync.Rooms is null) { Status = "No rooms in sync..."; - nextBatch = "end"; - continue; + break; } if (sync.Rooms.Join is null) { Status = "No joined rooms in sync..."; - nextBatch = "end"; - continue; + break; } if (sync.Rooms.Join.Count == 0) { Status = "Joined rooms list was empty..."; - nextBatch = "end"; - continue; + break; } - nextBatch = sync.NextBatch; + // nextBatch = sync.NextBatch; foreach (var (roomId, data) in sync.Rooms!.Join!) { data.State?.Events?.ForEach(e => { if (e.Type == "m.space.child") { diff --git a/MatrixRoomUtils.Web/Pages/User/Manage.razor b/MatrixRoomUtils.Web/Pages/User/Manage.razor new file mode 100644 index 0000000..281cbfc --- /dev/null +++ b/MatrixRoomUtils.Web/Pages/User/Manage.razor @@ -0,0 +1,55 @@ +@page "/User/Manage" +@using LibMatrix.Homeservers +@using LibMatrix.EventTypes.Spec.State +@using ArcaneLibs.Extensions +

Manage user - @HomeServer?.WhoAmI?.UserId

+
+ +@if (Profile is not null) { +

Profile

+
+ + +
+ Display name:
+ Avatar URL: +
+ Update profile + Update profile (restore room overrides) +
+ @if (Busy) { +
Busy processing profile update, please do not leave this page...
+ } +} + +@code { + + private AuthenticatedHomeserverGeneric? HomeServer { get; set; } + private ProfileResponseEventContent? Profile { get; set; } + private bool Busy { get; set; } = false; + + protected override async Task OnInitializedAsync() { + HomeServer = await MRUStorage.GetCurrentSessionOrNavigate(); + if (HomeServer is null) return; + if (HomeServer.WhoAmI?.UserId is not null) + Profile = (await HomeServer.GetProfileAsync(HomeServer.WhoAmI.UserId)).DeepClone(); + + await base.OnInitializedAsync(); + } + + private async Task AvatarChanged(InputFileChangeEventArgs arg) { + var res = await HomeServer.UploadFile(arg.File.Name, arg.File.OpenReadStream(), arg.File.ContentType); + Console.WriteLine(res); + Profile.AvatarUrl = res; + StateHasChanged(); + } + + private async Task UpdateProfile(bool restoreRoomProfiles = false) { + Busy = true; + StateHasChanged(); + await HomeServer.UpdateProfileAsync(Profile, restoreRoomProfiles); + Busy = false; + StateHasChanged(); + } + +} \ No newline at end of file -- cgit 1.5.1