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

♻️ Better local actor

Browse Source
This commit is contained in:
LittleSheep
2025-12-30 00:31:09 +08:00
parent f556313f1d
commit 72b0739f41
10 changed files with 2810 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DysonNetwork.Shared/Models/FediverseActor.cs
View File

@@ -41,4 +41,6 @@ public class SnFediverseActor : ModelBase
public Instant? LastFetchedAt { get; set; }
public Instant? LastActivityAt { get; set; }
public Guid? PublisherId { get; set; }
}

11
DysonNetwork.Shared/Models/FediverseRelationship.cs
View File

@@ -11,11 +11,8 @@ public class SnFediverseRelationship : ModelBase
public Guid Id { get; set; } = Guid.NewGuid();
public Guid ActorId { get; set; }
[JsonIgnore]
public SnFediverseActor Actor { get; set; } = null!;
public Guid TargetActorId { get; set; }
[JsonIgnore]
public SnFediverseActor TargetActor { get; set; } = null!;
public RelationshipState State { get; set; } = RelationshipState.Pending;
@@ -29,13 +26,7 @@ public class SnFediverseRelationship : ModelBase
public Instant? FollowedAt { get; set; }
public Instant? FollowedBackAt { get; set; }
[MaxLength(4096)]
public string? RejectReason { get; set; }
public bool IsLocalActor { get; set; }
public Guid? LocalAccountId { get; set; }
public Guid? LocalPublisherId { get; set; }
[MaxLength(4096)] public string? RejectReason { get; set; }
}
public enum RelationshipState

BIN
DysonNetwork.Sphere/.DS_Store vendored
View File

Binary file not shown.

47
DysonNetwork.Sphere/ActivityPub/ActivityPubActivityProcessor.cs
View File

