From 03313562d21d5db9bf6a14ebbeab80e06c883d3a Mon Sep 17 00:00:00 2001 From: Rory& Date: Wed, 24 Jan 2024 02:31:56 +0100 Subject: MRU->RMU, fixes, cleanup --- MatrixRoomUtils.Web/Shared/EditablePre.razor | 19 -- MatrixRoomUtils.Web/Shared/InlineUserItem.razor | 71 -------- MatrixRoomUtils.Web/Shared/LogView.razor | 41 ----- MatrixRoomUtils.Web/Shared/MainLayout.razor | 20 --- MatrixRoomUtils.Web/Shared/MainLayout.razor.css | 81 --------- MatrixRoomUtils.Web/Shared/MxcImage.razor | 53 ------ MatrixRoomUtils.Web/Shared/NavMenu.razor | 101 ----------- MatrixRoomUtils.Web/Shared/NavMenu.razor.css | 68 ------- .../PolicyEditorComponents/PolicyEditorModal.razor | 92 ---------- MatrixRoomUtils.Web/Shared/RoomList.razor | 97 ---------- MatrixRoomUtils.Web/Shared/RoomList.razor.css | 8 - .../RoomListComponents/RoomListCategory.razor | 63 ------- .../RoomListComponents/RoomListPolicyRoom.razor | 13 -- .../Shared/RoomListComponents/RoomListSpace.razor | 60 ------- MatrixRoomUtils.Web/Shared/RoomListItem.razor | 196 --------------------- MatrixRoomUtils.Web/Shared/RoomListItem.razor.css | 48 ----- .../TimelineComponents/BaseTimelineItem.razor | 33 ---- .../TimelineCanonicalAliasItem.razor | 27 --- .../TimelineHistoryVisibilityItem.razor | 27 --- .../TimelineComponents/TimelineMemberItem.razor | 53 ------ .../TimelineComponents/TimelineMessageItem.razor | 34 ---- .../TimelineRoomCreateItem.razor | 18 -- .../TimelineComponents/TimelineRoomNameItem.razor | 27 --- .../TimelineComponents/TimelineRoomTopicItem.razor | 37 ---- .../TimelineComponents/TimelineUnknownItem.razor | 16 -- MatrixRoomUtils.Web/Shared/UserListItem.razor | 44 ----- 26 files changed, 1347 deletions(-) delete mode 100644 MatrixRoomUtils.Web/Shared/EditablePre.razor delete mode 100644 MatrixRoomUtils.Web/Shared/InlineUserItem.razor delete mode 100644 MatrixRoomUtils.Web/Shared/LogView.razor delete mode 100644 MatrixRoomUtils.Web/Shared/MainLayout.razor delete mode 100644 MatrixRoomUtils.Web/Shared/MainLayout.razor.css delete mode 100644 MatrixRoomUtils.Web/Shared/MxcImage.razor delete mode 100644 MatrixRoomUtils.Web/Shared/NavMenu.razor delete mode 100644 MatrixRoomUtils.Web/Shared/NavMenu.razor.css delete mode 100644 MatrixRoomUtils.Web/Shared/PolicyEditorComponents/PolicyEditorModal.razor delete mode 100644 MatrixRoomUtils.Web/Shared/RoomList.razor delete mode 100644 MatrixRoomUtils.Web/Shared/RoomList.razor.css delete mode 100644 MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListCategory.razor delete mode 100644 MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListPolicyRoom.razor delete mode 100644 MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListSpace.razor delete mode 100644 MatrixRoomUtils.Web/Shared/RoomListItem.razor delete mode 100644 MatrixRoomUtils.Web/Shared/RoomListItem.razor.css delete mode 100644 MatrixRoomUtils.Web/Shared/TimelineComponents/BaseTimelineItem.razor delete mode 100644 MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineCanonicalAliasItem.razor delete mode 100644 MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineHistoryVisibilityItem.razor delete mode 100644 MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMemberItem.razor delete mode 100644 MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMessageItem.razor delete mode 100644 MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineRoomCreateItem.razor delete mode 100644 MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineRoomNameItem.razor delete mode 100644 MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineRoomTopicItem.razor delete mode 100644 MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineUnknownItem.razor delete mode 100644 MatrixRoomUtils.Web/Shared/UserListItem.razor (limited to 'MatrixRoomUtils.Web/Shared') diff --git a/MatrixRoomUtils.Web/Shared/EditablePre.razor b/MatrixRoomUtils.Web/Shared/EditablePre.razor deleted file mode 100644 index acb477c..0000000 --- a/MatrixRoomUtils.Web/Shared/EditablePre.razor +++ /dev/null @@ -1,19 +0,0 @@ -@inherits InputBase -
@CurrentValue
- -@code { - - protected override bool TryParseValueFromString(string? value, out string result, out string? validationErrorMessage) { - result = value; - validationErrorMessage = null; - return true; - } - - public object Id { get; set; } - - private Task Callback() { - Console.WriteLine("beep"); - return Task.CompletedTask; - } - -} \ No newline at end of file diff --git a/MatrixRoomUtils.Web/Shared/InlineUserItem.razor b/MatrixRoomUtils.Web/Shared/InlineUserItem.razor deleted file mode 100644 index dc58210..0000000 --- a/MatrixRoomUtils.Web/Shared/InlineUserItem.razor +++ /dev/null @@ -1,71 +0,0 @@ -@using LibMatrix -@using LibMatrix.EventTypes.Spec.State -@using LibMatrix.Helpers -@using LibMatrix.Homeservers -@using LibMatrix.Responses -
- - @ProfileName - -
- @if (ChildContent is not null) { - @ChildContent - } -
- -
- -@code { - - [Parameter] - public RenderFragment? ChildContent { get; set; } - - [Parameter] - public UserProfileResponse? User { get; set; } - - [Parameter] - public RoomMemberEventContent? MemberEvent { get; set; } - - [Parameter] - public string? UserId { get; set; } - - [Parameter] - public string? ProfileAvatar { get; set; } = null; - - [Parameter] - public string? ProfileName { get; set; } = null; - - [Parameter] - public AuthenticatedHomeserverGeneric? Homeserver { get; set; } - - private static SemaphoreSlim _semaphoreSlim = new(128); - - protected override async Task OnInitializedAsync() { - await base.OnInitializedAsync(); - Homeserver ??= await MRUStorage.GetCurrentSessionOrNavigate(); - if(Homeserver is null) return; - - await _semaphoreSlim.WaitAsync(); - - if (User == null && UserId == null && MemberEvent != null) - throw new ArgumentNullException(nameof(UserId)); - - if (MemberEvent != null) { - User = new UserProfileResponse { - AvatarUrl = MemberEvent.AvatarUrl, - DisplayName = MemberEvent.DisplayName - }; - } - - if (User is null && UserId is not null) { - User ??= await Homeserver.GetProfileAsync(UserId); - } - - - ProfileAvatar ??= Homeserver.ResolveMediaUri(User.AvatarUrl); - ProfileName ??= User.DisplayName; - - _semaphoreSlim.Release(); - } - -} diff --git a/MatrixRoomUtils.Web/Shared/LogView.razor b/MatrixRoomUtils.Web/Shared/LogView.razor deleted file mode 100644 index d541b82..0000000 --- a/MatrixRoomUtils.Web/Shared/LogView.razor +++ /dev/null @@ -1,41 +0,0 @@ -@* @using System.Text *@ -@* @if (LocalStorageWrapper.Settings.DeveloperSettings.EnableLogViewers) { *@ -@* Logs *@ -@*
*@ -@* 
 *@
-@*         @_stringBuilder *@
-@*
*@ -@* } *@ -@* *@ -@* @code { *@ -@* StringBuilder _stringBuilder = new(); *@ -@* *@ -@* protected override async Task OnInitializedAsync() { *@ -@* if (!LocalStorageWrapper.Settings.DeveloperSettings.EnableConsoleLogging) { *@ -@* Console.WriteLine("Console logging disabled!"); *@ -@* var _sw = new StringWriter(); *@ -@* Console.SetOut(_sw); *@ -@* Console.SetError(_sw); *@ -@* return; *@ -@* } *@ -@* if (!LocalStorageWrapper.Settings.DeveloperSettings.EnableLogViewers) return; *@ -@* //intecept stdout with textwriter to get logs *@ -@* var sw = new StringWriter(_stringBuilder); *@ -@* Console.SetOut(sw); *@ -@* Console.SetError(sw); *@ -@* //keep updated *@ -@* var length = 0; *@ -@* Task.Run(async () => { *@ -@* while (true) { *@ -@* await Task.Delay(100); *@ -@* if (_stringBuilder.Length != length) { *@ -@* StateHasChanged(); *@ -@* length = _stringBuilder.Length; *@ -@* } *@ -@* } *@ -@* // ReSharper disable once FunctionNeverReturns - This is intentional behavior *@ -@* }); *@ -@* await base.OnInitializedAsync(); *@ -@* } *@ -@* *@ -@* } *@ \ No newline at end of file diff --git a/MatrixRoomUtils.Web/Shared/MainLayout.razor b/MatrixRoomUtils.Web/Shared/MainLayout.razor deleted file mode 100644 index 2322af1..0000000 --- a/MatrixRoomUtils.Web/Shared/MainLayout.razor +++ /dev/null @@ -1,20 +0,0 @@ -@using System.Net -@inherits LayoutComponentBase - -
-
- -
- -
-
- - Git - Matrix -
- -
- @Body -
-
-
\ No newline at end of file diff --git a/MatrixRoomUtils.Web/Shared/MainLayout.razor.css b/MatrixRoomUtils.Web/Shared/MainLayout.razor.css deleted file mode 100644 index 01a5066..0000000 --- a/MatrixRoomUtils.Web/Shared/MainLayout.razor.css +++ /dev/null @@ -1,81 +0,0 @@ -.page { - position: relative; - display: flex; - flex-direction: column; -} - -main { - flex: 1; -} - -.sidebar { - background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%); -} - -.top-row { - background-color: #f7f7f7; - border-bottom: 1px solid #d6d5d5; - justify-content: flex-end; - height: 3.5rem; - display: flex; - align-items: center; -} - -.top-row ::deep a, .top-row ::deep .btn-link { - white-space: nowrap; - margin-left: 1.5rem; - text-decoration: none; -} - -.top-row ::deep a:hover, .top-row ::deep .btn-link:hover { - text-decoration: underline; -} - -.top-row ::deep a:first-child { - overflow: hidden; - text-overflow: ellipsis; -} - -@media (max-width: 640.98px) { - .top-row:not(.auth) { - display: none; - } - - .top-row.auth { - justify-content: space-between; - } - - .top-row ::deep a, .top-row ::deep .btn-link { - margin-left: 0; - } -} - -@media (min-width: 641px) { - .page { - flex-direction: row; - } - - .sidebar { - width: 250px; - height: 100vh; - position: sticky; - top: 0; - } - - .top-row { - position: sticky; - top: 0; - z-index: 1; - } - - .top-row.auth ::deep a:first-child { - flex: 1; - text-align: right; - width: 0; - } - - .top-row, article { - padding-left: 2rem !important; - padding-right: 1.5rem !important; - } -} diff --git a/MatrixRoomUtils.Web/Shared/MxcImage.razor b/MatrixRoomUtils.Web/Shared/MxcImage.razor deleted file mode 100644 index fb8c248..0000000 --- a/MatrixRoomUtils.Web/Shared/MxcImage.razor +++ /dev/null @@ -1,53 +0,0 @@ - -@code { - private string _mxcUri; - private string _style; - private string _resolvedUri; - - [Parameter] - public string MxcUri { - get => _mxcUri ?? ""; - set { - Console.WriteLine($"New MXC uri: {value}"); - _mxcUri = value; - UriHasChanged(value); - } - } - - //mxcuri binding - - - [Parameter] - public string Style { - get => _style; - set { - _style = value; - StateHasChanged(); - } - } - [Parameter] - public RemoteHomeserver? Homeserver { get; set; } - - private string ResolvedUri { - get => _resolvedUri; - set { - _resolvedUri = value; - StateHasChanged(); - } - } - - private async Task UriHasChanged(string value) { - var uri = value[5..].Split('/'); - Console.WriteLine($"UriHasChanged: {value} {uri[0]}"); - if (Homeserver is null) { - Console.WriteLine($"Homeserver is null, creating new remotehomeserver for {uri[0]}"); - Homeserver = await hsProvider.GetRemoteHomeserver(uri[0]); - } - ResolvedUri = Homeserver.ResolveMediaUri(value); - Console.WriteLine($"ResolvedUri: {ResolvedUri}"); - } - - [Parameter] - public string Class { get; set; } - -} \ No newline at end of file diff --git a/MatrixRoomUtils.Web/Shared/NavMenu.razor b/MatrixRoomUtils.Web/Shared/NavMenu.razor deleted file mode 100644 index f232940..0000000 --- a/MatrixRoomUtils.Web/Shared/NavMenu.razor +++ /dev/null @@ -1,101 +0,0 @@ -
-
- Rory&::MatrixRoomUtils - -
-
- -
- -
- -@code { - private bool collapseNavMenu = true; - - private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null; - - private void ToggleNavMenu() => collapseNavMenu = !collapseNavMenu; - -} \ No newline at end of file diff --git a/MatrixRoomUtils.Web/Shared/NavMenu.razor.css b/MatrixRoomUtils.Web/Shared/NavMenu.razor.css deleted file mode 100644 index 447f2df..0000000 --- a/MatrixRoomUtils.Web/Shared/NavMenu.razor.css +++ /dev/null @@ -1,68 +0,0 @@ -.navbar-toggler { - background-color: rgba(255, 255, 255, 0.1); -} - -.top-row { - height: 3.5rem; - background-color: rgba(0, 0, 0, 0.4); -} - -.navbar-brand { - font-size: 1.1rem; -} - -.oi { - width: 2rem; - font-size: 1.1rem; - vertical-align: text-top; - top: -2px; -} - -.nav-item { - font-size: 0.9rem; - padding-bottom: 0.5rem; -} - -.nav-item:first-of-type { - padding-top: 1rem; -} - -.nav-item:last-of-type { - padding-bottom: 1rem; -} - -.nav-item ::deep a { - color: #d7d7d7; - border-radius: 4px; - height: 3rem; - display: flex; - align-items: center; - line-height: 3rem; -} - -.nav-item ::deep a.active { - background-color: rgba(255, 255, 255, 0.25); - color: white; -} - -.nav-item ::deep a:hover { - background-color: rgba(255, 255, 255, 0.1); - color: white; -} - -@media (min-width: 641px) { - .navbar-toggler { - display: none; - } - - .collapse { - /* Never collapse the sidebar for wide screens */ - display: block; - } - - .nav-scrollable { - /* Allow sidebar to scroll for tall menus */ - height: calc(100vh - 3.5rem); - overflow-y: auto; - } -} diff --git a/MatrixRoomUtils.Web/Shared/PolicyEditorComponents/PolicyEditorModal.razor b/MatrixRoomUtils.Web/Shared/PolicyEditorComponents/PolicyEditorModal.razor deleted file mode 100644 index 4fd151d..0000000 --- a/MatrixRoomUtils.Web/Shared/PolicyEditorComponents/PolicyEditorModal.razor +++ /dev/null @@ -1,92 +0,0 @@ -@using LibMatrix.EventTypes.Spec.State.Policy -@using System.Reflection -@using ArcaneLibs.Attributes -@using ArcaneLibs.Extensions -@using LibMatrix -@using System.Collections.Frozen -@using LibMatrix.EventTypes - - @{ - var policyData = (PolicyEvent.TypedContent as PolicyRuleEventContent)!; - } - @if (string.IsNullOrWhiteSpace(PolicyEvent.EventId)) { - Policy type: - - } - - - @{ - // enumerate all properties with friendly name - var props = PolicyEvent.MappedType.GetProperties(BindingFlags.Public | BindingFlags.Instance) - .Where(x => (x.GetFriendlyNameOrNull() ?? x.GetJsonPropertyNameOrNull()) is not null) - .Where(x => x.GetCustomAttribute() is null) - .ToFrozenSet(); - var propNames = props.Select(x => x.GetFriendlyNameOrNull() ?? x.GetJsonPropertyName()!).ToFrozenSet(); - } - - - - - - - - - @foreach (var prop in props) { - - - @{ - var getter = prop.GetGetMethod(); - var setter = prop.GetSetMethod(); - } - @switch (Nullable.GetUnderlyingType(prop.PropertyType) ?? prop.PropertyType) { - case Type t when t == typeof(string): - {e}"); setter?.Invoke(policyData, [e]); StateHasChanged(); })"> - break; - default: -

Unsupported type: @prop.PropertyType

- break; - } - - } - -
PropertyValue
- @prop.GetFriendlyName() - @if (Nullable.GetUnderlyingType(prop.PropertyType) is not null) { - * - } -
-
- 
-        @PolicyEvent.ToJson(true, false)
-
- Cancel - Save - @* Target entity: *@ - @*
*@ - @* Reason: *@ - @* *@ - - -@code { - - [Parameter] - public StateEventResponse? PolicyEvent { get; set; } - - [Parameter] - public required Action OnClose { get; set; } - - [Parameter] - public required Action OnSave { get; set; } - - private static FrozenSet KnownPolicyTypes = StateEvent.KnownStateEventTypes.Where(x => x.IsAssignableTo(typeof(PolicyRuleEventContent))).ToFrozenSet(); - - private static Dictionary PolicyTypes = KnownPolicyTypes - .ToDictionary(x => x.GetCustomAttributes().First(y => !string.IsNullOrWhiteSpace(y.EventName)).EventName, x => x); - -} \ No newline at end of file diff --git a/MatrixRoomUtils.Web/Shared/RoomList.razor b/MatrixRoomUtils.Web/Shared/RoomList.razor deleted file mode 100644 index 31f0430..0000000 --- a/MatrixRoomUtils.Web/Shared/RoomList.razor +++ /dev/null @@ -1,97 +0,0 @@ -@using MatrixRoomUtils.Web.Shared.RoomListComponents; -@using LibMatrix -@using LibMatrix.Extensions -@using ArcaneLibs.Extensions -@using LibMatrix.EventTypes.Spec.State -@using System.Collections.ObjectModel -@using LibMatrix.Responses -@using MatrixRoomUtils.Abstractions -@using _Imports = MatrixRoomUtils.Web._Imports -@if (!StillFetching) { -

Fetching room details... @RoomsWithTypes.Sum(x => x.Value.Count) out of @Rooms.Count done!

- @foreach (var category in RoomsWithTypes.OrderBy(x => x.Value.Count)) { -

@category.Key (@category.Value.Count)

- } -} -else { - @foreach (var category in RoomsWithTypes.OrderBy(x => x.Value.Count)) { - - } -} - -@code { - - [Parameter] - public ObservableCollection Rooms { get; set; } - - [Parameter] - public UserProfileResponse? GlobalProfile { get; set; } - - [Parameter] - public bool StillFetching { get; set; } = true; - - [Parameter] - public EventCallback StillFetchingChanged { get; set; } - - private Dictionary> RoomsWithTypes => Rooms is null ? new() : Rooms.GroupBy(x => GetRoomTypeName(x.CreationEventContent?.Type)).ToDictionary(x => x.Key, x => x.ToList()); - - private bool hooked; - protected override async Task OnParametersSetAsync() { - var hs = await MRUStorage.GetCurrentSessionOrNavigate(); - if (hs is null) return; - if (!hooked) { - Rooms.CollectionChanged += (_, args) => { - foreach (RoomInfo item in args.NewItems) { - item.PropertyChanged += (_, args2) => { - // Console.WriteLine(args2); - - if (args2.PropertyName == nameof(item.CreationEventContent)) - StateHasChanged(); - }; - } - }; - hooked = true; - } - - // GlobalProfile ??= await hs.GetProfileAsync(hs.WhoAmI.UserId); - - await base.OnParametersSetAsync(); - } - - private string GetRoomTypeName(string? roomType) => roomType switch { - null => "Room", - "m.space" => "Space", - "msc3588.stories.stories-room" => "Story room", - "support.feline.policy.lists.msc.v1" => "MSC3784 Policy list (v1)", - _ => roomType - }; - - // private static SemaphoreSlim _semaphoreSlim = new(8, 8); - - // private async Task ProcessRoom(RoomInfo room) { - // await _semaphoreSlim.WaitAsync(); - // string roomType; - // try { - // var createEvent = (await room.GetStateEvent("m.room.create")).TypedContent as RoomCreateEventContent; - // roomType = GetRoomTypeName(createEvent.Type); - // - // if (roomType == "Room") { - // var mjolnirData = await room.GetStateEvent("org.matrix.mjolnir.shortcode"); - // if (mjolnirData?.RawContent?.ToJson(ignoreNull: true) is not null and not "{}") - // roomType = "Legacy policy room"; - // } - // } - // catch (MatrixException e) { - // roomType = $"Error: {e.ErrorCode}"; - // } - // - // // if (!RoomsWithTypes.ContainsKey(roomType)) { - // // RoomsWithTypes.Add(roomType, new List()); - // // } - // // RoomsWithTypes[roomType].Add(room); - // - // StateHasChanged(); - // _semaphoreSlim.Release(); - // } - -} \ No newline at end of file diff --git a/MatrixRoomUtils.Web/Shared/RoomList.razor.css b/MatrixRoomUtils.Web/Shared/RoomList.razor.css deleted file mode 100644 index a159305..0000000 --- a/MatrixRoomUtils.Web/Shared/RoomList.razor.css +++ /dev/null @@ -1,8 +0,0 @@ -.room-list-item { - background-color: #ffffff11; - border-radius: 0.5em; - display: block; - margin-top: 4px; - padding: 4px; - width: fit-content; -} \ No newline at end of file diff --git a/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListCategory.razor b/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListCategory.razor deleted file mode 100644 index 4db25e1..0000000 --- a/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListCategory.razor +++ /dev/null @@ -1,63 +0,0 @@ -@using MatrixRoomUtils.Web.Classes.Constants -@using LibMatrix -@using LibMatrix.EventTypes.Spec.State -@using LibMatrix.Homeservers -@using LibMatrix.Responses -@using MatrixRoomUtils.Abstractions -
- @RoomType (@Rooms.Count) - @foreach (var room in Rooms) { -
- - @* @if (RoomVersionDangerLevel(room) != 0 && *@ - @* (room.StateEvents.FirstOrDefault(x=>x.Type == "m.room.power_levels")?.TypedContent is RoomPowerLevelEventContent powerLevels && powerLevels.UserHasPermission(Homeserver.UserId, "m.room.tombstone"))) { *@ - @* Upgrade room *@ - @* } *@ - View timeline - View state - Edit state - - @if (room.CreationEventContent?.Type == "m.space") { - - } - else if (room.CreationEventContent?.Type == "support.feline.policy.lists.msc.v1" || RoomType == "org.matrix.mjolnir.policy") { - Manage policies - } -
- } -
-
- -@code { - - [Parameter] - public KeyValuePair> Category { get; set; } - - [Parameter] - public UserProfileResponse? GlobalProfile { get; set; } - - [CascadingParameter] - public AuthenticatedHomeserverGeneric Homeserver { get; set; } = null!; - - private string RoomType => Category.Key; - private List Rooms => Category.Value; - - private int RoomVersionDangerLevel(RoomInfo room) { - var creationEvent = room.StateEvents.FirstOrDefault(x => x?.Type == "m.room.create"); - if (creationEvent is null) return 0; - return creationEvent.TypedContent is not RoomCreateEventContent roomVersionContent ? 0 - : RoomConstants.DangerousRoomVersions.Contains(roomVersionContent.RoomVersion) ? 2 - : roomVersionContent.RoomVersion != RoomConstants.RecommendedRoomVersion ? 1 : 0; - } - - public static string GetRoomTypeName(string roomType) { - return roomType switch { - null => "Room", - "m.space" => "Space", - "org.matrix.mjolnir.policy" => "Policy room", - - _ => roomType - }; - } - -} diff --git a/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListPolicyRoom.razor b/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListPolicyRoom.razor deleted file mode 100644 index 7afdc8c..0000000 --- a/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListPolicyRoom.razor +++ /dev/null @@ -1,13 +0,0 @@ -@using LibMatrix.RoomTypes -Manage policies - -@code { - - [Parameter] - public GenericRoom Room { get; set; } - - protected override async Task OnInitializedAsync() { - await base.OnInitializedAsync(); - } - -} diff --git a/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListSpace.razor b/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListSpace.razor deleted file mode 100644 index a6c006b..0000000 --- a/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListSpace.razor +++ /dev/null @@ -1,60 +0,0 @@ -@using System.Collections.ObjectModel -@using MatrixRoomUtils.Abstractions -Manage space - -
-
- @Children.Count children - @if (_shouldRenderChildren) { -

Breadcrumb: @Breadcrumbs

-
- -
- } -
- -@code { - - [Parameter] - public RoomInfo Space { get; set; } - - [Parameter, CascadingParameter] - public List KnownRooms { get; set; } = new(); - - [Parameter, CascadingParameter] - public string? Breadcrumbs { - get => _breadcrumbs + Space.Room.RoomId; - set => _breadcrumbs = value; - } - - private ObservableCollection Children { get; set; } = new(); - - protected override async Task OnInitializedAsync() { - if (Breadcrumbs == null) throw new ArgumentNullException(nameof(Breadcrumbs)); - await Task.Delay(Random.Shared.Next(1000, 10000)); - var rooms = Space.Room.AsSpace.GetChildrenAsync(); - await foreach (var room in rooms) { - if (Breadcrumbs.Contains(room.RoomId)) continue; - var roomInfo = KnownRooms.FirstOrDefault(x => x.Room.RoomId == room.RoomId); - if (roomInfo is null) { - roomInfo = new RoomInfo() { - Room = room - }; - KnownRooms.Add(roomInfo); - } - Children.Add(roomInfo); - } - await base.OnInitializedAsync(); - } - - private bool _shouldRenderChildren = false; - private string? _breadcrumbs; - - private Task SpaceChildrenOpened() { - if (_shouldRenderChildren) return Task.CompletedTask; - _shouldRenderChildren = true; - Console.WriteLine($"[RoomList] Rendering children of {Space.Room.RoomId}"); - return Task.CompletedTask; - } - -} diff --git a/MatrixRoomUtils.Web/Shared/RoomListItem.razor b/MatrixRoomUtils.Web/Shared/RoomListItem.razor deleted file mode 100644 index 07f0756..0000000 --- a/MatrixRoomUtils.Web/Shared/RoomListItem.razor +++ /dev/null @@ -1,196 +0,0 @@ -@using System.Text.Json -@using LibMatrix -@using LibMatrix.EventTypes.Spec.State -@using LibMatrix.Helpers -@using LibMatrix.Homeservers -@using LibMatrix.Responses -@using LibMatrix.RoomTypes -@using MatrixRoomUtils.Abstractions -@using MatrixRoomUtils.Web.Classes.Constants -@if (RoomInfo is not null) { -
- @if (OwnMemberState != null) { - - - @(OwnMemberState?.DisplayName ?? GlobalProfile?.DisplayName ?? "Loading...") - - -> - } - -
- @RoomInfo.RoomName - @if (ChildContent is not null) { - @ChildContent - } -
- -
-} -else { -

Warning: RoomInfo is null!

-} - -@code { - - [Parameter] - public RenderFragment? ChildContent { get; set; } - - [Parameter] - public RoomInfo? RoomInfo { - get => _roomInfo; - set { - _roomInfo = value; - OnParametersSetAsync(); - } - } - - [Parameter] - public bool ShowOwnProfile { get; set; } = false; - - [Parameter] - public RoomMemberEventContent? OwnMemberState { get; set; } - - [CascadingParameter] - public UserProfileResponse? GlobalProfile { get; set; } - - [Parameter] - public bool LoadData { - get => _loadData; - set { - _loadData = value; - OnParametersSetAsync(); - } - } - - private bool HasOldRoomVersion { get; set; } = false; - private bool HasDangerousRoomVersion { get; set; } = false; - - private static SemaphoreSlim _semaphoreSlim = new(8); - private RoomInfo? _roomInfo; - private bool _loadData = false; - private static AuthenticatedHomeserverGeneric? hs { get; set; } - - private bool _hooked; - protected override async Task OnParametersSetAsync() { - if (RoomInfo != null) { - if (!_hooked) { - _hooked = true; - RoomInfo.PropertyChanged += (_, a) => { - Console.WriteLine(a.PropertyName); - StateHasChanged(); - }; - } - - if (LoadData) { - try { - await RoomInfo.GetStateEvent("m.room.create"); - if (ShowOwnProfile) - OwnMemberState ??= (await RoomInfo.GetStateEvent("m.room.member", hs.WhoAmI.UserId)).TypedContent as RoomMemberEventContent; - - await RoomInfo.GetStateEvent("m.room.name"); - await RoomInfo.GetStateEvent("m.room.avatar"); - } - catch (MatrixException e) { - if (e.ErrorCode == "M_FORBIDDEN") { - LoadData = false; - RoomInfo.StateEvents.Add(new() { - Type = "m.room.create", - TypedContent = new RoomCreateEventContent() { RoomVersion = "0" }, - RoomId = null, Sender = null, EventId = null //TODO: implement - }); - RoomInfo.StateEvents.Add(new() { - Type = "m.room.name", - TypedContent = new RoomNameEventContent() { - Name = "M_FORBIDDEN: Are you a member of this room? " + RoomInfo.Room.RoomId - }, - RoomId = null, Sender = null, EventId = null //TODO: implement - }); - } - } - } - } - - await base.OnParametersSetAsync(); - } - - protected override async Task OnInitializedAsync() { - await base.OnInitializedAsync(); - - await _semaphoreSlim.WaitAsync(); - - hs ??= await MRUStorage.GetCurrentSessionOrNavigate(); - if (hs is null) return; - - try { - await CheckRoomVersion(); - // await GetRoomInfo(); - // await LoadOwnProfile(); - } - catch (MatrixException e) { - if (e is not { ErrorCode: "M_FORBIDDEN" }) { - throw; - } - // RoomName = "Error: " + e.Message; - // RoomIcon = "/blobfox_outage.gif"; - } - catch (Exception e) { - Console.WriteLine($"Failed to load room info for {RoomInfo.Room.RoomId}: {e.Message}"); - } - _semaphoreSlim.Release(); - } - - private async Task LoadOwnProfile() { - if (!ShowOwnProfile) return; - try { - // OwnMemberState ??= (await RoomInfo.GetStateEvent("m.room.member", hs.UserId)).TypedContent as RoomMemberEventContent; - GlobalProfile ??= await hs.GetProfileAsync(hs.UserId); - } - catch (MatrixException e) { - if (e is { ErrorCode: "M_FORBIDDEN" }) { - Console.WriteLine($"Failed to get profile for {hs.UserId}: {e.Message}"); - ShowOwnProfile = false; - } - else { - throw; - } - } - } - - private async Task CheckRoomVersion() { - while (RoomInfo?.CreationEventContent is null) { - Console.WriteLine($"Room creation event content for {RoomInfo.Room.RoomId} is null..."); - await Task.Delay(Random.Shared.Next(1000, 2500)); - } - var ce = RoomInfo.CreationEventContent; - if (int.TryParse(ce.RoomVersion, out var rv)) { - if (rv < 10) - HasOldRoomVersion = true; - } - else // treat unstable room versions as dangerous - HasDangerousRoomVersion = true; - - if (RoomConstants.DangerousRoomVersions.Contains(ce.RoomVersion)) { - HasDangerousRoomVersion = true; - // RoomName = "Dangerous room: " + RoomName; - } - } - - // private async Task GetRoomInfo() { - // try { - // RoomName ??= ((await RoomInfo.GetStateEvent("m.room.name"))?.TypedContent as RoomNameEventContent)?.Name ?? RoomId; - // - // var state = (await RoomInfo.GetStateEvent("m.room.avatar")).TypedContent as RoomAvatarEventContent; - // if (state?.Url is { } url) { - // RoomIcon = await hsResolver.ResolveMediaUri(hs.ServerName, url); - // // Console.WriteLine($"Got avatar for room {RoomId}: {roomIcon} ({url})"); - // } - // } - // catch (MatrixException e) { - // if (e is not { ErrorCode: "M_FORBIDDEN" }) { - // throw; - // } - // } - // } - -} \ No newline at end of file diff --git a/MatrixRoomUtils.Web/Shared/RoomListItem.razor.css b/MatrixRoomUtils.Web/Shared/RoomListItem.razor.css deleted file mode 100644 index 13de656..0000000 --- a/MatrixRoomUtils.Web/Shared/RoomListItem.razor.css +++ /dev/null @@ -1,48 +0,0 @@ -.roomListItem { - background-color: #ffffff11; - border-radius: 25px; - margin: 8px; - width: fit-Content; -} - -.roomListItem.dangerousRoomVersion { - border: red 4px solid; -} - -.roomListItem.oldRoomVersion { - border: #FF0 1px solid; -} - -.avatar32 { - width: 32px; - height: 32px; - border-radius: 50%; -} - -.avatar32.vcenter { - vertical-align: baseline; -} - -.highlightChange { - background-color: red; - border-color: red; - border-width: 3px; - border-style: dashed; -} - -.inlineBlock { - display: inline-block; -} - -.centerVertical { - vertical-align: middle; - padding-right: 8px; -} - -.noLeftPadding { - padding-left: 0px; -} - -.border75 { - border-radius: 75px; -} \ No newline at end of file diff --git a/MatrixRoomUtils.Web/Shared/TimelineComponents/BaseTimelineItem.razor b/MatrixRoomUtils.Web/Shared/TimelineComponents/BaseTimelineItem.razor deleted file mode 100644 index 8d608e3..0000000 --- a/MatrixRoomUtils.Web/Shared/TimelineComponents/BaseTimelineItem.razor +++ /dev/null @@ -1,33 +0,0 @@ -@using LibMatrix -@using LibMatrix.EventTypes.Spec.State -@using LibMatrix.Homeservers -@using LibMatrix.Responses -

BaseTimelineItem

- -@code { - - [Parameter] - public StateEventResponse Event { get; set; } - - [Parameter] - public List Events { get; set; } - - [Parameter] - public AuthenticatedHomeserverGeneric Homeserver { get; set; } - - public List EventsBefore => Events.TakeWhile(e => e.EventId != Event.EventId).ToList(); - - public List MatchingEventsBefore => EventsBefore.Where(x => x.Type == Event.Type && x.StateKey == Event.StateKey).ToList(); - - public StateEventResponse? PreviousState => MatchingEventsBefore.LastOrDefault(); - - public RoomMemberEventContent? CurrentSenderMemberEventContent => EventsBefore.LastOrDefault(x => x.Type == "m.room.member" && x.StateKey == Event.Sender)? - .TypedContent as RoomMemberEventContent; - - public UserProfileResponse CurrentSenderProfile => new() { DisplayName = CurrentSenderMemberEventContent?.DisplayName, AvatarUrl = CurrentSenderMemberEventContent?.AvatarUrl }; - - public bool HasPreviousMessage => EventsBefore.Last() is { Type: "m.room.message" } response && response.Sender == Event.Sender; - - - -} \ No newline at end of file diff --git a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineCanonicalAliasItem.razor b/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineCanonicalAliasItem.razor deleted file mode 100644 index 1213432..0000000 --- a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineCanonicalAliasItem.razor +++ /dev/null @@ -1,27 +0,0 @@ -@using ArcaneLibs.Extensions -@using LibMatrix.EventTypes.Spec.State -@using LibMatrix.Responses -@inherits BaseTimelineItem - -@if (currentEventContent is not null) { - @if (previousEventContent is null) { - set the room alias to "@currentEventContent.Alias" - } - else { - changed the room name from "@previousEventContent.Alias" to "@currentEventContent.Alias" - } -} -else { -
- Unknown event @Event.Type (@Event.StateKey) - 
-            @Event.ToJson()
-
-
-} - -@code { - private RoomCanonicalAliasEventContent? previousEventContent => PreviousState?.TypedContent as RoomCanonicalAliasEventContent; - - private RoomCanonicalAliasEventContent? currentEventContent => Event.TypedContent as RoomCanonicalAliasEventContent; -} \ No newline at end of file diff --git a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineHistoryVisibilityItem.razor b/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineHistoryVisibilityItem.razor deleted file mode 100644 index 172a38c..0000000 --- a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineHistoryVisibilityItem.razor +++ /dev/null @@ -1,27 +0,0 @@ -@using ArcaneLibs.Extensions -@using LibMatrix.EventTypes.Spec.State -@using LibMatrix.Responses -@inherits BaseTimelineItem - -@if (currentEventContent is not null) { - @if (previousEventContent is null) { - set the history visibility to "@currentEventContent.HistoryVisibility" - } - else { - changed the history visibility from "@previousEventContent.HistoryVisibility" to "@currentEventContent.HistoryVisibility" - } -} -else { -
- Unknown event @Event.Type (@Event.StateKey) - 
-            @Event.ToJson()
-
-
-} - -@code { - private RoomHistoryVisibilityEventContent? previousEventContent => PreviousState?.TypedContent as RoomHistoryVisibilityEventContent; - - private RoomHistoryVisibilityEventContent? currentEventContent => Event.TypedContent as RoomHistoryVisibilityEventContent; -} \ No newline at end of file diff --git a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMemberItem.razor b/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMemberItem.razor deleted file mode 100644 index 3b18b95..0000000 --- a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMemberItem.razor +++ /dev/null @@ -1,53 +0,0 @@ -@using ArcaneLibs.Extensions -@using LibMatrix.EventTypes.Spec.State -@using LibMatrix.Responses -@inherits BaseTimelineItem - -@if (roomMemberData is not null) { - @switch (roomMemberData.Membership) { - case "ban": - @Event.StateKey was banned - break; - case "invite": - @Event.StateKey was invited - break; - case "join" when Event.ReplacesState is not null: - @Event.StateKey changed their display name to @(roomMemberData.DisplayName ?? Event.Sender) - break; - case "join": - @if (prevRoomMemberData is null) { - joined - } - else { - changed their profile to - } - break; - case "leave": - @Event.StateKey left - break; - case "knock": - @Event.StateKey knocked - break; - default: - @Event.StateKey has an unknown state: - 
-                @Event.ToJson()
-
- break; - } -} -else { -
- Unknown membership event for @Event.StateKey - 
-            @Event.ToJson()
-
-
-} - -@code { - - private RoomMemberEventContent? roomMemberData => Event.TypedContent as RoomMemberEventContent; - private RoomMemberEventContent? prevRoomMemberData => PreviousState?.TypedContent as RoomMemberEventContent; - -} diff --git a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMessageItem.razor b/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMessageItem.razor deleted file mode 100644 index 81956b0..0000000 --- a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMessageItem.razor +++ /dev/null @@ -1,34 +0,0 @@ -@using ArcaneLibs.Extensions -@using LibMatrix.EventTypes.Spec -@inherits BaseTimelineItem - - - @if (!HasPreviousMessage) { - :
- } - @switch (currentEventContent.MessageType) { - case "m.text": { - @foreach (var line in currentEventContent.Body.Split('\n')) { - @line
- } - break; - } - case "m.image": { - @currentEventContent.Body
- - break; - } - default: { - 
-               @Event.RawContent?.ToJson(indent: false)
-
- break; - } - } - - -@code { - private RoomMessageEventContent? previousEventContent => PreviousState?.TypedContent as RoomMessageEventContent; - - private RoomMessageEventContent? currentEventContent => Event.TypedContent as RoomMessageEventContent; -} \ No newline at end of file diff --git a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineRoomCreateItem.razor b/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineRoomCreateItem.razor deleted file mode 100644 index f3e6c7e..0000000 --- a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineRoomCreateItem.razor +++ /dev/null @@ -1,18 +0,0 @@ -@using ArcaneLibs.Extensions -@using LibMatrix.EventTypes.Spec.State -@inherits BaseTimelineItem - - - @Event.Sender created the room with room version @CreationEventContent.RoomVersion - @(CreationEventContent.Federate ?? true ? "and" : "without") federating with other servers.
- This room is of type @(CreationEventContent.Type ?? "Untyped room (usually a chat room)") - -
-    @Event.RawContent?.ToJson(indent: false)
-
- -@code { - - private RoomCreateEventContent CreationEventContent => Event.TypedContent as RoomCreateEventContent; - -} diff --git a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineRoomNameItem.razor b/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineRoomNameItem.razor deleted file mode 100644 index eeec3de..0000000 --- a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineRoomNameItem.razor +++ /dev/null @@ -1,27 +0,0 @@ -@using ArcaneLibs.Extensions -@using LibMatrix.EventTypes.Spec.State -@using LibMatrix.Responses -@inherits BaseTimelineItem - -@if (currentEventContent is not null) { - @if (previousEventContent is null) { - set the room name to "@currentEventContent.Name" - } - else { - changed the room name from "@previousEventContent.Name" to "@currentEventContent.Name" - } -} -else { -
- Unknown event @Event.Type (@Event.StateKey) - 
-            @Event.ToJson()
-
-
-} - -@code { - private RoomNameEventContent? previousEventContent => PreviousState?.TypedContent as RoomNameEventContent; - - private RoomNameEventContent? currentEventContent => Event.TypedContent as RoomNameEventContent; -} \ No newline at end of file diff --git a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineRoomTopicItem.razor b/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineRoomTopicItem.razor deleted file mode 100644 index 7ef17a8..0000000 --- a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineRoomTopicItem.razor +++ /dev/null @@ -1,37 +0,0 @@ -@using ArcaneLibs.Extensions -@using LibMatrix.EventTypes.Spec.State -@using LibMatrix.Responses -@inherits BaseTimelineItem - -@if (currentEventContent is not null) { - @if (previousEventContent is null) { - set the room topic to
- 
-            @currentEventContent.Topic
-
- } - else { - changed the room topic from
- 
-            @previousEventContent.Topic
-

- to
- 
-            @currentEventContent.Topic
-
- } -} -else { -
- Unknown event @Event.Type (@Event.StateKey) - 
-            @Event.ToJson()
-
-
-} - -@code { - private RoomTopicEventContent? previousEventContent => PreviousState?.TypedContent as RoomTopicEventContent; - - private RoomTopicEventContent? currentEventContent => Event.TypedContent as RoomTopicEventContent; -} \ No newline at end of file diff --git a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineUnknownItem.razor b/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineUnknownItem.razor deleted file mode 100644 index 4f05b30..0000000 --- a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineUnknownItem.razor +++ /dev/null @@ -1,16 +0,0 @@ -@using ArcaneLibs.Extensions -@inherits BaseTimelineItem - -
-
- - Unknown event type: 
@Event.Type
 - - 
@Event.ToJson(ignoreNull: true)
-
-
- -@code { - - -} diff --git a/MatrixRoomUtils.Web/Shared/UserListItem.razor b/MatrixRoomUtils.Web/Shared/UserListItem.razor deleted file mode 100644 index 167809e..0000000 --- a/MatrixRoomUtils.Web/Shared/UserListItem.razor +++ /dev/null @@ -1,44 +0,0 @@ -@using LibMatrix.Helpers -@using LibMatrix.EventTypes.Spec.State -@using LibMatrix.Homeservers -@using LibMatrix.Responses -
- - @User?.DisplayName - -
- @if (ChildContent is not null) { - @ChildContent - } -
- -
- -@code { - - [Parameter] - public RenderFragment? ChildContent { get; set; } - - [Parameter] - public UserProfileResponse? User { get; set; } - - [Parameter] - public string UserId { get; set; } - - private AuthenticatedHomeserverGeneric _homeserver = null!; - - protected override async Task OnInitializedAsync() { - _homeserver = await MRUStorage.GetCurrentSessionOrNavigate(); - if (_homeserver is null) return; - - if (User == null) { - if (UserId == null) { - throw new ArgumentNullException(nameof(UserId)); - } - User = await _homeserver.GetProfileAsync(UserId); - } - - await base.OnInitializedAsync(); - } - -} \ No newline at end of file -- cgit 1.5.1