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
@@ -28,8 +28,9 @@ namespace PrivaPub.Domain.Social
|
||||
Task<WebResult> Followings(string rootUserId, string avatarId, CancellationToken token);
|
||||
/// <summary>Follows an account, or changes how a follow already made shows it: notify and languages (R8) change only
|
||||
/// when given (languages empty: every language).</summary>
|
||||
Task<Following> FollowAs(LocalActor follower, string target, bool showReblogs, CancellationToken token, bool? notify = default,
|
||||
IReadOnlyList<string> languages = default);
|
||||
Task<Following> FollowAs(LocalActor follower, string target, bool showReblogs, bool? notify = default,
|
||||
IReadOnlyList<string> languages = default,
|
||||
CancellationToken token = default);
|
||||
Task UnfollowAs(LocalActor follower, string target, CancellationToken token);
|
||||
Task<bool> Decide(LocalActor me, string followerAccountId, bool accept, CancellationToken token);
|
||||
Task<int> ResendPending(DateTime now, CancellationToken token);
|
||||
@@ -37,26 +38,14 @@ namespace PrivaPub.Domain.Social
|
||||
Task<(LocalActor Local, ForeignAvatar Remote)> Resolve(string target, CancellationToken token);
|
||||
}
|
||||
|
||||
public class FollowService : IFollowService
|
||||
public class FollowService(
|
||||
DbEntities dbEntities,
|
||||
ILocalActorService localActors,
|
||||
IRemoteActorService remoteActors,
|
||||
IDeliveryService delivery,
|
||||
IStringLocalizer<GenericRes> localizer,
|
||||
ILogger<FollowService> logger) : IFollowService
|
||||
{
|
||||
readonly DbEntities _dbEntities;
|
||||
readonly ILocalActorService _localActors;
|
||||
readonly IRemoteActorService _remoteActors;
|
||||
readonly IDeliveryService _delivery;
|
||||
readonly IStringLocalizer<GenericRes> _localizer;
|
||||
readonly ILogger<FollowService> _logger;
|
||||
|
||||
public FollowService(DbEntities dbEntities, ILocalActorService localActors, IRemoteActorService remoteActors, IDeliveryService delivery,
|
||||
IStringLocalizer<GenericRes> localizer, ILogger<FollowService> logger)
|
||||
{
|
||||
_dbEntities = dbEntities;
|
||||
_localActors = localActors;
|
||||
_remoteActors = remoteActors;
|
||||
_delivery = delivery;
|
||||
_localizer = localizer;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
public async Task<WebResult> Follow(string rootUserId, FollowForm form, CancellationToken token)
|
||||
{
|
||||
var result = new WebResult();
|
||||
@@ -64,17 +53,17 @@ namespace PrivaPub.Domain.Social
|
||||
{
|
||||
var follower = await OwnedAvatar(rootUserId, form.AvatarId, token);
|
||||
if (follower == default)
|
||||
return result.Invalidate(_localizer["Avatar not found."], StatusCodes.Status404NotFound);
|
||||
var following = await FollowAs(follower, form.Target, true, token);
|
||||
return result.Invalidate(localizer["Avatar not found."], StatusCodes.Status404NotFound);
|
||||
var following = await FollowAs(follower, form.Target, true, token: token);
|
||||
if (following == default)
|
||||
return result.Invalidate(_localizer["Account not found."], StatusCodes.Status404NotFound);
|
||||
return result.Invalidate(localizer["Account not found."], StatusCodes.Status404NotFound);
|
||||
result.Data = ToView(following);
|
||||
return result;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, $"{nameof(FollowService)}.{nameof(Follow)}");
|
||||
return result.Invalidate(_localizer["Something went wrong."], exception: ex);
|
||||
logger.LogError(ex, $"{nameof(FollowService)}.{nameof(Follow)}");
|
||||
return result.Invalidate(localizer["Something went wrong."], exception: ex);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -85,14 +74,14 @@ namespace PrivaPub.Domain.Social
|
||||
{
|
||||
var follower = await OwnedAvatar(rootUserId, form.AvatarId, token);
|
||||
if (follower == default)
|
||||
return result.Invalidate(_localizer["Avatar not found."], StatusCodes.Status404NotFound);
|
||||
return result.Invalidate(localizer["Avatar not found."], StatusCodes.Status404NotFound);
|
||||
await UnfollowAs(follower, form.Target, token);
|
||||
return result;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, $"{nameof(FollowService)}.{nameof(Unfollow)}");
|
||||
return result.Invalidate(_localizer["Something went wrong."], exception: ex);
|
||||
logger.LogError(ex, $"{nameof(FollowService)}.{nameof(Unfollow)}");
|
||||
return result.Invalidate(localizer["Something went wrong."], exception: ex);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -106,8 +95,9 @@ namespace PrivaPub.Domain.Social
|
||||
return kept.Count == 0 ? null : kept;
|
||||
}
|
||||
|
||||
public async Task<Following> FollowAs(LocalActor follower, string target, bool showReblogs, CancellationToken token, bool? notify = default,
|
||||
IReadOnlyList<string> languages = default)
|
||||
public async Task<Following> FollowAs(LocalActor follower, string target, bool showReblogs, bool? notify = default,
|
||||
IReadOnlyList<string> languages = default,
|
||||
CancellationToken token = default)
|
||||
{
|
||||
var (local, remote) = await ResolveTarget(target, token);
|
||||
if (local == default && remote == default)
|
||||
@@ -116,7 +106,7 @@ namespace PrivaPub.Domain.Social
|
||||
return default;
|
||||
|
||||
var targetUri = local?.Uri ?? remote.ActorURI;
|
||||
var existing = await _dbEntities.Followings.Match(f => f.AvatarId == follower.Id && f.TargetActorURI == targetUri).ExecuteFirstAsync(token);
|
||||
var existing = await dbEntities.Followings.Match(f => f.AvatarId == follower.Id && f.TargetActorURI == targetUri).ExecuteFirstAsync(token);
|
||||
if (existing != default)
|
||||
{
|
||||
if (existing.ShowReblogs != showReblogs)
|
||||
@@ -136,8 +126,8 @@ namespace PrivaPub.Domain.Social
|
||||
// a request still unanswered is sent again, at most once an hour: a server can take a Follow (202) and
|
||||
// drop it later, as one that cannot yet read our actor does; one that holds it already ignores the copy
|
||||
if (existing.State == FollowState.Requested && remote != default)
|
||||
await _delivery.Enqueue(follower, new[] { remote.InboxURL }, FollowActivity(follower, existing), token,
|
||||
again: "again-" + DateTime.UtcNow.ToString("yyyyMMddHH", System.Globalization.CultureInfo.InvariantCulture));
|
||||
await delivery.Enqueue(follower, new[] { remote.InboxURL }, FollowActivity(follower, existing),
|
||||
again: "again-" + DateTime.UtcNow.ToString("yyyyMMddHH", System.Globalization.CultureInfo.InvariantCulture), token);
|
||||
return existing;
|
||||
}
|
||||
|
||||
@@ -162,7 +152,7 @@ namespace PrivaPub.Domain.Social
|
||||
}
|
||||
catch (MongoWriteException ex) when (ex.WriteError?.Category == ServerErrorCategory.DuplicateKey)
|
||||
{
|
||||
return await _dbEntities.Followings.Match(f => f.AvatarId == follower.Id && f.TargetActorURI == targetUri).ExecuteFirstAsync(token);
|
||||
return await dbEntities.Followings.Match(f => f.AvatarId == follower.Id && f.TargetActorURI == targetUri).ExecuteFirstAsync(token);
|
||||
}
|
||||
//a new follow starts in no list, whatever lists the account was in before a follow that ended without passing here
|
||||
await DB.Default.DeleteAsync<PersonaListMember>(m => m.AvatarId == follower.Id && m.AccountId == following.TargetAccountId);
|
||||
@@ -170,7 +160,7 @@ namespace PrivaPub.Domain.Social
|
||||
if (local != default)
|
||||
await FollowLocally(follower, local, following, token);
|
||||
else
|
||||
await _delivery.Enqueue(follower, new[] { remote.InboxURL }, FollowActivity(follower, following), token);
|
||||
await delivery.Enqueue(follower, new[] { remote.InboxURL }, FollowActivity(follower, following), token: token);
|
||||
return following;
|
||||
}
|
||||
|
||||
@@ -178,7 +168,7 @@ namespace PrivaPub.Domain.Social
|
||||
{
|
||||
var (local, remote) = await ResolveTarget(target, token);
|
||||
var targetUri = local?.Uri ?? remote?.ActorURI ?? target;
|
||||
var following = await _dbEntities.Followings.Match(f => f.AvatarId == follower.Id && f.TargetActorURI == targetUri).ExecuteFirstAsync(token);
|
||||
var following = await dbEntities.Followings.Match(f => f.AvatarId == follower.Id && f.TargetActorURI == targetUri).ExecuteFirstAsync(token);
|
||||
if (following == default)
|
||||
return;
|
||||
|
||||
@@ -202,17 +192,17 @@ namespace PrivaPub.Domain.Social
|
||||
["actor"] = follower.Uri,
|
||||
["object"] = FollowActivity(follower, following)
|
||||
};
|
||||
await _delivery.Enqueue(follower, new[] { following.TargetInboxURL }, undo, token);
|
||||
await delivery.Enqueue(follower, new[] { following.TargetInboxURL }, undo, token: token);
|
||||
}
|
||||
|
||||
public async Task<bool> Decide(LocalActor me, string followerAccountId, bool accept, CancellationToken token)
|
||||
{
|
||||
var localFollower = await _localActors.FindById(LocalActorKind.Person, followerAccountId, token);
|
||||
var remoteFollower = localFollower == default ? await _dbEntities.ForeignAvatars.MatchID(followerAccountId).ExecuteFirstAsync(token) : default;
|
||||
var localFollower = await localActors.FindById(LocalActorKind.Person, followerAccountId, token);
|
||||
var remoteFollower = localFollower == default ? await dbEntities.ForeignAvatars.MatchID(followerAccountId).ExecuteFirstAsync(token) : default;
|
||||
var followerUri = localFollower?.Uri ?? remoteFollower?.ActorURI;
|
||||
if (followerUri == default)
|
||||
return false;
|
||||
var request = await _dbEntities.Followers.Match(f => f.LocalActorId == me.Id && f.LocalActorKind == me.Kind && f.ActorURI == followerUri && !f.IsAccepted)
|
||||
var request = await dbEntities.Followers.Match(f => f.LocalActorId == me.Id && f.LocalActorKind == me.Kind && f.ActorURI == followerUri && !f.IsAccepted)
|
||||
.ExecuteFirstAsync(token);
|
||||
if (request == default)
|
||||
return false;
|
||||
@@ -249,10 +239,10 @@ namespace PrivaPub.Domain.Social
|
||||
["actor"] = me.Uri,
|
||||
["object"] = follow
|
||||
};
|
||||
await _delivery.Enqueue(me, new[] { request.InboxURL }, answer, token);
|
||||
await delivery.Enqueue(me, new[] { request.InboxURL }, answer, token: token);
|
||||
}
|
||||
if (accept)
|
||||
await Notifications.Add(me.Id, NotificationType.Follow, followerAccountId, followerUri, default, token);
|
||||
await Notifications.Add(me.Id, NotificationType.Follow, followerAccountId, followerUri, default, token: token);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -261,8 +251,8 @@ namespace PrivaPub.Domain.Social
|
||||
var result = new WebResult();
|
||||
var follower = await OwnedAvatar(rootUserId, avatarId, token);
|
||||
if (follower == default)
|
||||
return result.Invalidate(_localizer["Avatar not found."], StatusCodes.Status404NotFound);
|
||||
result.Data = (await _dbEntities.Followings.Match(f => f.AvatarId == follower.Id).Sort(f => f.ID, Order.Descending).ExecuteAsync(token))
|
||||
return result.Invalidate(localizer["Avatar not found."], StatusCodes.Status404NotFound);
|
||||
result.Data = (await dbEntities.Followings.Match(f => f.AvatarId == follower.Id).Sort(f => f.ID, Order.Descending).ExecuteAsync(token))
|
||||
.Select(ToView).ToList();
|
||||
return result;
|
||||
}
|
||||
@@ -286,7 +276,7 @@ namespace PrivaPub.Domain.Social
|
||||
.ExecuteAsync(token);
|
||||
if (target.Kind == LocalActorKind.Person)
|
||||
await Notifications.Add(target.Id, following.State == FollowState.Accepted ? NotificationType.Follow : NotificationType.FollowRequest,
|
||||
follower.Id, follower.Uri, default, token);
|
||||
follower.Id, follower.Uri, default, token: token);
|
||||
}
|
||||
|
||||
public Task<(LocalActor Local, ForeignAvatar Remote)> Resolve(string target, CancellationToken token) => ResolveTarget(target, token);
|
||||
@@ -298,17 +288,17 @@ namespace PrivaPub.Domain.Social
|
||||
return default;
|
||||
if (target.StartsWith("https://", StringComparison.OrdinalIgnoreCase) || target.StartsWith("http://", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
var byUri = await _localActors.FindByUri(target, token);
|
||||
return byUri != default ? (byUri, default) : (default, await _remoteActors.GetActor(target, refresh: false, token));
|
||||
var byUri = await localActors.FindByUri(target, token);
|
||||
return byUri != default ? (byUri, default) : (default, await remoteActors.GetActor(target, refresh: false, token));
|
||||
}
|
||||
|
||||
var parts = target.TrimStart('@').Split('@');
|
||||
var localDomain = new Uri(_localActors.BaseAddress).Authority;
|
||||
var localDomain = new Uri(localActors.BaseAddress).Authority;
|
||||
if (parts.Length == 1 || parts[1].Equals(localDomain, StringComparison.OrdinalIgnoreCase))
|
||||
return (await _localActors.FindByUserName(parts[0], token), default);
|
||||
return (await localActors.FindByUserName(parts[0], token), default);
|
||||
|
||||
var actorUri = await _remoteActors.ResolveHandle($"{parts[0]}@{parts[1]}", token);
|
||||
return (default, actorUri == default ? default : await _remoteActors.GetActor(actorUri, refresh: false, token));
|
||||
var actorUri = await remoteActors.ResolveHandle($"{parts[0]}@{parts[1]}", token);
|
||||
return (default, actorUri == default ? default : await remoteActors.GetActor(actorUri, refresh: false, token));
|
||||
}
|
||||
|
||||
// how long after it was made, or last sent again, a request still unanswered is sent again: a server can take a Follow and
|
||||
@@ -324,19 +314,19 @@ namespace PrivaPub.Domain.Social
|
||||
{
|
||||
var sent = 0;
|
||||
// (a request older than the count has no Resent yet: "not at least" matches it, "less than" would not)
|
||||
var pending = await _dbEntities.Followings.Match(f => f.State == FollowState.Requested && !f.TargetIsLocal && !(f.Resent >= ResendAfter.Length))
|
||||
var pending = await dbEntities.Followings.Match(f => f.State == FollowState.Requested && !f.TargetIsLocal && !(f.Resent >= ResendAfter.Length))
|
||||
.ExecuteAsync(token);
|
||||
foreach (var following in pending.Where(f => (f.ResentAt ?? f.CreatedAt) + ResendAfter[f.Resent] <= now))
|
||||
{
|
||||
var follower = await _localActors.FindById(following.FollowerKind ?? LocalActorKind.Person, following.AvatarId, token);
|
||||
var inbox = following.TargetInboxURL ?? (await _remoteActors.GetActor(following.TargetActorURI, refresh: false, token))?.InboxURL;
|
||||
var follower = await localActors.FindById(following.FollowerKind ?? LocalActorKind.Person, following.AvatarId, token);
|
||||
var inbox = following.TargetInboxURL ?? (await remoteActors.GetActor(following.TargetActorURI, refresh: false, token))?.InboxURL;
|
||||
if (follower != default && !string.IsNullOrEmpty(inbox))
|
||||
{
|
||||
// under a new id each time: Lemmy keeps the ids it received and never answers one again
|
||||
var again = FollowActivity(follower, following);
|
||||
again["id"] = AgainId(following.FollowActivityURI, following.Resent + 1);
|
||||
await _delivery.Enqueue(follower, new[] { inbox }, again, token,
|
||||
again: "resend-" + now.ToString("yyyyMMddHHmm", System.Globalization.CultureInfo.InvariantCulture));
|
||||
await delivery.Enqueue(follower, new[] { inbox }, again,
|
||||
again: "resend-" + now.ToString("yyyyMMddHHmm", System.Globalization.CultureInfo.InvariantCulture), token);
|
||||
sent++;
|
||||
}
|
||||
await DB.Default.Update<Following>().MatchID(following.ID).Modify(b => b.Inc(f => f.Resent, 1)).Modify(f => f.ResentAt, now)
|
||||
@@ -363,10 +353,10 @@ namespace PrivaPub.Domain.Social
|
||||
{
|
||||
if (string.IsNullOrEmpty(rootUserId) || string.IsNullOrEmpty(avatarId))
|
||||
return default;
|
||||
if (!await _dbEntities.RootToAvatars.Match(ra => ra.RootId == rootUserId && ra.AvatarId == avatarId).ExecuteAnyAsync(token))
|
||||
if (!await dbEntities.RootToAvatars.Match(ra => ra.RootId == rootUserId && ra.AvatarId == avatarId).ExecuteAnyAsync(token))
|
||||
return default;
|
||||
// a suspended persona does nothing through the client API either (R6)
|
||||
return await _localActors.FindById(LocalActorKind.Person, avatarId, token) is { Suspended: false } persona ? persona : default;
|
||||
return await localActors.FindById(LocalActorKind.Person, avatarId, token) is { Suspended: false } persona ? persona : default;
|
||||
}
|
||||
|
||||
static ViewFollowing ToView(Following following) => new()
|
||||
|
||||
Reference in new issue
Block a user