@@ -94,6 +94,13 @@ public class ActivityPubActivityProcessor(
objectUri, targetUsername);
return false;
}
var localActor = await deliveryService.GetOrCreateLocalActorAsync(targetPublisher);
if (localActor == null)
{
logger.LogWarning("Target publisher has no actor...");
return false;
}
logger.LogInformation("Target publisher found: {PublisherName} (ID: {Id})",
targetPublisher.Name, targetPublisher.Id);
@@ -101,10 +108,9 @@ public class ActivityPubActivityProcessor(
var existingRelationship = await db.FediverseRelationships
.FirstOrDefaultAsync(r =>
r.ActorId == actor.Id &&
r.TargetActorId == actor.Id &&
r.IsLocalActor);
r.TargetActorId == actor.Id);
if (existingRelationship != null && existingRelationship.State == RelationshipState.Accepted)
if (existingRelationship is { State: RelationshipState.Accepted })
{
logger.LogInformation("Follow relationship already exists and is accepted. ActorId: {ActorId}, PublisherId: {PublisherId}",
actor.Id, targetPublisher.Id);
@@ -116,9 +122,7 @@ public class ActivityPubActivityProcessor(
existingRelationship = new SnFediverseRelationship
{
ActorId = actor.Id,
TargetActorId = actor.Id,
IsLocalActor = true,
LocalPublisherId = targetPublisher.Id,
TargetActorId = localActor.Id,
State = RelationshipState.Pending,
IsFollowing = false,
IsFollowedBy = true
@@ -158,7 +162,6 @@ public class ActivityPubActivityProcessor(
.Include(r => r.Actor)
.Include(r => r.TargetActor)
.FirstOrDefaultAsync(r =>
r.IsLocalActor &&
r.TargetActorId == actor.Id &&
r.State == RelationshipState.Pending);
@@ -188,7 +191,6 @@ public class ActivityPubActivityProcessor(
var relationship = await db.FediverseRelationships
.FirstOrDefaultAsync(r =>
r.IsLocalActor &&
r.TargetActorId == actor.Id);
if (relationship == null)
@@ -212,24 +214,21 @@ public class ActivityPubActivityProcessor(
var objectValue = activity.GetValueOrDefault("object");
if (objectValue == null)
return false;
var objectDict = objectValue as Dictionary<string, object>;
if (objectDict != null)
if (objectValue is not Dictionary<string, object> objectDict) return false;
var objectType = objectDict.GetValueOrDefault("type")?.ToString();
switch (objectType)
{
var objectType = objectDict.GetValueOrDefault("type")?.ToString();
switch (objectType)
{
case "Follow":
return await UndoFollowAsync(actorUri, objectDict.GetValueOrDefault("id")?.ToString());
case "Like":
return await UndoLikeAsync(actorUri, objectDict.GetValueOrDefault("id")?.ToString());
case "Announce":
return await UndoAnnounceAsync(actorUri, objectDict.GetValueOrDefault("id")?.ToString());
default:
return false;
}
case "Follow":
return await UndoFollowAsync(actorUri, objectDict.GetValueOrDefault("id")?.ToString());
case "Like":
return await UndoLikeAsync(actorUri, objectDict.GetValueOrDefault("id")?.ToString());
case "Announce":
return await UndoAnnounceAsync(actorUri, objectDict.GetValueOrDefault("id")?.ToString());
default:
return false;
}
return false;
}

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

@@ -191,7 +191,7 @@ public class ActivityPubController(
var relationshipsQuery = db.FediverseRelationships
.Include(r => r.Actor)
.Where(r => r.LocalPublisherId == publisher.Id && r.IsFollowedBy);
.Where(r => r.Actor.PublisherId == publisher.Id && r.IsFollowedBy);
var totalItems = await relationshipsQuery.CountAsync();
@@ -257,7 +257,7 @@ public class ActivityPubController(
var relationshipsQuery = db.FediverseRelationships
.Include(r => r.TargetActor)
.Where(r => r.LocalPublisherId == publisher.Id && r.IsFollowing);
.Where(r => r.Actor.PublisherId == publisher.Id && r.IsFollowing);
var totalItems = await relationshipsQuery.CountAsync();

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

@@ -87,16 +87,28 @@ public class ActivityPubDeliveryService(
["object"] = targetActorUri
};
await db.FediverseRelationships.AddAsync(new SnFediverseRelationship
var existingRelationship = await db.FediverseRelationships
.FirstOrDefaultAsync(r =>
r.ActorId == localActor.Id &&
r.TargetActorId == targetActor.Id);
if (existingRelationship == null)
{
IsLocalActor = true,
LocalPublisherId = publisher.Id,
ActorId = localActor.Id,
TargetActorId = targetActor.Id,
State = RelationshipState.Pending,
IsFollowing = true,
IsFollowedBy = false
});
existingRelationship = new SnFediverseRelationship
{
ActorId = localActor.Id,
TargetActorId = targetActor.Id,
State = RelationshipState.Pending,
IsFollowing = true,
IsFollowedBy = false
};
db.FediverseRelationships.Add(existingRelationship);
}
else
{
existingRelationship.IsFollowing = true;
existingRelationship.State = RelationshipState.Pending;
}
await db.SaveChangesAsync();
@@ -139,7 +151,7 @@ public class ActivityPubDeliveryService(
}
};
var followers = await GetRemoteFollowersAsync(publisher.Id);
var followers = await GetRemoteFollowersAsync();
var successCount = 0;
foreach (var follower in followers)
@@ -200,7 +212,7 @@ public class ActivityPubDeliveryService(
return false;
var actorUrl = $"https://{Domain}/activitypub/actors/{publisher.Name}";
var followers = await GetRemoteFollowersAsync(publisher.Id);
var followers = await GetRemoteFollowersAsync();
var activity = new Dictionary<string, object>
{
@@ -297,19 +309,16 @@ public class ActivityPubDeliveryService(
}
}
private async Task<List<SnFediverseActor>> GetRemoteFollowersAsync(Guid publisherId)
private async Task<List<SnFediverseActor>> GetRemoteFollowersAsync()
{
return await db.FediverseRelationships
.Include(r => r.TargetActor)
.Where(r =>
r.LocalPublisherId == publisherId &&
r.IsFollowedBy &&
r.IsLocalActor)
.Where(r => r.IsFollowedBy)
.Select(r => r.TargetActor)
.ToListAsync();
}
private async Task<SnFediverseActor?> GetOrCreateLocalActorAsync(SnPublisher publisher)
public async Task<SnFediverseActor?> GetOrCreateLocalActorAsync(SnPublisher publisher)
{
var actorUrl = $"https://{Domain}/activitypub/actors/{publisher.Name}";
@@ -347,7 +356,8 @@ public class ActivityPubDeliveryService(
FollowingUri = $"{actorUrl}/following",
AvatarUrl = publisher.Picture != null ? $"{assetsBaseUrl}/{publisher.Picture.Id}" : null,
HeaderUrl = publisher.Background != null ? $"{assetsBaseUrl}/{publisher.Background.Id}" : null,
InstanceId = instance.Id
InstanceId = instance.Id,
PublisherId = publisher.Id,
};
db.FediverseActors.Add(localActor);
@@ -422,4 +432,4 @@ public class ActivityPubDeliveryService(
{
return actorUri.Split('/').Last();
}
}
}

17
DysonNetwork.Sphere/ActivityPub/ActivityPubFollowController.cs
View File

@@ -110,8 +110,7 @@ public class ActivityPubFollowController(
.Include(r => r.TargetActor)
.ThenInclude(a => a.Instance)
.Where(r =>
r.IsLocalActor &&
r.LocalPublisherId == publisher.Id &&
r.Actor.PublisherId == publisher.Id &&
r.IsFollowing &&
r.State == RelationshipState.Accepted)
.OrderByDescending(r => r.FollowedAt)
@@ -143,8 +142,7 @@ public class ActivityPubFollowController(
.Include(r => r.Actor)
.ThenInclude(a => a.Instance)
.Where(r =>
!r.IsLocalActor &&
r.LocalPublisherId == publisher.Id &&
r.Actor.PublisherId == publisher.Id &&
r.IsFollowedBy &&
r.State == RelationshipState.Accepted)
.OrderByDescending(r => r.FollowedAt ?? r.CreatedAt)
@@ -188,27 +186,24 @@ public class ActivityPubFollowController(
var followingCount = await db.FediverseRelationships
.CountAsync(r =>
r.IsLocalActor &&
r.LocalPublisherId == publisher.Id &&
r.Actor.PublisherId == publisher.Id &&
r.IsFollowing &&
r.State == RelationshipState.Accepted);
var followersCount = await db.FediverseRelationships
.CountAsync(r =>
!r.IsLocalActor &&
r.LocalPublisherId == publisher.Id &&
r.Actor.PublisherId == publisher.Id &&
r.IsFollowedBy &&
r.State == RelationshipState.Accepted);
var pendingCount = await db.FediverseRelationships
.CountAsync(r =>
r.IsLocalActor &&
r.LocalPublisherId == publisher.Id &&
r.Actor.PublisherId == publisher.Id &&
r.State == RelationshipState.Pending);
var relationships = await db.FediverseRelationships
.Include(r => r.TargetActor)
.Where(r => r.IsLocalActor && r.LocalPublisherId == publisher.Id)
.Where(r => r.Actor.PublisherId == publisher.Id)
.OrderByDescending(r => r.FollowedAt ?? r.CreatedAt)
.Take(20)
.ToListAsync();

2683
DysonNetwork.Sphere/Migrations/20251229163103_BetterLocalActor.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

60
DysonNetwork.Sphere/Migrations/20251229163103_BetterLocalActor.cs Normal file
View File

@@ -0,0 +1,60 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace DysonNetwork.Sphere.Migrations
{
/// <inheritdoc />
public partial class BetterLocalActor : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "is_local_actor",
table: "fediverse_relationships");
migrationBuilder.DropColumn(
name: "local_account_id",
table: "fediverse_relationships");
migrationBuilder.DropColumn(
name: "local_publisher_id",
table: "fediverse_relationships");
migrationBuilder.AddColumn<Guid>(
name: "publisher_id",
table: "fediverse_actors",
type: "uuid",
nullable: true);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "publisher_id",
table: "fediverse_actors");
migrationBuilder.AddColumn<bool>(
name: "is_local_actor",
table: "fediverse_relationships",
type: "boolean",
nullable: false,
defaultValue: false);
migrationBuilder.AddColumn<Guid>(
name: "local_account_id",
table: "fediverse_relationships",
type: "uuid",
nullable: true);
migrationBuilder.AddColumn<Guid>(
name: "local_publisher_id",
table: "fediverse_relationships",
type: "uuid",
nullable: true);
}
}
}

16
DysonNetwork.Sphere/Migrations/AppDatabaseModelSnapshot.cs
View File

@@ -495,6 +495,10 @@ namespace DysonNetwork.Sphere.Migrations
.HasColumnType("character varying(2048)")
.HasColumnName("public_key_id");
b.Property<Guid?>("PublisherId")
.HasColumnType("uuid")
.HasColumnName("publisher_id");
b.Property<string>("Type")
.IsRequired()
.HasMaxLength(2048)
@@ -877,22 +881,10 @@ namespace DysonNetwork.Sphere.Migrations
.HasColumnType("boolean")
.HasColumnName("is_following");
b.Property<bool>("IsLocalActor")
.HasColumnType("boolean")
.HasColumnName("is_local_actor");
b.Property<bool>("IsMuting")
.HasColumnType("boolean")
.HasColumnName("is_muting");
b.Property<Guid?>("LocalAccountId")
.HasColumnType("uuid")
.HasColumnName("local_account_id");
b.Property<Guid?>("LocalPublisherId")
.HasColumnType("uuid")
.HasColumnName("local_publisher_id");
b.Property<string>("RejectReason")
.HasMaxLength(4096)
.HasColumnType("character varying(4096)")