notfire/Iceshrimp.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[frontend/components] Fix new descendants not showing up in single note view.

Browse source
This commit is contained in:
Lilian 2025-02-04 19:45:55 +01:00
parent 60f100385d
commit e1e78a1052
No known key found for this signature in database
6 changed files with 69 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
Iceshrimp.Frontend/Components/Compose.razor
View file

@ -2,6 +2,7 @@
@using Iceshrimp.Frontend.Components.Note
@using Iceshrimp.Frontend.Core.Miscellaneous
@using Iceshrimp.Frontend.Core.Services
@using Iceshrimp.Frontend.Core.Services.NoteStore
@using Iceshrimp.Frontend.Localization
@using Iceshrimp.MfmSharp
@using Iceshrimp.Shared.Schemas.Web
@ -16,6 +17,7 @@
@inject GlobalComponentSvc GlobalComponentSvc
@inject MessageService MessageService
@inject SettingsService Settings;
@inject NoteActions NoteActions;
<dialog @onkeydown="HandleKeyDown" class="dialog" @ref="Dialog">
<div class="compose">
<div class="header">
@ -23,7 +25,8 @@
<Icon Name="Icons.X"/>
</button>
<Dropdown TBind="NoteVisibility" Elements="@DropDownCreate()" @bind-Value="NoteDraft.Visibility"/>
<StateButton OnClick="SendNote" @ref="SendButton" ExtraClasses="post-btn" AriaLabel="post" Disabled="@(NoteLength - ((NoteDraft.Cw?.Length ?? 0) + NoteDraft.Text.Length) < 0)">
<StateButton OnClick="SendNote" @ref="SendButton" ExtraClasses="post-btn" AriaLabel="post"
Disabled="@(NoteLength - ((NoteDraft.Cw?.Length ?? 0) + NoteDraft.Text.Length) < 0)">
<Initial>
@Loc["ComposeNote"]<Icon Name="Icons.PaperPlaneRight"/>
</Initial>
@ -50,7 +53,8 @@
aria-label="content warning"/>
<hr class="separator"/>
}
<textarea @ref="Textarea" @bind="NoteDraft.Text" @bind:event="oninput" class="textarea" placeholder="@TextPlaceholder" rows="5"
<textarea @ref="Textarea" @bind="NoteDraft.Text" @bind:event="oninput" class="textarea"
placeholder="@TextPlaceholder" rows="5"
cols="35" autofocus="autofocus" aria-label="note text"></textarea>
<div class="footer">
<div class="buttons">
@ -69,7 +73,8 @@
</button>
</div>
<div class="buttons">
<span title="@Loc["Character limit"]" aria-label="character limit">@(NoteLength - ((NoteDraft.Cw?.Length ?? 0) + NoteDraft.Text.Length))</span>
<span title="@Loc["Character limit"]"
aria-label="character limit">@(NoteLength - ((NoteDraft.Cw?.Length ?? 0) + NoteDraft.Text.Length))</span>
<button class="btn" title="@Loc["Preview"]" @onclick="() => Preview = !Preview"
aria-label="preview">
<Icon Name="Icons.Binoculars" Size="1.3rem"></Icon>
@ -116,16 +121,11 @@
Cw = null
};
private Dictionary<string, string> AvailablePlaceholders { get; set; } = new()
{
{ "default", "What's on your mind?" },
{ "reply", "Reply goes here!" },
{ "quote", "Quote this post!" }
};
private Dictionary<string, string> AvailablePlaceholders { get; set; } = new() { { "default", "What's on your mind?" }, { "reply", "Reply goes here!" }, { "quote", "Quote this post!" } };
private async Task HandleKeyDown(KeyboardEventArgs e)
{
if (e is { Code: "Enter", CtrlKey: true } or {Code: "Enter", MetaKey: true})
if (e is { Code: "Enter", CtrlKey: true } or { Code: "Enter", MetaKey: true })
{
await SendNote();
}
@ -162,9 +162,7 @@
new DropdownElement<NoteVisibility>
{
#pragma warning disable BL0005 // Setting this outside the component is fine until this is reworked
Icon = DropdownIcon(vis),
Content = DropdownContent(vis),
Selection = vis
Icon = DropdownIcon(vis), Content = DropdownContent(vis), Selection = vis
#pragma warning restore BL0005
})
.ToList();
@ -257,14 +255,9 @@
private async Task ResetState()
{
var settings = await Settings.GetUserSettingsAsync();
ReplyOrQuote = null;
Attachments = new List<DriveFileResponse>();
NoteDraft = new NoteCreateRequest
{
Text = "",
Visibility = settings.DefaultNoteVisibility,
Cw = null
};
ReplyOrQuote = null;
Attachments = new List<DriveFileResponse>();
NoteDraft = new NoteCreateRequest { Text = "", Visibility = settings.DefaultNoteVisibility, Cw = null };
TextPlaceholder = AvailablePlaceholders["default"];
}
@ -295,8 +288,7 @@
if (ReplyOrQuote != null)
{
var res = await ApiService.Notes.GetNoteAsync(ReplyOrQuote.Id);
if (res != null) _ = MessageService.UpdateNoteAsync(res);
await NoteActions.RefetchNoteAsync(ReplyOrQuote);
}
SendButton.State = StateButton.StateEnum.Success;
@ -324,10 +316,10 @@
_module = await Js.InvokeAsync<IJSObjectReference>("import",
"./Components/Compose.razor.js");
EmojiList = await EmojiService.GetEmojiAsync();
var instance = await MetadataService.Instance.Value;
NoteLength = instance.Limits.NoteLength;
ComposeService.ComposeDialog = this;
}
}

