From 1204eee4b1cfada1d7ada541e0470e35055a9d36 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Mon, 9 Sep 2024 21:54:12 +0200 Subject: [PATCH] [backend/federation] Improve code quality regarding ASActor.WebfingerAddress --- .../Core/Federation/ActivityPub/UserRenderer.cs | 2 +- .../Core/Federation/ActivityStreams/Types/ASActor.cs | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Iceshrimp.Backend/Core/Federation/ActivityPub/UserRenderer.cs b/Iceshrimp.Backend/Core/Federation/ActivityPub/UserRenderer.cs index f943bbff..1fb7fcdf 100644 --- a/Iceshrimp.Backend/Core/Federation/ActivityPub/UserRenderer.cs +++ b/Iceshrimp.Backend/Core/Federation/ActivityPub/UserRenderer.cs @@ -81,7 +81,7 @@ public class UserRenderer(IOptions config, DatabaseConte SharedInbox = new ASLink($"https://{config.Value.WebDomain}/inbox"), Url = new ASLink(user.GetPublicUrl(config.Value)), Username = user.Username, - WebfingerAddressXsd = user.IsLocalUser ? $"{user.Username}@{config.Value.AccountDomain}" : null, + WebfingerAddress = user.IsLocalUser ? $"{user.Username}@{config.Value.AccountDomain}" : null, DisplayName = user.DisplayName ?? user.Username, Summary = summary, MkSummary = profile?.Description, diff --git a/Iceshrimp.Backend/Core/Federation/ActivityStreams/Types/ASActor.cs b/Iceshrimp.Backend/Core/Federation/ActivityStreams/Types/ASActor.cs index 266a47bd..23637ea6 100644 --- a/Iceshrimp.Backend/Core/Federation/ActivityStreams/Types/ASActor.cs +++ b/Iceshrimp.Backend/Core/Federation/ActivityStreams/Types/ASActor.cs @@ -128,12 +128,16 @@ public class ASActor : ASObject [J("https://purl.archive.org/socialweb/webfinger#webfinger")] [JC(typeof(VC))] - public XsdString? WebfingerAddressXsd { get; set; } + private XsdString? WebfingerAddressXsd { get; set; } [JI] - public string? WebfingerAddress => WebfingerAddressXsd is { } s && !s.ToString()?.StartsWith("acct:") == true - ? "acct:" + WebfingerAddressXsd - : WebfingerAddressXsd?.ToString(); + public string? WebfingerAddress + { + get => WebfingerAddressXsd is { } s && !s.ToString()?.StartsWith("acct:") == true + ? "acct:" + WebfingerAddressXsd + : WebfingerAddressXsd?.ToString(); + set => WebfingerAddressXsd = value; + } [JI] public bool IsBot => Type == $"{Constants.ActivityStreamsNs}#Service";