SolarNetwork/Swarm
2
3
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

✨ Activitypub supports reply and repost

Browse Source
This commit is contained in:
LittleSheep
2026-01-01 13:37:29 +08:00
parent fb15930611
commit 7c5c92a501
5 changed files with 114 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
DysonNetwork.Sphere/ActivityPub/ActivityPubController.cs
View File

@@ -15,7 +15,8 @@ public class ActivityPubController(
ILogger<ActivityPubController> logger,
ActivityPubSignatureService signatureService,
ActivityPubActivityHandler activityHandler,
ActivityPubKeyService keyService
ActivityPubKeyService keyService,
ActivityPubObjectFactory objFactory
) : ControllerBase
{
private string Domain => configuration["ActivityPub:Domain"] ?? "localhost";
@@ -159,7 +160,7 @@ public class ActivityPubController(
var items = posts.Select(post =>
{
var postObject = ActivityPubObjectFactory.CreatePostObject(configuration, post, actorUrl);
var postObject = objFactory.CreatePostObject(post, actorUrl);
postObject["url"] = $"https://{Domain}/posts/{post.Id}";
return new Dictionary<string, object>
{
@@ -167,7 +168,7 @@ public class ActivityPubController(
["type"] = "Create",
["actor"] = actorUrl,
["published"] = (post.PublishedAt ?? post.CreatedAt).ToDateTimeOffset(),
["to"] = ActivityPubObjectFactory.PublicTo,
["to"] = new[] { ActivityPubObjectFactory.PublicTo },
["cc"] = new[] { $"{actorUrl}/followers" },
["@object"] = postObject
};

34
DysonNetwork.Sphere/ActivityPub/ActivityPubDeliveryService.cs
View File

@@ -10,7 +10,8 @@ public class ActivityPubDeliveryService(
ActivityPubQueueService queueService,
IConfiguration configuration,
ILogger<ActivityPubDeliveryService> logger,
IClock clock
IClock clock,
ActivityPubObjectFactory objFactory
)
{
private string Domain => configuration["ActivityPub:Domain"] ?? "localhost";
@@ -53,7 +54,7 @@ public class ActivityPubDeliveryService(
string targetActorUri
)
{
var localActor = await GetLocalActorAsync(publisherId);
var localActor = await objFactory.GetLocalActorAsync(publisherId);
if (localActor == null)
return false;
@@ -106,7 +107,7 @@ public class ActivityPubDeliveryService(
string targetActorUri
)
{
var localActor = await GetLocalActorAsync(publisherId);
var localActor = await objFactory.GetLocalActorAsync(publisherId);
if (localActor == null)
return false;
@@ -151,7 +152,7 @@ public class ActivityPubDeliveryService(
{
if (post.PublisherId == null)
return false;
var localActor = await GetLocalActorAsync(post.PublisherId.Value);
var localActor = await objFactory.GetLocalActorAsync(post.PublisherId.Value);
if (localActor == null)
return false;
@@ -166,9 +167,9 @@ public class ActivityPubDeliveryService(
["type"] = "Create",
["actor"] = actorUrl,
["published"] = (post.PublishedAt ?? post.CreatedAt).ToDateTimeOffset(),
["to"] = ActivityPubObjectFactory.PublicTo,
["to"] = new[] { ActivityPubObjectFactory.PublicTo },
["cc"] = new[] { $"{actorUrl}/followers" },
["object"] = ActivityPubObjectFactory.CreatePostObject(configuration, post, actorUrl)
["object"] = objFactory.CreatePostObject(post, actorUrl)
};
var followers = await GetRemoteFollowersAsync();
@@ -187,7 +188,7 @@ public class ActivityPubDeliveryService(
{
if (post.PublisherId == null)
return false;
var localActor = await GetLocalActorAsync(post.PublisherId.Value);
var localActor = await objFactory.GetLocalActorAsync(post.PublisherId.Value);
if (localActor == null)
return false;
@@ -202,9 +203,9 @@ public class ActivityPubDeliveryService(
["type"] = "Update",
["actor"] = actorUrl,
["published"] = (post.PublishedAt ?? post.CreatedAt).ToDateTimeOffset(),
["to"] = ActivityPubObjectFactory.PublicTo,
["to"] = new[] { ActivityPubObjectFactory.PublicTo },
["cc"] = new[] { $"{actorUrl}/followers" },
["object"] = ActivityPubObjectFactory.CreatePostObject(configuration, post, actorUrl)
["object"] = objFactory.CreatePostObject(post, actorUrl)
};
var followers = await GetRemoteFollowersAsync();
@@ -223,7 +224,7 @@ public class ActivityPubDeliveryService(
{
if (post.PublisherId == null)
return false;
var localActor = await GetLocalActorAsync(post.PublisherId.Value);
var localActor = await objFactory.GetLocalActorAsync(post.PublisherId.Value);
if (localActor == null)
return false;
@@ -499,8 +500,10 @@ public class ActivityPubDeliveryService(
stats.TotalDeliveries = deliveries.Count;
stats.SentDeliveries = deliveries.Count(d => d.Status == DeliveryStatus.Sent);
stats.FailedDeliveries = deliveries.Count(d => d.Status == DeliveryStatus.Failed || d.Status == DeliveryStatus.ExhaustedRetries);
stats.PendingDeliveries = deliveries.Count(d => d.Status == DeliveryStatus.Pending || d.Status == DeliveryStatus.Processing);
stats.FailedDeliveries = deliveries.Count(d =>
d.Status == DeliveryStatus.Failed || d.Status == DeliveryStatus.ExhaustedRetries);
stats.PendingDeliveries =
deliveries.Count(d => d.Status == DeliveryStatus.Pending || d.Status == DeliveryStatus.Processing);
return stats;
}
@@ -578,13 +581,6 @@ public class ActivityPubDeliveryService(
.ToListAsync();
}
public async Task<SnFediverseActor?> GetLocalActorAsync(Guid publisherId)
{
return await db.FediverseActors
.Include(a => a.Instance)
.FirstOrDefaultAsync(a => a.PublisherId == publisherId);
}
public async Task<SnFediverseActor?> GetOrCreateLocalActorAsync(SnPublisher publisher)
{
var actorUrl = $"https://{Domain}/activitypub/actors/{publisher.Name}";

54
DysonNetwork.Sphere/ActivityPub/ActivityPubObjectFactory.cs
View File

@@ -1,15 +1,22 @@
using System.Text;
using DysonNetwork.Shared.Models;
using Markdig;
using Microsoft.EntityFrameworkCore;
namespace DysonNetwork.Sphere.ActivityPub;
public static class ActivityPubObjectFactory
public class ActivityPubObjectFactory(IConfiguration configuration, AppDatabase db)
{
public static readonly string[] PublicTo = ["https://www.w3.org/ns/activitystreams#Public"];
public static readonly string PublicTo = "https://www.w3.org/ns/activitystreams#Public";
public static Dictionary<string, object> CreatePostObject(
IConfiguration configuration,
public async Task<SnFediverseActor?> GetLocalActorAsync(Guid publisherId)
{
return await db.FediverseActors
.Include(a => a.Instance)
.FirstOrDefaultAsync(a => a.PublisherId == publisherId);
}
public Dictionary<string, object> CreatePostObject(
SnPost post,
string actorUrl
)
@@ -44,6 +51,23 @@ public static class ActivityPubObjectFactory
var finalContent = contentBuilder.ToString();
var postReceivers = new List<string> { PublicTo };
if (post.RepliedPost != null)
{
// Local post
if (post.RepliedPost.Publisher != null)
{
var actor = GetLocalActorAsync(post.RepliedPost.PublisherId!.Value).GetAwaiter().GetResult();
if (actor?.FollowersUri != null)
postReceivers.Add(actor.FollowersUri);
}
// Fediverse post
if (post.Actor?.FollowersUri != null)
postReceivers.Add(post.Actor.FollowersUri);
}
var postObject = new Dictionary<string, object>
{
["id"] = postUrl,
@@ -51,7 +75,7 @@ public static class ActivityPubObjectFactory
["published"] = (post.PublishedAt ?? post.CreatedAt).ToDateTimeOffset(),
["attributedTo"] = actorUrl,
["content"] = Markdown.ToHtml(finalContent),
["to"] = PublicTo,
["to"] = postReceivers,
["cc"] = new[] { $"{actorUrl}/followers" },
["attachment"] = post.Attachments.Select(a => new Dictionary<string, object>
{
@@ -61,6 +85,26 @@ public static class ActivityPubObjectFactory
}).ToList<object>()
};
if (post.RepliedPost != null)
{
// Local post
if (post.RepliedPost.Publisher != null)
postObject["inReplyTo"] = $"https://{baseDomain}/posts/{post.RepliedPostId}";
// Fediverse post
if (post.RepliedPost.FediverseUri != null)
postObject["inReplyTo"] = post.RepliedPost.FediverseUri;
}
if (post.ForwardedPost != null)
{
// Local post
if (post.ForwardedPost.Publisher != null)
postObject["quoteUri"] = $"https://{baseDomain}/posts/{post.RepliedPostId}";
// Fediverse post
if (post.ForwardedPost.FediverseUri != null)
postObject["quoteUri"] = post.ForwardedPost.FediverseUri;
}
if (post.EditedAt.HasValue)
postObject["updated"] = post.EditedAt.Value.ToDateTimeOffset();

12
DysonNetwork.Sphere/Post/PostService.cs
View File

@@ -27,7 +27,7 @@ public partial class PostService(
Publisher.PublisherService ps,
WebReaderService reader,
AccountService.AccountServiceClient accounts,
ActivityPubDeliveryService apDelivery
ActivityPubObjectFactory objFactory
)
{
private const string PostFileUsageIdentifier = "post";
@@ -586,15 +586,18 @@ public partial class PostService(
await db.SaveChangesAsync();
if (isSelfReact) return isRemoving;
// Send ActivityPub Like/Undo activities if post's publisher has actor
if (post.PublisherId.HasValue && reaction.AccountId.HasValue)
if (post.PublisherId.HasValue)
{
var accountId = Guid.Parse(sender.Id);
var accountPublisher = await db.Publishers
.Where(p => p.Members.Any(m => m.AccountId == reaction.AccountId.Value))
.Where(p => p.Members.Any(m => m.AccountId == accountId))
.FirstOrDefaultAsync();
var accountActor = accountPublisher is null
? null
: await apDelivery.GetLocalActorAsync(accountPublisher.Id);
: await objFactory.GetLocalActorAsync(accountPublisher.Id);
if (accountActor != null && reaction.Attitude == Shared.Models.PostReactionAttitude.Positive)
{
@@ -643,7 +646,6 @@ public partial class PostService(
}
}
if (!isSelfReact)
_ = Task.Run(async () =>
{
using var scope = factory.CreateScope();

3
DysonNetwork.Sphere/Startup/ServiceCollectionExtensions.cs
View File

@@ -110,9 +110,8 @@ public static class ServiceCollectionExtensions
services.AddScoped<ActivityPubActivityHandler>();
services.AddScoped<ActivityPubDeliveryService>();
services.AddScoped<ActivityPubDiscoveryService>();
services.AddScoped<ActivityPubObjectFactory>();
services.AddSingleton<ActivityPubQueueService>();
services.AddScoped<ActivityPubFollowController>();
services.AddScoped<ActivityPubController>();
var translationProvider = configuration["Translation:Provider"]?.ToLower();
switch (translationProvider)