17
Iceshrimp.Frontend/Components/RecursiveNote.razor
View file

@ -1,10 +1,12 @@
@* ReSharper disable once RedundantUsingDirective *@
@using Iceshrimp.Frontend.Components.Note
@using Iceshrimp.Frontend.Core.Services
@using Iceshrimp.Frontend.Core.Services.NoteStore
@using Iceshrimp.Shared.Schemas.Web
@inject NavigationManager NavigationManager
@inject MessageService MessageService
@inject ApiService Api
@inject RelatedStore Store
@implements IDisposable
@if (_hidden == false)
@ -69,12 +71,11 @@
[Parameter] [EditorRequired] public required int Depth { get; set; }
[Parameter] [EditorRequired] public required int MaxDepth { get; set; }
private bool _indented = false;
private IDisposable _noteChangedHandler = null!;
private bool _hidden = false;
protected override void OnInitialized()
{
_noteChangedHandler = MessageService.Register(Note.Id, OnNoteChanged, MessageService.Type.Updated);
Store.NoteChanged += OnNoteChanged;
if (Depth > 0 || Note.Descendants?.Count > 0)
{
_indented = true;
@ -90,15 +91,19 @@
private void OnNoteChanged(object? _, NoteResponse note)
{
var __ = Refresh();
if (note.Id == Note.Id)
{
var __ = Refresh();
}
}
private async Task Refresh()
{
if (Depth < MaxDepth)
{
var res = await Api.Notes.GetNoteDescendantsAsync(Note.Id, MaxDepth - Depth);
Note.Descendants = res;
var res = await Store.GetDescendantsAsync(Note.Id, MaxDepth - Depth, true);
if (res == null) return;
Note.Descendants = res.Select(p => p.Value).ToList();
StateHasChanged();
}
}
@ -110,6 +115,6 @@
public void Dispose()
{
_noteChangedHandler.Dispose();
Store.NoteChanged -= OnNoteChanged;
}
}

14
Iceshrimp.Frontend/Core/Services/NoteStore/NoteActions.cs
View file

@ -15,6 +15,20 @@ internal class NoteActions(
stateSynchronizer.Broadcast(note);
}
public async Task RefetchNoteAsync(NoteBase note)
{
try
{
var res = await api.Notes.GetNoteAsync(note.Id);
if (res == null) return;
Broadcast(res);
}
catch (ApiException e)
{
logger.LogError(e, "Failed to fetch note.");
}
}
public async Task ToggleLikeAsync(NoteBase note)
{
if (note.Liked)

12
Iceshrimp.Frontend/Core/Services/NoteStore/RelatedStore.cs
View file

@ -36,7 +36,6 @@ internal class RelatedStore : NoteMessageProvider, IDisposable
note.Attachments = noteResponse.Attachments;
note.Reactions = noteResponse.Reactions;
// container.Value.Notes[noteResponse.Id] = note;
NoteChangedHandlers.First(p => p.Key == note.Id).Value.Invoke(this, note);
NoteChanged?.Invoke(this, note);
}
@ -64,7 +63,8 @@ internal class RelatedStore : NoteMessageProvider, IDisposable
input.Replies = updated.Replies;
input.Attachments = updated.Attachments;
input.Reactions = updated.Reactions;
NoteChangedHandlers.First(p => p.Key == input.Id).Value.Invoke(this, input);
var handler = NoteChangedHandlers.FirstOrDefault(p => p.Key == input.Id);
handler.Value?.Invoke(this, input);
NoteChanged?.Invoke(this, input);
}
@ -82,10 +82,14 @@ internal class RelatedStore : NoteMessageProvider, IDisposable
return await FetchAscendantsAsync(id, limit);
}
public async Task<SortedList<string, NoteResponse>?> GetDescendantsAsync(string id, int? limit)
public async Task<SortedList<string, NoteResponse>?> GetDescendantsAsync(
string id, int? limit, bool refresh = false
)
{
if (refresh) return await FetchDescendantsAsync(id, limit);
var success = Descendants.TryGetValue(id, out var value);
if (success) return value?.Notes ?? throw new InvalidOperationException("Key somehow had no associated value.");
if (success)
return value?.Notes ?? throw new InvalidOperationException("Key somehow had no associated value.");
return await FetchDescendantsAsync(id, limit);
}

