From fdadc41c618af7c2b9a86a8568a22ad2cbe939d7 Mon Sep 17 00:00:00 2001 From: pancakes Date: Wed, 18 Dec 2024 18:41:13 +1000 Subject: [PATCH] [backend/federation] Include alt text for avatar and banner in UserRenderer --- Iceshrimp.Backend/Core/Extensions/QueryableExtensions.cs | 4 +++- Iceshrimp.Backend/Core/Federation/ActivityPub/UserRenderer.cs | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Iceshrimp.Backend/Core/Extensions/QueryableExtensions.cs b/Iceshrimp.Backend/Core/Extensions/QueryableExtensions.cs index 3a251739..3dd9707d 100644 --- a/Iceshrimp.Backend/Core/Extensions/QueryableExtensions.cs +++ b/Iceshrimp.Backend/Core/Extensions/QueryableExtensions.cs @@ -714,7 +714,9 @@ public static class QueryableExtensions public static IQueryable IncludeCommonProperties(this IQueryable query) { - return query.Include(p => p.UserProfile); + return query.Include(p => p.UserProfile) + .Include(p => p.Avatar) + .Include(p => p.Banner); } public static IQueryable IncludeCommonProperties(this IQueryable query) diff --git a/Iceshrimp.Backend/Core/Federation/ActivityPub/UserRenderer.cs b/Iceshrimp.Backend/Core/Federation/ActivityPub/UserRenderer.cs index 0237bea9..938fcaf9 100644 --- a/Iceshrimp.Backend/Core/Federation/ActivityPub/UserRenderer.cs +++ b/Iceshrimp.Backend/Core/Federation/ActivityPub/UserRenderer.cs @@ -111,10 +111,10 @@ public class UserRenderer( MovedTo = user.MovedToUri is not null ? new ASLink(user.MovedToUri) : null, Featured = new ASOrderedCollection($"{id}/collections/featured"), Avatar = user.Avatar != null - ? new ASImage { Url = new ASLink(user.Avatar.RawAccessUrl) } + ? new ASImage { Url = new ASLink(user.Avatar.RawAccessUrl), Description = user.Avatar?.Comment } : null, Banner = user.Banner != null - ? new ASImage { Url = new ASLink(user.Banner.RawAccessUrl) } + ? new ASImage { Url = new ASLink(user.Banner.RawAccessUrl), Description = user.Banner?.Comment } : null, Endpoints = new ASEndpoints { SharedInbox = new ASObjectBase($"https://{config.Value.WebDomain}/inbox") }, PublicKey = new ASPublicKey