From ca2b64a7ad5670b6d3469c033c632296d704e029 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Sat, 15 Mar 2025 01:21:13 +0100 Subject: [PATCH] [backend/razor] Add rel=alternate links to UserPreview and NotePreview --- .../Components/PublicPreview/Renderers/NoteRenderer.cs | 1 + .../Components/PublicPreview/Renderers/UserRenderer.cs | 1 + .../Components/PublicPreview/Schemas/PreviewNote.cs | 1 + .../Components/PublicPreview/Schemas/PreviewUser.cs | 1 + Iceshrimp.Backend/Pages/NotePreview.razor | 1 + Iceshrimp.Backend/Pages/UserPreview.razor | 1 + 6 files changed, 6 insertions(+) diff --git a/Iceshrimp.Backend/Components/PublicPreview/Renderers/NoteRenderer.cs b/Iceshrimp.Backend/Components/PublicPreview/Renderers/NoteRenderer.cs index e4d1728e..f4abc3c2 100644 --- a/Iceshrimp.Backend/Components/PublicPreview/Renderers/NoteRenderer.cs +++ b/Iceshrimp.Backend/Components/PublicPreview/Renderers/NoteRenderer.cs @@ -48,6 +48,7 @@ public class NoteRenderer( Text = renderedText?.Html, Cw = note.Cw, RawText = note.Text, + Uri = note.Uri ?? note.GetPublicUri(instance.Value), QuoteUrl = note.Renote?.Url ?? note.Renote?.Uri ?? note.Renote?.GetPublicUriOrNull(instance.Value), QuoteInaccessible = note.Renote?.VisibilityIsPublicOrHome == false, Attachments = attachments[note.Id]?.Where(p => !inlineMediaUrls.Contains(p.Url)).ToList(), diff --git a/Iceshrimp.Backend/Components/PublicPreview/Renderers/UserRenderer.cs b/Iceshrimp.Backend/Components/PublicPreview/Renderers/UserRenderer.cs index 37131731..1aa5a9f5 100644 --- a/Iceshrimp.Backend/Components/PublicPreview/Renderers/UserRenderer.cs +++ b/Iceshrimp.Backend/Components/PublicPreview/Renderers/UserRenderer.cs @@ -32,6 +32,7 @@ public class UserRenderer( Id = user.Id, Username = user.Username, Host = user.Host ?? instance.Value.AccountDomain, + Uri = user.GetUriOrPublicUri(instance.Value), Url = user.UserProfile?.Url ?? user.Uri ?? user.PublicUrlPath, AvatarUrl = user.GetAvatarUrl(instance.Value), BannerUrl = user.GetBannerUrl(instance.Value), diff --git a/Iceshrimp.Backend/Components/PublicPreview/Schemas/PreviewNote.cs b/Iceshrimp.Backend/Components/PublicPreview/Schemas/PreviewNote.cs index c688756d..a84fe87c 100644 --- a/Iceshrimp.Backend/Components/PublicPreview/Schemas/PreviewNote.cs +++ b/Iceshrimp.Backend/Components/PublicPreview/Schemas/PreviewNote.cs @@ -8,6 +8,7 @@ public class PreviewNote public required string? RawText; public required MarkupString? Text; public required string? Cw; + public required string? Uri; public required string? QuoteUrl; public required bool QuoteInaccessible; public required List? Attachments; diff --git a/Iceshrimp.Backend/Components/PublicPreview/Schemas/PreviewUser.cs b/Iceshrimp.Backend/Components/PublicPreview/Schemas/PreviewUser.cs index 84c1171d..68157c21 100644 --- a/Iceshrimp.Backend/Components/PublicPreview/Schemas/PreviewUser.cs +++ b/Iceshrimp.Backend/Components/PublicPreview/Schemas/PreviewUser.cs @@ -11,6 +11,7 @@ public class PreviewUser public required string Username; public required string Host; public required string Url; + public required string Uri; public required string AvatarUrl; public required string? BannerUrl; public required string? MovedToUri; diff --git a/Iceshrimp.Backend/Pages/NotePreview.razor b/Iceshrimp.Backend/Pages/NotePreview.razor index 7f39dade..f09986cf 100644 --- a/Iceshrimp.Backend/Pages/NotePreview.razor +++ b/Iceshrimp.Backend/Pages/NotePreview.razor @@ -127,6 +127,7 @@ else + diff --git a/Iceshrimp.Backend/Pages/UserPreview.razor b/Iceshrimp.Backend/Pages/UserPreview.razor index f6706bdb..9a464157 100644 --- a/Iceshrimp.Backend/Pages/UserPreview.razor +++ b/Iceshrimp.Backend/Pages/UserPreview.razor @@ -42,6 +42,7 @@ else } + } \ No newline at end of file