3
Iceshrimp.Frontend/Core/Services/NoteStore/TimelineStore.cs
View file

@ -57,7 +57,8 @@ internal class TimelineStore : NoteMessageProvider, IAsyncDisposable, IStreaming
note.Attachments = changedNote.Attachments;
note.Reactions = changedNote.Reactions;
NoteChangedHandlers.First(p => p.Key == note.Id).Value.Invoke(this, note);
var handler = NoteChangedHandlers.FirstOrDefault(p => p.Key == note.Id);
handler.Value?.Invoke(this, note);
}
}
}

18
Iceshrimp.Frontend/Pages/SingleNote.razor
View file

@ -218,6 +218,7 @@
{
_locationChangingHandlerDisposable = Navigation.RegisterLocationChangingHandler(LocationChangeHandler);
StateSynchronizer.NoteDeleted += OnNoteDeleted;
NoteStore.AnyNoteChanged += OnNoteChanged;
}
private void OnNoteDeleted(object? _, NoteBase note)
@ -235,6 +236,20 @@
StateHasChanged();
}
private void OnNoteChanged(object? _, NoteResponse note)
{
if (note.Id == NoteId)
{
var __ = Refresh();
}
}
private async Task Refresh()
{
if (NoteId != null) Descendants = await RelatedStore.GetDescendantsAsync(NoteId, _depth, true);
StateHasChanged();
}
// ReSharper disable once InconsistentNaming
private ValueTask LocationChangeHandler(LocationChangingContext arg)
{
@ -322,5 +337,6 @@
SaveState();
_locationChangingHandlerDisposable?.Dispose();
StateSynchronizer.NoteDeleted -= OnNoteDeleted;
NoteStore.AnyNoteChanged -= OnNoteChanged;
}
}
}