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

✨ Save uncategorized actor data in metadata

Browse Source
This commit is contained in:
LittleSheep
2025-12-29 00:51:19 +08:00
parent 44a791db1f
commit 7cb471e978
5 changed files with 2747 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,68 +10,34 @@ namespace DysonNetwork.Shared.Models;
public class SnFediverseActor : ModelBase
{
public Guid Id { get; set; } = Guid.NewGuid();
[MaxLength(2048)]
public string Uri { get; set; } = null!;
[MaxLength(256)]
public string Username { get; set; } = null!;
[MaxLength(2048)]
public string? DisplayName { get; set; }
[MaxLength(4096)]
public string? Bio { get; set; }
[MaxLength(2048)]
public string? InboxUri { get; set; }
[MaxLength(2048)]
public string? OutboxUri { get; set; }
[MaxLength(2048)]
public string? FollowersUri { get; set; }
[MaxLength(2048)]
public string? FollowingUri { get; set; }
[MaxLength(2048)]
public string? FeaturedUri { get; set; }
[MaxLength(2048)]
public string? PublicKeyId { get; set; }
[MaxLength(8192)]
public string? PublicKey { get; set; }
[Column(TypeName = "jsonb")]
public Dictionary<string, object>? Metadata { get; set; }
[MaxLength(2048)]
public string? AvatarUrl { get; set; }
[MaxLength(2048)]
public string? HeaderUrl { get; set; }
[MaxLength(2048)] public string Type { get; set; } = "Person";
[MaxLength(2048)] public string Uri { get; set; } = null!;
[MaxLength(256)] public string Username { get; set; } = null!;
[MaxLength(2048)] public string? DisplayName { get; set; }
[MaxLength(4096)] public string? Bio { get; set; }
[MaxLength(2048)] public string? InboxUri { get; set; }
[MaxLength(2048)] public string? OutboxUri { get; set; }
[MaxLength(2048)] public string? FollowersUri { get; set; }
[MaxLength(2048)] public string? FollowingUri { get; set; }
[MaxLength(2048)] public string? FeaturedUri { get; set; }
[MaxLength(2048)] public string? PublicKeyId { get; set; }
[MaxLength(8192)] public string? PublicKey { get; set; }
[Column(TypeName = "jsonb")] public Dictionary<string, object>? Metadata { get; set; }
[MaxLength(2048)] public string? AvatarUrl { get; set; }
[MaxLength(2048)] public string? HeaderUrl { get; set; }
public bool IsBot { get; set; } = false;
public bool IsLocked { get; set; } = false;
public bool IsDiscoverable { get; set; } = true;
public Guid InstanceId { get; set; }
[JsonIgnore]
public SnFediverseInstance Instance { get; set; } = null!;
[JsonIgnore]
public ICollection<SnFediverseContent> Contents { get; set; } = [];
[JsonIgnore]
public ICollection<SnFediverseActivity> Activities { get; set; } = [];
[JsonIgnore]
public ICollection<SnFediverseRelationship> FollowingRelationships { get; set; } = [];
[JsonIgnore]
public ICollection<SnFediverseRelationship> FollowerRelationships { get; set; } = [];
[JsonIgnore] public SnFediverseInstance Instance { get; set; } = null!;
[JsonIgnore] public ICollection<SnFediverseContent> Contents { get; set; } = [];
[JsonIgnore] public ICollection<SnFediverseActivity> Activities { get; set; } = [];
[JsonIgnore] public ICollection<SnFediverseRelationship> FollowingRelationships { get; set; } = [];
[JsonIgnore] public ICollection<SnFediverseRelationship> FollowerRelationships { get; set; } = [];
public Instant? LastFetchedAt { get; set; }
public Instant? LastActivityAt { get; set; }

36
DysonNetwork.Sphere/ActivityPub/ActivityPubDiscoveryService.cs
View File

@@ -1,5 +1,6 @@
using DysonNetwork.Shared.Models;
using Microsoft.EntityFrameworkCore;
using System.Linq;
using System.Text.Json;
using System.Text.RegularExpressions;
using System.Xml.Linq;
@@ -66,7 +67,8 @@ public partial class ActivityPubDiscoveryService(
return !match.Success ? (null, null) : (match.Groups[1].Value, match.Groups[2].Value);
}
private async Task<(string? actorUri, string? avatarUrl)> GetActorUriFromWebfingerAsync(string username, string domain)
private async Task<(string? actorUri, string? avatarUrl)> GetActorUriFromWebfingerAsync(string username,
string domain)
{
if (domain == Domain)
return (null, null);
@@ -101,7 +103,8 @@ public partial class ActivityPubDiscoveryService(
}
else
{
logger.LogWarning("Unknown Content-Type from {Url}: {ContentType}, trying JSON parsing", webfingerUrl, contentType);
logger.LogWarning("Unknown Content-Type from {Url}: {ContentType}, trying JSON parsing", webfingerUrl,
contentType);
result = ParseJsonWebfingerResponse(content, webfingerUrl);
}
@@ -111,7 +114,8 @@ public partial class ActivityPubDiscoveryService(
return (null, null);
}
logger.LogInformation("Found actor URI via Webfinger: {ActorUri}, Avatar: {AvatarUrl}", result.actorUri, result.avatarUrl);
logger.LogInformation("Found actor URI via Webfinger: {ActorUri}, Avatar: {AvatarUrl}", result.actorUri,
result.avatarUrl);
return result;
}
catch (Exception ex)
@@ -206,7 +210,8 @@ public partial class ActivityPubDiscoveryService(
}
}
private async Task<SnFediverseActor?> StoreActorAsync(string actorUri, string username, string domain, string? webfingerAvatarUrl)
private async Task<SnFediverseActor?> StoreActorAsync(string actorUri, string username, string domain,
string? webfingerAvatarUrl)
{
var existingActor = await db.FediverseActors
.FirstOrDefaultAsync(a => a.Uri == actorUri);
@@ -246,7 +251,7 @@ public partial class ActivityPubDiscoveryService(
logger.LogInformation("Successfully stored actor from Webfinger: {Username}@{Domain}", username, domain);
await FetchAdditionalActorDataAsync(actor);
await FetchActorDataAsync(actor);
return actor;
}
@@ -257,19 +262,21 @@ public partial class ActivityPubDiscoveryService(
}
}
private async Task FetchAdditionalActorDataAsync(SnFediverseActor actor)
private async Task FetchActorDataAsync(SnFediverseActor actor)
{
try
{
logger.LogInformation("Attempting to fetch additional actor data from: {ActorUri}", actor.Uri);
var request = new HttpRequestMessage(HttpMethod.Get, actor.Uri);
request.Headers.Accept.Add(new System.Net.Http.Headers.MediaTypeWithQualityHeaderValue("application/activity+json"));
request.Headers.Accept.Add(
new System.Net.Http.Headers.MediaTypeWithQualityHeaderValue("application/activity+json"));
var response = await HttpClient.SendAsync(request);
if (!response.IsSuccessStatusCode)
{
logger.LogWarning("Failed to fetch actor data: {Url} - {StatusCode}, using Webfinger data only", actor.Uri, response.StatusCode);
logger.LogWarning("Failed to fetch actor data: {Url} - {StatusCode}, using Webfinger data only",
actor.Uri, response.StatusCode);
return;
}
@@ -282,6 +289,7 @@ public partial class ActivityPubDiscoveryService(
return;
}
actor.Type = actorData.GetValueOrDefault("type")?.ToString();
actor.DisplayName = actorData.GetValueOrDefault("name")?.ToString();
actor.Bio = actorData.GetValueOrDefault("summary")?.ToString();
actor.InboxUri = actorData.GetValueOrDefault("inbox")?.ToString();
@@ -297,13 +305,23 @@ public partial class ActivityPubDiscoveryService(
actor.IsLocked = actorData.GetValueOrDefault("manuallyApprovesFollowers")?.ToString() == "true";
actor.IsDiscoverable = actorData.GetValueOrDefault("discoverable")?.ToString() != "false";
// Store additional fields in Metadata
var excludedKeys = new HashSet<string>
{
"id", "name", "summary", "preferredUsername", "inbox", "outbox", "followers", "following", "featured",
"icon", "image", "publicKey", "type", "manuallyApprovesFollowers", "discoverable", "@context"
};
actor.Metadata = actorData.Where(kvp => !excludedKeys.Contains(kvp.Key))
.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
await db.SaveChangesAsync();
logger.LogInformation("Successfully fetched additional actor data for: {Username}", actor.Username);
}
catch (Exception ex)
{
logger.LogWarning(ex, "Failed to fetch additional actor data for {Uri}, using Webfinger data only", actor.Uri);
logger.LogWarning(ex, "Failed to fetch additional actor data for {Uri}, using Webfinger data only",
actor.Uri);
}
}

2663
DysonNetwork.Sphere/Migrations/20251228165042_AddSeprateActorType.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

30
DysonNetwork.Sphere/Migrations/20251228165042_AddSeprateActorType.cs Normal file
View File

@@ -0,0 +1,30 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace DysonNetwork.Sphere.Migrations
{
/// <inheritdoc />
public partial class AddSeprateActorType : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "type",
table: "fediverse_actors",
type: "character varying(2048)",
maxLength: 2048,
nullable: false,
defaultValue: "Person");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "type",
table: "fediverse_actors");
}
}
}

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

@@ -495,6 +495,12 @@ namespace DysonNetwork.Sphere.Migrations
.HasColumnType("character varying(2048)")
.HasColumnName("public_key_id");
b.Property<string>("Type")
.IsRequired()
.HasMaxLength(2048)
.HasColumnType("character varying(2048)")
.HasColumnName("type");
b.Property<Instant>("UpdatedAt")
.HasColumnType("timestamp with time zone")
.HasColumnName("updated_at");