House rules: primary constructors, a cancellation token on every async call, and the rules fail the build
Build / Build (push) Successful in 30s
Build / Build (push) Successful in 30s
- Services, controllers and jobs take their dependencies through primary constructors and use them directly; where a method already named a local after a dependency, the dependency takes its type's name. - Every async method takes a CancellationToken last and passes it down to MongoDB, HTTP and the job queue. The setup claim is still given back when a request is cancelled. - The federation and media options are read through IOptionsMonitor. - The Mastodon entities keep sending "" for empty strings, and every model field where null means something says so. - The inbox's 503 with Retry-After, which other servers retry, is the one server error left, and says why. - Arasaka.HouseRules.Analyzers checks all of this in every build, here and in PrivaPub.ClientModels as decePubClient builds it. Checked against GoToSocial in the pasture: 64 passed, 0 failed. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01W4YtEJrgxG12Pc39Fai8Bd
This commit is contained in:
1 parent
f0a14c737f
commit
0f73f69239
176 files changed
+2789
-3974
No files matched your search
@@ -38,24 +38,13 @@ namespace PrivaPub.Domain.Statuses
|
||||
Task<bool> MayReply(NoteDocument reply, ForeignAvatar replier, PostEntity parent, CancellationToken token);
|
||||
}
|
||||
|
||||
public class InteractionApprovals : IInteractionApprovals
|
||||
public class InteractionApprovals(
|
||||
DbEntities dbEntities,
|
||||
IRemoteActorService remoteActors,
|
||||
ILocalActorService localActors,
|
||||
IDeliveryService deliveryService,
|
||||
IOutboxPublisher outbox) : IInteractionApprovals
|
||||
{
|
||||
readonly DbEntities _dbEntities;
|
||||
readonly IRemoteActorService _remoteActors;
|
||||
readonly ILocalActorService _localActors;
|
||||
readonly IDeliveryService _delivery;
|
||||
readonly IOutboxPublisher _outbox;
|
||||
|
||||
public InteractionApprovals(DbEntities dbEntities, IRemoteActorService remoteActors, ILocalActorService localActors, IDeliveryService delivery,
|
||||
IOutboxPublisher outbox)
|
||||
{
|
||||
_dbEntities = dbEntities;
|
||||
_remoteActors = remoteActors;
|
||||
_localActors = localActors;
|
||||
_delivery = delivery;
|
||||
_outbox = outbox;
|
||||
}
|
||||
|
||||
static string Prefix(InteractionKind kind) => kind switch
|
||||
{
|
||||
InteractionKind.Reply => "reply-request-",
|
||||
@@ -98,33 +87,33 @@ namespace PrivaPub.Domain.Statuses
|
||||
return false;
|
||||
if (who.Any(Addressing.IsPublic) || who.Contains(actor.Uri))
|
||||
return true;
|
||||
var author = await _dbEntities.ForeignAvatars.Match(f => f.ActorURI == target.ActorURI).ExecuteFirstAsync(token);
|
||||
var author = await dbEntities.ForeignAvatars.Match(f => f.ActorURI == target.ActorURI).ExecuteFirstAsync(token);
|
||||
if (author == default)
|
||||
return false;
|
||||
if (!string.IsNullOrEmpty(author.FollowersURL) && who.Contains(author.FollowersURL)
|
||||
&& await _dbEntities.Followings.Match(f => f.AvatarId == actor.Id && f.TargetActorURI == author.ActorURI && f.State == FollowState.Accepted)
|
||||
&& await dbEntities.Followings.Match(f => f.AvatarId == actor.Id && f.TargetActorURI == author.ActorURI && f.State == FollowState.Accepted)
|
||||
.ExecuteAnyAsync(token))
|
||||
return true;
|
||||
return !string.IsNullOrEmpty(author.FollowingURL) && who.Contains(author.FollowingURL)
|
||||
&& await _dbEntities.Followers.Match(f => f.LocalActorId == actor.Id && f.ActorURI == author.ActorURI && f.IsAccepted).ExecuteAnyAsync(token);
|
||||
&& await dbEntities.Followers.Match(f => f.LocalActorId == actor.Id && f.ActorURI == author.ActorURI && f.IsAccepted).ExecuteAnyAsync(token);
|
||||
}
|
||||
|
||||
// asks the author, with the interaction as the request's instrument; it goes to no one else until the author agrees
|
||||
public async Task Ask(LocalActor actor, PostEntity target, InteractionKind kind, JsonObject interaction, string localId, CancellationToken token)
|
||||
{
|
||||
var author = await _dbEntities.ForeignAvatars.Match(f => f.ActorURI == target.ActorURI).ExecuteFirstAsync(token);
|
||||
var author = await dbEntities.ForeignAvatars.Match(f => f.ActorURI == target.ActorURI).ExecuteFirstAsync(token);
|
||||
if (string.IsNullOrEmpty(author?.InboxURL))
|
||||
return;
|
||||
// FEP-5624: the reply itself is the question, to the author alone
|
||||
if (ApprovesReplies(target, kind))
|
||||
{
|
||||
await _delivery.Enqueue(actor, new[] { author.InboxURL }, ActivityPubRenderer.Create(actor, (JsonObject)interaction.DeepClone(), $"create-{localId}"),
|
||||
token);
|
||||
await deliveryService.Enqueue(actor, new[] { author.InboxURL }, ActivityPubRenderer.Create(actor, (JsonObject)interaction.DeepClone(), $"create-{localId}"),
|
||||
token: token);
|
||||
return;
|
||||
}
|
||||
var instrument = (JsonObject)interaction.DeepClone();
|
||||
instrument.Remove("@context");
|
||||
await _delivery.Enqueue(actor, new[] { author.InboxURL }, new JsonObject
|
||||
await deliveryService.Enqueue(actor, new[] { author.InboxURL }, new JsonObject
|
||||
{
|
||||
["@context"] = ActivityPubRenderer.Context(),
|
||||
["id"] = actor.ActivityUri(Prefix(kind) + localId),
|
||||
@@ -133,7 +122,7 @@ namespace PrivaPub.Domain.Statuses
|
||||
["to"] = target.ActorURI,
|
||||
["object"] = target.ObjectURI,
|
||||
["instrument"] = instrument
|
||||
}, token);
|
||||
}, token: token);
|
||||
}
|
||||
|
||||
// an author's answer to one of our requests (the request, or the interaction itself when it was sent unasked)
|
||||
@@ -154,7 +143,7 @@ namespace PrivaPub.Domain.Statuses
|
||||
if (kind == InteractionKind.Like)
|
||||
{
|
||||
var like = await DB.Default.Find<Favourite>().OneAsync(localId, token);
|
||||
var liked = like == default ? default : await _dbEntities.Posts.MatchID(like.PostId).ExecuteFirstAsync(token);
|
||||
var liked = like == default ? default : await dbEntities.Posts.MatchID(like.PostId).ExecuteFirstAsync(token);
|
||||
if (like is not { Approval: ApprovalState.Pending } || liked?.ActorURI != actor.ActorURI)
|
||||
return true;
|
||||
if (!accepted)
|
||||
@@ -168,9 +157,9 @@ namespace PrivaPub.Domain.Statuses
|
||||
return true;
|
||||
await DB.Default.Update<Favourite>().MatchID(like.ID).Modify(f => f.Approval, ApprovalState.Accepted).Modify(f => f.ApprovalURI, stamp)
|
||||
.ExecuteAsync(token);
|
||||
var liker = await _localActors.FindById(Models.Federation.LocalActorKind.Person, like.AccountId, token);
|
||||
var liker = await localActors.FindById(Models.Federation.LocalActorKind.Person, like.AccountId, token);
|
||||
if (liker != default && !string.IsNullOrEmpty(actor.InboxURL))
|
||||
await _delivery.Enqueue(liker, new[] { actor.InboxURL }, new JsonObject
|
||||
await deliveryService.Enqueue(liker, new[] { actor.InboxURL }, new JsonObject
|
||||
{
|
||||
["@context"] = ActivityPubRenderer.Context(),
|
||||
["id"] = like.ActivityURI,
|
||||
@@ -178,16 +167,16 @@ namespace PrivaPub.Domain.Statuses
|
||||
["actor"] = liker.Uri,
|
||||
["object"] = liked.ObjectURI,
|
||||
["likeAuthorization"] = stamp
|
||||
}, token);
|
||||
}, token: token);
|
||||
return true;
|
||||
}
|
||||
|
||||
var post = await _dbEntities.Posts.Match(p => p.ID == localId && !p.IsFederatedCopy && !p.DeletedAt.HasValue).ExecuteFirstAsync(token);
|
||||
var target = post == default ? default : await _dbEntities.Posts.MatchID(kind == InteractionKind.Reply ? post.AnsweringToPostId : post.ReblogOfPostId)
|
||||
var post = await dbEntities.Posts.Match(p => p.ID == localId && !p.IsFederatedCopy && !p.DeletedAt.HasValue).ExecuteFirstAsync(token);
|
||||
var target = post == default ? default : await dbEntities.Posts.MatchID(kind == InteractionKind.Reply ? post.AnsweringToPostId : post.ReblogOfPostId)
|
||||
.ExecuteFirstAsync(token);
|
||||
if (post is not { Approval: ApprovalState.Pending } || target?.ActorURI != actor.ActorURI)
|
||||
return true;
|
||||
var author = await _localActors.FindById(Models.Federation.LocalActorKind.Person, post.GroupUserId, token);
|
||||
var author = await localActors.FindById(Models.Federation.LocalActorKind.Person, post.GroupUserId, token);
|
||||
if (author == default)
|
||||
return true;
|
||||
if (!accepted)
|
||||
@@ -223,7 +212,7 @@ namespace PrivaPub.Domain.Statuses
|
||||
if (kind == InteractionKind.Reply)
|
||||
{
|
||||
var create = ActivityPubRenderer.Create(author, ActivityPubRenderer.Note(post, author, default, post.InReplyToURI), $"create-{post.ID}");
|
||||
await _outbox.Publish(author, post, create, token);
|
||||
await outbox.Publish(author, post, create, token);
|
||||
return true;
|
||||
}
|
||||
var announce = new JsonObject
|
||||
@@ -238,13 +227,13 @@ namespace PrivaPub.Domain.Statuses
|
||||
["object"] = target.ObjectURI,
|
||||
["announceAuthorization"] = post.ApprovalURI
|
||||
};
|
||||
await _delivery.EnqueueToFollowers(author, announce, token, string.IsNullOrEmpty(actor.InboxURL) ? default : new[] { actor.InboxURL });
|
||||
await deliveryService.EnqueueToFollowers(author, announce, string.IsNullOrEmpty(actor.InboxURL) ? default : new[] { actor.InboxURL }, token);
|
||||
return true;
|
||||
}
|
||||
|
||||
(InteractionKind Kind, string LocalId) Request(string requestId)
|
||||
{
|
||||
if (requestId == default || !requestId.StartsWith(_localActors.BaseAddress + "/", StringComparison.OrdinalIgnoreCase))
|
||||
if (requestId == default || !requestId.StartsWith(localActors.BaseAddress + "/", StringComparison.OrdinalIgnoreCase))
|
||||
return default;
|
||||
foreach (var kind in new[] { InteractionKind.Reply, InteractionKind.Like, InteractionKind.Announce })
|
||||
{
|
||||
@@ -258,11 +247,11 @@ namespace PrivaPub.Domain.Statuses
|
||||
// an interaction of ours named by its own id, as an answer to one sent unasked names it
|
||||
async Task<(InteractionKind Kind, string LocalId)> Interaction(string uri, CancellationToken token)
|
||||
{
|
||||
if (!uri.StartsWith(_localActors.BaseAddress + "/", StringComparison.OrdinalIgnoreCase))
|
||||
if (!uri.StartsWith(localActors.BaseAddress + "/", StringComparison.OrdinalIgnoreCase))
|
||||
return default;
|
||||
if (await DB.Default.Find<Favourite>().Match(f => f.ActivityURI == uri).ExecuteFirstAsync(token) is { } like)
|
||||
return (InteractionKind.Like, like.ID);
|
||||
if (await _dbEntities.Posts.Match(p => (p.ObjectURI == uri || p.ActivityURI == uri) && !p.IsFederatedCopy).ExecuteFirstAsync(token) is { } post)
|
||||
if (await dbEntities.Posts.Match(p => (p.ObjectURI == uri || p.ActivityURI == uri) && !p.IsFederatedCopy).ExecuteFirstAsync(token) is { } post)
|
||||
return (post.ReblogOfPostId != default ? InteractionKind.Announce : InteractionKind.Reply, post.ID);
|
||||
return default;
|
||||
}
|
||||
@@ -272,7 +261,7 @@ namespace PrivaPub.Domain.Statuses
|
||||
{
|
||||
if (!Origin.Same(authorization, target.ActorURI))
|
||||
return false;
|
||||
using var fetched = await _remoteActors.FetchObject(authorization, token);
|
||||
using var fetched = await remoteActors.FetchObject(authorization, token);
|
||||
if (fetched == default)
|
||||
return false;
|
||||
var stamp = JsonNode.Parse(fetched.Root.GetRawText());
|
||||
@@ -288,7 +277,7 @@ namespace PrivaPub.Domain.Statuses
|
||||
if (parent is not { IsFederatedCopy: true, ReplyPolicy: { } rule } || replier.ActorURI == parent.ActorURI)
|
||||
return true;
|
||||
// anyone, the replier itself, or a collection (followers, following) whose members we cannot list from here
|
||||
var author = await _dbEntities.ForeignAvatars.Match(f => f.ActorURI == parent.ActorURI).ExecuteFirstAsync(token);
|
||||
var author = await dbEntities.ForeignAvatars.Match(f => f.ActorURI == parent.ActorURI).ExecuteFirstAsync(token);
|
||||
if (rule.Automatic.Any(Addressing.IsPublic) || rule.Automatic.Contains(replier.ActorURI)
|
||||
|| author != default && (rule.Automatic.Contains(author.FollowersURL) || rule.Automatic.Contains(author.FollowingURL)))
|
||||
return true;
|
||||
|
||||
Reference in new issue
Block a user