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
@@ -26,7 +26,12 @@ namespace PrivaPub.Api.Mastodon.Controllers
|
||||
// The instance API: what the server says of itself comes from its settings (IInstanceSettings, edited on the
|
||||
// administrator's page; until then exactly what it said before), its numbers from Counted, its limits from where they
|
||||
// are enforced.
|
||||
public class InstanceController : MastodonController
|
||||
public class InstanceController(
|
||||
ILocalActorService localActors,
|
||||
IOptionsMonitor<RegistrationOptions> registrationOptions,
|
||||
IInstanceSettings instanceSettings,
|
||||
MastodonMapper mapper,
|
||||
PrivaPub.Infrastructure.Push.IVapid vapidKeys) : MastodonController
|
||||
{
|
||||
// The Mastodon version this API answers as, then PrivaPub's own release (its tag, or the commit a build came from).
|
||||
// 4.5.0 since R9 (2026-10-18): every client route of Mastodon 4.3, 4.4 and 4.5 is served or answers as a documented
|
||||
@@ -47,27 +52,12 @@ namespace PrivaPub.Api.Mastodon.Controllers
|
||||
|
||||
sealed record CachedActivity(DateTime At, object Weeks);
|
||||
|
||||
readonly ILocalActorService _localActors;
|
||||
readonly IOptionsMonitor<RegistrationOptions> _registrations;
|
||||
readonly IInstanceSettings _settings;
|
||||
readonly MastodonMapper _mapper;
|
||||
readonly PrivaPub.Infrastructure.Push.IVapid _vapid;
|
||||
|
||||
public InstanceController(ILocalActorService localActors, IOptionsMonitor<RegistrationOptions> registrations, IInstanceSettings settings,
|
||||
MastodonMapper mapper, PrivaPub.Infrastructure.Push.IVapid vapid)
|
||||
{
|
||||
_localActors = localActors;
|
||||
_registrations = registrations;
|
||||
_settings = settings;
|
||||
_mapper = mapper;
|
||||
_vapid = vapid;
|
||||
}
|
||||
bool Open => registrationOptions.CurrentValue.IsOpen;
|
||||
|
||||
bool Open => _registrations.CurrentValue.IsOpen;
|
||||
ServerSettings Settings => instanceSettings.Current;
|
||||
|
||||
ServerSettings Settings => _settings.Current;
|
||||
|
||||
string Thumbnail => Settings.ThumbnailUrl ?? $"{_localActors.BaseAddress}{ServerSettings.DefaultThumbnailPath}";
|
||||
string Thumbnail => Settings.ThumbnailUrl ?? $"{localActors.BaseAddress}{ServerSettings.DefaultThumbnailPath}";
|
||||
|
||||
static object Rules(ServerSettings settings) =>
|
||||
settings.ListedRules().Select(r => new { id = r.Id, text = r.Text ?? string.Empty, hint = r.Hint ?? string.Empty }).ToList();
|
||||
@@ -81,7 +71,7 @@ namespace PrivaPub.Api.Mastodon.Controllers
|
||||
var avatar = await DB.Default.Find<Avatar>().Match(a => a.ID == id && !a.DeletionAt.HasValue).ExecuteFirstAsync(token);
|
||||
if (avatar == default || (await Counted.HeldBackPersonas(token)).Contains(id))
|
||||
return default;
|
||||
return await _mapper.Local(_localActors.FromAvatar(avatar), false, token);
|
||||
return await mapper.Local(localActors.FromAvatar(avatar), false, token);
|
||||
}
|
||||
|
||||
// the languages this server is set up for (AppConfiguration:SupportedLanguages), "en" when none are named
|
||||
@@ -92,10 +82,10 @@ namespace PrivaPub.Api.Mastodon.Controllers
|
||||
return codes.Count == 0 ? new[] { "en" } : codes;
|
||||
}
|
||||
|
||||
string Domain => new Uri(_localActors.BaseAddress).Authority;
|
||||
string Domain => new Uri(localActors.BaseAddress).Authority;
|
||||
|
||||
// where clients open their streams (StreamingController): this server, as ws or wss
|
||||
string Streaming => new UriBuilder(_localActors.BaseAddress) { Scheme = _localActors.BaseAddress.StartsWith("https", StringComparison.OrdinalIgnoreCase) ? "wss" : "ws" }
|
||||
string Streaming => new UriBuilder(localActors.BaseAddress) { Scheme = localActors.BaseAddress.StartsWith("https", StringComparison.OrdinalIgnoreCase) ? "wss" : "ws" }
|
||||
.Uri.GetLeftPart(UriPartial.Authority);
|
||||
|
||||
// every limit is what the server enforces, read from where it is enforced
|
||||
@@ -180,7 +170,7 @@ namespace PrivaPub.Api.Mastodon.Controllers
|
||||
media_attachments = MediaAttachments,
|
||||
polls = Polls,
|
||||
translation = new { enabled = false },
|
||||
vapid = new { public_key = (await _vapid.Key(token)).ForApi }//Web Push (R9): the key every push is signed with
|
||||
vapid = new { public_key = (await vapidKeys.Key(token)).ForApi }//Web Push (R9): the key every push is signed with
|
||||
},
|
||||
registrations = new { enabled = Open, approval_required = false, message = Open ? default : RegistrationOptions.ClosedMessage },
|
||||
contact = new { email = Settings.ContactEmail ?? string.Empty, account = await ContactAccount(Settings, token) },
|
||||
|
||||
Reference in new issue
Block a user