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
@@ -30,26 +30,16 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
[ApiController,
|
||||
Route("clientapi/admin"),
|
||||
Authorize(Policy = Policies.IsAdmin)]
|
||||
public class InstanceAdminController : ControllerBase
|
||||
public class InstanceAdminController(
|
||||
IInstanceSettings instanceSettings,
|
||||
IModerationLog moderationLog,
|
||||
IStringLocalizer<GenericRes> localizer,
|
||||
ILocalActorService localActors,
|
||||
ILogger<InstanceAdminController> logger) : ControllerBase
|
||||
{
|
||||
const int MaxSettingsRelays = 20;
|
||||
const string Thumbnail = "thumbnail";
|
||||
|
||||
readonly IInstanceSettings _settings;
|
||||
readonly IModerationLog _log;
|
||||
readonly IStringLocalizer _localizer;
|
||||
readonly ILocalActorService _localActors;
|
||||
readonly ILogger<InstanceAdminController> _logger;
|
||||
|
||||
public InstanceAdminController(IInstanceSettings settings, IModerationLog log, IStringLocalizer<GenericRes> localizer, ILocalActorService localActors,
|
||||
ILogger<InstanceAdminController> logger)
|
||||
{
|
||||
_settings = settings;
|
||||
_log = log;
|
||||
_localizer = localizer;
|
||||
_localActors = localActors;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
// the token says administrator; the database has the last word
|
||||
async Task<RootUser> Administrator(CancellationToken token)
|
||||
@@ -58,7 +48,7 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
return root is { IsBanned: false, DeletedAt: null } && root.Policies.Contains(Policies.IsAdmin) ? root : default;
|
||||
}
|
||||
|
||||
IActionResult Refused(int status, string message) => StatusCode(status, new WebResult().Invalidate(_localizer[message], status));
|
||||
IActionResult Refused(int status, string message) => StatusCode(status, new WebResult().Invalidate(localizer[message], status));
|
||||
|
||||
#region settings
|
||||
|
||||
@@ -67,7 +57,7 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
{
|
||||
if (await Administrator(token) == default)
|
||||
return Forbid();
|
||||
return Ok(await View(_settings.Current, token));
|
||||
return Ok(await View(instanceSettings.Current, token));
|
||||
}
|
||||
|
||||
[HttpPost, Route("/clientapi/admin/settings")]
|
||||
@@ -86,7 +76,7 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
var changed = new List<string>();
|
||||
var ruleActs = new List<(string Action, ServerRule Rule)>();
|
||||
var now = DateTime.UtcNow;
|
||||
var saved = await _settings.Update(settings =>
|
||||
var saved = await instanceSettings.Update(settings =>
|
||||
{
|
||||
void Set(string name, string value, Func<string> get, Action<string> set)
|
||||
{
|
||||
@@ -175,9 +165,9 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
}, admin.ID, token);
|
||||
|
||||
if (changed.Count > 0)
|
||||
await _log.Write(admin.ID, AdminActions.SettingsUpdate, AdminTargets.Settings, ServerSettings.Name, saved.Title, note: string.Join(", ", changed), token: token);
|
||||
await moderationLog.Write(admin.ID, AdminActions.SettingsUpdate, AdminTargets.Settings, ServerSettings.Name, saved.Title, note: string.Join(", ", changed), token: token);
|
||||
foreach (var (action, rule) in ruleActs)
|
||||
await _log.Write(admin.ID, action, AdminTargets.Rule, rule.Id, rule.Text, token: token);
|
||||
await moderationLog.Write(admin.ID, action, AdminTargets.Rule, rule.Id, rule.Text, token: token);
|
||||
return Ok(await View(saved, token));
|
||||
}
|
||||
|
||||
@@ -194,7 +184,7 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
if (!outcome.Ok)
|
||||
return StatusCode(outcome.Status, new WebResult().Invalidate(outcome.Error, outcome.Status));
|
||||
var previous = default(string);
|
||||
var saved = await _settings.Update(settings =>
|
||||
var saved = await instanceSettings.Update(settings =>
|
||||
{
|
||||
previous = settings.ThumbnailMediaId;
|
||||
settings.ThumbnailMediaId = outcome.Attachment.ID;
|
||||
@@ -202,7 +192,7 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
}, admin.ID, token);
|
||||
if (previous != default)
|
||||
await media.Trash(m => m.ID == previous && m.ServerUse == Thumbnail, "thumbnail replaced", token);
|
||||
await _log.Write(admin.ID, AdminActions.SettingsThumbnail, AdminTargets.Settings, ServerSettings.Name, saved.Title, note: "replaced", token: token);
|
||||
await moderationLog.Write(admin.ID, AdminActions.SettingsThumbnail, AdminTargets.Settings, ServerSettings.Name, saved.Title, note: "replaced", token: token);
|
||||
return Ok(await View(saved, token));
|
||||
}
|
||||
|
||||
@@ -213,7 +203,7 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
if (admin == default)
|
||||
return Forbid();
|
||||
var previous = default(string);
|
||||
var saved = await _settings.Update(settings =>
|
||||
var saved = await instanceSettings.Update(settings =>
|
||||
{
|
||||
previous = settings.ThumbnailMediaId;
|
||||
settings.ThumbnailMediaId = default;
|
||||
@@ -222,7 +212,7 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
if (previous != default)
|
||||
{
|
||||
await media.Trash(m => m.ID == previous && m.ServerUse == Thumbnail, "thumbnail removed", token);
|
||||
await _log.Write(admin.ID, AdminActions.SettingsThumbnail, AdminTargets.Settings, ServerSettings.Name, saved.Title, note: "removed", token: token);
|
||||
await moderationLog.Write(admin.ID, AdminActions.SettingsThumbnail, AdminTargets.Settings, ServerSettings.Name, saved.Title, note: "removed", token: token);
|
||||
}
|
||||
return Ok(await View(saved, token));
|
||||
}
|
||||
@@ -257,9 +247,9 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
Id = contact.ID,
|
||||
UserName = contact.UserName,
|
||||
Name = contact.Name,
|
||||
Handle = _localActors.FromAvatar(contact).Handle
|
||||
Handle = localActors.FromAvatar(contact).Handle
|
||||
},
|
||||
ThumbnailUrl = settings.ThumbnailUrl ?? $"{_localActors.BaseAddress}{ServerSettings.DefaultThumbnailPath}",
|
||||
ThumbnailUrl = settings.ThumbnailUrl ?? $"{localActors.BaseAddress}{ServerSettings.DefaultThumbnailPath}",
|
||||
ThumbnailIsDefault = settings.ThumbnailUrl == default,
|
||||
PrivacyPolicy = settings.PrivacyPolicy,
|
||||
PrivacyPolicyUpdatedAt = settings.PrivacyPolicyUpdatedAt,
|
||||
@@ -322,7 +312,7 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
if (Invalid(form) is { } refused)
|
||||
return refused;
|
||||
var made = await announcements.Insert(Draft(form), token);
|
||||
await _log.Write(admin.ID, AdminActions.AnnouncementInsert, AdminTargets.Announcement, made.ID, made.Text,
|
||||
await moderationLog.Write(admin.ID, AdminActions.AnnouncementInsert, AdminTargets.Announcement, made.ID, made.Text,
|
||||
note: made.IsPublished ? "published" : "draft", token: token);
|
||||
return Ok(await View(made, token));
|
||||
}
|
||||
@@ -338,7 +328,7 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
var updated = await announcements.Update(form.Id, Draft(form), token);
|
||||
if (updated == default)
|
||||
return NotFound();
|
||||
await _log.Write(admin.ID, AdminActions.AnnouncementUpdate, AdminTargets.Announcement, updated.ID, updated.Text,
|
||||
await moderationLog.Write(admin.ID, AdminActions.AnnouncementUpdate, AdminTargets.Announcement, updated.ID, updated.Text,
|
||||
note: updated.IsPublished ? "published" : "draft", token: token);
|
||||
return Ok(await View(updated, token));
|
||||
}
|
||||
@@ -352,7 +342,7 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
var deleted = await announcements.Delete(id, token);
|
||||
if (deleted == default)
|
||||
return NotFound();
|
||||
await _log.Write(admin.ID, AdminActions.AnnouncementDelete, AdminTargets.Announcement, deleted.ID, deleted.Text, token: token);
|
||||
await moderationLog.Write(admin.ID, AdminActions.AnnouncementDelete, AdminTargets.Announcement, deleted.ID, deleted.Text, token: token);
|
||||
return Ok();
|
||||
}
|
||||
|
||||
@@ -398,7 +388,7 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
{
|
||||
if (await Administrator(token) == default)
|
||||
return Forbid();
|
||||
return Ok(await StaffPickViews(_settings.Current, token));
|
||||
return Ok(await StaffPickViews(instanceSettings.Current, token));
|
||||
}
|
||||
|
||||
[HttpPost, Route("/clientapi/admin/staff-picks/insert")]
|
||||
@@ -411,16 +401,16 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
var picked = await Pickable(id, token);
|
||||
if (picked == default)
|
||||
return Refused(StatusCodes.Status404NotFound, "No such account to suggest.");
|
||||
if (_settings.Current.StaffPicks.Contains(id))
|
||||
if (instanceSettings.Current.StaffPicks.Contains(id))
|
||||
return Refused(StatusCodes.Status409Conflict, "This account is suggested already.");
|
||||
if (_settings.Current.StaffPicks.Count >= MaxStaffPicks)
|
||||
if (instanceSettings.Current.StaffPicks.Count >= MaxStaffPicks)
|
||||
return Refused(StatusCodes.Status422UnprocessableEntity, "40 accounts at most are suggested.");
|
||||
var saved = await _settings.Update(settings =>
|
||||
var saved = await instanceSettings.Update(settings =>
|
||||
{
|
||||
if (!settings.StaffPicks.Contains(id))
|
||||
settings.StaffPicks.Add(id);
|
||||
}, admin.ID, token);
|
||||
await _log.Write(admin.ID, AdminActions.StaffPickInsert, picked.Value.IsLocal ? AdminTargets.Persona : AdminTargets.Account, id, picked.Value.Handle,
|
||||
await moderationLog.Write(admin.ID, AdminActions.StaffPickInsert, picked.Value.IsLocal ? AdminTargets.Persona : AdminTargets.Account, id, picked.Value.Handle,
|
||||
token: token);
|
||||
return Ok(await StaffPickViews(saved, token));
|
||||
}
|
||||
@@ -432,11 +422,11 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
if (admin == default)
|
||||
return Forbid();
|
||||
accountId = accountId?.Trim();
|
||||
if (string.IsNullOrEmpty(accountId) || !_settings.Current.StaffPicks.Contains(accountId))
|
||||
if (string.IsNullOrEmpty(accountId) || !instanceSettings.Current.StaffPicks.Contains(accountId))
|
||||
return NotFound();
|
||||
var view = (await StaffPickViews(_settings.Current, token)).FirstOrDefault(p => p.AccountId == accountId);
|
||||
var saved = await _settings.Update(settings => settings.StaffPicks.Remove(accountId), admin.ID, token);
|
||||
await _log.Write(admin.ID, AdminActions.StaffPickDelete, view?.IsLocal == true ? AdminTargets.Persona : AdminTargets.Account, accountId,
|
||||
var view = (await StaffPickViews(instanceSettings.Current, token)).FirstOrDefault(p => p.AccountId == accountId);
|
||||
var saved = await instanceSettings.Update(settings => settings.StaffPicks.Remove(accountId), admin.ID, token);
|
||||
await moderationLog.Write(admin.ID, AdminActions.StaffPickDelete, view?.IsLocal == true ? AdminTargets.Persona : AdminTargets.Account, accountId,
|
||||
view?.Handle ?? accountId, token: token);
|
||||
return Ok(await StaffPickViews(saved, token));
|
||||
}
|
||||
@@ -451,7 +441,7 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
return default;
|
||||
var avatar = await DB.Default.Find<Avatar>().Match(a => a.ID == id && !a.DeletionAt.HasValue && !a.SuspendedAt.HasValue).ExecuteFirstAsync(token);
|
||||
if (avatar != default)
|
||||
return (await Counted.HeldBackPersonas(token)).Contains(avatar.ID) ? ((bool, string)?)null : (true, _localActors.FromAvatar(avatar).Handle);
|
||||
return (await Counted.HeldBackPersonas(token)).Contains(avatar.ID) ? ((bool, string)?)null : (true, localActors.FromAvatar(avatar).Handle);
|
||||
var foreign = await DB.Default.Find<ForeignAvatar>().Match(f => f.ID == id && !f.DeletionAt.HasValue && !f.SuspendedAt.HasValue
|
||||
&& (f.AvatarType == AvatarType.Person || f.AvatarType == AvatarType.Service || f.AvatarType == AvatarType.Organization)).ExecuteFirstAsync(token);
|
||||
return foreign == default ? ((bool, string)?)null : (false, $"{foreign.UserName}@{foreign.Domain}");
|
||||
@@ -468,7 +458,7 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
{
|
||||
AccountId = id,
|
||||
IsLocal = true,
|
||||
Handle = _localActors.FromAvatar(avatar).Handle,
|
||||
Handle = localActors.FromAvatar(avatar).Handle,
|
||||
Name = avatar.Name,
|
||||
IsShown = avatar.DeletionAt == default && avatar.SuspendedAt == default && avatar.SilencedAt == default && !held.Contains(id)
|
||||
}
|
||||
@@ -492,7 +482,7 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
{
|
||||
if (await Administrator(token) == default)
|
||||
return Forbid();
|
||||
return Ok(await RelayViews(_settings.Current, token));
|
||||
return Ok(await RelayViews(instanceSettings.Current, token));
|
||||
}
|
||||
|
||||
// a relay named by the settings: subscribed to at once (in the background: resolving it is a fetch), the page polls
|
||||
@@ -508,16 +498,16 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
return Refused(StatusCodes.Status422UnprocessableEntity, "A relay is named by the https address of its actor or its inbox.");
|
||||
if (relays.Configured.Contains(address))
|
||||
return Refused(StatusCodes.Status409Conflict, "The configuration names this relay already.");
|
||||
if (_settings.Current.Relays.Contains(address))
|
||||
return Ok(await RelayViews(_settings.Current, token));
|
||||
if (_settings.Current.Relays.Count >= MaxSettingsRelays)
|
||||
if (instanceSettings.Current.Relays.Contains(address))
|
||||
return Ok(await RelayViews(instanceSettings.Current, token));
|
||||
if (instanceSettings.Current.Relays.Count >= MaxSettingsRelays)
|
||||
return Refused(StatusCodes.Status422UnprocessableEntity, "The settings name 20 relays at most.");
|
||||
var saved = await _settings.Update(settings =>
|
||||
var saved = await instanceSettings.Update(settings =>
|
||||
{
|
||||
if (!settings.Relays.Contains(address))
|
||||
settings.Relays.Add(address);
|
||||
}, admin.ID, token);
|
||||
await _log.Write(admin.ID, AdminActions.RelayInsert, AdminTargets.Relay, address, address, token: token);
|
||||
await moderationLog.Write(admin.ID, AdminActions.RelayInsert, AdminTargets.Relay, address, address, token: token);
|
||||
Reconcile(relays);
|
||||
return Accepted(await RelayViews(saved, token));
|
||||
}
|
||||
@@ -532,10 +522,10 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
address = address?.Trim();
|
||||
if (relays.Configured.Contains(address))
|
||||
return Refused(StatusCodes.Status409Conflict, "This relay is named by the configuration (Federation:Relays): remove it there.");
|
||||
if (string.IsNullOrEmpty(address) || !_settings.Current.Relays.Contains(address))
|
||||
if (string.IsNullOrEmpty(address) || !instanceSettings.Current.Relays.Contains(address))
|
||||
return NotFound();
|
||||
var saved = await _settings.Update(settings => settings.Relays.Remove(address), admin.ID, token);
|
||||
await _log.Write(admin.ID, AdminActions.RelayDelete, AdminTargets.Relay, address, address, token: token);
|
||||
var saved = await instanceSettings.Update(settings => settings.Relays.Remove(address), admin.ID, token);
|
||||
await moderationLog.Write(admin.ID, AdminActions.RelayDelete, AdminTargets.Relay, address, address, token: token);
|
||||
Reconcile(relays);
|
||||
return Accepted(await RelayViews(saved, token));
|
||||
}
|
||||
@@ -548,7 +538,7 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogWarning(ex, "Relay subscriptions could not be brought up to date");
|
||||
logger.LogWarning(ex, "Relay subscriptions could not be brought up to date");
|
||||
}
|
||||
}, CancellationToken.None);
|
||||
|
||||
|
||||
Reference in new issue
Block a user