One Post model for every visibility, read from notes the way peers write them
Post gains what federation and the Mastodon API need: Visibility (Public, Unlisted, FollowersOnly, Direct, Circle, LocalGeo), the author's account id, to/cc, the Create's id, url, context, quote, InReplyToURI and the parent's author, a separate SpoilerText next to the title, language, mentions, hashtags, remote attachments (alt text, blurhash, focus, size), reply/favourite/reblog counters, revisions, EditedAt and DeletedAt. Direct messages are Posts with Visibility Direct and a ConversationId; migration _005 copies DmPost rows across with their ids and fills the new fields of existing posts. DmPost is left in place so a rollback still sees the old messages. Inbound: - NoteParser reads Note, Article, Page, Question and media types: content, then contentMap, then _misskey_content; summary as the spoiler and name as the title; Mention and Hashtag tags; attachments; a PeerTube-style list attribution prefers the person over the channel; quote URIs. - Addressing classifies like Mastodon, finding followers-only by the author's own followers URL (now stored on ForeignAvatar), not by a "/followers" suffix. - Create keeps a post when a local persona is addressed or mentioned, when it replies to a local post (the parent's reply count goes up) or when a community it follows is addressed; an unsolicited public post is not stored. Update keeps the previous version as a revision. The outbox and object endpoints serve only Public and Unlisted posts. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_012CzABvBkbcFqoHdmi8b9WB
This commit is contained in:
thepraandClaude Opus 5.5 committed
1 parent
796f06acf4
commit
e9529310fe
21 files changed
+777
-192
No files matched your search
@@ -5,6 +5,7 @@ using MongoDB.Entities;
|
||||
|
||||
using PrivaPub.Federation.Actors;
|
||||
using PrivaPub.Federation.Inbox;
|
||||
using PrivaPub.Federation.Objects;
|
||||
using PrivaPub.Federation.Inbox.Handlers;
|
||||
using PrivaPub.Models.Jobs;
|
||||
using PrivaPub.Federation.Outbox;
|
||||
@@ -50,7 +51,7 @@ namespace PrivaPub.Tests.Federation
|
||||
new UndoHandler(db, _local, remote, delivery),
|
||||
new CreateHandler(db, _local, remote, delivery),
|
||||
new DeleteHandler(db, _local, remote, delivery),
|
||||
new UpdateHandler(db, _local, remote, delivery)
|
||||
new UpdateHandler(db, _local, remote)
|
||||
}, NullLogger<InboxProcessor>.Instance);
|
||||
}
|
||||
|
||||
@@ -119,10 +120,10 @@ namespace PrivaPub.Tests.Federation
|
||||
|
||||
Assert.Equal(202, first.StatusCode);
|
||||
Assert.Equal(202, injected.StatusCode);
|
||||
var bobDm = await DB.Default.Find<DmPost>().Match(p => p.ActorURI == bob.Id).ExecuteSingleAsync(token);
|
||||
var malloryDm = await DB.Default.Find<DmPost>().Match(p => p.ActorURI == mallory.Id).ExecuteSingleAsync(token);
|
||||
Assert.NotEqual(bobDm.GroupId, malloryDm.GroupId);
|
||||
var bobConversation = await DB.Default.Find<DmGroup>().OneAsync(bobDm.GroupId, token);
|
||||
var bobDm = await DB.Default.Find<Post>().Match(p => p.ActorURI == bob.Id && p.Visibility == PostVisibility.Direct).ExecuteSingleAsync(token);
|
||||
var malloryDm = await DB.Default.Find<Post>().Match(p => p.ActorURI == mallory.Id).ExecuteSingleAsync(token);
|
||||
Assert.NotEqual(bobDm.ConversationId, malloryDm.ConversationId);
|
||||
var bobConversation = await DB.Default.Find<DmGroup>().OneAsync(bobDm.ConversationId, token);
|
||||
Assert.DoesNotContain(bobConversation.Members, m => m.AvatarId == mallory.Id);
|
||||
}
|
||||
|
||||
@@ -136,9 +137,9 @@ namespace PrivaPub.Tests.Federation
|
||||
await Deliver(bob, $"/peasants/{alice.UserName}/mouth", DirectCreate(bob, alice.Uri));
|
||||
await Deliver(bob, $"/peasants/{alice.UserName}/mouth", DirectCreate(bob, alice.Uri));
|
||||
|
||||
var dms = await DB.Default.Find<DmPost>().Match(p => p.ActorURI == bob.Id).ExecuteAsync(token);
|
||||
var dms = await DB.Default.Find<Post>().Match(p => p.ActorURI == bob.Id && p.Visibility == PostVisibility.Direct).ExecuteAsync(token);
|
||||
Assert.Equal(2, dms.Count);
|
||||
Assert.Single(dms.Select(d => d.GroupId).Distinct());
|
||||
Assert.Single(dms.Select(d => d.ConversationId).Distinct());
|
||||
}
|
||||
|
||||
[Fact]
|
||||
@@ -166,7 +167,7 @@ namespace PrivaPub.Tests.Federation
|
||||
var result = await Deliver(mallory, $"/peasants/{alice.UserName}/mouth", DirectCreate(mallory, alice.Uri, attributedTo: victim.Id));
|
||||
|
||||
Assert.Equal(400, result.StatusCode);
|
||||
Assert.False(await DB.Default.Find<DmPost>().Match(p => p.ActorURI == victim.Id).ExecuteAnyAsync(token));
|
||||
Assert.False(await DB.Default.Find<Post>().Match(p => p.ActorURI == victim.Id).ExecuteAnyAsync(token));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
@@ -179,7 +180,78 @@ namespace PrivaPub.Tests.Federation
|
||||
var result = await Deliver(mallory, $"/peasants/{alice.UserName}/mouth", DirectCreate(mallory, alice.Uri, objectOrigin: _peer.B));
|
||||
|
||||
Assert.Equal(202, result.StatusCode);
|
||||
Assert.False(await DB.Default.Find<DmPost>().Match(p => p.ActorURI == mallory.Id).ExecuteAnyAsync(token));
|
||||
Assert.False(await DB.Default.Find<Post>().Match(p => p.ActorURI == mallory.Id).ExecuteAnyAsync(token));
|
||||
}
|
||||
|
||||
static JsonObject PublicCreate(RemoteActor author, string inReplyTo = default, params string[] cc)
|
||||
{
|
||||
var id = $"{Origin(author.Id)}/notes/{Guid.NewGuid():N}";
|
||||
var note = new JsonObject
|
||||
{
|
||||
["id"] = id,
|
||||
["type"] = "Note",
|
||||
["attributedTo"] = author.Id,
|
||||
["content"] = "<p>hello</p>",
|
||||
["to"] = new JsonArray(Addressing.Public),
|
||||
["cc"] = new JsonArray(cc.Prepend(author.Id + "/followers").Select(c => (JsonNode)c).ToArray())
|
||||
};
|
||||
if (inReplyTo != default)
|
||||
note["inReplyTo"] = inReplyTo;
|
||||
return new JsonObject
|
||||
{
|
||||
["id"] = $"{Origin(author.Id)}/activities/{Guid.NewGuid():N}",
|
||||
["type"] = "Create",
|
||||
["actor"] = author.Id,
|
||||
["object"] = note
|
||||
};
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task A_public_reply_to_a_local_post_is_kept_and_counted()
|
||||
{
|
||||
var token = TestContext.Current.CancellationToken;
|
||||
var alice = await LocalAvatar("alice");
|
||||
var parent = new Post { GroupUserId = alice.Id, AuthorAccountId = alice.Id, ActorURI = alice.Uri, Text = "hi" };
|
||||
parent.ID = (string)parent.GenerateNewID();
|
||||
parent.ObjectURI = alice.PostUri(parent.ID);
|
||||
await DB.Default.SaveAsync(parent, token);
|
||||
var bob = new RemoteActor(_peer, "bob");
|
||||
|
||||
await Deliver(bob, "/human-centipede", PublicCreate(bob, parent.ObjectURI));
|
||||
|
||||
var reply = await DB.Default.Find<Post>().Match(p => p.ActorURI == bob.Id).ExecuteSingleAsync(token);
|
||||
Assert.Equal(PostVisibility.Public, reply.Visibility);
|
||||
Assert.Equal(parent.ID, reply.AnsweringToPostId);
|
||||
Assert.Equal(alice.Id, reply.InReplyToAccountId);
|
||||
Assert.Equal(1, (await DB.Default.Find<Post>().OneAsync(parent.ID, token)).RepliesCount);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task A_public_post_nobody_here_asked_for_is_dropped()
|
||||
{
|
||||
var token = TestContext.Current.CancellationToken;
|
||||
var bob = new RemoteActor(_peer, "bob");
|
||||
|
||||
await Deliver(bob, "/human-centipede", PublicCreate(bob));
|
||||
|
||||
Assert.False(await DB.Default.Find<Post>().Match(p => p.ActorURI == bob.Id).ExecuteAnyAsync(token));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task A_mention_is_kept_and_linked_to_the_local_persona()
|
||||
{
|
||||
var token = TestContext.Current.CancellationToken;
|
||||
var alice = await LocalAvatar("alice");
|
||||
var bob = new RemoteActor(_peer, "bob");
|
||||
var create = PublicCreate(bob, default, alice.Uri);
|
||||
create["object"]!["tag"] = new JsonArray(new JsonObject { ["type"] = "Mention", ["href"] = alice.Uri, ["name"] = "@" + alice.Handle });
|
||||
|
||||
await Deliver(bob, "/human-centipede", create);
|
||||
|
||||
var post = await DB.Default.Find<Post>().Match(p => p.ActorURI == bob.Id).ExecuteSingleAsync(token);
|
||||
var mention = Assert.Single(post.Mentions);
|
||||
Assert.True(mention.IsLocal);
|
||||
Assert.Equal(alice.Id, mention.AccountId);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
|
||||
@@ -0,0 +1,114 @@
|
||||
using PrivaPub.Federation.Objects;
|
||||
using PrivaPub.Models.Post;
|
||||
|
||||
using System.Text.Json.Nodes;
|
||||
|
||||
namespace PrivaPub.Tests.Federation
|
||||
{
|
||||
public class NoteParserTests
|
||||
{
|
||||
const string MastodonNote = """
|
||||
{
|
||||
"id": "https://m.example/users/alice/statuses/1",
|
||||
"type": "Note",
|
||||
"summary": "spoilers",
|
||||
"inReplyTo": "https://privapub.test/peasants/bob/posts/abc",
|
||||
"published": "2026-09-30T10:00:00Z",
|
||||
"url": "https://m.example/@alice/1",
|
||||
"attributedTo": "https://m.example/users/alice",
|
||||
"to": ["https://www.w3.org/ns/activitystreams#Public"],
|
||||
"cc": ["https://m.example/users/alice/followers", "https://privapub.test/peasants/bob"],
|
||||
"sensitive": true,
|
||||
"conversation": "tag:m.example,2026-09-30:objectId=1:objectType=Conversation",
|
||||
"context": "https://m.example/contexts/1",
|
||||
"content": "<p><span class=\"h-card\"><a href=\"https://privapub.test/peasants/bob\" class=\"u-url mention\">@<span>bob</span></a></span> hi <a href=\"https://m.example/tags/Fedi\" class=\"mention hashtag\" rel=\"tag\">#<span>Fedi</span></a><script>x</script></p>",
|
||||
"contentMap": { "en": "<p>hi</p>" },
|
||||
"attachment": [{
|
||||
"type": "Document", "mediaType": "image/png", "url": "https://files.m.example/a.png",
|
||||
"name": "a cat", "blurhash": "UBL_:rOpGG-oBUNG,qRj2so|=eE1w^n4S5NH", "focalPoint": [0.5, -2.0], "width": 640, "height": 480
|
||||
}],
|
||||
"tag": [
|
||||
{ "type": "Mention", "href": "https://privapub.test/peasants/bob", "name": "@bob@privapub.test" },
|
||||
{ "type": "Hashtag", "href": "https://m.example/tags/fedi", "name": "#Fedi" },
|
||||
{ "type": "Emoji", "name": ":blob:", "icon": { "type": "Image", "url": "https://files.m.example/blob.png" } }
|
||||
]
|
||||
}
|
||||
""";
|
||||
|
||||
[Fact]
|
||||
public void Reads_a_mastodon_note()
|
||||
{
|
||||
var note = NoteParser.Parse(JsonNode.Parse(MastodonNote));
|
||||
|
||||
Assert.Equal("https://m.example/users/alice", note.AttributedTo);
|
||||
Assert.Equal("spoilers", note.SpoilerText);
|
||||
Assert.True(note.Sensitive);
|
||||
Assert.Equal("en", note.Language);
|
||||
Assert.Equal("https://m.example/@alice/1", note.Url);
|
||||
Assert.Equal("https://m.example/contexts/1", note.Context);
|
||||
Assert.DoesNotContain("<script>", note.ContentHtml);
|
||||
Assert.Contains("u-url mention", note.ContentHtml);
|
||||
Assert.Equal("https://privapub.test/peasants/bob", Assert.Single(note.Mentions).ActorURI);
|
||||
Assert.Equal("fedi", Assert.Single(note.Tags));
|
||||
var media = Assert.Single(note.Attachments);
|
||||
Assert.Equal("a cat", media.Description);
|
||||
Assert.Equal(new[] { 0.5f, -1f }, media.Focus);
|
||||
Assert.Equal(new DateTime(2026, 9, 30, 10, 0, 0, DateTimeKind.Utc), note.Published);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Reads_a_lemmy_page_with_a_title()
|
||||
{
|
||||
var note = NoteParser.Parse(JsonNode.Parse("""
|
||||
{
|
||||
"id": "https://l.example/post/7", "type": "Page", "name": "A title",
|
||||
"attributedTo": "https://l.example/u/carol", "audience": "https://l.example/c/cats",
|
||||
"content": "<p>body</p>", "to": ["https://l.example/c/cats", "https://www.w3.org/ns/activitystreams#Public"],
|
||||
"published": "2026-09-30T10:00:00.123456+00:00"
|
||||
}
|
||||
"""));
|
||||
|
||||
Assert.Equal("A title", note.Title);
|
||||
Assert.Equal("https://l.example/c/cats", note.Audience);
|
||||
Assert.False(note.Sensitive);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Falls_back_to_misskey_content_and_takes_the_person_from_a_peertube_attribution()
|
||||
{
|
||||
var note = NoteParser.Parse(JsonNode.Parse("""
|
||||
{
|
||||
"id": "https://k.example/notes/9", "type": "Note",
|
||||
"attributedTo": [{ "type": "Group", "id": "https://k.example/c/chan" }, { "type": "Person", "id": "https://k.example/users/9" }],
|
||||
"_misskey_content": "hello <b>there</b>\nnext", "_misskey_quote": "https://k.example/notes/8"
|
||||
}
|
||||
"""));
|
||||
|
||||
Assert.Equal("https://k.example/users/9", note.AttributedTo);
|
||||
Assert.Equal("hello <b>there</b><br>next", note.ContentHtml);
|
||||
Assert.Equal("https://k.example/notes/8", note.QuoteUri);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData("""{ "id": "https://x.example/1", "type": "Person" }""")]
|
||||
[InlineData("""{ "id": "not a uri", "type": "Note" }""")]
|
||||
[InlineData("""[1, 2]""")]
|
||||
public void Refuses_what_is_not_a_note(string json) =>
|
||||
Assert.Null(NoteParser.Parse(JsonNode.Parse(json)));
|
||||
}
|
||||
|
||||
public class AddressingTests
|
||||
{
|
||||
const string Followers = "https://m.example/users/alice/followers";
|
||||
|
||||
[Theory]
|
||||
[InlineData(new[] { Addressing.Public }, new[] { Followers }, PostVisibility.Public)]
|
||||
[InlineData(new[] { "as:Public" }, new string[0], PostVisibility.Public)]
|
||||
[InlineData(new[] { Followers }, new[] { Addressing.Public }, PostVisibility.Unlisted)]
|
||||
[InlineData(new[] { Followers }, new[] { "https://privapub.test/peasants/bob" }, PostVisibility.FollowersOnly)]
|
||||
[InlineData(new[] { "https://privapub.test/peasants/bob" }, new string[0], PostVisibility.Direct)]
|
||||
[InlineData(new[] { "https://m.example/users/mallory/followers" }, new string[0], PostVisibility.Direct)]
|
||||
public void Classifies_like_mastodon(string[] to, string[] cc, PostVisibility expected) =>
|
||||
Assert.Equal(expected, Addressing.Classify(to, cc, Followers));
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user