From d8b91f1c5e07a1aa30963977a145ff8ecde10a41 Mon Sep 17 00:00:00 2001 From: TheArcaneBrony Date: Mon, 17 Jul 2023 03:14:38 +0200 Subject: Improve timeline --- .../Pages/RoomManager/RoomManagerTimeline.razor | 54 ---------------------- MatrixRoomUtils.Web/Pages/Rooms/Index.razor | 8 ++-- MatrixRoomUtils.Web/Pages/Rooms/Timeline.razor | 53 +++++++++++++++++++++ 3 files changed, 57 insertions(+), 58 deletions(-) delete mode 100644 MatrixRoomUtils.Web/Pages/RoomManager/RoomManagerTimeline.razor create mode 100644 MatrixRoomUtils.Web/Pages/Rooms/Timeline.razor (limited to 'MatrixRoomUtils.Web/Pages') diff --git a/MatrixRoomUtils.Web/Pages/RoomManager/RoomManagerTimeline.razor b/MatrixRoomUtils.Web/Pages/RoomManager/RoomManagerTimeline.razor deleted file mode 100644 index 3225c15..0000000 --- a/MatrixRoomUtils.Web/Pages/RoomManager/RoomManagerTimeline.razor +++ /dev/null @@ -1,54 +0,0 @@ -@page "/Rooms/{RoomId}/Timeline" -@using MatrixRoomUtils.Web.Shared.TimelineComponents -@using MatrixRoomUtils.Core.Responses -

RoomManagerTimeline

-
-

Loaded @Events.Count events...

- -@foreach (var evt in Events) { -
- -
-} - -@code { - - [Parameter] - public string RoomId { get; set; } - - private List Messages { get; } = new(); - private List Events { get; } = new(); - - protected override async Task OnInitializedAsync() { - Console.WriteLine("RoomId: " + RoomId); - var hs = await MRUStorage.GetCurrentSessionOrNavigate(); - if (hs is null) return; - var room = await hs.GetRoom(RoomId); - MessagesResponse? msgs = null; - do { - msgs = await room.GetMessagesAsync(limit: 250, from: msgs?.End, dir: "b"); - Messages.Add(msgs); - Console.WriteLine($"Got {msgs.Chunk.Count} messages"); - msgs.Chunk.Reverse(); - Events.InsertRange(0, msgs.Chunk); - StateHasChanged(); - } while (msgs.End is not null); - - await base.OnInitializedAsync(); - } - - private StateEventResponse GetProfileEventBefore(StateEventResponse Event) => Events.TakeWhile(x => x != Event).Last(e => e.Type == "m.room.member" && e.StateKey == Event.Sender); - - private Type ComponentType(StateEventResponse Event) => Event.Type switch { - "m.room.message" => typeof(TimelineMessageItem), - "m.room.member" => typeof(TimelineMemberItem), - _ => typeof(TimelineUnknownItem) - }; - - private Dictionary ComponentParameters(Type componentType, StateEventResponse @event) => componentType switch { - not null when componentType == typeof(TimelineMessageItem) => new Dictionary { { "Event", @event }, { "Events", Events } }, - not null when componentType == typeof(TimelineMemberItem) => new Dictionary { { "Event", @event }, { "Events", Events } }, - _ => new Dictionary { { "Event", @event }, { "Events", Events } } - }; - -} \ No newline at end of file diff --git a/MatrixRoomUtils.Web/Pages/Rooms/Index.razor b/MatrixRoomUtils.Web/Pages/Rooms/Index.razor index a70ed9d..816299f 100644 --- a/MatrixRoomUtils.Web/Pages/Rooms/Index.razor +++ b/MatrixRoomUtils.Web/Pages/Rooms/Index.razor @@ -52,7 +52,7 @@ SyncResult? sync = null; string? nextBatch = null; while (sync is null or { Rooms.Join.Count: > 10}) { - sync = await hs.SyncHelper.Sync(since: nextBatch, filter: filter); + sync = await hs.SyncHelper.Sync(since: nextBatch, filter: filter, timeout: 0); nextBatch = sync?.NextBatch ?? nextBatch; if (sync is null) continue; Console.WriteLine($"Got sync, next batch: {nextBatch}!"); @@ -91,7 +91,7 @@ roomInfo.StateEvents.Add(new StateEventResponse() { Type = "m.room.avatar", TypedContent = new RoomAvatarEventData() { - + } }); } @@ -135,7 +135,7 @@ } private bool RenderContents { get; set; } = false; - + private string _status; public string Status { @@ -146,4 +146,4 @@ } } -} \ No newline at end of file +} diff --git a/MatrixRoomUtils.Web/Pages/Rooms/Timeline.razor b/MatrixRoomUtils.Web/Pages/Rooms/Timeline.razor new file mode 100644 index 0000000..2234dd9 --- /dev/null +++ b/MatrixRoomUtils.Web/Pages/Rooms/Timeline.razor @@ -0,0 +1,53 @@ +@page "/Rooms/{RoomId}/Timeline" +@using MatrixRoomUtils.Web.Shared.TimelineComponents +@using MatrixRoomUtils.Core.Responses +@using MatrixRoomUtils.Core.StateEventTypes.Spec +

RoomManagerTimeline

+
+

Loaded @Events.Count events...

+ +@foreach (var evt in Events) { +
+ + +
+} + +@code { + + [Parameter] + public string RoomId { get; set; } + + private List Messages { get; } = new(); + private List Events { get; } = new(); + + private AuthenticatedHomeServer? HomeServer { get; set; } + + protected override async Task OnInitializedAsync() { + Console.WriteLine("RoomId: " + RoomId); + HomeServer = await MRUStorage.GetCurrentSessionOrNavigate(); + if (HomeServer is null) return; + var room = await HomeServer.GetRoom(RoomId); + MessagesResponse? msgs = null; + do { + msgs = await room.GetMessagesAsync(limit: 1000, from: msgs?.End, dir: "b"); + Messages.Add(msgs); + Console.WriteLine($"Got {msgs.Chunk.Count} messages"); + msgs.Chunk.Reverse(); + Events.InsertRange(0, msgs.Chunk); + } while (msgs.End is not null); + + + await base.OnInitializedAsync(); + } + + private StateEventResponse GetProfileEventBefore(StateEventResponse Event) => Events.TakeWhile(x => x != Event).Last(e => e.Type == "m.room.member" && e.StateKey == Event.Sender); + + private Type ComponentType(StateEventResponse Event) => Event.TypedContent switch { + RoomMessageEventData => typeof(TimelineMessageItem), + RoomMemberEventData => typeof(TimelineMemberItem), + _ => typeof(TimelineUnknownItem) + }; + +} -- cgit 1.5.1