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
@@ -18,27 +18,18 @@ namespace PrivaPub.Domain.Relationships
|
||||
IReadOnlyList<string> ruleIds, bool forward, CancellationToken token);
|
||||
}
|
||||
|
||||
public class ReportService : IReportService
|
||||
public class ReportService(
|
||||
DbEntities dbEntities,
|
||||
ILocalActorService localActors,
|
||||
IDeliveryService delivery,
|
||||
Instance.IInstanceSettings settings) : IReportService
|
||||
{
|
||||
readonly DbEntities _dbEntities;
|
||||
readonly ILocalActorService _localActors;
|
||||
readonly IDeliveryService _delivery;
|
||||
readonly Instance.IInstanceSettings _settings;
|
||||
|
||||
public ReportService(DbEntities dbEntities, ILocalActorService localActors, IDeliveryService delivery, Instance.IInstanceSettings settings)
|
||||
{
|
||||
_dbEntities = dbEntities;
|
||||
_localActors = localActors;
|
||||
_delivery = delivery;
|
||||
_settings = settings;
|
||||
}
|
||||
|
||||
public async Task<Report> File(LocalActor reporter, string targetAccountId, IReadOnlyList<string> postIds, string comment, string category,
|
||||
IReadOnlyList<string> ruleIds, bool forward, CancellationToken token)
|
||||
{
|
||||
// the server's rules it names, deleted ones too (they may have been listed when the reader opened the dialog); a
|
||||
// report naming rules is a violation unless it says what else it is, and only a violation names rules, as on Mastodon
|
||||
var known = _settings.Current.Rules.Select(r => r.Id).ToHashSet(StringComparer.Ordinal);
|
||||
var known = settings.Current.Rules.Select(r => r.Id).ToHashSet(StringComparer.Ordinal);
|
||||
var rules = (ruleIds ?? Array.Empty<string>()).Where(known.Contains).Distinct().ToList();
|
||||
if (rules.Count > 0 && string.IsNullOrEmpty(category))
|
||||
category = "violation";
|
||||
@@ -46,14 +37,14 @@ namespace PrivaPub.Domain.Relationships
|
||||
if (category != "violation")
|
||||
rules.Clear();
|
||||
|
||||
var localTarget = await _dbEntities.Avatars.MatchID(targetAccountId).ExecuteFirstAsync(token);
|
||||
var remoteTarget = localTarget == default ? await _dbEntities.ForeignAvatars.MatchID(targetAccountId).ExecuteFirstAsync(token) : default;
|
||||
var localTarget = await dbEntities.Avatars.MatchID(targetAccountId).ExecuteFirstAsync(token);
|
||||
var remoteTarget = localTarget == default ? await dbEntities.ForeignAvatars.MatchID(targetAccountId).ExecuteFirstAsync(token) : default;
|
||||
if (localTarget == default && remoteTarget == default)
|
||||
return default;
|
||||
var targetUri = localTarget != default ? _localActors.FromAvatar(localTarget).Uri : remoteTarget.ActorURI;
|
||||
var targetUri = localTarget != default ? localActors.FromAvatar(localTarget).Uri : remoteTarget.ActorURI;
|
||||
var posts = postIds.Count == 0
|
||||
? new List<Models.Post.Post>()
|
||||
: await _dbEntities.Posts.Match(p => postIds.Contains(p.ID) && p.ActorURI == targetUri).ExecuteAsync(token);
|
||||
: await dbEntities.Posts.Match(p => postIds.Contains(p.ID) && p.ActorURI == targetUri).ExecuteAsync(token);
|
||||
|
||||
var report = new Report
|
||||
{
|
||||
@@ -75,15 +66,15 @@ namespace PrivaPub.Domain.Relationships
|
||||
var reason = string.IsNullOrEmpty(report.Comment) ? report.Category : report.Comment;
|
||||
foreach (var post in posts)
|
||||
{
|
||||
var community = await Communities.Of(post, _dbEntities, token);
|
||||
var community = await Communities.Of(post, dbEntities, token);
|
||||
if (community == default || !await TakesServiceReports(community, token))
|
||||
continue;
|
||||
var group = await _dbEntities.ForeignAvatars.Match(a => a.ActorURI == community).ExecuteFirstAsync(token);
|
||||
var group = await dbEntities.ForeignAvatars.Match(a => a.ActorURI == community).ExecuteFirstAsync(token);
|
||||
var inbox = string.IsNullOrEmpty(group?.SharedInboxURL) ? group?.InboxURL : group.SharedInboxURL;
|
||||
if (string.IsNullOrEmpty(inbox))
|
||||
continue;
|
||||
var serviceReporter = await _localActors.GetReporterActor(token);
|
||||
await _delivery.Enqueue(serviceReporter, new[] { inbox }, new JsonObject
|
||||
var serviceReporter = await localActors.GetReporterActor(token);
|
||||
await delivery.Enqueue(serviceReporter, new[] { inbox }, new JsonObject
|
||||
{
|
||||
["@context"] = ActivityPubRenderer.ActivityStreams,
|
||||
["id"] = serviceReporter.ActivityUri($"flag-{report.ID}-{++flagged}"),
|
||||
@@ -94,13 +85,13 @@ namespace PrivaPub.Domain.Relationships
|
||||
["object"] = post.ObjectURI,
|
||||
["summary"] = reason,
|
||||
["content"] = reason
|
||||
}, token);
|
||||
}, token: token);
|
||||
}
|
||||
// every other server, the author's, as before: an account alone, or posts outside such communities, go nowhere when
|
||||
// the author's server takes reports only in Lemmy's shape
|
||||
if (!await TakesServiceReports(targetUri, token))
|
||||
{
|
||||
var instance = await _localActors.GetInstanceActor(token);
|
||||
var instance = await localActors.GetInstanceActor(token);
|
||||
var flag = new JsonObject
|
||||
{
|
||||
["@context"] = ActivityPubRenderer.ActivityStreams,
|
||||
@@ -110,7 +101,7 @@ namespace PrivaPub.Domain.Relationships
|
||||
["content"] = report.Comment ?? string.Empty,
|
||||
["object"] = new JsonArray(report.ObjectURIs.Prepend(targetUri).Select(u => (JsonNode)u).ToArray())
|
||||
};
|
||||
await _delivery.Enqueue(instance, new[] { remoteTarget.SharedInboxURL ?? remoteTarget.InboxURL }, flag, token);
|
||||
await delivery.Enqueue(instance, new[] { remoteTarget.SharedInboxURL ?? remoteTarget.InboxURL }, flag, token: token);
|
||||
flagged++;
|
||||
}
|
||||
if (flagged > 0)
|
||||
|
||||
Reference in new issue
Block a user