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
@@ -91,7 +91,10 @@ namespace PrivaPub.Federation.Actors
|
||||
// a persona or group that was deleted: its name stays reserved, and its documents answer 410 with this
|
||||
public sealed record GoneActor(string Uri, string FormerType, DateTime DeletedAt);
|
||||
|
||||
public class LocalActorService : ILocalActorService
|
||||
public class LocalActorService(
|
||||
DbEntities dbEntities,
|
||||
IOptionsMonitor<AppConfiguration> appConfiguration,
|
||||
Domain.Instance.IInstanceSettings instanceSettings) : ILocalActorService
|
||||
{
|
||||
public const string InstanceUserName = "privapub";
|
||||
// the anonymous Service that carries this server's reports to Lemmy, which takes no report from an Application
|
||||
@@ -114,21 +117,11 @@ namespace PrivaPub.Federation.Actors
|
||||
// what the instance actor says of itself until the administrator describes the server (ServerSettings)
|
||||
const string InstanceSummary = "The instance actor of this PrivaPub server; it signs the requests no other actor speaks for.";
|
||||
|
||||
readonly DbEntities _dbEntities;
|
||||
readonly IOptionsMonitor<AppConfiguration> _appConfiguration;
|
||||
readonly Domain.Instance.IInstanceSettings _settings;
|
||||
InstanceActor _instanceActor;
|
||||
ReporterActor _reporterActor;
|
||||
ReaderActor _readerActor;
|
||||
|
||||
public LocalActorService(DbEntities dbEntities, IOptionsMonitor<AppConfiguration> appConfiguration, Domain.Instance.IInstanceSettings settings)
|
||||
{
|
||||
_dbEntities = dbEntities;
|
||||
_appConfiguration = appConfiguration;
|
||||
_settings = settings;
|
||||
}
|
||||
|
||||
public string BaseAddress => _appConfiguration.CurrentValue.BackendBaseAddress?.TrimEnd('/');
|
||||
public string BaseAddress => appConfiguration.CurrentValue.BackendBaseAddress?.TrimEnd('/');
|
||||
|
||||
public async Task<LocalActor> FindByUserName(string userName, CancellationToken token)
|
||||
{
|
||||
@@ -142,13 +135,13 @@ namespace PrivaPub.Federation.Actors
|
||||
if (userName == ReaderUserName)
|
||||
return await GetReaderActor(token);
|
||||
|
||||
var avatar = await _dbEntities.Avatars
|
||||
var avatar = await dbEntities.Avatars
|
||||
.Match(a => a.UserName == userName && !a.DeletionAt.HasValue)
|
||||
.ExecuteFirstAsync(token);
|
||||
if (avatar != default)
|
||||
return FromAvatar(avatar);
|
||||
|
||||
var group = await _dbEntities.Groups
|
||||
var group = await dbEntities.Groups
|
||||
.Match(g => g.UserName == userName && !g.DeletionAt.HasValue)
|
||||
.ExecuteFirstAsync(token);
|
||||
return group == default ? default : FromGroup(group);
|
||||
@@ -159,10 +152,10 @@ namespace PrivaPub.Federation.Actors
|
||||
if (string.IsNullOrEmpty(userName))
|
||||
return default;
|
||||
userName = userName.ToLowerInvariant();
|
||||
var avatar = await _dbEntities.Avatars.Match(a => a.UserName == userName && a.DeletionAt.HasValue).ExecuteFirstAsync(token);
|
||||
var avatar = await dbEntities.Avatars.Match(a => a.UserName == userName && a.DeletionAt.HasValue).ExecuteFirstAsync(token);
|
||||
if (avatar != default)
|
||||
return new GoneActor($"{BaseAddress}/peasants/{avatar.UserName}", "Person", avatar.DeletionAt.Value);
|
||||
var group = await _dbEntities.Groups.Match(g => g.UserName == userName && g.DeletionAt.HasValue).ExecuteFirstAsync(token);
|
||||
var group = await dbEntities.Groups.Match(g => g.UserName == userName && g.DeletionAt.HasValue).ExecuteFirstAsync(token);
|
||||
return group == default ? default : new GoneActor($"{BaseAddress}/peasants/{group.UserName}", "Group", group.DeletionAt.Value);
|
||||
}
|
||||
|
||||
@@ -171,10 +164,10 @@ namespace PrivaPub.Federation.Actors
|
||||
switch (kind)
|
||||
{
|
||||
case LocalActorKind.Person:
|
||||
var avatar = await _dbEntities.Avatars.MatchID(id).ExecuteFirstAsync(token);
|
||||
var avatar = await dbEntities.Avatars.MatchID(id).ExecuteFirstAsync(token);
|
||||
return avatar == default ? default : FromAvatar(avatar);
|
||||
case LocalActorKind.Group:
|
||||
var group = await _dbEntities.Groups.MatchID(id).ExecuteFirstAsync(token);
|
||||
var group = await dbEntities.Groups.MatchID(id).ExecuteFirstAsync(token);
|
||||
return group == default ? default : FromGroup(group);
|
||||
case LocalActorKind.Reporter:
|
||||
return await GetReporterActor(token);
|
||||
@@ -208,7 +201,7 @@ namespace PrivaPub.Federation.Actors
|
||||
{
|
||||
var instance = _instanceActor ??= await LoadInstanceActor(token);
|
||||
// the server's name, and its short description once the administrator wrote one of their own
|
||||
var settings = _settings.Current;
|
||||
var settings = instanceSettings.Current;
|
||||
|
||||
return new LocalActor
|
||||
{
|
||||
@@ -268,7 +261,7 @@ namespace PrivaPub.Federation.Actors
|
||||
|
||||
async Task<ReaderActor> LoadReaderActor(CancellationToken token)
|
||||
{
|
||||
var reader = await _dbEntities.ReaderActors.Sort(r => r.CreationDate, Order.Ascending).ExecuteFirstAsync(token);
|
||||
var reader = await dbEntities.ReaderActors.Sort(r => r.CreationDate, Order.Ascending).ExecuteFirstAsync(token);
|
||||
if (reader != default)
|
||||
return reader;
|
||||
var (privateKey, publicKey) = Keys.NewKeyPair();
|
||||
@@ -279,7 +272,7 @@ namespace PrivaPub.Federation.Actors
|
||||
|
||||
async Task<ReporterActor> LoadReporterActor(CancellationToken token)
|
||||
{
|
||||
var reporter = await _dbEntities.ReporterActors.Sort(r => r.CreationDate, Order.Ascending).ExecuteFirstAsync(token);
|
||||
var reporter = await dbEntities.ReporterActors.Sort(r => r.CreationDate, Order.Ascending).ExecuteFirstAsync(token);
|
||||
if (reporter != default)
|
||||
return reporter;
|
||||
var (privateKey, publicKey) = Keys.NewKeyPair();
|
||||
@@ -290,7 +283,7 @@ namespace PrivaPub.Federation.Actors
|
||||
|
||||
async Task<InstanceActor> LoadInstanceActor(CancellationToken token)
|
||||
{
|
||||
var instance = await _dbEntities.InstanceActors.Sort(i => i.CreationDate, Order.Ascending).ExecuteFirstAsync(token);
|
||||
var instance = await dbEntities.InstanceActors.Sort(i => i.CreationDate, Order.Ascending).ExecuteFirstAsync(token);
|
||||
if (instance != default)
|
||||
return instance;
|
||||
var (privateKey, publicKey) = Keys.NewKeyPair();
|
||||
|
||||
Reference in new issue
Block a user