From 0f73f6923978a083d1cb33ff86b11f0362157783 Mon Sep 17 00:00:00 2001 From: thepra Date: Tue, 10 Nov 2026 01:24:43 +0100 Subject: [PATCH] House rules: primary constructors, a cancellation token on every async call, and the rules fail the build - 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 Claude-Session: https://claude.ai/code/session_01W4YtEJrgxG12Pc39Fai8Bd --- CLAUDE.md | 42 ++- Directory.Build.props | 10 + .../AtLeastOnePropertyAttribute.cs | 15 +- PrivaPub/Api/Mastodon/Auth/OAuthPruner.cs | 18 +- PrivaPub/Api/Mastodon/Auth/OAuthSetup.cs | 1 + PrivaPub/Api/Mastodon/Auth/PersonaExchange.cs | 14 +- PrivaPub/Api/Mastodon/Auth/TokenController.cs | 20 +- .../Controllers/AccountsController.cs | 159 ++++---- .../Controllers/AnnouncementsController.cs | 16 +- .../Mastodon/Controllers/AppsController.cs | 31 +- .../Mastodon/Controllers/CdnsController.cs | 10 +- .../Controllers/FeaturedTagsController.cs | 43 +-- .../Mastodon/Controllers/FiltersController.cs | 11 +- .../Controllers/InstanceController.cs | 36 +- .../Mastodon/Controllers/ListsController.cs | 26 +- .../Mastodon/Controllers/MediaController.cs | 40 +- .../NotificationRequestsController.cs | 19 +- .../Mastodon/Controllers/PollsController.cs | 24 +- .../Controllers/ProvenanceController.cs | 38 +- .../Mastodon/Controllers/PushController.cs | 24 +- .../Controllers/ReactionsController.cs | 30 +- .../Mastodon/Controllers/ReportsController.cs | 17 +- .../ScheduledStatusesController.cs | 23 +- .../Mastodon/Controllers/SearchController.cs | 58 ++- .../Controllers/StatusesController.cs | 174 ++++----- .../Controllers/StreamingController.cs | 28 +- .../Controllers/SuggestionsController.cs | 17 +- .../Mastodon/Controllers/TagsController.cs | 28 +- .../Controllers/TimelinesController.cs | 63 ++-- .../Mastodon/Controllers/TrendsController.cs | 51 ++- .../Controllers/UserinfoController.cs | 16 +- PrivaPub/Api/Mastodon/Entities/Entities.cs | 21 ++ .../Api/Mastodon/Mappers/AccountSearch.cs | 47 +-- .../Api/Mastodon/Mappers/MastodonMapper.cs | 75 ++-- .../ClientToServer/AdminController.cs | 101 +++-- .../ClientToServer/DataController.cs | 22 +- .../ClientToServer/DomainBlockController.cs | 39 +- .../ClientToServer/EmojiAdminController.cs | 44 +-- .../ClientToServer/GroupController.cs | 41 +-- .../ClientToServer/InstanceAdminController.cs | 92 +++-- .../ClientToServer/ModeratorController.cs | 58 ++- .../ClientToServer/PostController.cs | 29 +- .../ClientToServer/PrivateAvatarController.cs | 56 ++- .../ClientToServer/RootUserController.cs | 272 +++++++------- .../ClientToServer/SocialController.cs | 21 +- .../ClientToServer/StatisticsController.cs | 32 +- .../ClientToServer/TimelineController.cs | 16 +- PrivaPub/Data/InitDb.cs | 22 +- PrivaPub/Domain/Content/ContentRenderer.cs | 22 +- PrivaPub/Domain/Content/LinkPreviews.cs | 39 +- PrivaPub/Domain/Instance/InstanceSettings.cs | 11 +- PrivaPub/Domain/Media/Blurhash.cs | 2 +- PrivaPub/Domain/Media/MediaProxy.cs | 82 ++--- PrivaPub/Domain/Media/MediaService.cs | 81 ++-- PrivaPub/Domain/Media/ProcessMediaJob.cs | 17 +- .../Domain/Moderation/AccountModeration.cs | 92 ++--- PrivaPub/Domain/Moderation/ModerationLog.cs | 11 +- .../Domain/Portability/ImportArchiveJob.cs | 8 +- PrivaPub/Domain/Portability/SafeArchive.cs | 2 +- .../Relationships/RelationshipService.cs | 32 +- .../Domain/Relationships/ReportService.cs | 43 +-- PrivaPub/Domain/Social/FeaturedTags.cs | 18 +- PrivaPub/Domain/Social/FeedFollows.cs | 39 +- PrivaPub/Domain/Social/FollowService.cs | 108 +++--- PrivaPub/Domain/Social/Notifications.cs | 3 +- PrivaPub/Domain/Social/Reactions.cs | 22 +- PrivaPub/Domain/Social/Trends.cs | 24 +- PrivaPub/Domain/Social/WebPush.cs | 21 +- PrivaPub/Domain/Statistics/SelfLocation.cs | 34 +- PrivaPub/Domain/Statistics/ServerPlaces.cs | 18 +- .../Domain/Statuses/InteractionApprovals.cs | 67 ++-- PrivaPub/Domain/Statuses/Participations.cs | 25 +- PrivaPub/Domain/Statuses/PollService.cs | 74 ++-- PrivaPub/Domain/Statuses/QuoteService.cs | 76 ++-- PrivaPub/Domain/Statuses/ScheduledStatuses.cs | 17 +- PrivaPub/Domain/Statuses/StatusService.cs | 184 +++++----- PrivaPub/Domain/Timelines/Fanout.cs | 28 +- PrivaPub/Domain/Timelines/TimelineService.cs | 26 +- .../Federation/Actors/AccountCountsJob.cs | 48 +-- PrivaPub/Federation/Actors/ActorDocument.cs | 1 + PrivaPub/Federation/Actors/FeaturedPosts.cs | 23 +- .../Actors/FollowingSynchronization.cs | 36 +- .../Federation/Actors/LocalActorService.cs | 37 +- PrivaPub/Federation/Actors/OutboxBackfill.cs | 23 +- .../Federation/Actors/RemoteActorService.cs | 57 ++- PrivaPub/Federation/Actors/Walls.cs | 41 +-- .../Controllers/EmojisController.cs | 13 +- .../Controllers/PeasantsController.cs | 147 ++++---- .../Controllers/WellKnownController.cs | 45 +-- PrivaPub/Federation/Crawler/Crawler.cs | 77 ++-- .../Inbox/Handlers/AcceptHandler.cs | 43 +-- .../Inbox/Handlers/AnnounceHandler.cs | 113 +++--- .../Federation/Inbox/Handlers/BlockHandler.cs | 17 +- .../Inbox/Handlers/CreateHandler.cs | 111 +++--- .../Inbox/Handlers/DeleteHandler.cs | 42 +-- .../Inbox/Handlers/DislikeHandler.cs | 12 +- .../Inbox/Handlers/EmojiReactHandler.cs | 17 +- .../Inbox/Handlers/FeaturedHandler.cs | 44 +-- .../Federation/Inbox/Handlers/FlagHandler.cs | 19 +- .../Inbox/Handlers/FollowHandler.cs | 28 +- .../Federation/Inbox/Handlers/JoinHandler.cs | 26 +- .../Federation/Inbox/Handlers/LikeHandler.cs | 19 +- .../Federation/Inbox/Handlers/LockHandler.cs | 12 +- .../Federation/Inbox/Handlers/MoveHandler.cs | 41 +-- .../Inbox/Handlers/QuoteRequestHandler.cs | 12 +- .../Inbox/Handlers/ReplyApprovalHandler.cs | 9 +- .../Inbox/Handlers/ResolveHandler.cs | 18 +- .../Federation/Inbox/Handlers/UndoHandler.cs | 36 +- .../Inbox/Handlers/UpdateHandler.cs | 46 +-- .../Federation/Inbox/Handlers/WarnHandler.cs | 29 +- PrivaPub/Federation/Inbox/InboxProcessor.cs | 42 +-- PrivaPub/Federation/Inbox/InboxReceiver.cs | 64 ++-- PrivaPub/Federation/Inbox/RemotePosts.cs | 73 ++-- PrivaPub/Federation/Inbox/RemoteReplies.cs | 34 +- PrivaPub/Federation/Inbox/ReplyRelay.cs | 2 +- .../Federation/Moderation/DomainBlocks.cs | 11 +- .../Federation/Objects/InstanceDescriber.cs | 44 +-- .../Federation/Objects/InstanceDocuments.cs | 4 +- PrivaPub/Federation/Objects/NoteParser.cs | 1 + PrivaPub/Federation/Objects/ObjectRecords.cs | 8 +- PrivaPub/Federation/Outbox/DeliveryService.cs | 75 ++-- .../Federation/Outbox/GroupDistributor.cs | 13 +- PrivaPub/Federation/Outbox/OutboxPublisher.cs | 47 +-- PrivaPub/Federation/Relays/Relays.cs | 36 +- PrivaPub/Federation/Signing/HttpSignatures.cs | 4 +- .../Federation/Signing/MessageSignatures.cs | 2 +- .../Signing/SignedFetchAuthorizer.cs | 27 +- .../Infrastructure/Backup/MaintenanceLock.cs | 7 +- .../Infrastructure/Backup/TransferStore.cs | 2 +- PrivaPub/Infrastructure/Cli/AdminCommands.cs | 100 ++--- PrivaPub/Infrastructure/Data/Indexes.cs | 1 + .../_001_deduplicate_before_unique_indexes.cs | 14 +- .../_005_direct_posts_join_posts.cs | 4 +- PrivaPub/Infrastructure/Geo/CdnCatalog.cs | 2 +- PrivaPub/Infrastructure/Geo/CdnRanges.cs | 2 +- PrivaPub/Infrastructure/Geo/CdnUpdater.cs | 32 +- PrivaPub/Infrastructure/Geo/GeoLocator.cs | 23 +- PrivaPub/Infrastructure/Geo/GeoUpdater.cs | 34 +- PrivaPub/Infrastructure/Http/EdgeHints.cs | 9 +- .../Infrastructure/Http/FederationHttp.cs | 82 ++--- PrivaPub/Infrastructure/Http/HttpScope.cs | 9 +- .../Http/SafeHttpHandlerFactory.cs | 7 +- .../Infrastructure/Jobs/HostCircuitBreaker.cs | 15 +- PrivaPub/Infrastructure/Jobs/JobWorker.cs | 52 ++- PrivaPub/Infrastructure/Push/WebPushJob.cs | 79 ++-- .../Statistics/InteractionLedger.cs | 52 ++- .../Statistics/InteractionSalts.cs | 2 +- .../Infrastructure/Statistics/RollupJob.cs | 29 +- PrivaPub/Models/Federation/ObjectRecord.cs | 2 + PrivaPub/Models/Jobs/RemoteInstance.cs | 2 + PrivaPub/Models/Media/MediaAttachment.cs | 1 + PrivaPub/Models/Post/Post.cs | 3 +- PrivaPub/Models/Post/PostMedia.cs | 1 + PrivaPub/Models/ServerSetup.cs | 2 +- PrivaPub/Models/Social/Following.cs | 1 + PrivaPub/Models/Social/Notification.cs | 1 + .../Models/Statistics/InteractionEvent.cs | 1 + PrivaPub/Models/User/Avatar.cs | 2 + PrivaPub/Services/AppConfigurationService.cs | 11 +- .../Private/IPrivateAvatarUsersService.cs | 100 +++-- .../ClientToServer/Public/DataService.cs | 17 +- PrivaPub/Services/EmailVerificationJob.cs | 22 +- PrivaPub/Services/GroupUsersService.cs | 178 ++++----- PrivaPub/Services/IRootUsersService.cs | 40 +- PrivaPub/Services/Mailer.cs | 17 +- PrivaPub/Services/PersonaRemoval.cs | 73 ++-- PrivaPub/Services/PostsService.cs | 91 ++--- PrivaPub/Services/RecoveryJob.cs | 21 +- .../RequestLocalizationOptionsService.cs | 17 +- PrivaPub/Services/RootRemoval.cs | 24 +- PrivaPub/Services/RootSessions.cs | 29 +- PrivaPub/Services/RootUsersService.cs | 347 ++++++++---------- PrivaPub/StaticServices/AuthTokenManager.cs | 15 +- PrivaPub/Web/Pages/OAuth/OAuthPages.cs | 50 +-- PrivaPub/Web/Pages/Pages.cs | 77 ++-- nuget.config | 16 + 176 files changed, 2789 insertions(+), 3974 deletions(-) create mode 100644 nuget.config diff --git a/CLAUDE.md b/CLAUDE.md index 4eb858c..5389f91 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -1045,8 +1045,7 @@ client's role route never does. ## Code style - Tabs, block-scoped namespaces, Allman braces. -- New services use `readonly _camel` fields and constructor injection. Older services use PascalCase fields; leave - them. +- Dependencies come in through primary constructors and are used as parameters (House rules, HR0004). - Services return `WebResult` (`PrivaPub.ClientModels/WebResult.cs`): `result.Invalidate(localizer[...], status)`. Controllers turn it into a status code. - Localised strings go through `IStringLocalizer`. @@ -1060,6 +1059,45 @@ client's role route never does. - Libraries chosen for the roadmap: HtmlSanitizer, Markdig (`DisableHtml`), NSign (RFC 9421 inbound), OpenIddict + OpenIddict.MongoDb, NetVips, Blurhash.Core, FFMpegCore. No ImageSharp (licence key enforced), no MassTransit. +## House rules + +The owner's rules for every .NET project (`~/RiderProjects/HouseRules/RULES.md`, repo `Arasaka/HouseRules`) apply +here and win over anything else in this file. `Arasaka.HouseRules.Analyzers` (`Directory.Build.props`) reports the +checkable ones as `HRxxxx` errors in every build and in Rider; decePubClient builds `PrivaPub.ClientModels` under the +same rules. Applied to PrivaPub: + +- **Coding style:** + - `var x = default(T)` for a local without a value yet (HR0001). + - `IOptionsMonitor.CurrentValue`, never `IOptions` (HR0002). + - Primary constructors, using the parameters directly (HR0004). Where a method already names a local after the + parameter (`media`, `statuses`, `settings`), the parameter takes its type's name (`IMediaService mediaService`). + A private constructor behind static factories stays as it is (`RobotsTxt`, `RequestSignature`, `SafeArchive`). + - A `CancellationToken token` last on every async method, passed down to MongoDB, HTTP and the job queue (HR0003). + A write that must happen even when the request is cancelled passes `CancellationToken.None` on purpose (the + setup claim and its release, the lease renewal). Exempt, with a reason on each: OpenIddict inline handlers (their + signature is fixed), `Indexes.Plain` (a `params` array comes last), `JobWorker.KeepLease` (it takes the source it + cancels). +- **Models:** + - Collections start as `= []` (HR0006) and strings have no `= string.Empty` (HR0005), unless null means something. + Each exception carries a `[SuppressMessage("HouseRules", …, Justification = …)]` that says what: the Mastodon + entities' strings (the API sends `""`, never null), "not stated" (`SearchableBy`, `RemoteInstance.Languages`), + "every language" (`Following.Languages`), "fall back" (`Notification.StatusIds`, `ObjectRecord.Extensions`, + `ObjectRecord.ContextNamespaces`), "keep the media" (`StatusDraft.MediaIds`), "no focal point" (`Focus`), and the + Mastodon fields the API sends as null (`FilterResult` matches, `Poll.OwnVotes`, `Relationship.Languages`). + - Request and response types in `PrivaPub.ClientModels` are `View*`, `*Request` and `*Form` (HR0010). The Mastodon + entities and ActivityPub documents keep their names and JSON shapes: they are other software's contract. +- **APIs:** + - **No 5XX** (HR0007). The one exception: the inbox answers 503 with `Retry-After` while a signing key cannot be + fetched yet, because ActivityPub servers retry it (`InboxReceiver.Receive`). The Mastodon API's own 4XX codes + (422 for a request it refuses, 429 for the rate limits) are part of that API and stay. + - Services take the user's id from the controller, never `IHttpContextAccessor` (HR0008). + - Services return `WebResult`; a `LocalizedString` stored in it is cast, `(string)localizer[key]`, never `.Value` + (HR0009). + - Numbers shown to a reader go through formatting helpers (HR0011). The ISO week key (`InstanceDescriber.Week`) + and the six-digit email code (`EmailVerificationJob.NewCode`) are identifiers, and say so. +- **Still open:** route constants shared with decePubClient (HR0305; the frozen literals above stay their values) + and source-generated JSON contexts (HR0306). + ## Verifying There is no test project (owner decision 2026-10-17: `PrivaPub.Tests` was removed, with the CI and deploy steps that diff --git a/Directory.Build.props b/Directory.Build.props index 8f315ce..66abc89 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -6,4 +6,14 @@ + + true + PrivaPub.ClientModels + $(WarningsAsErrors);HR0001;HR0002;HR0003;HR0004;HR0005;HR0006;HR0007;HR0008;HR0009;HR0010;HR0011;HR0101;HR0102;HR0103;HR0104;HR0105;HR0106;HR0201 + + + + + + diff --git a/PrivaPub.ClientModels/AtLeastOnePropertyAttribute.cs b/PrivaPub.ClientModels/AtLeastOnePropertyAttribute.cs index 2b7f87a..fae1e7e 100644 --- a/PrivaPub.ClientModels/AtLeastOnePropertyAttribute.cs +++ b/PrivaPub.ClientModels/AtLeastOnePropertyAttribute.cs @@ -1,18 +1,10 @@ using System.ComponentModel.DataAnnotations; -using System.Reflection; namespace PrivaPub.ClientModels { [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)] - public class AtLeastOnePropertyAttribute : ValidationAttribute + public class AtLeastOnePropertyAttribute(params string[] propertyList) : ValidationAttribute { - private string[] PropertyList { get; set; } - - public AtLeastOnePropertyAttribute(params string[] propertyList) - { - PropertyList = propertyList; - } - public override object TypeId { get @@ -23,10 +15,9 @@ namespace PrivaPub.ClientModels public override bool IsValid(object value) { - PropertyInfo propertyInfo; - foreach (string propertyName in PropertyList) + foreach (var propertyName in propertyList) { - propertyInfo = value.GetType().GetProperty(propertyName); + var propertyInfo = value.GetType().GetProperty(propertyName); if (propertyInfo != null && propertyInfo.GetValue(value, null) != null) return true; diff --git a/PrivaPub/Api/Mastodon/Auth/OAuthPruner.cs b/PrivaPub/Api/Mastodon/Auth/OAuthPruner.cs index 88d1818..111600d 100644 --- a/PrivaPub/Api/Mastodon/Auth/OAuthPruner.cs +++ b/PrivaPub/Api/Mastodon/Auth/OAuthPruner.cs @@ -2,19 +2,13 @@ using OpenIddict.Abstractions; namespace PrivaPub.Api.Mastodon.Auth { - public class OAuthPruner : BackgroundService + public class OAuthPruner( + IServiceProvider services, + ILogger logger) : BackgroundService { static readonly TimeSpan Interval = TimeSpan.FromHours(6); static readonly TimeSpan Threshold = TimeSpan.FromDays(14); - readonly IServiceProvider _services; - readonly ILogger _logger; - - public OAuthPruner(IServiceProvider services, ILogger logger) - { - _services = services; - _logger = logger; - } protected override async Task ExecuteAsync(CancellationToken stoppingToken) { @@ -25,7 +19,7 @@ namespace PrivaPub.Api.Mastodon.Auth await Task.Delay(Interval, stoppingToken); var (tokens, authorizations) = await Prune(DateTimeOffset.UtcNow - Threshold, stoppingToken); if (tokens + authorizations > 0) - _logger.LogInformation("{Service} removed {Tokens} tokens and {Authorizations} authorizations", nameof(OAuthPruner), tokens, authorizations); + logger.LogInformation("{Service} removed {Tokens} tokens and {Authorizations} authorizations", nameof(OAuthPruner), tokens, authorizations); } catch (OperationCanceledException) when (stoppingToken.IsCancellationRequested) { @@ -33,7 +27,7 @@ namespace PrivaPub.Api.Mastodon.Auth } catch (Exception ex) { - _logger.LogWarning(ex, "{Service} pass failed", nameof(OAuthPruner)); + logger.LogWarning(ex, "{Service} pass failed", nameof(OAuthPruner)); } } } @@ -41,7 +35,7 @@ namespace PrivaPub.Api.Mastodon.Auth //one pass: tokens and authorizations created before the threshold that are no longer valid public async Task<(long Tokens, long Authorizations)> Prune(DateTimeOffset threshold, CancellationToken token) { - using var scope = _services.CreateScope(); + using var scope = services.CreateScope(); var tokens = await scope.ServiceProvider.GetRequiredService().PruneAsync(threshold, token); var authorizations = await scope.ServiceProvider.GetRequiredService().PruneAsync(threshold, token); return (tokens, authorizations); diff --git a/PrivaPub/Api/Mastodon/Auth/OAuthSetup.cs b/PrivaPub/Api/Mastodon/Auth/OAuthSetup.cs index ad122fb..93df236 100644 --- a/PrivaPub/Api/Mastodon/Auth/OAuthSetup.cs +++ b/PrivaPub/Api/Mastodon/Auth/OAuthSetup.cs @@ -112,6 +112,7 @@ namespace PrivaPub.Api.Mastodon.Auth return services; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0003", Justification = "An OpenIddict inline handler: its signature is fixed and the request's token travels on the context.")] static async ValueTask OutOfBandCode(ApplyAuthorizationResponseContext context) { if (context.RedirectUri != OutOfBand || context.Response.Code == default) diff --git a/PrivaPub/Api/Mastodon/Auth/PersonaExchange.cs b/PrivaPub/Api/Mastodon/Auth/PersonaExchange.cs index 71c9163..66cfeca 100644 --- a/PrivaPub/Api/Mastodon/Auth/PersonaExchange.cs +++ b/PrivaPub/Api/Mastodon/Auth/PersonaExchange.cs @@ -66,7 +66,9 @@ namespace PrivaPub.Api.Mastodon.Auth // Validates a root JWT given as a token exchange subject token, before OpenIddict tries it as one of its own tokens. // The principal it builds names the root under PersonaExchange.RootClaim for TokenController, which signs in a fresh // identity for the avatar. - public sealed class RootJwtSubjectToken : IOpenIddictServerHandler + public sealed class RootJwtSubjectToken( + IConfiguration configuration, + DbEntities dbEntities) : IOpenIddictServerHandler { public static OpenIddictServerHandlerDescriptor Descriptor { get; } = OpenIddictServerHandlerDescriptor.CreateBuilder() .UseScopedHandler() @@ -74,21 +76,13 @@ namespace PrivaPub.Api.Mastodon.Auth .SetType(OpenIddictServerHandlerType.Custom) .Build(); - readonly IConfiguration _configuration; - readonly DbEntities _dbEntities; - - public RootJwtSubjectToken(IConfiguration configuration, DbEntities dbEntities) - { - _configuration = configuration; - _dbEntities = dbEntities; - } public async ValueTask HandleAsync(ValidateTokenContext context) { if (context.ValidTokenTypes.Count != 1 || !context.ValidTokenTypes.Contains(PersonaExchange.SubjectTokenType)) return; - var root = await RootJwt.Root(context.Token, _configuration, _dbEntities, context.Transaction.CancellationToken); + var root = await RootJwt.Root(context.Token, configuration, dbEntities, context.Transaction.CancellationToken); if (root == default) { context.Reject(Errors.InvalidGrant, "The session token is not valid."); diff --git a/PrivaPub/Api/Mastodon/Auth/TokenController.cs b/PrivaPub/Api/Mastodon/Auth/TokenController.cs index 2cb74f4..2140321 100644 --- a/PrivaPub/Api/Mastodon/Auth/TokenController.cs +++ b/PrivaPub/Api/Mastodon/Auth/TokenController.cs @@ -15,15 +15,9 @@ using static OpenIddict.Abstractions.OpenIddictConstants; namespace PrivaPub.Api.Mastodon.Auth { [ApiController] - public class TokenController : ControllerBase + public class TokenController( + DbEntities dbEntities) : ControllerBase { - readonly DbEntities _dbEntities; - - public TokenController(DbEntities dbEntities) - { - _dbEntities = dbEntities; - } - [HttpPost("/oauth/token"), IgnoreAntiforgeryToken, Produces("application/json")] public async Task Exchange(CancellationToken token) { @@ -62,8 +56,8 @@ namespace PrivaPub.Api.Mastodon.Auth var avatarId = (string)request[PersonaExchange.AvatarParameter]; if (string.IsNullOrEmpty(rootId) || string.IsNullOrEmpty(avatarId)) return Refuse(Errors.InvalidGrant, "The persona can no longer be used."); - var owns = await _dbEntities.RootToAvatars.Match(r => r.RootId == rootId && r.AvatarId == avatarId).ExecuteAnyAsync(token); - var avatar = owns ? await _dbEntities.Avatars.MatchID(avatarId).ExecuteFirstAsync(token) : default; + var owns = await dbEntities.RootToAvatars.Match(r => r.RootId == rootId && r.AvatarId == avatarId).ExecuteAnyAsync(token); + var avatar = owns ? await dbEntities.Avatars.MatchID(avatarId).ExecuteFirstAsync(token) : default; if (avatar == default || !await Usable(avatarId, token)) return Refuse(Errors.InvalidGrant, "The persona can no longer be used."); @@ -79,9 +73,9 @@ namespace PrivaPub.Api.Mastodon.Auth { if (string.IsNullOrEmpty(avatarId)) return false; - var link = await _dbEntities.RootToAvatars.Match(r => r.AvatarId == avatarId).ExecuteFirstAsync(token); - var root = link == default ? default : await _dbEntities.RootUsers.MatchID(link.RootId).ExecuteFirstAsync(token); - var avatar = await _dbEntities.Avatars.MatchID(avatarId).ExecuteFirstAsync(token); + var link = await dbEntities.RootToAvatars.Match(r => r.AvatarId == avatarId).ExecuteFirstAsync(token); + var root = link == default ? default : await dbEntities.RootUsers.MatchID(link.RootId).ExecuteFirstAsync(token); + var avatar = await dbEntities.Avatars.MatchID(avatarId).ExecuteFirstAsync(token); // a suspended persona gets no token (R6), as its tokens were revoked when it was suspended return root is { IsBanned: false, DeletedAt: null } && avatar is { DeletionAt: null, SuspendedAt: null }; } diff --git a/PrivaPub/Api/Mastodon/Controllers/AccountsController.cs b/PrivaPub/Api/Mastodon/Controllers/AccountsController.cs index 7e5fd8e..2257523 100644 --- a/PrivaPub/Api/Mastodon/Controllers/AccountsController.cs +++ b/PrivaPub/Api/Mastodon/Controllers/AccountsController.cs @@ -23,39 +23,24 @@ using PostEntity = PrivaPub.Models.Post.Post; namespace PrivaPub.Api.Mastodon.Controllers { - public class AccountsController : MastodonController + public class AccountsController( + MastodonMapper mapper, + DbEntities dbEntities, + ILocalActorService localActors, + IFollowService followService, + IOutboxPublisher outbox, + IRelationshipService relationshipService, + IFeedFollows feedFollows) : MastodonController { - readonly MastodonMapper _mapper; - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - readonly IRemoteActorService _remoteActors; - readonly IFollowService _follows; - readonly IOutboxPublisher _outbox; - readonly IRelationshipService _relationships; - readonly IFeedFollows _feeds; - - public AccountsController(MastodonMapper mapper, DbEntities dbEntities, ILocalActorService localActors, IRemoteActorService remoteActors, - IFollowService follows, IOutboxPublisher outbox, IRelationshipService relationships, IFeedFollows feeds) - { - _feeds = feeds; - _relationships = relationships; - _mapper = mapper; - _dbEntities = dbEntities; - _localActors = localActors; - _remoteActors = remoteActors; - _follows = follows; - _outbox = outbox; - } - // Mastodon 4.4: a token with the profile scope alone may read it too [HttpGet("/api/v1/accounts/verify_credentials"), Scope("read:accounts|profile")] - public async Task VerifyCredentials(CancellationToken token) => Json(await _mapper.Local(Me, withSource: true, token)); + public async Task VerifyCredentials(CancellationToken token) => Json(await mapper.Local(Me, withSource: true, token)); [HttpPatch("/api/v1/accounts/update_credentials"), Scope("write:accounts"), EnableRateLimiting(RateLimiting.Uploads), RequestSizeLimit(20 * 1024 * 1024), RequestFormLimits(MultipartBodyLengthLimit = 20 * 1024 * 1024)] public async Task UpdateCredentials([FromServices] IMediaService media, CancellationToken token) { - var avatar = await _dbEntities.Avatars.MatchID(Me.Id).ExecuteFirstAsync(token); + var avatar = await dbEntities.Avatars.MatchID(Me.Id).ExecuteFirstAsync(token); // a new picture is a row of its own; the one it replaces goes to the trash once the profile is saved var replaced = new List(); if (Request.HasFormContentType) @@ -122,9 +107,9 @@ namespace PrivaPub.Api.Mastodon.Controllers foreach (var made in replaced) await media.Trash(m => m.ProfileOfAvatarId == avatar.ID && m.Kind == made.Kind && m.ID != made.ID, "replaced", token); - var actor = _localActors.FromAvatar(avatar); - await _outbox.PublishProfile(actor, token); - return Json(await _mapper.Local(actor, withSource: true, token)); + var actor = localActors.FromAvatar(avatar); + await outbox.PublishProfile(actor, token); + return Json(await mapper.Local(actor, withSource: true, token)); } // Mastodon's: the picture goes (to the trash), the profile shows the default again, and followers are told @@ -136,7 +121,7 @@ namespace PrivaPub.Api.Mastodon.Controllers async Task DeletePicture(IMediaService media, string kind, CancellationToken token) { - var avatar = await _dbEntities.Avatars.MatchID(Me.Id).ExecuteFirstAsync(token); + var avatar = await dbEntities.Avatars.MatchID(Me.Id).ExecuteFirstAsync(token); if (kind == "avatar") avatar.PictureURL = default; else @@ -144,9 +129,9 @@ namespace PrivaPub.Api.Mastodon.Controllers avatar.UpdatedAt = DateTime.UtcNow; await DB.Default.SaveAsync(avatar, token); await media.Trash(m => m.ProfileOfAvatarId == avatar.ID && m.Kind == kind, "removed", token); - var actor = _localActors.FromAvatar(avatar); - await _outbox.PublishProfile(actor, token); - return Json(await _mapper.Local(actor, withSource: true, token)); + var actor = localActors.FromAvatar(avatar); + await outbox.PublishProfile(actor, token); + return Json(await mapper.Local(actor, withSource: true, token)); } [HttpGet("/api/v1/accounts/lookup"), Scope("read:accounts", requiresUser: false), Microsoft.AspNetCore.Authorization.AllowAnonymous] @@ -156,17 +141,17 @@ namespace PrivaPub.Api.Mastodon.Controllers var parts = acct?.Split('@'); if (parts is not { Length: 1 or 2 } || string.IsNullOrEmpty(parts[0])) return NotFoundError(); - var localDomain = new Uri(_localActors.BaseAddress).Authority; + var localDomain = new Uri(localActors.BaseAddress).Authority; if (parts.Length == 1 || parts[1].Equals(localDomain, StringComparison.OrdinalIgnoreCase)) { - var local = await _localActors.FindByUserName(parts[0], token); - return local is { IsFederated: true, IsCircle: false, IsServerActor: false, Suspended: false } ? Json(await _mapper.Local(local, false, token)) : NotFoundError(); + var local = await localActors.FindByUserName(parts[0], token); + return local is { IsFederated: true, IsCircle: false, IsServerActor: false, Suspended: false } ? Json(await mapper.Local(local, false, token)) : NotFoundError(); } var userName = parts[0]; var domain = parts[1].ToLowerInvariant(); - var foreign = await _dbEntities.ForeignAvatars.Match(f => f.UserName == userName && f.Domain == domain && !f.DeletionAt.HasValue && !f.SuspendedAt.HasValue) + var foreign = await dbEntities.ForeignAvatars.Match(f => f.UserName == userName && f.Domain == domain && !f.DeletionAt.HasValue && !f.SuspendedAt.HasValue) .ExecuteFirstAsync(token); - return foreign == default ? NotFoundError() : Json(_mapper.Foreign(foreign)); + return foreign == default ? NotFoundError() : Json(mapper.Foreign(foreign)); } [HttpGet("/api/v1/accounts/relationships"), Scope("read:follows")] @@ -190,7 +175,7 @@ namespace PrivaPub.Api.Mastodon.Controllers { var accounts = new List(); foreach (var id in Params.List("id").Distinct().Take(40)) - if (await _mapper.Account(id, token) is { } account) + if (await mapper.Account(id, token) is { } account) accounts.Add(account); return Json(accounts); } @@ -198,7 +183,7 @@ namespace PrivaPub.Api.Mastodon.Controllers [HttpGet("/api/v1/accounts/{id}"), Scope("read:accounts", requiresUser: false), Microsoft.AspNetCore.Authorization.AllowAnonymous] public async Task Get(string id, CancellationToken token) { - var account = await _mapper.Account(id, token); + var account = await mapper.Account(id, token); return account == default ? NotFoundError() : Json(account); } @@ -215,22 +200,22 @@ namespace PrivaPub.Api.Mastodon.Controllers { var featured = (await DB.Default.Find().Match(f => f.ActorURI == remote.ActorURI).Sort(f => f.Position, Order.Ascending) .Limit(Federation.Actors.FeaturedPosts.MaxFeatured).ExecuteAsync(token)).Select(f => f.PostId).ToList(); - var featuredPosts = await _dbEntities.Posts.Match(p => featured.Contains(p.ID) && !p.DeletedAt.HasValue).Match(VisibilityPolicy.IsPublic).ExecuteAsync(token); - return Json(await _mapper.Statuses(featured.Select(id => featuredPosts.FirstOrDefault(p => p.ID == id)).Where(p => p != default).ToList(), MyId, token)); + var featuredPosts = await dbEntities.Posts.Match(p => featured.Contains(p.ID) && !p.DeletedAt.HasValue).Match(VisibilityPolicy.IsPublic).ExecuteAsync(token); + return Json(await mapper.Statuses(featured.Select(id => featuredPosts.FirstOrDefault(p => p.ID == id)).Where(p => p != default).ToList(), MyId, token)); } var pinIds = (await DB.Default.Find().Match(p => p.AvatarId == local.Id).Sort(p => p.ID, Order.Descending).ExecuteAsync(token)).Select(p => p.PostId).ToList(); - var pinnedPosts = await _dbEntities.Posts.Match(p => pinIds.Contains(p.ID)).Match(VisibilityPolicy.IsPublic).ExecuteAsync(token); - return Json(await _mapper.Statuses(pinIds.Select(id => pinnedPosts.FirstOrDefault(p => p.ID == id)).Where(p => p != default).ToList(), MyId, token)); + var pinnedPosts = await dbEntities.Posts.Match(p => pinIds.Contains(p.ID)).Match(VisibilityPolicy.IsPublic).ExecuteAsync(token); + return Json(await mapper.Statuses(pinIds.Select(id => pinnedPosts.FirstOrDefault(p => p.ID == id)).Where(p => p != default).ToList(), MyId, token)); } var query = local is { Kind: LocalActorKind.Group } - ? _dbEntities.Posts.Match(p => p.GroupId == local.Id).Match(VisibilityPolicy.IsShown) + ? dbEntities.Posts.Match(p => p.GroupId == local.Id).Match(VisibilityPolicy.IsShown) : local != default - ? _dbEntities.Posts.Match(p => p.GroupUserId == local.Id && !p.IsFederatedCopy).Match(VisibilityPolicy.IsShown) - : _dbEntities.Posts.Match(p => p.ActorURI == remote.ActorURI && p.IsFederatedCopy).Match(VisibilityPolicy.IsShown); + ? dbEntities.Posts.Match(p => p.GroupUserId == local.Id && !p.IsFederatedCopy).Match(VisibilityPolicy.IsShown) + : dbEntities.Posts.Match(p => p.ActorURI == remote.ActorURI && p.IsFederatedCopy).Match(VisibilityPolicy.IsShown); var viewerFollows = MyId != default && (local != default - ? await _dbEntities.Followings.Match(f => f.AvatarId == MyId && f.TargetAccountId == local.Id && f.State == FollowState.Accepted).ExecuteAnyAsync(token) - : await _dbEntities.Followings.Match(f => f.AvatarId == MyId && f.TargetActorURI == remote.ActorURI && f.State == FollowState.Accepted).ExecuteAnyAsync(token)); + ? await dbEntities.Followings.Match(f => f.AvatarId == MyId && f.TargetAccountId == local.Id && f.State == FollowState.Accepted).ExecuteAnyAsync(token) + : await dbEntities.Followings.Match(f => f.AvatarId == MyId && f.TargetActorURI == remote.ActorURI && f.State == FollowState.Accepted).ExecuteAnyAsync(token)); if (MyId != id) query.Match(viewerFollows ? p => p.Visibility == PostVisibility.Public || p.Visibility == PostVisibility.Unlisted || p.Visibility == PostVisibility.FollowersOnly @@ -250,7 +235,7 @@ namespace PrivaPub.Api.Mastodon.Controllers query.Match(p => p.Tags.Contains(tag.ToLowerInvariant())); var posts = await Page.From(Params, Limit()).Fetch(query, p => p.ID, token); - var statuses = await _mapper.Statuses(posts, MyId, token); + var statuses = await mapper.Statuses(posts, MyId, token); Link($"/api/v1/accounts/{id}/statuses", posts.LastOrDefault()?.ID, posts.FirstOrDefault()?.ID); return Json(statuses); } @@ -262,7 +247,7 @@ namespace PrivaPub.Api.Mastodon.Controllers if (local == default || local.Id != MyId) return Json(Array.Empty()); var followers = await Page.From(Params, Limit(40, 80)) - .Fetch(_dbEntities.Followers.Match(f => f.LocalActorId == local.Id && f.LocalActorKind == local.Kind && f.IsAccepted), f => f.ID, token); + .Fetch(dbEntities.Followers.Match(f => f.LocalActorId == local.Id && f.LocalActorKind == local.Kind && f.IsAccepted), f => f.ID, token); Link($"/api/v1/accounts/{id}/followers", followers.LastOrDefault()?.ID, followers.FirstOrDefault()?.ID); return Json(await AccountsFor(followers.Select(f => f.ActorURI), token)); } @@ -277,9 +262,9 @@ namespace PrivaPub.Api.Mastodon.Controllers if (local == default || local.Id != MyId) return Json(Array.Empty()); var following = await Page.From(Params, Limit(40, 80)) - .Fetch(_dbEntities.Followings.Match(f => f.AvatarId == local.Id && f.State == FollowState.Accepted), f => f.ID, token); + .Fetch(dbEntities.Followings.Match(f => f.AvatarId == local.Id && f.State == FollowState.Accepted), f => f.ID, token); Link($"/api/v1/accounts/{id}/following", following.LastOrDefault()?.ID, following.FirstOrDefault()?.ID); - var accounts = await _mapper.Accounts(following.Select(f => f.TargetAccountId), token); + var accounts = await mapper.Accounts(following.Select(f => f.TargetAccountId), token); return Json(following.Select(f => accounts.GetValueOrDefault(f.TargetAccountId)).Where(a => a != default).ToList()); } @@ -288,7 +273,7 @@ namespace PrivaPub.Api.Mastodon.Controllers public async Task Feeds(CancellationToken token) { var read = await DB.Default.Find().Match(s => s.AvatarId == MyId).Sort(s => s.ID, MongoDB.Entities.Order.Descending).ExecuteAsync(token); - var accounts = await _mapper.Accounts(read.Select(s => s.FeedAccountId), token); + var accounts = await mapper.Accounts(read.Select(s => s.FeedAccountId), token); return Json(read.Select(s => accounts.GetValueOrDefault(s.FeedAccountId)).Where(a => a != default).ToList()); } @@ -302,13 +287,13 @@ namespace PrivaPub.Api.Mastodon.Controllers // a feed is read through the server, whose reader follows its communities; the persona follows nothing if (remote is { AvatarType: AvatarType.Feed }) { - await _feeds.Subscribe(Me, remote, true, token); + await feedFollows.Subscribe(Me, remote, true, token); return Json(await Relationship(id, token)); } // notify: a `status` notification for each of its new posts; languages: only its posts in those reach the home (R8). // Either changes only when given, as on Mastodon - var following = await _follows.FollowAs(Me, local?.Uri ?? remote.ActorURI, Params.Bool("reblogs") != false, token, Params.Bool("notify"), - Params.Has("languages") ? Params.List("languages") : default); + var following = await followService.FollowAs(Me, local?.Uri ?? remote.ActorURI, Params.Bool("reblogs") != false, Params.Bool("notify"), + Params.Has("languages") ? Params.List("languages") : default, token); return following == default ? Error(StatusCodes.Status403Forbidden, "This action is not allowed") : Json(await Relationship(id, token)); } @@ -319,9 +304,9 @@ namespace PrivaPub.Api.Mastodon.Controllers if (local == default && remote == default) return NotFoundError(); if (remote is { AvatarType: AvatarType.Feed }) - await _feeds.Subscribe(Me, remote, false, token); + await feedFollows.Subscribe(Me, remote, false, token); else - await _follows.UnfollowAs(Me, local?.Uri ?? remote.ActorURI, token); + await followService.UnfollowAs(Me, local?.Uri ?? remote.ActorURI, token); return Json(await Relationship(id, token)); } @@ -332,7 +317,7 @@ namespace PrivaPub.Api.Mastodon.Controllers var uri = local?.Uri ?? remote?.ActorURI; if (uri == default) return NotFoundError(); - await _relationships.RemoveFollower(Me, uri, id, token); + await relationshipService.RemoveFollower(Me, uri, id, token); return Json(await Relationship(id, token)); } @@ -342,7 +327,7 @@ namespace PrivaPub.Api.Mastodon.Controllers var (local, remote) = await Find(id, token); if (local == default && remote == default || local?.Id == MyId) return NotFoundError(); - await _relationships.Block(Me, local?.Uri ?? remote.ActorURI, id, token); + await relationshipService.Block(Me, local?.Uri ?? remote.ActorURI, id, token); return Json(await Relationship(id, token)); } @@ -352,7 +337,7 @@ namespace PrivaPub.Api.Mastodon.Controllers var (local, remote) = await Find(id, token); if (local == default && remote == default) return NotFoundError(); - await _relationships.Unblock(Me, local?.Uri ?? remote.ActorURI, token); + await relationshipService.Unblock(Me, local?.Uri ?? remote.ActorURI, token); return Json(await Relationship(id, token)); } @@ -363,7 +348,7 @@ namespace PrivaPub.Api.Mastodon.Controllers if (local == default && remote == default || local?.Id == MyId) return NotFoundError(); var duration = Params.Int("duration") is { } seconds and > 0 ? TimeSpan.FromSeconds(seconds) : (TimeSpan?)null; - await _relationships.Mute(Me, local?.Uri ?? remote.ActorURI, id, Params.Bool("notifications") != false, duration, token); + await relationshipService.Mute(Me, local?.Uri ?? remote.ActorURI, id, Params.Bool("notifications") != false, duration, token); return Json(await Relationship(id, token)); } @@ -373,7 +358,7 @@ namespace PrivaPub.Api.Mastodon.Controllers var (local, remote) = await Find(id, token); if (local == default && remote == default) return NotFoundError(); - await _relationships.Unmute(Me, local?.Uri ?? remote.ActorURI, token); + await relationshipService.Unmute(Me, local?.Uri ?? remote.ActorURI, token); return Json(await Relationship(id, token)); } @@ -381,7 +366,7 @@ namespace PrivaPub.Api.Mastodon.Controllers public async Task Blocks(CancellationToken token) { var blocks = await Page.From(Params, Limit(40, 80)).Fetch(DB.Default.Find().Match(b => b.AvatarId == MyId), b => b.ID, token); - var accounts = await _mapper.Accounts(blocks.Select(b => b.TargetAccountId), token); + var accounts = await mapper.Accounts(blocks.Select(b => b.TargetAccountId), token); Link("/api/v1/blocks", blocks.LastOrDefault()?.ID, blocks.FirstOrDefault()?.ID); return Json(blocks.Select(b => accounts.GetValueOrDefault(b.TargetAccountId)).Where(a => a != default).ToList()); } @@ -390,7 +375,7 @@ namespace PrivaPub.Api.Mastodon.Controllers public async Task Mutes(CancellationToken token) { var mutes = await Page.From(Params, Limit(40, 80)).Fetch(DB.Default.Find().Match(m => m.AvatarId == MyId), m => m.ID, token); - var accounts = await _mapper.Accounts(mutes.Select(m => m.TargetAccountId), token); + var accounts = await mapper.Accounts(mutes.Select(m => m.TargetAccountId), token); Link("/api/v1/mutes", mutes.LastOrDefault()?.ID, mutes.FirstOrDefault()?.ID); return Json(mutes.Select(m => accounts.GetValueOrDefault(m.TargetAccountId)).Where(a => a != default).ToList()); } @@ -410,9 +395,9 @@ namespace PrivaPub.Api.Mastodon.Controllers return Error(StatusCodes.Status400BadRequest, "Param is missing or the value is empty: domain"); if (Uri.CheckHostName(domain) != UriHostNameType.Dns) return Error(StatusCodes.Status422UnprocessableEntity, "Validation failed: Domain is invalid"); - var followings = await _dbEntities.Followings.Match(f => f.AvatarId == MyId && !f.TargetIsLocal && f.State == FollowState.Accepted) + var followings = await dbEntities.Followings.Match(f => f.AvatarId == MyId && !f.TargetIsLocal && f.State == FollowState.Accepted) .ExecuteAsync(token); - var followers = await _dbEntities.Followers.Match(f => f.LocalActorId == MyId && f.IsAccepted).ExecuteAsync(token); + var followers = await dbEntities.Followers.Match(f => f.LocalActorId == MyId && f.IsAccepted).ExecuteAsync(token); var handles = await Hidden.HandleDomains(followings.Select(f => f.TargetActorURI).Concat(followers.Select(f => f.ActorURI)).ToList(), token); return Json(new { @@ -424,32 +409,32 @@ namespace PrivaPub.Api.Mastodon.Controllers [HttpPost("/api/v1/domain_blocks"), Scope("write:blocks")] public async Task BlockDomain(CancellationToken token) { - await _relationships.BlockDomain(Me, Params.Get("domain"), token); + await relationshipService.BlockDomain(Me, Params.Get("domain"), token); return Json(new { }); } [HttpDelete("/api/v1/domain_blocks"), Scope("write:blocks")] public async Task UnblockDomain(CancellationToken token) { - await _relationships.UnblockDomain(Me, Params.Get("domain"), token); + await relationshipService.UnblockDomain(Me, Params.Get("domain"), token); return Json(new { }); } [HttpGet("/api/v1/follow_requests"), Scope("read:follows")] public async Task FollowRequests(CancellationToken token) { - var requests = await _dbEntities.Followers.Match(f => f.LocalActorId == Me.Id && f.LocalActorKind == LocalActorKind.Person && !f.IsAccepted) + var requests = await dbEntities.Followers.Match(f => f.LocalActorId == Me.Id && f.LocalActorKind == LocalActorKind.Person && !f.IsAccepted) .Sort(f => f.ID, Order.Descending).Limit(Limit(40, 80)).ExecuteAsync(token); return Json(await AccountsFor(requests.Select(r => r.ActorURI), token)); } [HttpPost("/api/v1/follow_requests/{id}/authorize"), Scope("write:follows")] public async Task Authorize(string id, CancellationToken token) => - await _follows.Decide(Me, id, accept: true, token) ? Json(await Relationship(id, token)) : NotFoundError(); + await followService.Decide(Me, id, accept: true, token) ? Json(await Relationship(id, token)) : NotFoundError(); [HttpPost("/api/v1/follow_requests/{id}/reject"), Scope("write:follows")] public async Task Reject(string id, CancellationToken token) => - await _follows.Decide(Me, id, accept: false, token) ? Json(await Relationship(id, token)) : NotFoundError(); + await followService.Decide(Me, id, accept: false, token) ? Json(await Relationship(id, token)) : NotFoundError(); // Familiar followers stay empty by design: which of the accounts the persona follows also follow another account would // tell who follows whom among the personas here (and their followers lists are never shown, hide_collections), so @@ -507,12 +492,12 @@ namespace PrivaPub.Api.Mastodon.Controllers async Task EndorsementsOf(string path, CancellationToken token) { - var followed = (await _dbEntities.Followings.Match(f => f.AvatarId == MyId && f.State == FollowState.Accepted && f.FollowerKind == null) + var followed = (await dbEntities.Followings.Match(f => f.AvatarId == MyId && f.State == FollowState.Accepted && f.FollowerKind == null) .Project(f => f.Include(x => x.TargetActorURI)).ExecuteAsync(token)).Select(f => f.TargetActorURI).ToList(); var page = await Page.From(Params, Limit(40, 80)) .Fetch(DB.Default.Find().Match(e => e.AvatarId == MyId && followed.Contains(e.TargetActorURI)), e => e.ID, token); Link(path, page.LastOrDefault()?.ID, page.FirstOrDefault()?.ID); - var accounts = await _mapper.Accounts(page.Select(e => e.TargetAccountId), token); + var accounts = await mapper.Accounts(page.Select(e => e.TargetAccountId), token); return Json(page.Select(e => accounts.GetValueOrDefault(e.TargetAccountId)).Where(a => a != default).ToList()); } @@ -554,7 +539,7 @@ namespace PrivaPub.Api.Mastodon.Controllers const int MaxEndorsements = 500; async Task Follows(string uri, CancellationToken token) => - await _dbEntities.Followings.Match(f => f.AvatarId == MyId && f.TargetActorURI == uri && f.State == FollowState.Accepted && f.FollowerKind == null) + await dbEntities.Followings.Match(f => f.AvatarId == MyId && f.TargetActorURI == uri && f.State == FollowState.Accepted && f.FollowerKind == null) .ExecuteAnyAsync(token); async Task> AccountsFor(IEnumerable actorUris, CancellationToken token) @@ -562,37 +547,37 @@ namespace PrivaPub.Api.Mastodon.Controllers var accounts = new List(); foreach (var uri in actorUris) { - var local = await _localActors.FindByUri(uri, token); + var local = await localActors.FindByUri(uri, token); if (local != default) { - accounts.Add(await _mapper.Local(local, false, token)); + accounts.Add(await mapper.Local(local, false, token)); continue; } - var foreign = await _dbEntities.ForeignAvatars.Match(f => f.ActorURI == uri).ExecuteFirstAsync(token); + var foreign = await dbEntities.ForeignAvatars.Match(f => f.ActorURI == uri).ExecuteFirstAsync(token); if (foreign != default) - accounts.Add(_mapper.Foreign(foreign)); + accounts.Add(mapper.Foreign(foreign)); } return accounts; } async Task<(LocalActor Local, ForeignAvatar Remote)> Find(string id, CancellationToken token) { - var avatar = await _dbEntities.Avatars.MatchID(id).ExecuteFirstAsync(token); + var avatar = await dbEntities.Avatars.MatchID(id).ExecuteFirstAsync(token); if (avatar is { DeletionAt: null }) - return (_localActors.FromAvatar(avatar), default); - var group = await _dbEntities.Groups.MatchID(id).ExecuteFirstAsync(token); - if (group is { DeletionAt: null } && _localActors.FromGroup(group) is { IsFederated: true, IsCircle: false } community) + return (localActors.FromAvatar(avatar), default); + var group = await dbEntities.Groups.MatchID(id).ExecuteFirstAsync(token); + if (group is { DeletionAt: null } && localActors.FromGroup(group) is { IsFederated: true, IsCircle: false } community) return (community, default); - return (default, await _dbEntities.ForeignAvatars.MatchID(id).ExecuteFirstAsync(token)); + return (default, await dbEntities.ForeignAvatars.MatchID(id).ExecuteFirstAsync(token)); } async Task Relationship(string id, CancellationToken token) { var (local, remote) = await Find(id, token); var uri = local?.Uri ?? remote?.ActorURI; - var following = uri == default ? default : await _dbEntities.Followings.Match(f => f.AvatarId == MyId && f.TargetActorURI == uri).ExecuteFirstAsync(token); - var reading = remote is { AvatarType: AvatarType.Feed } && await _feeds.IsSubscribed(MyId, remote.ActorURI, token); - var followedBy = uri == default ? default : await _dbEntities.Followers.Match(f => f.LocalActorId == MyId && f.ActorURI == uri).ExecuteFirstAsync(token); + var following = uri == default ? default : await dbEntities.Followings.Match(f => f.AvatarId == MyId && f.TargetActorURI == uri).ExecuteFirstAsync(token); + var reading = remote is { AvatarType: AvatarType.Feed } && await feedFollows.IsSubscribed(MyId, remote.ActorURI, token); + var followedBy = uri == default ? default : await dbEntities.Followers.Match(f => f.LocalActorId == MyId && f.ActorURI == uri).ExecuteFirstAsync(token); var blocking = uri != default && await DB.Default.Find().Match(b => b.AvatarId == MyId && b.TargetActorURI == uri).ExecuteAnyAsync(token); var mute = uri == default ? default : await DB.Default.Find().Match(m => m.AvatarId == MyId && m.TargetActorURI == uri).ExecuteFirstAsync(token); var blockedBy = local != default diff --git a/PrivaPub/Api/Mastodon/Controllers/AnnouncementsController.cs b/PrivaPub/Api/Mastodon/Controllers/AnnouncementsController.cs index 5511002..9775d61 100644 --- a/PrivaPub/Api/Mastodon/Controllers/AnnouncementsController.cs +++ b/PrivaPub/Api/Mastodon/Controllers/AnnouncementsController.cs @@ -12,22 +12,16 @@ namespace PrivaPub.Api.Mastodon.Controllers { // Mastodon's announcements: the administrators' (Domain/Social/Announcements.cs), each persona's dismissals and // reactions its own. Anonymous readers get the list without `read` or `me`. - public class AnnouncementsController : MastodonController + public class AnnouncementsController( + IAnnouncements announcementService) : MastodonController { - readonly IAnnouncements _announcements; - - public AnnouncementsController(IAnnouncements announcements) - { - _announcements = announcements; - } - [HttpGet("/api/v1/announcements"), Scope("read", requiresUser: false), AllowAnonymous] public async Task List(CancellationToken token) => - Json(await Map(await _announcements.Shown(token), MyId, token)); + Json(await Map(await announcementService.Shown(token), MyId, token)); [HttpPost("/api/v1/announcements/{id}/dismiss"), Scope("write:accounts")] public async Task Dismiss(string id, CancellationToken token) => - await _announcements.Dismiss(id, MyId, token) ? Json(new { }) : NotFoundError(); + await announcementService.Dismiss(id, MyId, token) ? Json(new { }) : NotFoundError(); [HttpPut("/api/v1/announcements/{id}/reactions/{name}"), Scope("write:favourites")] public Task React(string id, string name, CancellationToken token) => Reaction(id, name, add: true, token); @@ -37,7 +31,7 @@ namespace PrivaPub.Api.Mastodon.Controllers async Task Reaction(string id, string name, bool add, CancellationToken token) { - var (status, error) = await _announcements.React(id, MyId, name, add, token); + var (status, error) = await announcementService.React(id, MyId, name, add, token); return error == default ? Json(new { }) : Error(status, error); } diff --git a/PrivaPub/Api/Mastodon/Controllers/AppsController.cs b/PrivaPub/Api/Mastodon/Controllers/AppsController.cs index dee609f..a8f80a2 100644 --- a/PrivaPub/Api/Mastodon/Controllers/AppsController.cs +++ b/PrivaPub/Api/Mastodon/Controllers/AppsController.cs @@ -13,17 +13,10 @@ using static OpenIddict.Abstractions.OpenIddictConstants; namespace PrivaPub.Api.Mastodon.Controllers { - public class AppsController : MastodonController + public class AppsController( + IOpenIddictApplicationManager applications, + PrivaPub.Infrastructure.Push.IVapid vapid) : MastodonController { - readonly IOpenIddictApplicationManager _applications; - readonly PrivaPub.Infrastructure.Push.IVapid _vapid; - - public AppsController(IOpenIddictApplicationManager applications, PrivaPub.Infrastructure.Push.IVapid vapid) - { - _applications = applications; - _vapid = vapid; - } - [HttpPost("/api/v1/apps"), AllowAnonymous] public async Task Create(CancellationToken token) { @@ -61,10 +54,10 @@ namespace PrivaPub.Api.Mastodon.Controllers if (Uri.TryCreate(website, UriKind.Absolute, out var site) && site.Scheme is "https" or "http") descriptor.Properties["website"] = System.Text.Json.JsonSerializer.SerializeToElement(website); - var application = await _applications.CreateAsync(descriptor, token); + var application = await applications.CreateAsync(descriptor, token); return Json(new Application { - Id = await _applications.GetIdAsync(application, token), + Id = await applications.GetIdAsync(application, token), Name = name, Website = website, Scopes = scopes.ToList(), @@ -72,7 +65,7 @@ namespace PrivaPub.Api.Mastodon.Controllers RedirectUri = string.Join("\n", redirects), ClientId = descriptor.ClientId, ClientSecret = descriptor.ClientSecret, - VapidKey = (await _vapid.Key(token)).ForApi//Web Push's server key, as Mastodon still gives it here + VapidKey = (await vapid.Key(token)).ForApi//Web Push's server key, as Mastodon still gives it here }); } @@ -80,18 +73,18 @@ namespace PrivaPub.Api.Mastodon.Controllers public async Task Verify(CancellationToken token) { var clientId = User.GetPresenters().FirstOrDefault() ?? User.GetClaim(Claims.ClientId); - var application = clientId == default ? default : await _applications.FindByClientIdAsync(clientId, token); + var application = clientId == default ? default : await applications.FindByClientIdAsync(clientId, token); if (application == default) return Error(StatusCodes.Status401Unauthorized, "The access token is invalid"); - var properties = await _applications.GetPropertiesAsync(application, token); + var properties = await applications.GetPropertiesAsync(application, token); return Json(new { - id = await _applications.GetIdAsync(application, token), - name = await _applications.GetDisplayNameAsync(application, token), + id = await applications.GetIdAsync(application, token), + name = await applications.GetDisplayNameAsync(application, token), website = properties.TryGetValue("website", out var website) ? website.GetString() : default, scopes = User.GetScopes().ToList(), - redirect_uris = (await _applications.GetRedirectUrisAsync(application, token)).ToList(), - vapid_key = (await _vapid.Key(token)).ForApi + redirect_uris = (await applications.GetRedirectUrisAsync(application, token)).ToList(), + vapid_key = (await vapid.Key(token)).ForApi }); } diff --git a/PrivaPub/Api/Mastodon/Controllers/CdnsController.cs b/PrivaPub/Api/Mastodon/Controllers/CdnsController.cs index a53dd62..900e0a3 100644 --- a/PrivaPub/Api/Mastodon/Controllers/CdnsController.cs +++ b/PrivaPub/Api/Mastodon/Controllers/CdnsController.cs @@ -8,21 +8,19 @@ namespace PrivaPub.Api.Mastodon.Controllers { // The CDNs in front of the servers this server knows, each named by its own domain (owner decision 2026-10-04): how many // servers are behind it, how it is recognised, and week by week who joined and who left. - public class CdnsController : MastodonController + public class CdnsController( + IServerPlaces places) : MastodonController { const int MaxWeeks = 260; - readonly IServerPlaces _places; - - public CdnsController(IServerPlaces places) => _places = places; [HttpGet("/api/privapub/v1/cdns"), Scope("read", requiresUser: false), AllowAnonymous] - public async Task List(CancellationToken token) => Json((await _places.Cdns(token)).Select(Summary).ToList()); + public async Task List(CancellationToken token) => Json((await places.Cdns(token)).Select(Summary).ToList()); [HttpGet("/api/privapub/v1/cdns/{key}"), Scope("read", requiresUser: false), AllowAnonymous] public async Task Detail(string key, CancellationToken token) { - var history = await _places.Cdn(key, Math.Clamp(Params.Int("weeks") ?? 52, 1, MaxWeeks), token); + var history = await places.Cdn(key, Math.Clamp(Params.Int("weeks") ?? 52, 1, MaxWeeks), token); if (history == default) return NotFoundError(); var detail = new CdnDetail diff --git a/PrivaPub/Api/Mastodon/Controllers/FeaturedTagsController.cs b/PrivaPub/Api/Mastodon/Controllers/FeaturedTagsController.cs index afe3ee2..594267c 100644 --- a/PrivaPub/Api/Mastodon/Controllers/FeaturedTagsController.cs +++ b/PrivaPub/Api/Mastodon/Controllers/FeaturedTagsController.cs @@ -16,42 +16,35 @@ namespace PrivaPub.Api.Mastodon.Controllers // Featured hashtags as Mastodon's API has them (completion program R8, Domain/Social/FeaturedTags): the persona's own, // featured and unfeatured (its followers are told), suggested from the tags it uses, and any account's: a persona's own // here, or those an account elsewhere features as its server tells them. They are public, as on Mastodon. - public class FeaturedTagsController : MastodonController + public class FeaturedTagsController( + IFeaturedTags featuredTags, + DbEntities dbEntities, + ILocalActorService localActors) : MastodonController { const int MaxSuggested = 10;//Mastodon's RECENT_TAGS_LIMIT const int SuggestionPosts = 200; - readonly IFeaturedTags _featured; - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - - public FeaturedTagsController(IFeaturedTags featured, DbEntities dbEntities, ILocalActorService localActors) - { - _featured = featured; - _dbEntities = dbEntities; - _localActors = localActors; - } [HttpGet("/api/v1/featured_tags"), Scope("read:accounts")] - public async Task Mine(CancellationToken token) => Json(await Entities(await _featured.Of(MyId, token), token)); + public async Task Mine(CancellationToken token) => Json(await Entities(await featuredTags.Of(MyId, token), token)); [HttpPost("/api/v1/featured_tags"), Scope("write:accounts")] public async Task Feature(CancellationToken token) { - var (tag, error) = await _featured.Feature(Me, Params.Get("name"), token); + var (tag, error) = await featuredTags.Feature(Me, Params.Get("name"), token); return tag == default ? Error(StatusCodes.Status422UnprocessableEntity, error) : Json((await Entities(new List { tag }, token))[0]); } [HttpDelete("/api/v1/featured_tags/{id}"), Scope("write:accounts")] public async Task Unfeature(string id, CancellationToken token) => - await _featured.Unfeature(Me, id, default, token) == default ? NotFoundError() : Json(new { }); + await featuredTags.Unfeature(Me, id, default, token) == default ? NotFoundError() : Json(new { }); // the tags the persona used lately and does not feature yet, the most used first, as Mastodon's Tag [HttpGet("/api/v1/featured_tags/suggestions"), Scope("read:accounts")] public async Task Suggestions(CancellationToken token) { - var featured = (await _featured.Of(MyId, token)).Select(t => t.Name).ToHashSet(StringComparer.Ordinal); - var recent = await _dbEntities.Posts.Match(p => p.GroupUserId == MyId && !p.IsFederatedCopy && !p.DeletedAt.HasValue && p.ReblogOfPostId == null + var featured = (await featuredTags.Of(MyId, token)).Select(t => t.Name).ToHashSet(StringComparer.Ordinal); + var recent = await dbEntities.Posts.Match(p => p.GroupUserId == MyId && !p.IsFederatedCopy && !p.DeletedAt.HasValue && p.ReblogOfPostId == null && p.Tags.Count > 0) .Sort(p => p.ID, Order.Descending).Limit(SuggestionPosts).Project(p => p.Include(x => x.Tags)).ExecuteAsync(token); var used = recent.SelectMany((p, age) => p.Tags.Distinct().Select(tag => (tag, age))) @@ -63,7 +56,7 @@ namespace PrivaPub.Api.Mastodon.Controllers .ToList(); var views = new List(); foreach (var tag in used) - views.Add(await TagsController.TagView(_dbEntities, _localActors.BaseAddress, tag, MyId, default, false, token)); + views.Add(await TagsController.TagView(dbEntities, localActors.BaseAddress, tag, MyId, default, false, token)); return Json(views); } @@ -72,19 +65,19 @@ namespace PrivaPub.Api.Mastodon.Controllers [HttpGet("/api/v1/accounts/{id}/featured_tags"), Scope("read:accounts", requiresUser: false), Microsoft.AspNetCore.Authorization.AllowAnonymous] public async Task OfAccount(string id, CancellationToken token) { - var avatar = await _dbEntities.Avatars.MatchID(id).Match(a => !a.DeletionAt.HasValue).ExecuteFirstAsync(token); + var avatar = await dbEntities.Avatars.MatchID(id).Match(a => !a.DeletionAt.HasValue).ExecuteFirstAsync(token); if (avatar != default) - return _localActors.FromAvatar(avatar) is { Suspended: false } - ? Json(await Entities(await _featured.Of(avatar.ID, token), token)) + return localActors.FromAvatar(avatar) is { Suspended: false } + ? Json(await Entities(await featuredTags.Of(avatar.ID, token), token)) : NotFoundError(); - if (await _dbEntities.Groups.MatchID(id).Match(g => !g.DeletionAt.HasValue).ExecuteAnyAsync(token)) + if (await dbEntities.Groups.MatchID(id).Match(g => !g.DeletionAt.HasValue).ExecuteAnyAsync(token)) return Json(Array.Empty()); - var remote = await _dbEntities.ForeignAvatars.MatchID(id).Match(f => !f.DeletionAt.HasValue).ExecuteFirstAsync(token); + var remote = await dbEntities.ForeignAvatars.MatchID(id).Match(f => !f.DeletionAt.HasValue).ExecuteFirstAsync(token); if (remote == default || remote.SuspendedAt.HasValue) return NotFoundError(); var tags = await DB.Default.Find().Match(t => t.ActorURI == remote.ActorURI).Sort(t => t.Position, Order.Ascending) .Limit(FeaturedTags.MaxRemote).ExecuteAsync(token); - var usage = await FeaturedTags.Usage(default, remote.ActorURI, tags.Select(t => t.Name).ToList(), _dbEntities, token); + var usage = await FeaturedTags.Usage(default, remote.ActorURI, tags.Select(t => t.Name).ToList(), dbEntities, token); return Json(tags.Select(t => Entity(t.ID, t.Name, t.DisplayName, t.Href, usage.GetValueOrDefault(t.Name))).ToList()); } @@ -94,7 +87,7 @@ namespace PrivaPub.Api.Mastodon.Controllers var entities = new List(); foreach (var persona in byPersona) { - var usage = await FeaturedTags.Usage(persona.Key, default, persona.Select(t => t.Name).ToList(), _dbEntities, token); + var usage = await FeaturedTags.Usage(persona.Key, default, persona.Select(t => t.Name).ToList(), dbEntities, token); entities.AddRange(persona.Select(t => Entity(t.ID, t.Name, t.DisplayName, default, usage.GetValueOrDefault(t.Name)))); } return entities; @@ -105,7 +98,7 @@ namespace PrivaPub.Api.Mastodon.Controllers Id = id, Name = string.IsNullOrEmpty(displayName) ? name : displayName, // (a link to the remote site is only a link, which the reader follows or not; ours is this server's tag page) - Url = href ?? ActivityPubRenderer.TagUrl(_localActors.BaseAddress, name), + Url = href ?? ActivityPubRenderer.TagUrl(localActors.BaseAddress, name), StatusesCount = usage.Count.ToString(System.Globalization.CultureInfo.InvariantCulture), LastStatusAt = usage.Last?.ToString("yyyy-MM-dd", System.Globalization.CultureInfo.InvariantCulture) }; diff --git a/PrivaPub/Api/Mastodon/Controllers/FiltersController.cs b/PrivaPub/Api/Mastodon/Controllers/FiltersController.cs index 00c1612..49506f5 100644 --- a/PrivaPub/Api/Mastodon/Controllers/FiltersController.cs +++ b/PrivaPub/Api/Mastodon/Controllers/FiltersController.cs @@ -16,19 +16,14 @@ namespace PrivaPub.Api.Mastodon.Controllers // Mastodon's filters (owner decision 2026-10-04, back from the cut list): v2 filters with their keywords and statuses, // and the v1 API, whose filter is one keyword of a v2 filter. Statuses carry what they match in `filtered`; clients // apply the context and the action. Nothing here leaves the server. - public class FiltersController : MastodonController + public class FiltersController( + DbEntities dbEntities) : MastodonController { const int MaxFilters = 100; const int MaxEntries = 100; const int MaxKeywordLength = 100; static readonly Regex Attribute = new(@"^keywords_attributes\[(\d*)\]\[(\w+)\]$", RegexOptions.Compiled); - readonly DbEntities _dbEntities; - - public FiltersController(DbEntities dbEntities) - { - _dbEntities = dbEntities; - } static string NewId() => ObjectId.GenerateNewId().ToString(); @@ -242,7 +237,7 @@ namespace PrivaPub.Api.Mastodon.Controllers if (await Mine(id, token) is not { } filter) return NotFoundError(); var statusId = Params.Get("status_id"); - var post = string.IsNullOrEmpty(statusId) ? default : await _dbEntities.Posts.Match(p => p.ID == statusId).ExecuteFirstAsync(token); + var post = string.IsNullOrEmpty(statusId) ? default : await dbEntities.Posts.Match(p => p.ID == statusId).ExecuteFirstAsync(token); if (post == default || !await Domain.Privacy.VisibilityPolicy.CanSee(post, MyId, token)) return NotFoundError(); if (filter.Statuses.FirstOrDefault(s => s.PostId == statusId) is { } present) diff --git a/PrivaPub/Api/Mastodon/Controllers/InstanceController.cs b/PrivaPub/Api/Mastodon/Controllers/InstanceController.cs index 5093d30..80ba832 100644 --- a/PrivaPub/Api/Mastodon/Controllers/InstanceController.cs +++ b/PrivaPub/Api/Mastodon/Controllers/InstanceController.cs @@ -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, + 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 _registrations; - readonly IInstanceSettings _settings; - readonly MastodonMapper _mapper; - readonly PrivaPub.Infrastructure.Push.IVapid _vapid; - public InstanceController(ILocalActorService localActors, IOptionsMonitor 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().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) }, diff --git a/PrivaPub/Api/Mastodon/Controllers/ListsController.cs b/PrivaPub/Api/Mastodon/Controllers/ListsController.cs index 30868fe..908ad9f 100644 --- a/PrivaPub/Api/Mastodon/Controllers/ListsController.cs +++ b/PrivaPub/Api/Mastodon/Controllers/ListsController.cs @@ -12,19 +12,13 @@ namespace PrivaPub.Api.Mastodon.Controllers { // Mastodon's lists (owner decision 2026-10-04, back from the cut list): a persona groups accounts it follows, reads them // as a timeline, and may keep an exclusive list's members out of its home. Nothing here leaves the server. - public class ListsController : MastodonController + public class ListsController( + DbEntities dbEntities, + MastodonMapper mapper) : MastodonController { const int MaxLists = 50; const int MaxMembers = 500; - readonly DbEntities _dbEntities; - readonly MastodonMapper _mapper; - - public ListsController(DbEntities dbEntities, MastodonMapper mapper) - { - _dbEntities = dbEntities; - _mapper = mapper; - } static object View(PersonaList list) => new { id = list.ID, title = list.Title, replies_policy = list.RepliesPolicy, exclusive = list.Exclusive }; @@ -38,7 +32,7 @@ namespace PrivaPub.Api.Mastodon.Controllers var members = (await DB.Default.Find().Match(m => m.ListId == list.ID).ExecuteAsync(token)).Select(m => m.AccountId).ToList(); if (members.Count == 0) return members; - var followed = (await _dbEntities.Followings.Match(f => f.AvatarId == MyId && f.State == FollowState.Accepted && members.Contains(f.TargetAccountId)) + var followed = (await dbEntities.Followings.Match(f => f.AvatarId == MyId && f.State == FollowState.Accepted && members.Contains(f.TargetAccountId)) .ExecuteAsync(token)).Select(f => f.TargetAccountId).ToHashSet(); var gone = members.Where(m => !followed.Contains(m)).ToList(); if (gone.Count > 0) @@ -113,7 +107,7 @@ namespace PrivaPub.Api.Mastodon.Controllers return NotFoundError(); await Members(list, token); var members = await Page.From(Params, Limit(40, 80)).Fetch(DB.Default.Find().Match(m => m.ListId == list.ID), m => m.ID, token); - var accounts = await _mapper.Accounts(members.Select(m => m.AccountId), token); + var accounts = await mapper.Accounts(members.Select(m => m.AccountId), token); Link($"/api/v1/lists/{id}/accounts", members.LastOrDefault()?.ID, members.FirstOrDefault()?.ID); return Json(members.Where(m => accounts.ContainsKey(m.AccountId)).Select(m => accounts[m.AccountId]).ToList()); } @@ -127,7 +121,7 @@ namespace PrivaPub.Api.Mastodon.Controllers var ids = Params.List("account_ids").Distinct().ToList(); if (ids.Count == 0) return Error(StatusCodes.Status422UnprocessableEntity, "Validation failed: Account ids can't be blank"); - var followed = (await _dbEntities.Followings.Match(f => f.AvatarId == MyId && f.State == FollowState.Accepted && ids.Contains(f.TargetAccountId)) + var followed = (await dbEntities.Followings.Match(f => f.AvatarId == MyId && f.State == FollowState.Accepted && ids.Contains(f.TargetAccountId)) .ExecuteAsync(token)).Select(f => f.TargetAccountId).ToHashSet(); if (ids.Any(a => !followed.Contains(a))) return Error(StatusCodes.Status422UnprocessableEntity, "Validation failed: You must follow this account to add it to a list"); @@ -168,12 +162,12 @@ namespace PrivaPub.Api.Mastodon.Controllers return NotFoundError(); var members = await Members(list, token); var entries = await Page.From(Params, Limit()).Fetch( - _dbEntities.TimelineEntries.Match(e => e.AvatarId == MyId && members.Contains(e.AuthorAccountId)), e => e.PostId, token); + dbEntities.TimelineEntries.Match(e => e.AvatarId == MyId && members.Contains(e.AuthorAccountId)), e => e.PostId, token); var ids = entries.Select(e => e.PostId).ToList(); - var posts = (await _dbEntities.Posts.Match(p => ids.Contains(p.ID)).Match(VisibilityPolicy.IsShown).ExecuteAsync(token)).ToDictionary(p => p.ID); + var posts = (await dbEntities.Posts.Match(p => ids.Contains(p.ID)).Match(VisibilityPolicy.IsShown).ExecuteAsync(token)).ToDictionary(p => p.ID); var answered = list.RepliesPolicy switch { - ListRepliesPolicy.Followed => (await _dbEntities.Followings.Match(f => f.AvatarId == MyId && f.State == FollowState.Accepted).ExecuteAsync(token)) + ListRepliesPolicy.Followed => (await dbEntities.Followings.Match(f => f.AvatarId == MyId && f.State == FollowState.Accepted).ExecuteAsync(token)) .Select(f => f.TargetAccountId).Append(MyId).ToHashSet(), ListRepliesPolicy.List => members.Append(MyId).ToHashSet(), _ => new HashSet { MyId } @@ -183,7 +177,7 @@ namespace PrivaPub.Api.Mastodon.Controllers || p.InReplyToAccountId != default && (p.InReplyToAccountId == p.AuthorAccountId || answered.Contains(p.InReplyToAccountId))) .ToList(); Link($"/api/v1/timelines/list/{id}", entries.LastOrDefault()?.PostId, entries.FirstOrDefault()?.PostId); - return Json(await _mapper.Statuses(shown, MyId, token)); + return Json(await mapper.Statuses(shown, MyId, token)); } } } diff --git a/PrivaPub/Api/Mastodon/Controllers/MediaController.cs b/PrivaPub/Api/Mastodon/Controllers/MediaController.cs index a7f4b44..bbbd85d 100644 --- a/PrivaPub/Api/Mastodon/Controllers/MediaController.cs +++ b/PrivaPub/Api/Mastodon/Controllers/MediaController.cs @@ -15,23 +15,15 @@ using System.Globalization; namespace PrivaPub.Api.Mastodon.Controllers { - public class MediaController : MastodonController + public class MediaController( + IMediaService mediaService, + IMediaProxy mediaProxy, + IJobQueue jobs, + IInteractionLedger ledger = default) : MastodonController { const long UploadLimit = 100L * 1024 * 1024; - readonly IMediaService _media; - readonly IMediaProxy _proxy; - readonly IJobQueue _jobs; - readonly IInteractionLedger _ledger; - - public MediaController(IMediaService media, IMediaProxy proxy, IJobQueue jobs, IInteractionLedger ledger = default) - { - _media = media; - _proxy = proxy; - _jobs = jobs; - _ledger = ledger; - } [HttpPost("/api/v1/media"), HttpPost("/api/v2/media"), Scope("write:media"), EnableRateLimiting(RateLimiting.Uploads), RequestSizeLimit(UploadLimit), RequestFormLimits(MultipartBodyLengthLimit = UploadLimit)] @@ -42,12 +34,12 @@ namespace PrivaPub.Api.Mastodon.Controllers var form = await Request.ReadFormAsync(token); // v2 may answer before audio or video is processed (202, its url null until then), as Mastodon does; v1 waits var later = Request.Path.StartsWithSegments("/api/v2/media"); - var outcome = await _media.Upload(Me, form.Files["file"], form["description"], form["focus"], later, token); + var outcome = await mediaService.Upload(Me, form.Files["file"], form["description"], form["focus"], later, token); if (!outcome.Ok) return Error(outcome.Status, outcome.Error); if (outcome.Attachment.ProcessingState != "pending") return Json(View(outcome.Attachment)); - await _jobs.EnqueueMany(new[] { ProcessMediaJob.JobFor(outcome.Attachment, new Uri(Me.BaseAddress).Host) }, token); + await jobs.EnqueueMany(new[] { ProcessMediaJob.JobFor(outcome.Attachment, new Uri(Me.BaseAddress).Host) }, token); return new JsonResult(View(outcome.Attachment)) { StatusCode = StatusCodes.Status202Accepted }; } @@ -74,7 +66,7 @@ namespace PrivaPub.Api.Mastodon.Controllers return NotFoundError(); if (attachment.PostId != null || attachment.ScheduledStatusId != null) return Error(StatusCodes.Status422UnprocessableEntity, "Media attachment is currently used by a status"); - await _media.Trash(m => m.ID == attachment.ID && m.PostId == null && m.ScheduledStatusId == null, "deleted by its owner", token); + await mediaService.Trash(m => m.ID == attachment.ID && m.PostId == null && m.ScheduledStatusId == null, "deleted by its owner", token); return Json(new { }); } @@ -96,19 +88,19 @@ namespace PrivaPub.Api.Mastodon.Controllers [HttpGet("/media/proxy/{signature}/{encoded}"), AllowAnonymous, EnableRateLimiting(RateLimiting.Proxy), ApiExplorerSettings(IgnoreApi = true)] public async Task Proxy(string signature, string encoded, CancellationToken token) { - var url = _proxy.Verified(signature, encoded); - if (url == default || _proxy.Refuses(url)) + var url = mediaProxy.Verified(signature, encoded); + if (url == default || mediaProxy.Refuses(url)) return NotFound(); Response.Headers["X-Content-Type-Options"] = "nosniff"; Response.Headers["Content-Security-Policy"] = "default-src 'none'; sandbox"; - if (_proxy.Cached(url) is { Path: not null } cached && Serve(cached.Path, cached.ContentType) is { } hit) + if (mediaProxy.Cached(url) is { Path: not null } cached && Serve(cached.Path, cached.ContentType) is { } hit) { - _ledger?.Count(Interactions.HostOf(url), "media:hit"); + ledger?.Count(Interactions.HostOf(url), "media:hit"); return hit; } if (Request.Headers.Range.Count == 0) { - var (outcome, path, contentType) = await _proxy.Download(url, token); + var (outcome, path, contentType) = await mediaProxy.Download(url, token); if (outcome == ProxyOutcome.Cached && Serve(path, contentType) is { } fetched) return fetched; if (outcome == ProxyOutcome.Failed) @@ -121,7 +113,7 @@ namespace PrivaPub.Api.Mastodon.Controllers // once there is something to cache IActionResult Serve(string path, string contentType) { - FileStream file; + var file = default(FileStream); try { file = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite | FileShare.Delete, 64 * 1024, useAsync: true); @@ -137,7 +129,7 @@ namespace PrivaPub.Api.Mastodon.Controllers async Task Stream(string url, CancellationToken token) { var range = System.Net.Http.Headers.RangeHeaderValue.TryParse(Request.Headers.Range.ToString(), out var asked) ? asked : default; - using var upstream = await _proxy.Open(url, range, token); + using var upstream = await mediaProxy.Open(url, range, token); if (upstream == default) return NotFound(); if (upstream.IsSuccessStatusCode) @@ -153,7 +145,7 @@ namespace PrivaPub.Api.Mastodon.Controllers return new EmptyResult(); } - object View(MediaAttachment attachment) => View(_media, attachment); + object View(MediaAttachment attachment) => View(mediaService, attachment); internal static object View(IMediaService media, MediaAttachment attachment) => new { diff --git a/PrivaPub/Api/Mastodon/Controllers/NotificationRequestsController.cs b/PrivaPub/Api/Mastodon/Controllers/NotificationRequestsController.cs index 28f771c..5ac767f 100644 --- a/PrivaPub/Api/Mastodon/Controllers/NotificationRequestsController.cs +++ b/PrivaPub/Api/Mastodon/Controllers/NotificationRequestsController.cs @@ -14,17 +14,10 @@ namespace PrivaPub.Api.Mastodon.Controllers // Mastodon's notification policy and requests (4.3): what the persona's notifications from strangers, new accounts, // unasked private mentions and silenced accounts become, and the requests that gather the filtered ones, one per // account, let in or dismissed - public class NotificationRequestsController : MastodonController + public class NotificationRequestsController( + MastodonMapper mapper, + DbEntities dbEntities) : MastodonController { - readonly MastodonMapper _mapper; - readonly DbEntities _dbEntities; - - public NotificationRequestsController(MastodonMapper mapper, DbEntities dbEntities) - { - _mapper = mapper; - _dbEntities = dbEntities; - } - static string Name(NotificationAction action) => action switch { NotificationAction.Filter => "filter", @@ -101,11 +94,11 @@ namespace PrivaPub.Api.Mastodon.Controllers async Task Map(NotificationRequest request, CancellationToken token) { - var account = await _mapper.Account(request.FromAccountId, token); + var account = await mapper.Account(request.FromAccountId, token); if (account == default) return default; var post = string.IsNullOrEmpty(request.LastPostId) ? default - : await _dbEntities.Posts.Match(p => p.ID == request.LastPostId && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); + : await dbEntities.Posts.Match(p => p.ID == request.LastPostId && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); return new { id = request.ID, @@ -113,7 +106,7 @@ namespace PrivaPub.Api.Mastodon.Controllers updated_at = MastodonJson.Time(request.UpdatedAt), notifications_count = request.NotificationsCount.ToString(System.Globalization.CultureInfo.InvariantCulture), account, - last_status = post == default ? default : await _mapper.Status(post, MyId, token) + last_status = post == default ? default : await mapper.Status(post, MyId, token) }; } diff --git a/PrivaPub/Api/Mastodon/Controllers/PollsController.cs b/PrivaPub/Api/Mastodon/Controllers/PollsController.cs index a6378e8..956ad34 100644 --- a/PrivaPub/Api/Mastodon/Controllers/PollsController.cs +++ b/PrivaPub/Api/Mastodon/Controllers/PollsController.cs @@ -12,24 +12,16 @@ using PostEntity = PrivaPub.Models.Post.Post; namespace PrivaPub.Api.Mastodon.Controllers { - public class PollsController : MastodonController + public class PollsController( + DbEntities dbEntities, + MastodonMapper mapper, + IPollService pollService) : MastodonController { - readonly DbEntities _dbEntities; - readonly MastodonMapper _mapper; - readonly IPollService _polls; - - public PollsController(DbEntities dbEntities, MastodonMapper mapper, IPollService polls) - { - _dbEntities = dbEntities; - _mapper = mapper; - _polls = polls; - } - [HttpGet("/api/v1/polls/{id}"), Scope("read:statuses", requiresUser: false), AllowAnonymous] public async Task Get(string id, CancellationToken token) { var post = await Visible(id, token); - return post?.Poll == default ? NotFoundError() : Json(_mapper.Poll(post, MyId, await _polls.OwnVotes(post.ID, MyId, token))); + return post?.Poll == default ? NotFoundError() : Json(mapper.Poll(post, MyId, await pollService.OwnVotes(post.ID, MyId, token))); } [HttpPost("/api/v1/polls/{id}/votes"), Scope("write:statuses")] @@ -39,15 +31,15 @@ namespace PrivaPub.Api.Mastodon.Controllers if (post?.Poll == default) return NotFoundError(); var choices = Params.List("choices").Select(c => int.TryParse(c, out var index) ? index : -1).ToList(); - var outcome = await _polls.Vote(Me, post, choices, token); + var outcome = await pollService.Vote(Me, post, choices, token); if (!outcome.Ok) return Error(outcome.Status, outcome.Error); - return Json(_mapper.Poll(outcome.Post, MyId, await _polls.OwnVotes(post.ID, MyId, token))); + return Json(mapper.Poll(outcome.Post, MyId, await pollService.OwnVotes(post.ID, MyId, token))); } async Task Visible(string id, CancellationToken token) { - var post = await _dbEntities.Posts.Match(p => p.ID == id && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); + var post = await dbEntities.Posts.Match(p => p.ID == id && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); return post != default && post.Visibility != PostVisibility.LocalGeo && await VisibilityPolicy.CanSee(post, MyId, token) ? post : default; } } diff --git a/PrivaPub/Api/Mastodon/Controllers/ProvenanceController.cs b/PrivaPub/Api/Mastodon/Controllers/ProvenanceController.cs index e59ddeb..9b5e52a 100644 --- a/PrivaPub/Api/Mastodon/Controllers/ProvenanceController.cs +++ b/PrivaPub/Api/Mastodon/Controllers/ProvenanceController.cs @@ -22,34 +22,24 @@ using PostEntity = PrivaPub.Models.Post.Post; namespace PrivaPub.Api.Mastodon.Controllers { - public class ProvenanceController : MastodonController + public class ProvenanceController( + DbEntities dbEntities, + ISelfLocation selfLocation, + IServerPlaces places, + ILocalActorService localActors, + IOptionsMonitor registrations) : MastodonController { const int MaxHosts = 40; - readonly DbEntities _dbEntities; const int MaxWeeks = 260; - readonly ISelfLocation _self; - readonly IServerPlaces _places; - readonly ILocalActorService _localActors; - readonly IOptionsMonitor _registrations; - - public ProvenanceController(DbEntities dbEntities, ISelfLocation self, IServerPlaces places, ILocalActorService localActors, - IOptionsMonitor registrations) - { - _dbEntities = dbEntities; - _self = self; - _places = places; - _localActors = localActors; - _registrations = registrations; - } [HttpGet("/api/privapub/v1/statuses/{id}/provenance"), Scope("read:statuses", requiresUser: false), AllowAnonymous] public async Task Status(string id, CancellationToken token) { - var post = await _dbEntities.Posts.Match(p => p.ID == id).Match(VisibilityPolicy.IsShown).ExecuteFirstAsync(token); + var post = await dbEntities.Posts.Match(p => p.ID == id).Match(VisibilityPolicy.IsShown).ExecuteFirstAsync(token); if (post?.ReblogOfPostId != default) - post = await _dbEntities.Posts.Match(p => p.ID == post.ReblogOfPostId).Match(VisibilityPolicy.IsShown).ExecuteFirstAsync(token); + post = await dbEntities.Posts.Match(p => p.ID == post.ReblogOfPostId).Match(VisibilityPolicy.IsShown).ExecuteFirstAsync(token); if (post == default || post.Visibility == PostVisibility.LocalGeo || !await VisibilityPolicy.CanSee(post, MyId, token)) return NotFoundError(); if (!post.IsFederatedCopy) @@ -59,7 +49,7 @@ namespace PrivaPub.Api.Mastodon.Controllers ?? await DB.Default.Find().Match(r => r.ObjectURI == post.ObjectURI).ExecuteFirstAsync(token); var host = record?.Host ?? (Uri.TryCreate(post.ObjectURI, UriKind.Absolute, out var uri) ? uri.Host.ToLowerInvariant() : default); var instance = host == default ? default : await DB.Default.Find().Match(i => i.Host == host).ExecuteFirstAsync(token); - var beforeCdn = instance?.Geo?.Cdn == default ? default : (await _places.BeforeCdn(new[] { instance.Host }, token)).GetValueOrDefault(instance.Host); + var beforeCdn = instance?.Geo?.Cdn == default ? default : (await places.BeforeCdn(new[] { instance.Host }, token)).GetValueOrDefault(instance.Host); return Json(Describe(post, record, instance, beforeCdn)); } @@ -82,7 +72,7 @@ namespace PrivaPub.Api.Mastodon.Controllers if (string.IsNullOrEmpty(host) || host.Length > 253 || !await DB.Default.Find().Match(i => i.Host == host).ExecuteAnyAsync(token)) return NotFoundError(); var weeks = Math.Clamp(Params.Int("weeks") ?? 52, 1, MaxWeeks); - return Json((await _places.History(host, weeks, token)).Select(s => new InstanceWeek + return Json((await places.History(host, weeks, token)).Select(s => new InstanceWeek { Week = s.Week, TakenAt = MastodonJson.Time(s.TakenAt), @@ -105,9 +95,9 @@ namespace PrivaPub.Api.Mastodon.Controllers { var wanted = hosts.Select(h => h?.Trim().ToLowerInvariant()).Where(h => !string.IsNullOrEmpty(h) && h.Length <= 253) .Distinct().Take(MaxHosts).ToList(); - var selfHost = Uri.TryCreate(_localActors.BaseAddress, UriKind.Absolute, out var self) ? self.Host.ToLowerInvariant() : default; + var selfHost = Uri.TryCreate(localActors.BaseAddress, UriKind.Absolute, out var self) ? self.Host.ToLowerInvariant() : default; var remote = await DB.Default.Find().Match(i => wanted.Contains(i.Host)).ExecuteAsync(token); - var beforeCdn = await _places.BeforeCdn(remote.Where(i => i.Geo?.Cdn != default).Select(i => i.Host), token); + var beforeCdn = await places.BeforeCdn(remote.Where(i => i.Geo?.Cdn != default).Select(i => i.Host), token); var described = new List(); foreach (var host in wanted) { @@ -121,7 +111,7 @@ namespace PrivaPub.Api.Mastodon.Controllers async Task DescribeSelf(string host, CancellationToken token) { - var geo = await _self.Get(token); + var geo = await selfLocation.Get(token); return new InstanceDescription { Host = host, @@ -129,7 +119,7 @@ namespace PrivaPub.Api.Mastodon.Controllers Version = BuildInfo.Ref, NodeName = HttpContext.RequestServices.GetRequiredService().Current.Title, Protocols = new() { "activitypub" }, - OpenRegistrations = _registrations.CurrentValue.IsOpen, + OpenRegistrations = registrations.CurrentValue.IsOpen, DescribedAt = MastodonJson.Time(DateTime.UtcNow), Geo = Located(PublicGeo.Project(geo), geo) }; diff --git a/PrivaPub/Api/Mastodon/Controllers/PushController.cs b/PrivaPub/Api/Mastodon/Controllers/PushController.cs index 034edfa..9a7f6d1 100644 --- a/PrivaPub/Api/Mastodon/Controllers/PushController.cs +++ b/PrivaPub/Api/Mastodon/Controllers/PushController.cs @@ -21,18 +21,12 @@ namespace PrivaPub.Api.Mastodon.Controllers // subscription[endpoint], subscription[keys][p256dh], subscription[keys][auth], subscription[standard] (4.4: RFC 8291 // and RFC 8292, else the aesgcm draft), data[alerts][] and data[policy] (all, followed, follower, none). Its answer is // Mastodon's WebPushSubscription. What is pushed, and how, is WebPushDispatcher's and WebPushJob's. - public class PushController : MastodonController + public class PushController( + IVapid vapid, + IOptionsMonitor federation) : MastodonController { const int MaxEndpointLength = 2048; - readonly IVapid _vapid; - readonly IOptionsMonitor _federation; - - public PushController(IVapid vapid, IOptionsMonitor federation) - { - _vapid = vapid; - _federation = federation; - } string TokenId => User.GetTokenId(); @@ -43,7 +37,7 @@ namespace PrivaPub.Api.Mastodon.Controllers var endpoint = Params.Get("subscription[endpoint]")?.Trim(); if (string.IsNullOrEmpty(endpoint)) return Error(StatusCodes.Status400BadRequest, "Param is missing or the value is empty: subscription"); - if (endpoint.Length > MaxEndpointLength || !Uri.TryCreate(endpoint, UriKind.Absolute, out var uri) || !WebPushJob.IsAllowed(uri, _federation.CurrentValue)) + if (endpoint.Length > MaxEndpointLength || !Uri.TryCreate(endpoint, UriKind.Absolute, out var uri) || !WebPushJob.IsAllowed(uri, federation.CurrentValue)) return Error(StatusCodes.Status422UnprocessableEntity, "Validation failed: Endpoint is not a valid URL"); var p256dh = Params.Get("subscription[keys][p256dh]")?.Trim(); var auth = Params.Get("subscription[keys][auth]")?.Trim(); @@ -55,7 +49,7 @@ namespace PrivaPub.Api.Mastodon.Controllers if (invalid != default) return invalid; var tokenId = TokenId; - var accessToken = await AccessToken(); + var accessToken = await AccessToken(token); if (string.IsNullOrEmpty(tokenId) || string.IsNullOrEmpty(accessToken)) return Error(StatusCodes.Status401Unauthorized, "The access token is invalid"); @@ -74,7 +68,7 @@ namespace PrivaPub.Api.Mastodon.Controllers // (two at once with one token: the unique index on the token keeps one, and the later replaces it) for (var attempt = 0; ; attempt++) { - await WebPush.ForgetToken(tokenId); + await WebPush.ForgetToken(tokenId, token); try { subscription.ID = default; @@ -116,7 +110,7 @@ namespace PrivaPub.Api.Mastodon.Controllers [HttpDelete("/api/v1/push/subscription"), Scope("push")] public async Task Delete(CancellationToken token) { - await WebPush.ForgetToken(TokenId); + await WebPush.ForgetToken(TokenId, token); return Json(new { }); } @@ -143,7 +137,7 @@ namespace PrivaPub.Api.Mastodon.Controllers // the bearer token of this request, wherever the client put it (OpenIddict takes the header, a form field or the // query): the payload carries it back, as Mastodon's does - async Task AccessToken() + async Task AccessToken(CancellationToken token = default) { var stored = await HttpContext.GetTokenAsync(OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme, OpenIddictValidationAspNetCoreConstants.Tokens.AccessToken); @@ -162,7 +156,7 @@ namespace PrivaPub.Api.Mastodon.Controllers endpoint = subscription.Endpoint, standard = subscription.Standard, alerts = WebPush.Alerts.ToDictionary(alert => alert, alert => subscription.Alerts.Contains(alert)), - server_key = (await _vapid.Key(token)).ForApi, + server_key = (await vapid.Key(token)).ForApi, policy = WebPush.Name(subscription.Policy) }; } diff --git a/PrivaPub/Api/Mastodon/Controllers/ReactionsController.cs b/PrivaPub/Api/Mastodon/Controllers/ReactionsController.cs index aa6336e..e5f0d57 100644 --- a/PrivaPub/Api/Mastodon/Controllers/ReactionsController.cs +++ b/PrivaPub/Api/Mastodon/Controllers/ReactionsController.cs @@ -15,19 +15,11 @@ using PostEntity = PrivaPub.Models.Post.Post; namespace PrivaPub.Api.Mastodon.Controllers { - public class ReactionsController : MastodonController + public class ReactionsController( + DbEntities dbEntities, + MastodonMapper mapper, + IReactions reactionService) : MastodonController { - readonly DbEntities _dbEntities; - readonly MastodonMapper _mapper; - readonly IReactions _reactions; - - public ReactionsController(DbEntities dbEntities, MastodonMapper mapper, IReactions reactions) - { - _dbEntities = dbEntities; - _mapper = mapper; - _reactions = reactions; - } - [HttpGet("/api/v1/pleroma/statuses/{id}/reactions"), Scope("read:statuses", requiresUser: false), AllowAnonymous] public async Task List(string id, CancellationToken token) { @@ -35,13 +27,13 @@ namespace PrivaPub.Api.Mastodon.Controllers if (post == default) return NotFoundError(); var reactions = await DB.Default.Find().Match(r => r.PostId == post.ID).ExecuteAsync(token); - var accounts = await _mapper.Accounts(reactions.Select(r => r.AccountId), token); + var accounts = await mapper.Accounts(reactions.Select(r => r.AccountId), token); return Json(reactions.GroupBy(r => r.Emoji).Select(group => new { name = group.Key, count = group.Count(), me = MyId != default && group.Any(r => r.AccountId == MyId), - url = _mapper.ProxiedUrl(group.First().EmojiURL), + url = mapper.ProxiedUrl(group.First().EmojiURL), accounts = group.Select(r => accounts.GetValueOrDefault(r.AccountId)).Where(a => a != default).ToList() }).OrderByDescending(r => r.count).ToList()); } @@ -52,9 +44,9 @@ namespace PrivaPub.Api.Mastodon.Controllers var post = await Visible(id, token); if (post == default) return NotFoundError(); - if (!await _reactions.React(Me, post, Uri.UnescapeDataString(emoji), token)) + if (!await reactionService.React(Me, post, Uri.UnescapeDataString(emoji), token)) return Error(StatusCodes.Status422UnprocessableEntity, "Validation failed: That emoji cannot be used here"); - return Json(await _mapper.Status(post, MyId, token)); + return Json(await mapper.Status(post, MyId, token)); } [HttpDelete("/api/v1/pleroma/statuses/{id}/reactions/{emoji}"), Scope("write:favourites")] @@ -63,13 +55,13 @@ namespace PrivaPub.Api.Mastodon.Controllers var post = await Visible(id, token); if (post == default) return NotFoundError(); - await _reactions.Unreact(Me, post, Uri.UnescapeDataString(emoji), token); - return Json(await _mapper.Status(post, MyId, token)); + await reactionService.Unreact(Me, post, Uri.UnescapeDataString(emoji), token); + return Json(await mapper.Status(post, MyId, token)); } async Task Visible(string id, CancellationToken token) { - var post = await _dbEntities.Posts.Match(p => p.ID == id && !p.DeletedAt.HasValue && p.ReblogOfPostId == null).ExecuteFirstAsync(token); + var post = await dbEntities.Posts.Match(p => p.ID == id && !p.DeletedAt.HasValue && p.ReblogOfPostId == null).ExecuteFirstAsync(token); return post != default && post.Visibility != PostVisibility.LocalGeo && await VisibilityPolicy.CanSee(post, MyId, token) ? post : default; } } diff --git a/PrivaPub/Api/Mastodon/Controllers/ReportsController.cs b/PrivaPub/Api/Mastodon/Controllers/ReportsController.cs index dc59c51..26e27c6 100644 --- a/PrivaPub/Api/Mastodon/Controllers/ReportsController.cs +++ b/PrivaPub/Api/Mastodon/Controllers/ReportsController.cs @@ -6,21 +6,14 @@ using PrivaPub.Domain.Relationships; namespace PrivaPub.Api.Mastodon.Controllers { - public class ReportsController : MastodonController + public class ReportsController( + IReportService reportService, + MastodonMapper mapper) : MastodonController { - readonly IReportService _reports; - readonly MastodonMapper _mapper; - - public ReportsController(IReportService reports, MastodonMapper mapper) - { - _reports = reports; - _mapper = mapper; - } - [HttpPost("/api/v1/reports"), Scope("write:reports")] public async Task Create(CancellationToken token) { - var report = await _reports.File(Me, Params.Get("account_id"), Params.List("status_ids"), Params.Get("comment"), Params.Get("category"), + var report = await reportService.File(Me, Params.Get("account_id"), Params.List("status_ids"), Params.Get("comment"), Params.Get("category"), Params.List("rule_ids"), Params.Bool("forward") == true, token); if (report == default) return NotFoundError(); @@ -35,7 +28,7 @@ namespace PrivaPub.Api.Mastodon.Controllers created_at = MastodonJson.Time(report.CreatedAt), status_ids = report.PostIds, rule_ids = report.RuleIds, - target_account = await _mapper.Account(report.TargetAccountId, token) + target_account = await mapper.Account(report.TargetAccountId, token) }); } } diff --git a/PrivaPub/Api/Mastodon/Controllers/ScheduledStatusesController.cs b/PrivaPub/Api/Mastodon/Controllers/ScheduledStatusesController.cs index 47a0932..a643662 100644 --- a/PrivaPub/Api/Mastodon/Controllers/ScheduledStatusesController.cs +++ b/PrivaPub/Api/Mastodon/Controllers/ScheduledStatusesController.cs @@ -13,17 +13,10 @@ namespace PrivaPub.Api.Mastodon.Controllers { // Mastodon's scheduled statuses (owner decision 2026-10-04, back from the cut list): the persona's posts waiting for // their time, moved to another time or dropped. POST /api/v1/statuses with scheduled_at makes them. - public class ScheduledStatusesController : MastodonController + public class ScheduledStatusesController( + IMediaService mediaService, + IJobQueue jobs) : MastodonController { - readonly IMediaService _media; - readonly IJobQueue _jobs; - - public ScheduledStatusesController(IMediaService media, IJobQueue jobs) - { - _media = media; - _jobs = jobs; - } - public static async Task View(ScheduledStatus scheduled, IMediaService media, CancellationToken token) { var p = scheduled.Params; @@ -66,13 +59,13 @@ namespace PrivaPub.Api.Mastodon.Controllers Link("/api/v1/scheduled_statuses", page.LastOrDefault()?.ID, page.FirstOrDefault()?.ID); var views = new List(); foreach (var scheduled in page) - views.Add(await View(scheduled, _media, token)); + views.Add(await View(scheduled, mediaService, token)); return Json(views); } [HttpGet("/api/v1/scheduled_statuses/{id}"), Scope("read:statuses")] public async Task One(string id, CancellationToken token) => - await Mine(id, token) is { } scheduled ? Json(await View(scheduled, _media, token)) : NotFoundError(); + await Mine(id, token) is { } scheduled ? Json(await View(scheduled, mediaService, token)) : NotFoundError(); [HttpPut("/api/v1/scheduled_statuses/{id}"), Scope("write:statuses")] public async Task Move(string id, CancellationToken token) @@ -86,8 +79,8 @@ namespace PrivaPub.Api.Mastodon.Controllers return Error(StatusCodes.Status422UnprocessableEntity, "Validation failed: " + refusal); scheduled.ScheduledAt = at; await DB.Default.Update().MatchID(scheduled.ID).Modify(s => s.ScheduledAt, at).ExecuteAsync(token); - await _jobs.EnqueueMany(new[] { ScheduledStatuses.JobFor(scheduled, new Uri(Me.BaseAddress).Host) }, token); - return Json(await View(scheduled, _media, token)); + await jobs.EnqueueMany(new[] { ScheduledStatuses.JobFor(scheduled, new Uri(Me.BaseAddress).Host) }, token); + return Json(await View(scheduled, mediaService, token)); } [HttpDelete("/api/v1/scheduled_statuses/{id}"), Scope("write:statuses")] @@ -97,7 +90,7 @@ namespace PrivaPub.Api.Mastodon.Controllers return NotFoundError(); await DB.Default.DeleteAsync(scheduled.ID); // its media were the scheduled post's alone, never posted - await _media.Trash(m => m.ScheduledStatusId == scheduled.ID, "scheduled post dropped", token); + await mediaService.Trash(m => m.ScheduledStatusId == scheduled.ID, "scheduled post dropped", token); return Json(new { }); } } diff --git a/PrivaPub/Api/Mastodon/Controllers/SearchController.cs b/PrivaPub/Api/Mastodon/Controllers/SearchController.cs index 3de059b..3272579 100644 --- a/PrivaPub/Api/Mastodon/Controllers/SearchController.cs +++ b/PrivaPub/Api/Mastodon/Controllers/SearchController.cs @@ -15,26 +15,14 @@ using PostEntity = PrivaPub.Models.Post.Post; namespace PrivaPub.Api.Mastodon.Controllers { - public partial class SearchController : MastodonController + public partial class SearchController( + MastodonMapper mapper, + DbEntities dbEntities, + ILocalActorService localActors, + IRemoteActorService remoteActors, + IRemotePosts remotePosts, + AccountSearch accountSearch) : MastodonController { - readonly MastodonMapper _mapper; - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - readonly IRemoteActorService _remoteActors; - readonly IRemotePosts _remotePosts; - readonly AccountSearch _search; - - public SearchController(MastodonMapper mapper, DbEntities dbEntities, ILocalActorService localActors, IRemoteActorService remoteActors, - IRemotePosts remotePosts, AccountSearch search) - { - _mapper = mapper; - _dbEntities = dbEntities; - _localActors = localActors; - _remoteActors = remoteActors; - _remotePosts = remotePosts; - _search = search; - } - // Anyone may search, as on Mastodon; only resolving (which fetches from other servers) and paging need a sign-in. [HttpGet("/api/v2/search"), Scope("read:search", requiresUser: false), Microsoft.AspNetCore.Authorization.AllowAnonymous] public async Task Search(CancellationToken token) @@ -51,33 +39,33 @@ namespace PrivaPub.Api.Mastodon.Controllers if (q.StartsWith("https://", StringComparison.OrdinalIgnoreCase)) { - var post = await _dbEntities.Posts.Match(p => (p.ObjectURI == q || p.Url == q) && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); + var post = await dbEntities.Posts.Match(p => (p.ObjectURI == q || p.Url == q) && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); if (post == default && resolve && type is null or "statuses") - post = await _remotePosts.StoreContext(q, 0, token); + post = await remotePosts.StoreContext(q, 0, token); if (post != default && type is null or "statuses" && await VisibilityPolicy.CanSee(post, MyId, token)) - if (await _mapper.Status(post, MyId, token) is { } status) + if (await mapper.Status(post, MyId, token) is { } status) results.Statuses.Add(status); if (results.Statuses.Count == 0 && type is null or "accounts") { - var local = await _localActors.FindByUri(q, token); - var foreign = local == default ? (resolve ? await _remoteActors.GetActor(q, refresh: false, token) : default) : default; + var local = await localActors.FindByUri(q, token); + var foreign = local == default ? (resolve ? await remoteActors.GetActor(q, refresh: false, token) : default) : default; if (local is { IsFederated: true, IsCircle: false }) - results.Accounts.Add(await _mapper.Local(local, false, token)); + results.Accounts.Add(await mapper.Local(local, false, token)); else if (foreign != default) - results.Accounts.Add(_mapper.Foreign(foreign)); + results.Accounts.Add(mapper.Foreign(foreign)); } return Json(results); } if (type is null or "accounts") { - results.Accounts = await _search.Find(q, resolve, Limit(), Math.Max(0, offset), token); + results.Accounts = await accountSearch.Find(q, resolve, Limit(), Math.Max(0, offset), token); } // an account's handle asks for the account, never for posts that happen to share its words if (type is null or "statuses" && MyId != default && !q.StartsWith('#') && !Handle().IsMatch(q)) results.Statuses = await Words(q, Math.Max(0, offset), Limit(), token); if (type is null or "hashtags" && TagsController.Normalise(q) is var tag && TagsController.IsHashtag(tag)) - results.Hashtags.Add(new { name = tag, url = $"{_localActors.BaseAddress}/tags/{Uri.EscapeDataString(tag)}", history = await TagsController.History(_dbEntities, tag, token) }); + results.Hashtags.Add(new { name = tag, url = $"{localActors.BaseAddress}/tags/{Uri.EscapeDataString(tag)}", history = await TagsController.History(dbEntities, tag, token) }); return Json(results); } } @@ -93,27 +81,27 @@ namespace PrivaPub.Api.Mastodon.Controllers // named in, and public posts of authors who let themselves be indexed; newest first, what the persona may see only async Task> Words(string q, int offset, int limit, CancellationToken token) { - var candidates = await _dbEntities.Posts.Match(f => f.Text(q)).Match(p => p.ReblogOfPostId == null).Match(VisibilityPolicy.IsShown) + var candidates = await dbEntities.Posts.Match(f => f.Text(q)).Match(p => p.ReblogOfPostId == null).Match(VisibilityPolicy.IsShown) .Sort(p => p.ID, MongoDB.Entities.Order.Descending).Limit(WordCandidates).ExecuteAsync(token); if (candidates.Count == 0) return new List(); var ids = candidates.Select(p => p.ID).ToList(); var mine = new HashSet(); - mine.UnionWith((await _dbEntities.Favourites.Match(f => f.AccountId == MyId && ids.Contains(f.PostId)).ExecuteAsync(token)).Select(f => f.PostId)); + mine.UnionWith((await dbEntities.Favourites.Match(f => f.AccountId == MyId && ids.Contains(f.PostId)).ExecuteAsync(token)).Select(f => f.PostId)); mine.UnionWith((await MongoDB.Entities.DB.Default.Find().Match(b => b.AvatarId == MyId && ids.Contains(b.PostId)).ExecuteAsync(token)) .Select(b => b.PostId)); - mine.UnionWith((await _dbEntities.Posts.Match(p => p.AuthorAccountId == MyId && ids.Contains(p.ReblogOfPostId) && !p.DeletedAt.HasValue).ExecuteAsync(token)) + mine.UnionWith((await dbEntities.Posts.Match(p => p.AuthorAccountId == MyId && ids.Contains(p.ReblogOfPostId) && !p.DeletedAt.HasValue).ExecuteAsync(token)) .Select(p => p.ReblogOfPostId)); var authors = candidates.Select(p => p.AuthorAccountId ?? p.GroupUserId).Where(a => a != default).Distinct().ToList(); - var indexable = (await _dbEntities.Avatars.Match(a => authors.Contains(a.ID) && a.Settings.IsIndexable).ExecuteAsync(token)).Select(a => a.ID).ToHashSet(); + var indexable = (await dbEntities.Avatars.Match(a => authors.Contains(a.ID) && a.Settings.IsIndexable).ExecuteAsync(token)).Select(a => a.ID).ToHashSet(); // a remote author's searchableBy (FEP-268d) outranks its indexable, and a post's own outranks both - var remoteAuthors = (await _dbEntities.ForeignAvatars.Match(f => authors.Contains(f.ID)).ExecuteAsync(token)).ToDictionary(f => f.ID); + var remoteAuthors = (await dbEntities.ForeignAvatars.Match(f => authors.Contains(f.ID)).ExecuteAsync(token)).ToDictionary(f => f.ID); var stating = remoteAuthors.Values.Where(f => f.SearchableBy != default).Select(f => f.ActorURI) .Concat(candidates.Where(p => p.SearchableBy != default).Select(p => p.ActorURI)) .Where(uri => uri != default).Distinct().ToList(); var followed = stating.Count == 0 ? new HashSet() - : (await _dbEntities.Followings.Match(f => f.AvatarId == MyId && stating.Contains(f.TargetActorURI) && f.State == Models.Social.FollowState.Accepted) + : (await dbEntities.Followings.Match(f => f.AvatarId == MyId && stating.Contains(f.TargetActorURI) && f.State == Models.Social.FollowState.Accepted) .ExecuteAsync(token)).Select(f => f.TargetActorURI).ToHashSet(); bool Searchable(PostEntity post, string author) { @@ -134,7 +122,7 @@ namespace PrivaPub.Api.Mastodon.Controllers if (found.Count >= offset + limit) break; } - return await _mapper.Statuses(found.Skip(offset).Take(limit).ToList(), MyId, token); + return await mapper.Statuses(found.Skip(offset).Take(limit).ToList(), MyId, token); } } diff --git a/PrivaPub/Api/Mastodon/Controllers/StatusesController.cs b/PrivaPub/Api/Mastodon/Controllers/StatusesController.cs index aa174e7..f2a0d64 100644 --- a/PrivaPub/Api/Mastodon/Controllers/StatusesController.cs +++ b/PrivaPub/Api/Mastodon/Controllers/StatusesController.cs @@ -19,49 +19,33 @@ using PostEntity = PrivaPub.Models.Post.Post; namespace PrivaPub.Api.Mastodon.Controllers { - public class StatusesController : MastodonController + public class StatusesController( + IStatusService statusService, + MastodonMapper mapper, + DbEntities dbEntities, + IMemoryCache cache, + IQuoteService quoteService, + IOutboxPublisher outbox, + PrivaPub.Infrastructure.Jobs.IJobQueue jobs, + Domain.Media.IMediaService mediaService, + IParticipations participations = default, + Federation.Actors.IWalls walls = default) : MastodonController { const int MaxContext = 200; public const int MaxPins = 5; - readonly IStatusService _statuses; - readonly MastodonMapper _mapper; - readonly DbEntities _dbEntities; - readonly IMemoryCache _cache; - readonly IQuoteService _quotes; - readonly IOutboxPublisher _outbox; - readonly PrivaPub.Infrastructure.Jobs.IJobQueue _jobs; - readonly Domain.Media.IMediaService _media; - readonly IParticipations _participations; - readonly Federation.Actors.IWalls _walls; - - public StatusesController(IStatusService statuses, MastodonMapper mapper, DbEntities dbEntities, IMemoryCache cache, IQuoteService quotes, - IOutboxPublisher outbox, PrivaPub.Infrastructure.Jobs.IJobQueue jobs, Domain.Media.IMediaService media, IParticipations participations = default, - Federation.Actors.IWalls walls = default) - { - _walls = walls; - _participations = participations; - _jobs = jobs; - _media = media; - _quotes = quotes; - _outbox = outbox; - _statuses = statuses; - _mapper = mapper; - _dbEntities = dbEntities; - _cache = cache; - } [HttpPost("/api/v1/statuses"), Scope("write:statuses")] public async Task Create(CancellationToken token) { var idempotency = Request.Headers["Idempotency-Key"].ToString(); var cacheKey = string.IsNullOrEmpty(idempotency) ? default : $"idempotency:{MyId}:{idempotency}"; - if (cacheKey != default && _cache.TryGetValue(cacheKey, out string earlier)) + if (cacheKey != default && cache.TryGetValue(cacheKey, out string earlier)) { - var existing = await _dbEntities.Posts.MatchID(earlier).ExecuteFirstAsync(token); + var existing = await dbEntities.Posts.MatchID(earlier).ExecuteFirstAsync(token); if (existing != default) - return Json(await _mapper.Status(existing, MyId, token)); + return Json(await mapper.Status(existing, MyId, token)); } var asked = new ScheduledParams { @@ -87,21 +71,21 @@ namespace PrivaPub.Api.Mastodon.Controllers }; if (Params.Get("scheduled_at") is { Length: > 0 } scheduledAt) return await Schedule(asked, scheduledAt, cacheKey, token); - var outcome = await _statuses.Publish(Me, ScheduledStatuses.Draft(asked), token); + var outcome = await statusService.Publish(Me, ScheduledStatuses.Draft(asked), token); if (!outcome.Ok) return Error(outcome.Status, outcome.Error); if (cacheKey != default) - _cache.Set(cacheKey, outcome.Post.ID, TimeSpan.FromHours(1)); - return Json(await _mapper.Status(outcome.Post, MyId, token)); + cache.Set(cacheKey, outcome.Post.ID, TimeSpan.FromHours(1)); + return Json(await mapper.Status(outcome.Post, MyId, token)); } // scheduled_at: the post waits, as asked, for a PublishScheduled job at that time; what it would need then (words, // media of the persona's own, not yet posted) is checked now async Task Schedule(ScheduledParams asked, string scheduledAt, string cacheKey, CancellationToken token) { - if (cacheKey != default && _cache.TryGetValue(cacheKey + ":scheduled", out string earlier) + if (cacheKey != default && cache.TryGetValue(cacheKey + ":scheduled", out string earlier) && await DB.Default.Find().MatchID(earlier).ExecuteFirstAsync(token) is { } waiting) - return Json(await ScheduledStatusesController.View(waiting, _media, token)); + return Json(await ScheduledStatusesController.View(waiting, mediaService, token)); if (!DateTime.TryParse(scheduledAt, System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.AdjustToUniversal | System.Globalization.DateTimeStyles.AssumeUniversal, out var at)) return Error(StatusCodes.Status422UnprocessableEntity, "Validation failed: Scheduled at is invalid"); @@ -131,36 +115,36 @@ namespace PrivaPub.Api.Mastodon.Controllers } } await DB.Default.SaveAsync(scheduled, token); - await _jobs.EnqueueMany(new[] { ScheduledStatuses.JobFor(scheduled, new Uri(Me.BaseAddress).Host) }, token); + await jobs.EnqueueMany(new[] { ScheduledStatuses.JobFor(scheduled, new Uri(Me.BaseAddress).Host) }, token); if (cacheKey != default) - _cache.Set(cacheKey + ":scheduled", scheduled.ID, TimeSpan.FromHours(1)); - return Json(await ScheduledStatusesController.View(scheduled, _media, token)); + cache.Set(cacheKey + ":scheduled", scheduled.ID, TimeSpan.FromHours(1)); + return Json(await ScheduledStatusesController.View(scheduled, mediaService, token)); } [HttpGet("/api/v1/statuses"), Scope("read:statuses", requiresUser: false), Microsoft.AspNetCore.Authorization.AllowAnonymous] public async Task Many(CancellationToken token) { var ids = Params.List("id").Take(20).ToList(); - var posts = await _dbEntities.Posts.Match(p => ids.Contains(p.ID) && !p.DeletedAt.HasValue).ExecuteAsync(token); + var posts = await dbEntities.Posts.Match(p => ids.Contains(p.ID) && !p.DeletedAt.HasValue).ExecuteAsync(token); var visible = new List(); foreach (var post in posts) if (await VisibilityPolicy.CanSee(post, MyId, token)) visible.Add(post); - return Json(await _mapper.Statuses(visible, MyId, token)); + return Json(await mapper.Statuses(visible, MyId, token)); } [HttpGet("/api/v1/statuses/{id}"), Scope("read:statuses", requiresUser: false), Microsoft.AspNetCore.Authorization.AllowAnonymous] public async Task Get(string id, CancellationToken token) { var post = await Visible(id, token); - var status = post == default ? default : await _mapper.Status(post, MyId, token); + var status = post == default ? default : await mapper.Status(post, MyId, token); return status == default ? NotFoundError() : Json(status); } [HttpPut("/api/v1/statuses/{id}"), Scope("write:statuses")] public async Task Edit(string id, CancellationToken token) { - var outcome = await _statuses.Edit(Me, id, new StatusDraft + var outcome = await statusService.Edit(Me, id, new StatusDraft { Text = Params.Get("status"), PlainText = true, @@ -170,7 +154,7 @@ namespace PrivaPub.Api.Mastodon.Controllers MediaIds = Params.Has("media_ids") ? Params.List("media_ids") : default, MediaChanges = MediaAttributes() }, token); - return outcome.Ok ? Json(await _mapper.Status(outcome.Post, MyId, token)) : Error(outcome.Status, outcome.Error); + return outcome.Ok ? Json(await mapper.Status(outcome.Post, MyId, token)) : Error(outcome.Status, outcome.Error); } // Mastodon's media_attributes: a JSON body's array of objects, or a form's media_attributes[i][field] or @@ -205,11 +189,11 @@ namespace PrivaPub.Api.Mastodon.Controllers [HttpDelete("/api/v1/statuses/{id}"), Scope("write:statuses")] public async Task Delete(string id, CancellationToken token) { - var before = await _dbEntities.Posts.Match(p => p.ID == id && p.GroupUserId == MyId && !p.IsFederatedCopy && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); + var before = await dbEntities.Posts.Match(p => p.ID == id && p.GroupUserId == MyId && !p.IsFederatedCopy && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); if (before == default) return await OffWall(id, token); - var status = await _mapper.Status(before, MyId, token); - var outcome = await _statuses.Remove(Me, id, token); + var status = await mapper.Status(before, MyId, token); + var outcome = await statusService.Remove(Me, id, token); if (!outcome.Ok) return Error(outcome.Status, outcome.Error); if (status != default) @@ -223,13 +207,13 @@ namespace PrivaPub.Api.Mastodon.Controllers // someone's post on the persona's wall (FEP-400e), taken off it: as on Smithereen, the owner of a wall deletes what is on it async Task OffWall(string id, CancellationToken token) { - var walled = _walls == default + var walled = walls == default ? default - : await _dbEntities.Posts.Match(p => p.ID == id && p.WallOwnerAccountId == MyId && p.IsFederatedCopy && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); + : await dbEntities.Posts.Match(p => p.ID == id && p.WallOwnerAccountId == MyId && p.IsFederatedCopy && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); if (walled == default) return NotFoundError(); - var status = await _mapper.Status(walled, MyId, token); - if (!await _walls.Remove(Me, walled, token)) + var status = await mapper.Status(walled, MyId, token); + if (!await walls.Remove(Me, walled, token)) return NotFoundError(); return Json(status); } @@ -245,7 +229,7 @@ namespace PrivaPub.Api.Mastodon.Controllers var cursor = post; while (!string.IsNullOrEmpty(cursor.AnsweringToPostId) && ancestors.Count < MaxContext) { - cursor = await _dbEntities.Posts.MatchID(cursor.AnsweringToPostId).ExecuteFirstAsync(token); + cursor = await dbEntities.Posts.MatchID(cursor.AnsweringToPostId).ExecuteFirstAsync(token); if (cursor == default || cursor.DeletedAt.HasValue || !await VisibilityPolicy.CanSee(cursor, MyId, token)) break; ancestors.Insert(0, cursor); @@ -256,7 +240,7 @@ namespace PrivaPub.Api.Mastodon.Controllers while (frontier.Count > 0 && descendants.Count < MaxContext) { var parents = frontier; - var children = await _dbEntities.Posts.Match(p => parents.Contains(p.AnsweringToPostId) && !p.DeletedAt.HasValue && p.ReblogOfPostId == null) + var children = await dbEntities.Posts.Match(p => parents.Contains(p.AnsweringToPostId) && !p.DeletedAt.HasValue && p.ReblogOfPostId == null) .Sort(p => p.ID, Order.Ascending).Limit(MaxContext).ExecuteAsync(token); frontier = new List(); foreach (var child in children) @@ -268,13 +252,13 @@ namespace PrivaPub.Api.Mastodon.Controllers } // a persona opening a public remote thread has its replies read from their servers, for the next look (once an hour) if (MyId != default) - await _jobs.EnqueueMany(new[] { post, ancestors.FirstOrDefault() } + await jobs.EnqueueMany(new[] { post, ancestors.FirstOrDefault() } .Where(p => p is { IsFederatedCopy: true, Visibility: PostVisibility.Public or PostVisibility.Unlisted }).DistinctBy(p => p.ID) .Select(p => Federation.Inbox.RepliesJobHandler.For(p, 1)), token); return Json(new Context { - Ancestors = await _mapper.Statuses(ancestors, MyId, token), - Descendants = await _mapper.Statuses(descendants.OrderBy(d => d.ID, StringComparer.Ordinal).ToList(), MyId, token) + Ancestors = await mapper.Statuses(ancestors, MyId, token), + Descendants = await mapper.Statuses(descendants.OrderBy(d => d.ID, StringComparer.Ordinal).ToList(), MyId, token) }); } @@ -284,7 +268,7 @@ namespace PrivaPub.Api.Mastodon.Controllers var post = await Visible(id, token); if (post == default) return NotFoundError(); - var account = await _mapper.Account(MastodonMapper.AuthorOf(post), token); + var account = await mapper.Account(MastodonMapper.AuthorOf(post), token); var edits = post.Revisions.Select(r => new StatusEdit { Content = r.ContentHtml ?? string.Empty, @@ -292,7 +276,7 @@ namespace PrivaPub.Api.Mastodon.Controllers Sensitive = r.HasContentWarning, CreatedAt = MastodonJson.Time(r.EditedAt), Account = account, - Emojis = _mapper.EmojisOf(post, r.Emojis, r.ContentHtml, r.SpoilerText, r.Title) + Emojis = mapper.EmojisOf(post, r.Emojis, r.ContentHtml, r.SpoilerText, r.Title) }).ToList(); edits.Add(new StatusEdit { @@ -301,7 +285,7 @@ namespace PrivaPub.Api.Mastodon.Controllers Sensitive = post.HasContentWarning, CreatedAt = MastodonJson.Time(post.EditedAt ?? post.CreationDate), Account = account, - Emojis = _mapper.EmojisOf(post, post.Emojis, post.ContentHtml, post.Text, post.SpoilerText, post.Title) + Emojis = mapper.EmojisOf(post, post.Emojis, post.ContentHtml, post.Text, post.SpoilerText, post.Title) }); return Json(edits); } @@ -309,7 +293,7 @@ namespace PrivaPub.Api.Mastodon.Controllers [HttpGet("/api/v1/statuses/{id}/source"), Scope("read:statuses")] public async Task Source(string id, CancellationToken token) { - var post = await _dbEntities.Posts.Match(p => p.ID == id && p.GroupUserId == MyId && !p.IsFederatedCopy && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); + var post = await dbEntities.Posts.Match(p => p.ID == id && p.GroupUserId == MyId && !p.IsFederatedCopy && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); return post == default ? NotFoundError() : Json(new StatusSource { Id = post.ID, Text = post.Text ?? string.Empty, SpoilerText = post.SpoilerText ?? string.Empty }); } @@ -318,47 +302,47 @@ namespace PrivaPub.Api.Mastodon.Controllers [HttpPost("/api/privapub/v1/statuses/{id}/join"), Scope("write:statuses")] public async Task Join(string id, CancellationToken token) { - var outcome = await _participations.Join(Me, id, token); - return outcome.Ok ? Json(await _mapper.Status(outcome.Post, MyId, token)) : Error(outcome.Status, outcome.Error); + var outcome = await participations.Join(Me, id, token); + return outcome.Ok ? Json(await mapper.Status(outcome.Post, MyId, token)) : Error(outcome.Status, outcome.Error); } [HttpPost("/api/privapub/v1/statuses/{id}/leave"), Scope("write:statuses")] public async Task Leave(string id, CancellationToken token) { - var outcome = await _participations.Leave(Me, id, token); - return outcome.Ok ? Json(await _mapper.Status(outcome.Post, MyId, token)) : Error(outcome.Status, outcome.Error); + var outcome = await participations.Leave(Me, id, token); + return outcome.Ok ? Json(await mapper.Status(outcome.Post, MyId, token)) : Error(outcome.Status, outcome.Error); } [HttpPost("/api/v1/statuses/{id}/favourite"), Scope("write:favourites")] - public Task Favourite(string id, CancellationToken token) => Toggle(_statuses.Favourite(Me, id, true, token), id, token); + public Task Favourite(string id, CancellationToken token) => Toggle(statusService.Favourite(Me, id, true, token), id, token); [HttpPost("/api/v1/statuses/{id}/unfavourite"), Scope("write:favourites")] - public Task Unfavourite(string id, CancellationToken token) => Toggle(_statuses.Favourite(Me, id, false, token), id, token); + public Task Unfavourite(string id, CancellationToken token) => Toggle(statusService.Favourite(Me, id, false, token), id, token); // PrivaPub's own, for the threadiverse's downvotes (a favourite is the upvote) [HttpPost("/api/v1/statuses/{id}/downvote"), Scope("write:favourites")] - public Task Downvote(string id, CancellationToken token) => Toggle(_statuses.Downvote(Me, id, true, token), id, token); + public Task Downvote(string id, CancellationToken token) => Toggle(statusService.Downvote(Me, id, true, token), id, token); [HttpPost("/api/v1/statuses/{id}/undownvote"), Scope("write:favourites")] - public Task Undownvote(string id, CancellationToken token) => Toggle(_statuses.Downvote(Me, id, false, token), id, token); + public Task Undownvote(string id, CancellationToken token) => Toggle(statusService.Downvote(Me, id, false, token), id, token); [HttpPost("/api/v1/statuses/{id}/reblog"), Scope("write:statuses")] public async Task Reblog(string id, CancellationToken token) { - var outcome = await _statuses.Reblog(Me, id, true, Visibility(Params.Get("visibility")), token); - return outcome.Ok ? Json(await _mapper.Status(outcome.Post, MyId, token)) : Error(outcome.Status, outcome.Error); + var outcome = await statusService.Reblog(Me, id, true, Visibility(Params.Get("visibility")), token); + return outcome.Ok ? Json(await mapper.Status(outcome.Post, MyId, token)) : Error(outcome.Status, outcome.Error); } [HttpPost("/api/v1/statuses/{id}/unreblog"), Scope("write:statuses")] - public Task Unreblog(string id, CancellationToken token) => Toggle(_statuses.Reblog(Me, id, false, PostVisibility.Public, token), id, token); + public Task Unreblog(string id, CancellationToken token) => Toggle(statusService.Reblog(Me, id, false, PostVisibility.Public, token), id, token); [HttpGet("/api/v1/statuses/{id}/favourited_by"), Scope("read:accounts", requiresUser: false), Microsoft.AspNetCore.Authorization.AllowAnonymous] public async Task FavouritedBy(string id, CancellationToken token) { if (await Visible(id, token) == default) return NotFoundError(); - var favourites = await _dbEntities.Favourites.Match(f => f.PostId == id).Sort(f => f.ID, Order.Descending).Limit(Limit(40, 80)).ExecuteAsync(token); - var accounts = await _mapper.Accounts(favourites.Select(f => f.AccountId), token); + var favourites = await dbEntities.Favourites.Match(f => f.PostId == id).Sort(f => f.ID, Order.Descending).Limit(Limit(40, 80)).ExecuteAsync(token); + var accounts = await mapper.Accounts(favourites.Select(f => f.AccountId), token); return Json(favourites.Select(f => accounts.GetValueOrDefault(f.AccountId)).Where(a => a != default).ToList()); } @@ -367,8 +351,8 @@ namespace PrivaPub.Api.Mastodon.Controllers { if (await Visible(id, token) == default) return NotFoundError(); - var reblogs = await _dbEntities.Posts.Match(p => p.ReblogOfPostId == id).Match(VisibilityPolicy.IsShown).Sort(p => p.ID, Order.Descending).Limit(Limit(40, 80)).ExecuteAsync(token); - var accounts = await _mapper.Accounts(reblogs.Select(MastodonMapper.AuthorOf), token); + var reblogs = await dbEntities.Posts.Match(p => p.ReblogOfPostId == id).Match(VisibilityPolicy.IsShown).Sort(p => p.ID, Order.Descending).Limit(Limit(40, 80)).ExecuteAsync(token); + var accounts = await mapper.Accounts(reblogs.Select(MastodonMapper.AuthorOf), token); return Json(reblogs.Select(r => accounts.GetValueOrDefault(MastodonMapper.AuthorOf(r))).Where(a => a != default).ToList()); } @@ -377,30 +361,30 @@ namespace PrivaPub.Api.Mastodon.Controllers { if (await Visible(id, token) == default) return NotFoundError(); - var query = _dbEntities.Posts.Match(p => p.QuotedPostId == id && p.QuoteState == QuoteState.Accepted && !p.DeletedAt.HasValue); + var query = dbEntities.Posts.Match(p => p.QuotedPostId == id && p.QuoteState == QuoteState.Accepted && !p.DeletedAt.HasValue); var quotes = await Page.From(Params, Limit()).Fetch(query, p => p.ID, token); var visible = new List(); foreach (var quote in quotes) if (quote.Visibility != PostVisibility.LocalGeo && await VisibilityPolicy.CanSee(quote, MyId, token)) visible.Add(quote); Link($"/api/v1/statuses/{id}/quotes", quotes.LastOrDefault()?.ID, quotes.FirstOrDefault()?.ID); - return Json(await _mapper.Statuses(visible, MyId, token)); + return Json(await mapper.Statuses(visible, MyId, token)); } [HttpPost("/api/v1/statuses/{id}/quotes/{quotingId}/revoke"), Scope("write:statuses")] public async Task RevokeQuote(string id, string quotingId, CancellationToken token) { - var quoted = await _dbEntities.Posts.Match(p => p.ID == id && p.GroupUserId == MyId && !p.IsFederatedCopy && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); - var quoting = quoted == default ? default : await _dbEntities.Posts.Match(p => p.ID == quotingId && p.QuotedPostId == quoted.ID).ExecuteFirstAsync(token); - if (quoting == default || !await _quotes.RevokeLicence(quoted, quoting, token)) + var quoted = await dbEntities.Posts.Match(p => p.ID == id && p.GroupUserId == MyId && !p.IsFederatedCopy && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); + var quoting = quoted == default ? default : await dbEntities.Posts.Match(p => p.ID == quotingId && p.QuotedPostId == quoted.ID).ExecuteFirstAsync(token); + if (quoting == default || !await quoteService.RevokeLicence(quoted, quoting, token)) return NotFoundError(); - return Json(await _mapper.Status(await _dbEntities.Posts.MatchID(quoting.ID).ExecuteFirstAsync(token), MyId, token)); + return Json(await mapper.Status(await dbEntities.Posts.MatchID(quoting.ID).ExecuteFirstAsync(token), MyId, token)); } [HttpPut("/api/v1/statuses/{id}/interaction_policy"), Scope("write:statuses")] public async Task InteractionPolicy(string id, CancellationToken token) { - var post = await _dbEntities.Posts.Match(p => p.ID == id && p.GroupUserId == MyId && !p.IsFederatedCopy && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); + var post = await dbEntities.Posts.Match(p => p.ID == id && p.GroupUserId == MyId && !p.IsFederatedCopy && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); if (post == default) return NotFoundError(); var policy = Params.Get("quote_approval_policy"); @@ -409,8 +393,8 @@ namespace PrivaPub.Api.Mastodon.Controllers await DB.Default.Update().MatchID(post.ID).Modify(p => p.LocalQuotePolicy, policy).ExecuteAsync(token); post.LocalQuotePolicy = policy; if (!post.IsLocalOnly) - await _outbox.PublishUpdate(Me, post, $"policy-{DateTime.UtcNow.Ticks}", token); - return Json(await _mapper.Status(post, MyId, token)); + await outbox.PublishUpdate(Me, post, $"policy-{DateTime.UtcNow.Ticks}", token); + return Json(await mapper.Status(post, MyId, token)); } [HttpPost("/api/v1/statuses/{id}/bookmark"), Scope("write:bookmarks")] @@ -426,7 +410,7 @@ namespace PrivaPub.Api.Mastodon.Controllers catch (MongoDB.Driver.MongoWriteException ex) when (ex.WriteError?.Category == MongoDB.Driver.ServerErrorCategory.DuplicateKey) { } - return Json(await _mapper.Status(post, MyId, token)); + return Json(await mapper.Status(post, MyId, token)); } [HttpPost("/api/v1/statuses/{id}/unbookmark"), Scope("write:bookmarks")] @@ -441,13 +425,13 @@ namespace PrivaPub.Api.Mastodon.Controllers { var bookmarks = await Page.From(Params, Limit()).Fetch(DB.Default.Find().Match(b => b.AvatarId == MyId), b => b.ID, token); var ids = bookmarks.Select(b => b.PostId).ToList(); - var posts = (await _dbEntities.Posts.Match(p => ids.Contains(p.ID) && !p.DeletedAt.HasValue).ExecuteAsync(token)).ToDictionary(p => p.ID); + var posts = (await dbEntities.Posts.Match(p => ids.Contains(p.ID) && !p.DeletedAt.HasValue).ExecuteAsync(token)).ToDictionary(p => p.ID); var visible = new List(); foreach (var postId in ids.Where(posts.ContainsKey)) if (await VisibilityPolicy.CanSee(posts[postId], MyId, token)) visible.Add(posts[postId]); Link("/api/v1/bookmarks", bookmarks.LastOrDefault()?.ID, bookmarks.FirstOrDefault()?.ID); - return Json(await _mapper.Statuses(visible, MyId, token)); + return Json(await mapper.Statuses(visible, MyId, token)); } [HttpPost("/api/v1/statuses/{id}/mute"), Scope("write:mutes")] @@ -459,7 +443,7 @@ namespace PrivaPub.Api.Mastodon.Controllers [HttpPost("/api/v1/statuses/{id}/pin"), Scope("write:accounts")] public async Task Pin(string id, CancellationToken token) { - var post = await _dbEntities.Posts.Match(p => p.ID == id && p.GroupUserId == MyId && !p.IsFederatedCopy && !p.DeletedAt.HasValue && p.ReblogOfPostId == null) + var post = await dbEntities.Posts.Match(p => p.ID == id && p.GroupUserId == MyId && !p.IsFederatedCopy && !p.DeletedAt.HasValue && p.ReblogOfPostId == null) .ExecuteFirstAsync(token); if (post == default) return await Visible(id, token) is { } other @@ -474,20 +458,20 @@ namespace PrivaPub.Api.Mastodon.Controllers try { await DB.Default.SaveAsync(new Models.Social.Pin { AvatarId = MyId, PostId = post.ID }, token); - await _outbox.PublishFeatured(MyId, post, featured: true, token); + await outbox.PublishFeatured(MyId, post, featured: true, token); } catch (MongoDB.Driver.MongoWriteException ex) when (ex.WriteError?.Category == MongoDB.Driver.ServerErrorCategory.DuplicateKey) { } - return Json(await _mapper.Status(post, MyId, token)); + return Json(await mapper.Status(post, MyId, token)); } [HttpPost("/api/v1/statuses/{id}/unpin"), Scope("write:accounts")] public async Task Unpin(string id, CancellationToken token) { var unpinned = await DB.Default.DeleteAsync(p => p.AvatarId == MyId && p.PostId == id); - if (unpinned is { IsAcknowledged: true, DeletedCount: > 0 } && await _dbEntities.Posts.MatchID(id).ExecuteFirstAsync(token) is { } post) - await _outbox.PublishFeatured(MyId, post, featured: false, token); + if (unpinned is { IsAcknowledged: true, DeletedCount: > 0 } && await dbEntities.Posts.MatchID(id).ExecuteFirstAsync(token) is { } post) + await outbox.PublishFeatured(MyId, post, featured: false, token); return await Unchanged(id, token); } @@ -496,20 +480,20 @@ namespace PrivaPub.Api.Mastodon.Controllers var outcome = await action; if (!outcome.Ok) return Error(outcome.Status, outcome.Error); - var post = await _dbEntities.Posts.MatchID(id).ExecuteFirstAsync(token); - return Json(await _mapper.Status(post, MyId, token)); + var post = await dbEntities.Posts.MatchID(id).ExecuteFirstAsync(token); + return Json(await mapper.Status(post, MyId, token)); } async Task Unchanged(string id, CancellationToken token) { var post = await Visible(id, token); - var status = post == default ? default : await _mapper.Status(post, MyId, token); + var status = post == default ? default : await mapper.Status(post, MyId, token); return status == default ? NotFoundError() : Json(status); } async Task Visible(string id, CancellationToken token) { - var post = await _dbEntities.Posts.Match(p => p.ID == id && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); + var post = await dbEntities.Posts.Match(p => p.ID == id && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); return post != default && post.Visibility != PostVisibility.LocalGeo && await VisibilityPolicy.CanSee(post, MyId, token) ? post : default; } diff --git a/PrivaPub/Api/Mastodon/Controllers/StreamingController.cs b/PrivaPub/Api/Mastodon/Controllers/StreamingController.cs index cef62bd..0059e82 100644 --- a/PrivaPub/Api/Mastodon/Controllers/StreamingController.cs +++ b/PrivaPub/Api/Mastodon/Controllers/StreamingController.cs @@ -20,18 +20,12 @@ namespace PrivaPub.Api.Mastodon.Controllers // per request as server-sent events on /api/v1/streaming/{stream}. Every stream needs a signed-in persona (the token // comes as access_token, in the Authorization header, or as the WebSocket's protocol). What a stream tells is mapped // for that persona as it is sent: a post it may not see, or whose author it blocked or muted, is never sent. - public class StreamingController : MastodonController + public class StreamingController( + MastodonMapper mapper, + DbEntities dbEntities) : MastodonController { static readonly TimeSpan KeepAlive = TimeSpan.FromSeconds(15); - readonly MastodonMapper _mapper; - readonly DbEntities _dbEntities; - - public StreamingController(MastodonMapper mapper, DbEntities dbEntities) - { - _mapper = mapper; - _dbEntities = dbEntities; - } [HttpGet("/api/v1/streaming/health"), Microsoft.AspNetCore.Authorization.AllowAnonymous] public IActionResult Health() => Content("OK", "text/plain"); @@ -72,22 +66,22 @@ namespace PrivaPub.Api.Mastodon.Controllers // a direct conversation the persona takes part in (R8): Mastodon's Conversation, as /api/v1/conversations lists it if (e.Name == "conversation") { - var group = await _dbEntities.DmGroups.Match(g => g.ID == e.Id && !g.DeletionAt.HasValue && g.Members.Any(m => !m.IsForeign && m.AvatarId == MyId)) + var group = await dbEntities.DmGroups.Match(g => g.ID == e.Id && !g.DeletionAt.HasValue && g.Members.Any(m => !m.IsForeign && m.AvatarId == MyId)) .ExecuteFirstAsync(token); var conversation = group == default ? default - : (await TimelinesController.ConversationsOf(_mapper, _dbEntities, MyId, new List { group }, token)).FirstOrDefault(); + : (await TimelinesController.ConversationsOf(mapper, dbEntities, MyId, new List { group }, token)).FirstOrDefault(); return conversation == default ? default : JsonSerializer.Serialize(conversation, MastodonJson.Options); } if (e.Name == "notification") { - var notification = await _dbEntities.Notifications.Match(n => n.ID == e.Id && n.AvatarId == MyId).ExecuteFirstAsync(token); - var mapped = notification == default ? default : (await _mapper.Notifications(new List { notification }, MyId, token)).FirstOrDefault(); + var notification = await dbEntities.Notifications.Match(n => n.ID == e.Id && n.AvatarId == MyId).ExecuteFirstAsync(token); + var mapped = notification == default ? default : (await mapper.Notifications(new List { notification }, MyId, token)).FirstOrDefault(); return mapped == default ? default : JsonSerializer.Serialize(mapped, MastodonJson.Options); } - var post = await _dbEntities.Posts.MatchID(e.Id).ExecuteFirstAsync(token); + var post = await dbEntities.Posts.MatchID(e.Id).ExecuteFirstAsync(token); if (post == default || !await VisibilityPolicy.CanSee(post, MyId, token)) return default; - var status = (await _mapper.Statuses(new[] { post }, MyId, token)).FirstOrDefault(); + var status = (await mapper.Statuses(new[] { post }, MyId, token)).FirstOrDefault(); return status == default ? default : JsonSerializer.Serialize(status, MastodonJson.Options); } @@ -137,7 +131,7 @@ namespace PrivaPub.Api.Mastodon.Controllers while (socket.State == WebSocketState.Open && !done.IsCancellationRequested) { var text = new StringBuilder(); - WebSocketReceiveResult received; + var received = default(WebSocketReceiveResult); do { received = await socket.ReceiveAsync(buffer, done.Token); @@ -149,7 +143,7 @@ namespace PrivaPub.Api.Mastodon.Controllers text.Append(Encoding.UTF8.GetString(buffer, 0, received.Count)); } while (!received.EndOfMessage && text.Length < 16384); - JsonNode message; + var message = default(JsonNode); try { message = JsonNode.Parse(text.ToString()); diff --git a/PrivaPub/Api/Mastodon/Controllers/SuggestionsController.cs b/PrivaPub/Api/Mastodon/Controllers/SuggestionsController.cs index a08da1d..d856cff 100644 --- a/PrivaPub/Api/Mastodon/Controllers/SuggestionsController.cs +++ b/PrivaPub/Api/Mastodon/Controllers/SuggestionsController.cs @@ -15,17 +15,10 @@ namespace PrivaPub.Api.Mastodon.Controllers { // Follow suggestions as Mastodon's API has them (completion program R8; who and why in Domain/Social/Suggestions): v1 the // accounts, v2 each with its reasons; a dismissed account is never suggested to that persona again. - public class SuggestionsController : MastodonController + public class SuggestionsController( + MastodonMapper mapper, + IInstanceSettings settings) : MastodonController { - readonly MastodonMapper _mapper; - readonly IInstanceSettings _settings; - - public SuggestionsController(MastodonMapper mapper, IInstanceSettings settings) - { - _mapper = mapper; - _settings = settings; - } - [HttpGet("/api/v1/suggestions"), Scope("read")] public async Task V1(CancellationToken token) => Json((await Suggested(token)).Select(s => s.Account).ToList()); @@ -53,12 +46,12 @@ namespace PrivaPub.Api.Mastodon.Controllers async Task> Suggested(CancellationToken token) { var limit = Limit(40, 80); - var candidates = await Suggestions.For(Me, _settings.Current.StaffPicks, token); + var candidates = await Suggestions.For(Me, settings.Current.StaffPicks, token); var suggested = new List(); for (var start = 0; start < candidates.Count && suggested.Count < limit; start += limit * 2) { var chunk = candidates.Skip(start).Take(limit * 2).ToList(); - var accounts = await _mapper.Accounts(chunk.Select(c => c.AccountId), token); + var accounts = await mapper.Accounts(chunk.Select(c => c.AccountId), token); var hidden = await Hidden.AuthorsHiddenFrom(MyId, accounts.Values.Select(a => a.Uri), forNotifications: false, token); foreach (var candidate in chunk) { diff --git a/PrivaPub/Api/Mastodon/Controllers/TagsController.cs b/PrivaPub/Api/Mastodon/Controllers/TagsController.cs index a11b3a8..f64729d 100644 --- a/PrivaPub/Api/Mastodon/Controllers/TagsController.cs +++ b/PrivaPub/Api/Mastodon/Controllers/TagsController.cs @@ -16,18 +16,12 @@ namespace PrivaPub.Api.Mastodon.Controllers // Hashtags as Mastodon shows them (owner decision 2026-10-04, followed tags back from the cut list): a tag with the // last week of its use in public posts PrivaPub holds, and whether the persona follows it; following one brings its // public posts to the persona's home as they arrive (Fanout). - public class TagsController : MastodonController + public class TagsController( + DbEntities db, + ILocalActorService localActors) : MastodonController { const int MaxFollowed = 500; - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - - public TagsController(DbEntities dbEntities, ILocalActorService localActors) - { - _dbEntities = dbEntities; - _localActors = localActors; - } public static string Normalise(string name) => name?.Trim().TrimStart('#').Normalize(NormalizationForm.FormKC).ToLowerInvariant() ?? string.Empty; @@ -59,8 +53,8 @@ namespace PrivaPub.Api.Mastodon.Controllers }).ToList(); } - Task View(string tag, bool? following, CancellationToken token, bool? featuring = default) => - TagView(_dbEntities, _localActors.BaseAddress, tag, MyId, following, featuring, token); + Task View(string tag, bool? following, bool? featuring = default, CancellationToken token = default) => + TagView(db, localActors.BaseAddress, tag, MyId, following, featuring, token); // Mastodon's Tag: its week of use, and for a signed-in persona whether it follows it and (Mastodon 4.4) features it internal static async Task TagView(DbEntities dbEntities, string baseAddress, string tag, string viewerId, bool? following, bool? featuring, @@ -78,7 +72,7 @@ namespace PrivaPub.Api.Mastodon.Controllers public async Task Tag(string name, CancellationToken token) { var tag = Normalise(name); - return tag.Length == 0 ? NotFoundError() : Json(await View(tag, default, token)); + return tag.Length == 0 ? NotFoundError() : Json(await View(tag, default, token: token)); } [HttpPost("/api/v1/tags/{name}/follow"), Scope("write:follows")] @@ -99,7 +93,7 @@ namespace PrivaPub.Api.Mastodon.Controllers { } } - return Json(await View(tag, true, token)); + return Json(await View(tag, true, token: token)); } [HttpPost("/api/v1/tags/{name}/unfollow"), Scope("write:follows")] @@ -107,7 +101,7 @@ namespace PrivaPub.Api.Mastodon.Controllers { var tag = Normalise(name); await DB.Default.DeleteAsync(t => t.AvatarId == MyId && t.Name == tag); - return Json(await View(tag, false, token)); + return Json(await View(tag, false, token: token)); } // Mastodon 4.4: a hashtag featured on the persona's profile, or no longer (R8, Domain/Social/FeaturedTags) @@ -115,7 +109,7 @@ namespace PrivaPub.Api.Mastodon.Controllers public async Task Feature(string name, [FromServices] Domain.Social.IFeaturedTags featured, CancellationToken token) { var (tag, error) = await featured.Feature(Me, name, token); - return tag == default ? Error(StatusCodes.Status422UnprocessableEntity, error) : Json(await View(tag.Name, default, token, featuring: true)); + return tag == default ? Error(StatusCodes.Status422UnprocessableEntity, error) : Json(await View(tag.Name, default, featuring: true, token)); } [HttpPost("/api/v1/tags/{name}/unfeature"), Scope("write:accounts")] @@ -125,7 +119,7 @@ namespace PrivaPub.Api.Mastodon.Controllers if (!IsHashtag(tag)) return NotFoundError(); await featured.Unfeature(Me, default, tag, token); - return Json(await View(tag, default, token, featuring: false)); + return Json(await View(tag, default, featuring: false, token)); } [HttpGet("/api/v1/followed_tags"), Scope("read:follows")] @@ -135,7 +129,7 @@ namespace PrivaPub.Api.Mastodon.Controllers Link("/api/v1/followed_tags", page.LastOrDefault()?.ID, page.FirstOrDefault()?.ID); var views = new List(); foreach (var followed in page) - views.Add(await View(followed.Name, true, token)); + views.Add(await View(followed.Name, true, token: token)); return Json(views); } } diff --git a/PrivaPub/Api/Mastodon/Controllers/TimelinesController.cs b/PrivaPub/Api/Mastodon/Controllers/TimelinesController.cs index 52511f7..fef9634 100644 --- a/PrivaPub/Api/Mastodon/Controllers/TimelinesController.cs +++ b/PrivaPub/Api/Mastodon/Controllers/TimelinesController.cs @@ -19,17 +19,10 @@ using MarkerEntity = PrivaPub.Models.Social.Marker; namespace PrivaPub.Api.Mastodon.Controllers { - public class TimelinesController : MastodonController + public class TimelinesController( + MastodonMapper mastodonMapper, + DbEntities db) : MastodonController { - readonly MastodonMapper _mapper; - readonly DbEntities _dbEntities; - - public TimelinesController(MastodonMapper mapper, DbEntities dbEntities) - { - _mapper = mapper; - _dbEntities = dbEntities; - } - [HttpGet("/api/v1/timelines/home"), Scope("read:statuses")] public async Task Home(CancellationToken token) { @@ -38,15 +31,15 @@ namespace PrivaPub.Api.Mastodon.Controllers var apart = exclusive.Count == 0 ? new List() : (await DB.Default.Find().Match(m => exclusive.Contains(m.ListId)).ExecuteAsync(token)).Select(m => m.AccountId).Distinct().ToList(); - var home = _dbEntities.TimelineEntries.Match(e => e.AvatarId == MyId); + var home = db.TimelineEntries.Match(e => e.AvatarId == MyId); if (apart.Count > 0) home.Match(e => !apart.Contains(e.AuthorAccountId)); var entries = await Page.From(Params, Limit()).Fetch(home, e => e.PostId, token); var ids = entries.Select(e => e.PostId).ToList(); // (located posts once reached their author's home: the entries left from then are passed over) - var posts = (await _dbEntities.Posts.Match(p => ids.Contains(p.ID) && p.Visibility != PostVisibility.LocalGeo).Match(VisibilityPolicy.IsShown) + var posts = (await db.Posts.Match(p => ids.Contains(p.ID) && p.Visibility != PostVisibility.LocalGeo).Match(VisibilityPolicy.IsShown) .ExecuteAsync(token)).ToDictionary(p => p.ID); - var statuses = await _mapper.Statuses(ids.Where(posts.ContainsKey).Select(id => posts[id]).ToList(), MyId, token); + var statuses = await mastodonMapper.Statuses(ids.Where(posts.ContainsKey).Select(id => posts[id]).ToList(), MyId, token); Link("/api/v1/timelines/home", entries.LastOrDefault()?.PostId, entries.FirstOrDefault()?.PostId); return Json(statuses); } @@ -54,7 +47,7 @@ namespace PrivaPub.Api.Mastodon.Controllers [HttpGet("/api/v1/timelines/public"), Scope("read:statuses", requiresUser: false), Microsoft.AspNetCore.Authorization.AllowAnonymous] public async Task Public(CancellationToken token) { - var query = _dbEntities.Posts.Match(p => p.Visibility == PostVisibility.Public && p.ReblogOfPostId == null).Match(VisibilityPolicy.IsPublic) + var query = db.Posts.Match(p => p.Visibility == PostVisibility.Public && p.ReblogOfPostId == null).Match(VisibilityPolicy.IsPublic) .Match(VisibilityPolicy.IsListed); if (Params.Bool("local") == true) query.Match(p => !p.IsFederatedCopy); @@ -70,7 +63,7 @@ namespace PrivaPub.Api.Mastodon.Controllers [HttpGet("/api/v1/timelines/feed/{id}"), Scope("read:statuses")] public async Task Feed(string id, CancellationToken token) { - var feed = await _dbEntities.ForeignAvatars.MatchID(id).ExecuteFirstAsync(token); + var feed = await db.ForeignAvatars.MatchID(id).ExecuteFirstAsync(token); if (feed is not { AvatarType: Models.User.AvatarType.Feed } || !await DB.Default.Find().Match(s => s.AvatarId == MyId && s.FeedActorURI == feed.ActorURI).ExecuteAnyAsync(token)) return NotFoundError(); @@ -79,8 +72,8 @@ namespace PrivaPub.Api.Mastodon.Controllers var names = communities.Where(c => c.StartsWith(ours, StringComparison.Ordinal)).Select(c => c[ours.Length..]).ToList(); var groups = names.Count == 0 ? new List() - : (await _dbEntities.Groups.Match(g => names.Contains(g.UserName) && !g.DeletionAt.HasValue).ExecuteAsync(token)).Select(g => g.ID).ToList(); - var query = _dbEntities.Posts.Match(p => (communities.Contains(p.AudienceURI) || groups.Contains(p.GroupId)) + : (await db.Groups.Match(g => names.Contains(g.UserName) && !g.DeletionAt.HasValue).ExecuteAsync(token)).Select(g => g.ID).ToList(); + var query = db.Posts.Match(p => (communities.Contains(p.AudienceURI) || groups.Contains(p.GroupId)) && p.ReblogOfPostId == null && p.InReplyToURI == null).Match(VisibilityPolicy.IsPublic); return await Respond(query, $"/api/v1/timelines/feed/{id}", token); } @@ -89,7 +82,7 @@ namespace PrivaPub.Api.Mastodon.Controllers public async Task Tag(string hashtag, CancellationToken token) { var tag = hashtag.TrimStart('#').ToLowerInvariant(); - var query = _dbEntities.Posts.Match(p => p.Tags.Contains(tag) && p.Visibility == PostVisibility.Public && p.ReblogOfPostId == null).Match(VisibilityPolicy.IsPublic) + var query = db.Posts.Match(p => p.Tags.Contains(tag) && p.Visibility == PostVisibility.Public && p.ReblogOfPostId == null).Match(VisibilityPolicy.IsPublic) .Match(VisibilityPolicy.IsListed); if (Params.Bool("local") == true) query.Match(p => !p.IsFederatedCopy); @@ -99,15 +92,15 @@ namespace PrivaPub.Api.Mastodon.Controllers [HttpGet("/api/v1/favourites"), Scope("read:favourites")] public async Task Favourites(CancellationToken token) { - var favourites = await Page.From(Params, Limit()).Fetch(_dbEntities.Favourites.Match(f => f.AccountId == MyId), f => f.ID, token); + var favourites = await Page.From(Params, Limit()).Fetch(db.Favourites.Match(f => f.AccountId == MyId), f => f.ID, token); var ids = favourites.Select(f => f.PostId).ToList(); - var posts = (await _dbEntities.Posts.Match(p => ids.Contains(p.ID) && !p.DeletedAt.HasValue).ExecuteAsync(token)).ToDictionary(p => p.ID); + var posts = (await db.Posts.Match(p => ids.Contains(p.ID) && !p.DeletedAt.HasValue).ExecuteAsync(token)).ToDictionary(p => p.ID); var visible = new List(); foreach (var id in ids.Where(posts.ContainsKey)) if (await VisibilityPolicy.CanSee(posts[id], MyId, token)) visible.Add(posts[id]); Link("/api/v1/favourites", favourites.LastOrDefault()?.ID, favourites.FirstOrDefault()?.ID); - return Json(await _mapper.Statuses(visible, MyId, token)); + return Json(await mastodonMapper.Statuses(visible, MyId, token)); } // the persona's direct conversations, by their newest post (paged like Mastodon's by that post's id), each with its @@ -117,13 +110,13 @@ namespace PrivaPub.Api.Mastodon.Controllers public async Task Conversations(CancellationToken token) { var groups = await Page.From(Params, Limit(20, 40)).Fetch( - _dbEntities.DmGroups.Match(g => !g.DeletionAt.HasValue && g.LastPostId != null && g.Members.Any(m => !m.IsForeign && m.AvatarId == MyId)), + db.DmGroups.Match(g => !g.DeletionAt.HasValue && g.LastPostId != null && g.Members.Any(m => !m.IsForeign && m.AvatarId == MyId)), g => g.LastPostId, token); Link("/api/v1/conversations", groups.LastOrDefault()?.LastPostId, groups.FirstOrDefault()?.LastPostId); return Json(await ConversationsOf(groups, token)); } - Task> ConversationsOf(List groups, CancellationToken token) => ConversationsOf(_mapper, _dbEntities, MyId, groups, token); + Task> ConversationsOf(List groups, CancellationToken token) => ConversationsOf(mastodonMapper, db, MyId, groups, token); // (also the `direct` stream's conversation event, StreamingController) internal static async Task> ConversationsOf(MastodonMapper mapper, DbEntities dbEntities, string viewerId, List groups, @@ -163,7 +156,7 @@ namespace PrivaPub.Api.Mastodon.Controllers } async Task MyConversation(string id, CancellationToken token) => - await _dbEntities.DmGroups.Match(g => g.ID == id && !g.DeletionAt.HasValue && g.Members.Any(m => !m.IsForeign && m.AvatarId == MyId)) + await db.DmGroups.Match(g => g.ID == id && !g.DeletionAt.HasValue && g.Members.Any(m => !m.IsForeign && m.AvatarId == MyId)) .ExecuteFirstAsync(token); [HttpPost("/api/v1/conversations/{id}/read"), Scope("write:conversations")] @@ -239,11 +232,13 @@ namespace PrivaPub.Api.Mastodon.Controllers { var posts = await Page.From(Params, Limit()).Fetch(query, p => p.ID, token); Link(path, posts.LastOrDefault()?.ID, posts.FirstOrDefault()?.ID); - return Json(await _mapper.Statuses(posts, MyId, token)); + return Json(await mastodonMapper.Statuses(posts, MyId, token)); } } - public class NotificationsController : MastodonController + public class NotificationsController( + MastodonMapper mapper, + DbEntities dbEntities) : MastodonController { internal static readonly Dictionary Names = new() { @@ -260,20 +255,12 @@ namespace PrivaPub.Api.Mastodon.Controllers [NotificationType.Status] = "status"//an account followed with notify posted (R8) }; - readonly MastodonMapper _mapper; - readonly DbEntities _dbEntities; - - public NotificationsController(MastodonMapper mapper, DbEntities dbEntities) - { - _mapper = mapper; - _dbEntities = dbEntities; - } Find Filtered() { var types = Params.List("types").Select(Parse).Where(t => t.HasValue).Select(t => t.Value).ToList(); var excluded = Params.List("exclude_types").Select(Parse).Where(t => t.HasValue).Select(t => t.Value).ToList(); - var query = _dbEntities.Notifications.Match(n => n.AvatarId == MyId); + var query = dbEntities.Notifications.Match(n => n.AvatarId == MyId); // what the persona's notification policy filtered stays in its requests, unless asked for (a request's own page) if (Params.Bool("include_filtered") != true) query.Match(NotFiltered); @@ -332,7 +319,7 @@ namespace PrivaPub.Api.Mastodon.Controllers async Task> Members(string key, CancellationToken token) => InGroup(key) is { } filter - ? await _dbEntities.Notifications.Match(filter).Match(NotFiltered).Sort(n => n.ID, Order.Descending).Limit(80).ExecuteAsync(token) + ? await dbEntities.Notifications.Match(filter).Match(NotFiltered).Sort(n => n.ID, Order.Descending).Limit(80).ExecuteAsync(token) : new List(); async Task Groups(List page, ISet grouped, CancellationToken token) @@ -417,7 +404,7 @@ namespace PrivaPub.Api.Mastodon.Controllers [HttpGet("/api/v1/notifications/{id}"), Scope("read:notifications")] public async Task Get(string id, CancellationToken token) { - var notification = await _dbEntities.Notifications.Match(n => n.ID == id && n.AvatarId == MyId).ExecuteFirstAsync(token); + var notification = await dbEntities.Notifications.Match(n => n.ID == id && n.AvatarId == MyId).ExecuteFirstAsync(token); var mapped = notification == default ? default : (await Map(new List { notification }, token)).FirstOrDefault(); return mapped == default ? NotFoundError() : Json(mapped); } @@ -447,7 +434,7 @@ namespace PrivaPub.Api.Mastodon.Controllers } Task> Map(List notifications, CancellationToken token) => - _mapper.Notifications(notifications, MyId, token); + mapper.Notifications(notifications, MyId, token); static NotificationType? Parse(string name) => Names.FirstOrDefault(n => n.Value == name) is { Value: not null } pair ? pair.Key : (NotificationType?)null; } diff --git a/PrivaPub/Api/Mastodon/Controllers/TrendsController.cs b/PrivaPub/Api/Mastodon/Controllers/TrendsController.cs index c24a133..567f7b0 100644 --- a/PrivaPub/Api/Mastodon/Controllers/TrendsController.cs +++ b/PrivaPub/Api/Mastodon/Controllers/TrendsController.cs @@ -15,21 +15,12 @@ namespace PrivaPub.Api.Mastodon.Controllers { // Trends and the directory (owner decision 2026-10-04, back from the cut list), from what PrivaPub already holds // (Trends). The directory lists only accounts that let themselves be discovered. - public class TrendsController : MastodonController + public class TrendsController( + Trends trendService, + MastodonMapper mapper, + DbEntities dbEntities, + ILocalActorService localActors) : MastodonController { - readonly Trends _trends; - readonly MastodonMapper _mapper; - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - - public TrendsController(Trends trends, MastodonMapper mapper, DbEntities dbEntities, ILocalActorService localActors) - { - _trends = trends; - _mapper = mapper; - _dbEntities = dbEntities; - _localActors = localActors; - } - static List History(Trends.Trend trend) => trend.History.Select(h => (object)new { day = new DateTimeOffset(h.Day, TimeSpan.Zero).ToUnixTimeSeconds().ToString(), @@ -46,10 +37,10 @@ namespace PrivaPub.Api.Mastodon.Controllers var followed = MyId == default ? new HashSet() : (await DB.Default.Find().Match(t => t.AvatarId == MyId).ExecuteAsync(token)).Select(t => t.Name).ToHashSet(); - return Json(Window(await _trends.Tags(token), 10, 20).Select(t => new + return Json(Window(await trendService.Tags(token), 10, 20).Select(t => new { name = t.Key, - url = $"{_localActors.BaseAddress}/tags/{Uri.EscapeDataString(t.Key)}", + url = $"{localActors.BaseAddress}/tags/{Uri.EscapeDataString(t.Key)}", history = History(t), following = MyId == default ? default(bool?) : followed.Contains(t.Key) }).ToList()); @@ -58,21 +49,21 @@ namespace PrivaPub.Api.Mastodon.Controllers [HttpGet("/api/v1/trends/statuses"), Scope("read", requiresUser: false), Microsoft.AspNetCore.Authorization.AllowAnonymous] public async Task Statuses(CancellationToken token) { - var ids = Window(await _trends.Statuses(token), 20, 40).ToList(); - var posts = (await _dbEntities.Posts.Match(p => ids.Contains(p.ID)).Match(VisibilityPolicy.IsShown).ExecuteAsync(token)).ToDictionary(p => p.ID); - return Json(await _mapper.Statuses(ids.Where(posts.ContainsKey).Select(id => posts[id]).ToList(), MyId, token)); + var ids = Window(await trendService.Statuses(token), 20, 40).ToList(); + var posts = (await dbEntities.Posts.Match(p => ids.Contains(p.ID)).Match(VisibilityPolicy.IsShown).ExecuteAsync(token)).ToDictionary(p => p.ID); + return Json(await mapper.Statuses(ids.Where(posts.ContainsKey).Select(id => posts[id]).ToList(), MyId, token)); } [HttpGet("/api/v1/trends/links"), Scope("read", requiresUser: false), Microsoft.AspNetCore.Authorization.AllowAnonymous] public async Task Links(CancellationToken token) { - var trends = Window(await _trends.Links(token), 10, 20).ToList(); + var trends = Window(await trendService.Links(token), 10, 20).ToList(); var sampleIds = trends.Select(t => t.SamplePostId).ToList(); - var samples = (await _dbEntities.Posts.Match(p => sampleIds.Contains(p.ID)).ExecuteAsync(token)).ToDictionary(p => p.ID); + var samples = (await dbEntities.Posts.Match(p => sampleIds.Contains(p.ID)).ExecuteAsync(token)).ToDictionary(p => p.ID); return Json(trends.Where(t => samples.ContainsKey(t.SamplePostId)).Select(t => { var link = samples[t.SamplePostId].Link; - var card = _mapper.LinkCard(t.Key, link.Title, link.Description, link.ImageURL); + var card = mapper.LinkCard(t.Key, link.Title, link.Description, link.ImageURL); return card == default ? default : (object)new { card.Url, card.Title, card.Description, card.Type, card.AuthorName, card.AuthorUrl, card.ProviderName, card.ProviderUrl, @@ -96,24 +87,24 @@ namespace PrivaPub.Api.Mastodon.Controllers if (Params.Get("order") == "new") { // many share a day: the first `wanted` are read with every other of the last one's day, so each page is cut the same way - var personas = await _dbEntities.Avatars.Match(a => a.Settings.IsDiscoverable && !a.DeletionAt.HasValue && !barred.Contains(a.ID) && !a.SilencedAt.HasValue) + var personas = await dbEntities.Avatars.Match(a => a.Settings.IsDiscoverable && !a.DeletionAt.HasValue && !barred.Contains(a.ID) && !a.SilencedAt.HasValue) .Sort(a => a.PublishedOn, Order.Descending).Limit(wanted).ExecuteAsync(token); if (personas.Count == wanted) { var edge = personas[^1].PublishedOn; var known = personas.Select(a => a.ID).ToList(); - personas.AddRange(await _dbEntities.Avatars.Match(a => a.Settings.IsDiscoverable && !a.DeletionAt.HasValue && !barred.Contains(a.ID) && !a.SilencedAt.HasValue + personas.AddRange(await dbEntities.Avatars.Match(a => a.Settings.IsDiscoverable && !a.DeletionAt.HasValue && !barred.Contains(a.ID) && !a.SilencedAt.HasValue && a.PublishedOn == edge && !known.Contains(a.ID)).ExecuteAsync(token)); } var remote = localOnly ? new List() - : await _dbEntities.ForeignAvatars.Match(f => f.IsDiscoverable && !f.DeletionAt.HasValue && !f.SuspendedAt.HasValue && !f.SilencedAt.HasValue && f.Published != null) + : await dbEntities.ForeignAvatars.Match(f => f.IsDiscoverable && !f.DeletionAt.HasValue && !f.SuspendedAt.HasValue && !f.SilencedAt.HasValue && f.Published != null) .Sort(f => f.Published, Order.Descending).Limit(wanted).ExecuteAsync(token); if (remote.Count == wanted) { var edge = remote[^1].Published; var known = remote.Select(f => f.ID).ToList(); - remote.AddRange(await _dbEntities.ForeignAvatars.Match(f => f.IsDiscoverable && !f.DeletionAt.HasValue && !f.SuspendedAt.HasValue && !f.SilencedAt.HasValue + remote.AddRange(await dbEntities.ForeignAvatars.Match(f => f.IsDiscoverable && !f.DeletionAt.HasValue && !f.SuspendedAt.HasValue && !f.SilencedAt.HasValue && f.Published == edge && !known.Contains(f.ID)).ExecuteAsync(token)); } ordered = personas.Select(a => (a.ID, Joined: a.PublishedOn, Tie: Tie(a.UserName))) @@ -123,13 +114,13 @@ namespace PrivaPub.Api.Mastodon.Controllers } else { - var discoverableLocal = (await _dbEntities.Avatars.Match(a => a.Settings.IsDiscoverable && !a.DeletionAt.HasValue && !barred.Contains(a.ID) && !a.SilencedAt.HasValue) + var discoverableLocal = (await dbEntities.Avatars.Match(a => a.Settings.IsDiscoverable && !a.DeletionAt.HasValue && !barred.Contains(a.ID) && !a.SilencedAt.HasValue) .Project(a => a.Include(x => x.ID)).ExecuteAsync(token)).Select(a => a.ID).ToHashSet(); var seen = new HashSet(); var maxId = default(string); for (var round = 0; round < 20 && ordered.Count < wanted; round++) { - var page = _dbEntities.Posts.Match(p => p.Visibility == Models.Post.PostVisibility.Public && !p.DeletedAt.HasValue && p.ReblogOfPostId == null); + var page = dbEntities.Posts.Match(p => p.Visibility == Models.Post.PostVisibility.Public && !p.DeletedAt.HasValue && p.ReblogOfPostId == null); if (maxId != default) page.Match(f => f.Lt(p => p.ID, maxId)); if (localOnly) @@ -144,13 +135,13 @@ namespace PrivaPub.Api.Mastodon.Controllers var remoteIds = fresh.Where(a => a.IsFederatedCopy).Select(a => a.Id).ToList(); var discoverableRemote = remoteIds.Count == 0 ? new HashSet() - : (await _dbEntities.ForeignAvatars.Match(f => remoteIds.Contains(f.ID) && f.IsDiscoverable && !f.DeletionAt.HasValue && !f.SuspendedAt.HasValue && !f.SilencedAt.HasValue) + : (await dbEntities.ForeignAvatars.Match(f => remoteIds.Contains(f.ID) && f.IsDiscoverable && !f.DeletionAt.HasValue && !f.SuspendedAt.HasValue && !f.SilencedAt.HasValue) .Project(f => f.Include(x => x.ID)).ExecuteAsync(token)).Select(f => f.ID).ToHashSet(); ordered.AddRange(fresh.Where(a => a.IsFederatedCopy ? discoverableRemote.Contains(a.Id) : discoverableLocal.Contains(a.Id)).Select(a => a.Id)); } ordered = ordered.Skip(offset).Take(limit).ToList(); } - var accounts = await _mapper.Accounts(ordered, token); + var accounts = await mapper.Accounts(ordered, token); return Json(ordered.Where(accounts.ContainsKey).Select(id => accounts[id]).ToList()); } diff --git a/PrivaPub/Api/Mastodon/Controllers/UserinfoController.cs b/PrivaPub/Api/Mastodon/Controllers/UserinfoController.cs index a8e109d..561e859 100644 --- a/PrivaPub/Api/Mastodon/Controllers/UserinfoController.cs +++ b/PrivaPub/Api/Mastodon/Controllers/UserinfoController.cs @@ -9,26 +9,20 @@ namespace PrivaPub.Api.Mastodon.Controllers // Mastodon 4.4's OAuth userinfo (OpenID Connect's shape, GET or POST, the `profile` scope): who the token's persona is, // for a site that signs in with it. Only what its public account says already; never its login. The authorization // server's metadata names it (OAuthSetup). - public class UserinfoController : MastodonController + public class UserinfoController( + MastodonMapper mapper, + ILocalActorService localActors) : MastodonController { public const string Path = "/oauth/userinfo"; - readonly MastodonMapper _mapper; - readonly ILocalActorService _localActors; - - public UserinfoController(MastodonMapper mapper, ILocalActorService localActors) - { - _mapper = mapper; - _localActors = localActors; - } [HttpGet(Path), HttpPost(Path), Scope("profile")] public async Task Show(CancellationToken token) { - var account = await _mapper.Local(Me, false, token); + var account = await mapper.Local(Me, false, token); return Json(new { - iss = _localActors.BaseAddress + "/", + iss = localActors.BaseAddress + "/", sub = Me.Uri, name = account.DisplayName, preferred_username = account.Username, diff --git a/PrivaPub/Api/Mastodon/Entities/Entities.cs b/PrivaPub/Api/Mastodon/Entities/Entities.cs index 83900d9..2e97c3e 100644 --- a/PrivaPub/Api/Mastodon/Entities/Entities.cs +++ b/PrivaPub/Api/Mastodon/Entities/Entities.cs @@ -29,7 +29,9 @@ public List Roles { get; set; } = new(); public bool? Memorial { get; set; } public bool? Limited { get; set; }//silenced by this server's staff, or its server silenced (Mastodon's `limited`) + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0005", Justification = "The Mastodon API sends this as a string, \"\" when empty; clients break on null.")] public string AvatarDescription { get; set; } = string.Empty; + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0005", Justification = "The Mastodon API sends this as a string, \"\" when empty; clients break on null.")] public string HeaderDescription { get; set; } = string.Empty; public List Fields { get; set; } = new(); public Source Source { get; set; } @@ -57,6 +59,7 @@ public string Privacy { get; set; } = "public"; public bool Sensitive { get; set; } public string Language { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0005", Justification = "The Mastodon API sends this as a string, \"\" when empty; clients break on null.")] public string Note { get; set; } = string.Empty; public List Fields { get; set; } = new(); public int FollowRequestsCount { get; set; } @@ -225,7 +228,9 @@ public class FilterResultEntity { public FilterEntity Filter { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0006", Justification = "The Mastodon API sends null when no keyword of the filter matched.")] public List KeywordMatches { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0006", Justification = "The Mastodon API sends null when no status of the filter matched.")] public List StatusMatches { get; set; } } @@ -263,6 +268,7 @@ public int VotesCount { get; set; } public int? VotersCount { get; set; } public bool? Voted { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0006", Justification = "The Mastodon API leaves own_votes null for a viewer who is not signed in.")] public List OwnVotes { get; set; } public List Options { get; set; } = new(); public List Emojis { get; set; } = new(); @@ -277,18 +283,27 @@ public class PreviewCard { public string Url { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0005", Justification = "The Mastodon API sends this as a string, \"\" when empty; clients break on null.")] public string Title { get; set; } = string.Empty; + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0005", Justification = "The Mastodon API sends this as a string, \"\" when empty; clients break on null.")] public string Description { get; set; } = string.Empty; public string Type { get; set; } = "link"; + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0005", Justification = "The Mastodon API sends this as a string, \"\" when empty; clients break on null.")] public string AuthorName { get; set; } = string.Empty; + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0005", Justification = "The Mastodon API sends this as a string, \"\" when empty; clients break on null.")] public string AuthorUrl { get; set; } = string.Empty; + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0005", Justification = "The Mastodon API sends this as a string, \"\" when empty; clients break on null.")] public string ProviderName { get; set; } = string.Empty; + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0005", Justification = "The Mastodon API sends this as a string, \"\" when empty; clients break on null.")] public string ProviderUrl { get; set; } = string.Empty; + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0005", Justification = "The Mastodon API sends this as a string, \"\" when empty; clients break on null.")] public string Html { get; set; } = string.Empty; public int Width { get; set; } public int Height { get; set; } public string Image { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0005", Justification = "The Mastodon API sends this as a string, \"\" when empty; clients break on null.")] public string ImageDescription { get; set; } = string.Empty; + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0005", Justification = "The Mastodon API sends this as a string, \"\" when empty; clients break on null.")] public string EmbedUrl { get; set; } = string.Empty; public string Blurhash { get; set; } public string Language { get; set; } @@ -305,6 +320,7 @@ public string InReplyToId { get; set; } public string InReplyToAccountId { get; set; } public Status Reblog { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0005", Justification = "The Mastodon API sends this as a string, \"\" when empty; clients break on null.")] public string Content { get; set; } = string.Empty; public string CreatedAt { get; set; } public string EditedAt { get; set; } @@ -318,6 +334,7 @@ public bool Bookmarked { get; set; } public bool Pinned { get; set; } public bool Sensitive { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0005", Justification = "The Mastodon API sends this as a string, \"\" when empty; clients break on null.")] public string SpoilerText { get; set; } = string.Empty; public string Visibility { get; set; } public List MediaAttachments { get; set; } = new(); @@ -388,6 +405,7 @@ public string RedirectUri { get; set; } public string ClientId { get; set; } public string ClientSecret { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0005", Justification = "The Mastodon API sends this as a string, \"\" when empty; clients break on null.")] public string VapidKey { get; set; } = string.Empty; } @@ -397,6 +415,7 @@ public bool Following { get; set; } public bool ShowingReblogs { get; set; } public bool Notifying { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0006", Justification = "The Mastodon API sends null when every language of the account is followed.")] public List Languages { get; set; } public bool FollowedBy { get; set; } public bool Blocking { get; set; } @@ -407,6 +426,7 @@ public bool RequestedBy { get; set; } public bool DomainBlocking { get; set; } public bool Endorsed { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0005", Justification = "The Mastodon API sends this as a string, \"\" when empty; clients break on null.")] public string Note { get; set; } = string.Empty; } @@ -445,6 +465,7 @@ { public string Id { get; set; } public string Action { get; set; } = "none"; + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0005", Justification = "The Mastodon API sends this as a string, \"\" when empty; clients break on null.")] public string Text { get; set; } = string.Empty; public List StatusIds { get; set; } = new(); public Account TargetAccount { get; set; } diff --git a/PrivaPub/Api/Mastodon/Mappers/AccountSearch.cs b/PrivaPub/Api/Mastodon/Mappers/AccountSearch.cs index e40b231..e1d12ad 100644 --- a/PrivaPub/Api/Mastodon/Mappers/AccountSearch.cs +++ b/PrivaPub/Api/Mastodon/Mappers/AccountSearch.cs @@ -4,21 +4,12 @@ using PrivaPub.StaticServices; namespace PrivaPub.Api.Mastodon.Mappers { - public class AccountSearch + public class AccountSearch( + MastodonMapper mapper, + DbEntities dbEntities, + ILocalActorService localActors, + IRemoteActorService remoteActors) { - readonly MastodonMapper _mapper; - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - readonly IRemoteActorService _remoteActors; - - public AccountSearch(MastodonMapper mapper, DbEntities dbEntities, ILocalActorService localActors, IRemoteActorService remoteActors) - { - _mapper = mapper; - _dbEntities = dbEntities; - _localActors = localActors; - _remoteActors = remoteActors; - } - public async Task> Find(string q, bool resolve, int limit, CancellationToken token) => await Find(q, resolve, limit, 0, token); // following=true: only accounts the persona follows, matched by the start of their name, display name or server @@ -26,22 +17,22 @@ namespace PrivaPub.Api.Mastodon.Mappers public async Task> Followed(string viewerId, string q, int limit, CancellationToken token) { q = q?.Trim().TrimStart('@') ?? string.Empty; - var ids = (await _dbEntities.Followings.Match(f => f.AvatarId == viewerId && f.State == Models.Social.FollowState.Accepted).ExecuteAsync(token)) + var ids = (await dbEntities.Followings.Match(f => f.AvatarId == viewerId && f.State == Models.Social.FollowState.Accepted).ExecuteAsync(token)) .Select(f => f.TargetAccountId).Where(id => !string.IsNullOrEmpty(id)).ToList(); if (ids.Count == 0) return new List(); var parts = q.Split('@'); - var localDomain = new Uri(_localActors.BaseAddress).Authority; + var localDomain = new Uri(localActors.BaseAddress).Authority; bool Matches(string userName, string name, string domain) => userName?.StartsWith(parts[0], StringComparison.OrdinalIgnoreCase) == true && (parts.Length < 2 || domain?.StartsWith(parts[1], StringComparison.OrdinalIgnoreCase) == true) || parts.Length == 1 && name?.Contains(q, StringComparison.OrdinalIgnoreCase) == true; - var found = (await _dbEntities.Avatars.Match(a => ids.Contains(a.ID) && !a.DeletionAt.HasValue).ExecuteAsync(token)) + var found = (await dbEntities.Avatars.Match(a => ids.Contains(a.ID) && !a.DeletionAt.HasValue).ExecuteAsync(token)) .Where(a => Matches(a.UserName, a.Name, localDomain)).Select(a => (a.UserName, a.ID)) - .Concat((await _dbEntities.ForeignAvatars.Match(f => ids.Contains(f.ID) && !f.DeletionAt.HasValue).ExecuteAsync(token)) + .Concat((await dbEntities.ForeignAvatars.Match(f => ids.Contains(f.ID) && !f.DeletionAt.HasValue).ExecuteAsync(token)) .Where(f => Matches(f.UserName, f.Name, f.Domain)).Select(f => (f.UserName, f.ID))) .OrderBy(a => a.UserName, StringComparer.OrdinalIgnoreCase).Take(limit).Select(a => a.ID).ToList(); - var accounts = await _mapper.Accounts(found, token); + var accounts = await mapper.Accounts(found, token); return found.Where(accounts.ContainsKey).Select(id => accounts[id]).ToList(); } @@ -53,39 +44,39 @@ namespace PrivaPub.Api.Mastodon.Mappers return new List(); var results = new List(); var parts = q.Split('@'); - var localDomain = new Uri(_localActors.BaseAddress).Authority; + var localDomain = new Uri(localActors.BaseAddress).Authority; if (parts.Length == 2 && !parts[1].Equals(localDomain, StringComparison.OrdinalIgnoreCase) && !string.IsNullOrEmpty(parts[0])) { var userName = parts[0]; var domain = parts[1].ToLowerInvariant(); - var known = await _dbEntities.ForeignAvatars.Match(f => f.UserName == userName && f.Domain == domain && !f.DeletionAt.HasValue).ExecuteFirstAsync(token); + var known = await dbEntities.ForeignAvatars.Match(f => f.UserName == userName && f.Domain == domain && !f.DeletionAt.HasValue).ExecuteFirstAsync(token); if (known == default && resolve) { - var actorUri = await _remoteActors.ResolveHandle(q, token); - known = actorUri == default ? default : await _remoteActors.GetActor(actorUri, refresh: false, token); + var actorUri = await remoteActors.ResolveHandle(q, token); + known = actorUri == default ? default : await remoteActors.GetActor(actorUri, refresh: false, token); } if (known is { DeletionAt: null, SuspendedAt: null } && offset == 0) - results.Add(_mapper.Foreign(known)); + results.Add(mapper.Foreign(known)); return results; } var prefix = parts[0].ToLowerInvariant(); var barred = await Domain.Privacy.Counted.HeldBackPersonas(token); - var locals = await _dbEntities.Avatars + var locals = await dbEntities.Avatars // a silenced persona is found only by its exact name (R6), as its followers look for it .Match(a => a.UserName.StartsWith(prefix) && !a.DeletionAt.HasValue && a.Settings.IsDiscoverable != false && !barred.Contains(a.ID) && (!a.SilencedAt.HasValue || a.UserName == prefix)) .Sort(a => a.UserName, MongoDB.Entities.Order.Ascending) .Limit(offset + limit).ExecuteAsync(token); foreach (var avatar in locals.Skip(offset)) - results.Add(await _mapper.Local(_localActors.FromAvatar(avatar), false, token)); + results.Add(await mapper.Local(localActors.FromAvatar(avatar), false, token)); var skipRemote = Math.Max(0, offset - locals.Count); if (results.Count < limit) - foreach (var foreign in await _dbEntities.ForeignAvatars.Match(f => f.UserName.StartsWith(parts[0]) && f.IsDiscoverable && !f.DeletionAt.HasValue + foreach (var foreign in await dbEntities.ForeignAvatars.Match(f => f.UserName.StartsWith(parts[0]) && f.IsDiscoverable && !f.DeletionAt.HasValue && !f.SuspendedAt.HasValue && !f.SilencedAt.HasValue) .Sort(f => f.UserName, MongoDB.Entities.Order.Ascending) .Skip(skipRemote).Limit(limit - results.Count).ExecuteAsync(token)) - results.Add(_mapper.Foreign(foreign)); + results.Add(mapper.Foreign(foreign)); return results; } } diff --git a/PrivaPub/Api/Mastodon/Mappers/MastodonMapper.cs b/PrivaPub/Api/Mastodon/Mappers/MastodonMapper.cs index 41075eb..d9d5c67 100644 --- a/PrivaPub/Api/Mastodon/Mappers/MastodonMapper.cs +++ b/PrivaPub/Api/Mastodon/Mappers/MastodonMapper.cs @@ -24,23 +24,13 @@ using PostEntity = PrivaPub.Models.Post.Post; namespace PrivaPub.Api.Mastodon.Mappers { - public class MastodonMapper + public class MastodonMapper( + DbEntities dbEntities, + ILocalActorService localActors, + IMediaProxy proxy = default, + PrivaPub.Federation.Moderation.IDomainBlocks domainBlocks = default) { - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - readonly IMediaProxy _proxy; - readonly PrivaPub.Federation.Moderation.IDomainBlocks _domainBlocks; - - public MastodonMapper(DbEntities dbEntities, ILocalActorService localActors, IMediaProxy proxy = default, - PrivaPub.Federation.Moderation.IDomainBlocks domainBlocks = default) - { - _dbEntities = dbEntities; - _localActors = localActors; - _proxy = proxy; - _domainBlocks = domainBlocks; - } - - string Proxied(string url) => _proxy == default ? url : _proxy.Wrap(url); + string Proxied(string url) => proxy == default ? url : proxy.Wrap(url); public string ProxiedUrl(string url) => Proxied(url); @@ -51,7 +41,7 @@ namespace PrivaPub.Api.Mastodon.Mappers var postIds = notifications.Where(n => n.PostId != default).Select(n => n.PostId).Distinct().ToList(); var posts = postIds.Count == 0 ? new List() - : await _dbEntities.Posts.Match(p => postIds.Contains(p.ID)).Match(VisibilityPolicy.IsShown).ExecuteAsync(token); + : await dbEntities.Posts.Match(p => postIds.Contains(p.ID)).Match(VisibilityPolicy.IsShown).ExecuteAsync(token); var statuses = (await Statuses(posts, viewerId, token)).ToDictionary(s => s.Id); var warned = notifications.Any(n => n.Type == NotificationType.ModerationWarning) && viewerId != default ? await Account(viewerId, token) : default; return notifications @@ -82,8 +72,8 @@ namespace PrivaPub.Api.Mastodon.Mappers .ToList(); } - string MissingAvatar => $"{_localActors.BaseAddress}/media/missing-avatar.png"; - string MissingHeader => $"{_localActors.BaseAddress}/media/missing-header.png"; + string MissingAvatar => $"{localActors.BaseAddress}/media/missing-avatar.png"; + string MissingHeader => $"{localActors.BaseAddress}/media/missing-header.png"; public async Task Local(LocalActor actor, bool withSource, CancellationToken token) { @@ -91,7 +81,7 @@ namespace PrivaPub.Api.Mastodon.Mappers var following = actor.Kind == LocalActorKind.Person ? await DB.Default.CountAsync(f => f.AvatarId == actor.Id && f.State == FollowState.Accepted, token) : 0; - var latest = await _dbEntities.Posts + var latest = await dbEntities.Posts .Match(Counted.By(actor)) .Sort(p => p.ID, Order.Descending) .Limit(1) @@ -172,8 +162,8 @@ namespace PrivaPub.Api.Mastodon.Mappers }; bool DomainSilenced(ForeignAvatar foreign) => - _domainBlocks != default && Uri.TryCreate(foreign.ActorURI, UriKind.Absolute, out var uri) - && _domainBlocks.Find(uri.Host)?.Severity == DomainBlockSeverity.Silence; + domainBlocks != default && Uri.TryCreate(foreign.ActorURI, UriKind.Absolute, out var uri) + && domainBlocks.Find(uri.Host)?.Severity == DomainBlockSeverity.Silence; public async Task Account(string id, CancellationToken token) => (await Accounts(new[] { id }, token)).GetValueOrDefault(id); @@ -187,19 +177,19 @@ namespace PrivaPub.Api.Mastodon.Mappers // a suspended account, here or elsewhere, and a banned login's personas are shown to nobody (R6): their posts and // what they notify are left out with them, wherever a list holds them - foreach (var avatar in await _dbEntities.Avatars.Match(a => wanted.Contains(a.ID) && !a.DeletionAt.HasValue && !a.SuspendedAt.HasValue).ExecuteAsync(token)) - if (_localActors.FromAvatar(avatar) is { Suspended: false } persona) + foreach (var avatar in await dbEntities.Avatars.Match(a => wanted.Contains(a.ID) && !a.DeletionAt.HasValue && !a.SuspendedAt.HasValue).ExecuteAsync(token)) + if (localActors.FromAvatar(avatar) is { Suspended: false } persona) accounts[avatar.ID] = await Local(persona, false, token); - foreach (var group in await _dbEntities.Groups.Match(g => wanted.Contains(g.ID) && !g.DeletionAt.HasValue && g.Kind == GroupKind.Community).ExecuteAsync(token)) - accounts[group.ID] = await Local(_localActors.FromGroup(group), false, token); - var foreigns = await _dbEntities.ForeignAvatars.Match(f => wanted.Contains(f.ID) && !f.DeletionAt.HasValue && !f.SuspendedAt.HasValue).ExecuteAsync(token); + foreach (var group in await dbEntities.Groups.Match(g => wanted.Contains(g.ID) && !g.DeletionAt.HasValue && g.Kind == GroupKind.Community).ExecuteAsync(token)) + accounts[group.ID] = await Local(localActors.FromGroup(group), false, token); + var foreigns = await dbEntities.ForeignAvatars.Match(f => wanted.Contains(f.ID) && !f.DeletionAt.HasValue && !f.SuspendedAt.HasValue).ExecuteAsync(token); foreach (var foreign in foreigns) accounts[foreign.ID] = Foreign(foreign); // an account that moved shows where to, once the new account names it as one of its own (as a Move is believed) var movedTo = foreigns.Where(f => !string.IsNullOrEmpty(f.MovedToURL)).Select(f => f.MovedToURL).Distinct().ToList(); if (movedTo.Count > 0) { - var targets = (await _dbEntities.ForeignAvatars.Match(f => movedTo.Contains(f.ActorURI) && !f.DeletionAt.HasValue).ExecuteAsync(token)) + var targets = (await dbEntities.ForeignAvatars.Match(f => movedTo.Contains(f.ActorURI) && !f.DeletionAt.HasValue).ExecuteAsync(token)) .ToDictionary(f => f.ActorURI); foreach (var foreign in foreigns) if (foreign.MovedToURL != default && targets.TryGetValue(foreign.MovedToURL, out var target) && target.AlsoKnownAs.Contains(foreign.ActorURI)) @@ -209,32 +199,33 @@ namespace PrivaPub.Api.Mastodon.Mappers } public async Task Status(PostEntity post, string viewerId, CancellationToken token) => - (await Statuses(new[] { post }, viewerId, nested: false, token, hideFromViewer: false)).FirstOrDefault(); + (await Statuses(new[] { post }, viewerId, nested: false, hideFromViewer: false, token)).FirstOrDefault(); public Task> Statuses(IReadOnlyCollection posts, string viewerId, CancellationToken token) => - Statuses(posts, viewerId, nested: false, token); + Statuses(posts, viewerId, nested: false, token: token); // Lists leave out what the viewer blocked or muted; a status asked for by its id is still shown, as Mastodon shows it // (only its author's block of the viewer hides it, and that is decided before mapping) - async Task> Statuses(IReadOnlyCollection posts, string viewerId, bool nested, CancellationToken token, - bool hideFromViewer = true) + async Task> Statuses(IReadOnlyCollection posts, string viewerId, bool nested, + bool hideFromViewer = true, + CancellationToken token = default) { var originalIds = posts.Where(p => p.ReblogOfPostId != default).Select(p => p.ReblogOfPostId).Distinct().ToList(); var originals = originalIds.Count == 0 ? new Dictionary() - : (await _dbEntities.Posts.Match(p => originalIds.Contains(p.ID)).Match(VisibilityPolicy.IsShown).ExecuteAsync(token)).ToDictionary(p => p.ID); + : (await dbEntities.Posts.Match(p => originalIds.Contains(p.ID)).Match(VisibilityPolicy.IsShown).ExecuteAsync(token)).ToDictionary(p => p.ID); var all = posts.Concat(originals.Values).ToList(); var mentionUris = all.SelectMany(p => p.Mentions).Where(m => !m.IsLocal).Select(m => m.ActorURI).Distinct().ToList(); var mentionAccounts = mentionUris.Count == 0 ? new Dictionary() - : (await _dbEntities.ForeignAvatars.Match(f => mentionUris.Contains(f.ActorURI)).ExecuteAsync(token)).ToDictionary(f => f.ActorURI); + : (await dbEntities.ForeignAvatars.Match(f => mentionUris.Contains(f.ActorURI)).ExecuteAsync(token)).ToDictionary(f => f.ActorURI); var accounts = await Accounts(all.Select(AuthorOf).Concat(all.Select(p => p.WallOwnerAccountId).Where(w => w != default)), token); var ids = all.Select(p => p.ID).ToList(); var favourited = viewerId == default ? new HashSet() - : (await _dbEntities.Favourites.Match(f => f.AccountId == viewerId && ids.Contains(f.PostId)).ExecuteAsync(token)).Select(f => f.PostId).ToHashSet(); + : (await dbEntities.Favourites.Match(f => f.AccountId == viewerId && ids.Contains(f.PostId)).ExecuteAsync(token)).Select(f => f.PostId).ToHashSet(); var downvoted = viewerId == default ? new HashSet() : (await DB.Default.Find().Match(d => d.AccountId == viewerId && ids.Contains(d.PostId)).ExecuteAsync(token)).Select(d => d.PostId).ToHashSet(); @@ -271,7 +262,7 @@ namespace PrivaPub.Api.Mastodon.Mappers var filters = await Domain.Social.Filters.Of(viewerId, token); var reblogged = viewerId == default ? new HashSet() - : (await _dbEntities.Posts.Match(p => p.AuthorAccountId == viewerId && ids.Contains(p.ReblogOfPostId) && !p.DeletedAt.HasValue).ExecuteAsync(token)) + : (await dbEntities.Posts.Match(p => p.AuthorAccountId == viewerId && ids.Contains(p.ReblogOfPostId) && !p.DeletedAt.HasValue).ExecuteAsync(token)) .Select(p => p.ReblogOfPostId).ToHashSet(); Status Map(PostEntity post) @@ -310,7 +301,7 @@ namespace PrivaPub.Api.Mastodon.Mappers EmojiReactions = reactions.GetValueOrDefault(post.ID) ?? new(), Pleroma = new PleromaStatus { EmojiReactions = reactions.GetValueOrDefault(post.ID) ?? new() }, Mentions = post.Mentions.Where(m => !m.Silent).Select(m => Mention(m, mentionAccounts)).Where(m => m != default).ToList(), - Tags = post.Tags.Select(t => new StatusTag { Name = t, Url = ActivityPubRenderer.TagUrl(_localActors.BaseAddress, t) }).ToList(), + Tags = post.Tags.Select(t => new StatusTag { Name = t, Url = ActivityPubRenderer.TagUrl(localActors.BaseAddress, t) }).ToList(), Filtered = filters.Of(post) }; return status; @@ -322,12 +313,12 @@ namespace PrivaPub.Api.Mastodon.Mappers : await FollowedLocalAuthors(viewerId, localAuthors, token); var quotedIds = nested ? new List() : all.Where(p => p.QuoteState == QuoteState.Accepted && p.QuotedPostId != default).Select(p => p.QuotedPostId).Distinct().ToList(); var quotedPosts = new List(); - foreach (var quotedPost in quotedIds.Count == 0 ? new List() : await _dbEntities.Posts.Match(p => quotedIds.Contains(p.ID)).Match(VisibilityPolicy.IsShown).ExecuteAsync(token)) + foreach (var quotedPost in quotedIds.Count == 0 ? new List() : await dbEntities.Posts.Match(p => quotedIds.Contains(p.ID)).Match(VisibilityPolicy.IsShown).ExecuteAsync(token)) if (quotedPost.Visibility != PostVisibility.LocalGeo && await VisibilityPolicy.CanSee(quotedPost, viewerId, token)) quotedPosts.Add(quotedPost); var quotedStatuses = quotedPosts.Count == 0 ? new Dictionary() - : (await Statuses(quotedPosts, viewerId, nested: true, token)).ToDictionary(q => q.Id); + : (await Statuses(quotedPosts, viewerId, nested: true, token: token)).ToDictionary(q => q.Id); void Quote(Status status, PostEntity post) { @@ -390,10 +381,10 @@ namespace PrivaPub.Api.Mastodon.Mappers async Task> FollowedLocalAuthors(string viewerId, List authorIds, CancellationToken token) { var uris = new Dictionary(); - foreach (var avatar in await _dbEntities.Avatars.Match(a => authorIds.Contains(a.ID)).ExecuteAsync(token)) - uris[_localActors.FromAvatar(avatar).Uri] = avatar.ID; + foreach (var avatar in await dbEntities.Avatars.Match(a => authorIds.Contains(a.ID)).ExecuteAsync(token)) + uris[localActors.FromAvatar(avatar).Uri] = avatar.ID; var targets = uris.Keys.ToList(); - return (await _dbEntities.Followings.Match(f => f.AvatarId == viewerId && targets.Contains(f.TargetActorURI) && f.State == FollowState.Accepted).ExecuteAsync(token)) + return (await dbEntities.Followings.Match(f => f.AvatarId == viewerId && targets.Contains(f.TargetActorURI) && f.State == FollowState.Accepted).ExecuteAsync(token)) .Select(f => uris[f.TargetActorURI]).ToHashSet(); } diff --git a/PrivaPub/Controllers/ClientToServer/AdminController.cs b/PrivaPub/Controllers/ClientToServer/AdminController.cs index fc2cba5..6d4b947 100644 --- a/PrivaPub/Controllers/ClientToServer/AdminController.cs +++ b/PrivaPub/Controllers/ClientToServer/AdminController.cs @@ -31,31 +31,16 @@ namespace PrivaPub.Controllers.ClientToServer [ApiController, Route("clientapi/admin"), Authorize(Policy = Policies.IsAdmin)] - public class AdminController : ControllerBase + public class AdminController( + ILogger logger, + IStringLocalizer localizer, + IRootUsersService rootUsersService, + IModerationLog moderationLog, + DbEntities dbEntities, + ILocalActorService localActors) : ControllerBase { const int MaxRootsPage = 100; - readonly IRootUsersService RootUsersService; - readonly ILogger Logger; - readonly IStringLocalizer Localizer; - readonly IModerationLog _log; - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - - public AdminController(ILogger logger, - IStringLocalizer localizer, - IRootUsersService rootUsersService, - IModerationLog log, - DbEntities dbEntities, - ILocalActorService localActors) - { - Logger = logger; - Localizer = localizer; - RootUsersService = rootUsersService; - _log = log; - _dbEntities = dbEntities; - _localActors = localActors; - } // an administrator never removes, bans or unbans itself; the request's own list is left as it came UsersIds Others(UsersIds usersIds) @@ -81,17 +66,17 @@ namespace PrivaPub.Controllers.ClientToServer { var others = Others(usersIds); var named = await Named(others, token); - result = await RootUsersService.RemoveUserAsync(others); + result = await rootUsersService.RemoveUserAsync(others, token); if (!result.IsValid) return StatusCode(result.StatusCode, result); foreach (var (id, name) in named) - await _log.Write(User.GetUserId(), AdminActions.RootDelete, AdminTargets.Root, id, name, token: CancellationToken.None); + await moderationLog.Write(User.GetUserId(), AdminActions.RootDelete, AdminTargets.Root, id, name, token: CancellationToken.None); return Ok(); } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(User)}.{nameof(RemoveUsers)}()"); - return BadRequest(result.Invalidate(Localizer["Something went wrong."])); + logger.LogError(ex, $"{nameof(User)}.{nameof(RemoveUsers)}()"); + return BadRequest(result.Invalidate(localizer["Something went wrong."])); } } @@ -108,7 +93,7 @@ namespace PrivaPub.Controllers.ClientToServer var others = Others(usersIds); var named = await Named(others, token); var banned = (await DB.Default.Find().Match(u => others.UserIdList.Contains(u.ID) && u.IsBanned).ExecuteAsync(token)).Select(u => u.ID).ToHashSet(); - result = await RootUsersService.BanUserAsync(others); + result = await rootUsersService.BanUserAsync(others, token); if (!result.IsValid) return StatusCode(result.StatusCode, result); @@ -116,16 +101,16 @@ namespace PrivaPub.Controllers.ClientToServer foreach (var (id, name) in named.Where(n => !banned.Contains(n.Key))) { await sessions.Revoke(id, CancellationToken.None); - foreach (var link in await _dbEntities.RootToAvatars.Match(ra => ra.RootId == id).ExecuteAsync(token)) + foreach (var link in await dbEntities.RootToAvatars.Match(ra => ra.RootId == id).ExecuteAsync(token)) Streams.CloseFor(link.AvatarId); - await _log.Write(User.GetUserId(), AdminActions.RootBan, AdminTargets.Root, id, name, token: CancellationToken.None); + await moderationLog.Write(User.GetUserId(), AdminActions.RootBan, AdminTargets.Root, id, name, token: CancellationToken.None); } return Ok(); } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(User)}.{nameof(BanUsers)}()"); - return BadRequest(result.Invalidate(Localizer["Something went wrong."])); + logger.LogError(ex, $"{nameof(User)}.{nameof(BanUsers)}()"); + return BadRequest(result.Invalidate(localizer["Something went wrong."])); } } @@ -140,18 +125,18 @@ namespace PrivaPub.Controllers.ClientToServer var others = Others(usersIds); var named = await Named(others, token); var banned = (await DB.Default.Find().Match(u => others.UserIdList.Contains(u.ID) && u.IsBanned).ExecuteAsync(token)).Select(u => u.ID).ToHashSet(); - result = await RootUsersService.UnbanUserAsync(others); + result = await rootUsersService.UnbanUserAsync(others, token); if (!result.IsValid) return StatusCode(result.StatusCode, result); await Restrictions.Reload(CancellationToken.None); foreach (var (id, name) in named.Where(n => banned.Contains(n.Key))) - await _log.Write(User.GetUserId(), AdminActions.RootUnban, AdminTargets.Root, id, name, token: CancellationToken.None); + await moderationLog.Write(User.GetUserId(), AdminActions.RootUnban, AdminTargets.Root, id, name, token: CancellationToken.None); return Ok(); } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(User)}.{nameof(UnbanUsers)}()"); - return BadRequest(result.Invalidate(Localizer["Something went wrong."])); + logger.LogError(ex, $"{nameof(User)}.{nameof(UnbanUsers)}()"); + return BadRequest(result.Invalidate(localizer["Something went wrong."])); } } @@ -198,9 +183,9 @@ namespace PrivaPub.Controllers.ClientToServer public async Task Role(string id, RootRoleForm form, CancellationToken token) { if (!ModelState.IsValid || !RootUser.TryParseRole(form.Role, out var role)) - return UnprocessableEntity(new WebResult().Invalidate(Localizer["Unknown role."], StatusCodes.Status422UnprocessableEntity)); + return UnprocessableEntity(new WebResult().Invalidate(localizer["Unknown role."], StatusCodes.Status422UnprocessableEntity)); if (id == User.GetUserId()) - return Conflict(new WebResult().Invalidate(Localizer["You can't change your own role."], StatusCodes.Status409Conflict)); + return Conflict(new WebResult().Invalidate(localizer["You can't change your own role."], StatusCodes.Status409Conflict)); var root = await DB.Default.Find().MatchID(id).Match(u => u.DeletedAt == null).ExecuteFirstAsync(token); if (root == default) return NotFound(); @@ -208,7 +193,7 @@ namespace PrivaPub.Controllers.ClientToServer if (was == role) return Ok((await Views(new List { root }, token))[0]); if (was == RootRole.Admin && !await OtherAdministrators(root.ID, token)) - return Conflict(new WebResult().Invalidate(Localizer["The last administrator can't be demoted."], StatusCodes.Status409Conflict)); + return Conflict(new WebResult().Invalidate(localizer["The last administrator can't be demoted."], StatusCodes.Status409Conflict)); root.SetRole(role); await DB.Default.Update().MatchID(root.ID).Modify(u => u.Policies, root.Policies).Modify(u => u.UpdatedAt, root.UpdatedAt) .ExecuteAsync(CancellationToken.None); @@ -217,11 +202,11 @@ namespace PrivaPub.Controllers.ClientToServer { root.SetRole(was); await DB.Default.Update().MatchID(root.ID).Modify(u => u.Policies, root.Policies).ExecuteAsync(CancellationToken.None); - return Conflict(new WebResult().Invalidate(Localizer["The last administrator can't be demoted."], StatusCodes.Status409Conflict)); + return Conflict(new WebResult().Invalidate(localizer["The last administrator can't be demoted."], StatusCodes.Status409Conflict)); } if (role == RootRole.Admin) await ServerSetup.Seal(root.ID, default);//an administrator exists: the client's setup is closed - await _log.Write(User.GetUserId(), AdminActions.RootRole, AdminTargets.Root, root.ID, root.UserName, + await moderationLog.Write(User.GetUserId(), AdminActions.RootRole, AdminTargets.Root, root.ID, root.UserName, note: $"{RoleName(was)} → {RoleName(role)}", token: CancellationToken.None); return Ok((await Views(new List { root }, token))[0]); } @@ -236,12 +221,12 @@ namespace PrivaPub.Controllers.ClientToServer public async Task ResetTotp(string id, CancellationToken token) { if (id == User.GetUserId()) - return Conflict(new WebResult().Invalidate(Localizer["Turn your own two-factor sign-in off from your account."], StatusCodes.Status409Conflict)); + return Conflict(new WebResult().Invalidate(localizer["Turn your own two-factor sign-in off from your account."], StatusCodes.Status409Conflict)); var root = await DB.Default.Find().MatchID(id).Match(u => u.DeletedAt == null).ExecuteFirstAsync(token); if (root == default) return NotFound(); await DB.Default.Update().MatchID(root.ID).Modify(u => u.Totp, null).ExecuteAsync(CancellationToken.None); - await _log.Write(User.GetUserId(), AdminActions.RootResetTotp, AdminTargets.Root, root.ID, root.UserName, token: CancellationToken.None); + await moderationLog.Write(User.GetUserId(), AdminActions.RootResetTotp, AdminTargets.Root, root.ID, root.UserName, token: CancellationToken.None); return Ok(); } @@ -251,16 +236,16 @@ namespace PrivaPub.Controllers.ClientToServer public async Task DeletePersona(string id, AdminPasswordForm form, [FromServices] IPersonaRemoval personas, CancellationToken token) { if (!ModelState.IsValid) - return BadRequest(new WebResult().Invalidate(Localizer["Invalid model."])); - if (!await RootUsersService.PasswordMatches(User.GetUserId(), form.Password)) - return StatusCode(StatusCodes.Status403Forbidden, new WebResult().Invalidate(Localizer[Services.RootUsersService.NoMatch], StatusCodes.Status403Forbidden)); - var avatar = await _dbEntities.Avatars.MatchID(id).Match(a => !a.DeletionAt.HasValue).ExecuteFirstAsync(token); + return BadRequest(new WebResult().Invalidate(localizer["Invalid model."])); + if (!await rootUsersService.PasswordMatches(User.GetUserId(), form.Password, token)) + return StatusCode(StatusCodes.Status403Forbidden, new WebResult().Invalidate(localizer[Services.RootUsersService.NoMatch], StatusCodes.Status403Forbidden)); + var avatar = await dbEntities.Avatars.MatchID(id).Match(a => !a.DeletionAt.HasValue).ExecuteFirstAsync(token); if (avatar == default) return NotFound(); - var label = "@" + _localActors.FromAvatar(avatar).Handle; + var label = "@" + localActors.FromAvatar(avatar).Handle; if (!await personas.Remove(avatar.ID, CancellationToken.None)) return NotFound(); - await _log.Write(User.GetUserId(), AdminActions.PersonaDelete, AdminTargets.Persona, avatar.ID, label, note: form.Note, token: CancellationToken.None); + await moderationLog.Write(User.GetUserId(), AdminActions.PersonaDelete, AdminTargets.Persona, avatar.ID, label, note: form.Note, token: CancellationToken.None); return Ok(); } @@ -268,30 +253,30 @@ namespace PrivaPub.Controllers.ClientToServer public async Task DeleteGroup(string id, AdminPasswordForm form, [FromServices] IGroupRemoval groups, CancellationToken token) { if (!ModelState.IsValid) - return BadRequest(new WebResult().Invalidate(Localizer["Invalid model."])); - if (!await RootUsersService.PasswordMatches(User.GetUserId(), form.Password)) - return StatusCode(StatusCodes.Status403Forbidden, new WebResult().Invalidate(Localizer[Services.RootUsersService.NoMatch], StatusCodes.Status403Forbidden)); - var group = await _dbEntities.Groups.MatchID(id).Match(g => !g.DeletionAt.HasValue).ExecuteFirstAsync(token); + return BadRequest(new WebResult().Invalidate(localizer["Invalid model."])); + if (!await rootUsersService.PasswordMatches(User.GetUserId(), form.Password, token)) + return StatusCode(StatusCodes.Status403Forbidden, new WebResult().Invalidate(localizer[Services.RootUsersService.NoMatch], StatusCodes.Status403Forbidden)); + var group = await dbEntities.Groups.MatchID(id).Match(g => !g.DeletionAt.HasValue).ExecuteFirstAsync(token); if (group == default) return NotFound(); - var label = "@" + _localActors.FromGroup(group).Handle; + var label = "@" + localActors.FromGroup(group).Handle; if (!await groups.Remove(group.ID, CancellationToken.None)) return NotFound(); - await _log.Write(User.GetUserId(), AdminActions.GroupDelete, AdminTargets.Group, group.ID, label, note: form.Note, token: CancellationToken.None); + await moderationLog.Write(User.GetUserId(), AdminActions.GroupDelete, AdminTargets.Group, group.ID, label, note: form.Note, token: CancellationToken.None); return Ok(); } async Task> Views(List roots, CancellationToken token) { var ids = roots.Select(r => r.ID).ToList(); - var links = ids.Count == 0 ? new List() : await _dbEntities.RootToAvatars.Match(ra => ids.Contains(ra.RootId)).ExecuteAsync(token); + var links = ids.Count == 0 ? new List() : await dbEntities.RootToAvatars.Match(ra => ids.Contains(ra.RootId)).ExecuteAsync(token); var avatarIds = links.Select(l => l.AvatarId).Distinct().ToList(); var avatars = avatarIds.Count == 0 ? new Dictionary() - : (await _dbEntities.Avatars.Match(a => avatarIds.Contains(a.ID) && !a.DeletionAt.HasValue).ExecuteAsync(token)).ToDictionary(a => a.ID); + : (await dbEntities.Avatars.Match(a => avatarIds.Contains(a.ID) && !a.DeletionAt.HasValue).ExecuteAsync(token)).ToDictionary(a => a.ID); var owned = avatarIds.Count == 0 ? new List() - : await _dbEntities.Groups.Match(g => avatarIds.Contains(g.OwnerAvatarId) && !g.DeletionAt.HasValue).ExecuteAsync(token); + : await dbEntities.Groups.Match(g => avatarIds.Contains(g.OwnerAvatarId) && !g.DeletionAt.HasValue).ExecuteAsync(token); var me = User.GetUserId(); return roots.Select(root => new ViewAdminRoot { @@ -308,7 +293,7 @@ namespace PrivaPub.Controllers.ClientToServer .OrderBy(a => a.UserName, StringComparer.Ordinal) .Select(a => { - var persona = _localActors.FromAvatar(a); + var persona = localActors.FromAvatar(a); return new ViewAdminPersona { Id = a.ID, diff --git a/PrivaPub/Controllers/ClientToServer/DataController.cs b/PrivaPub/Controllers/ClientToServer/DataController.cs index 9b64a56..58413fc 100644 --- a/PrivaPub/Controllers/ClientToServer/DataController.cs +++ b/PrivaPub/Controllers/ClientToServer/DataController.cs @@ -9,24 +9,16 @@ namespace PrivaPub.Controllers.ClientToServer { [ApiController, Route("clientapi/data")] - public class DataController : ControllerBase + public class DataController( + IDataService dataService, + ILogger logger) : ControllerBase { - readonly IDataService DataService; - readonly ILogger Logger; - - public DataController(IDataService dataService, - ILogger logger) - { - DataService = dataService; - Logger = logger; - } - [HttpGet, Route("/clientapi/data/ping"), AllowAnonymous] - public async ValueTask Ping() => NoContent(); + public async ValueTask Ping(CancellationToken token = default) => NoContent(); [HttpGet, Route("/clientapi/data/current-version"), AllowAnonymous] public IActionResult CurrentVersion() => - Ok(DataService.GetCurrentVersion()); + Ok(dataService.GetCurrentVersion()); [HttpGet, Route("/clientapi/data/languages"), AllowAnonymous] public async Task Languages(CancellationToken cancellationToken) @@ -34,7 +26,7 @@ namespace PrivaPub.Controllers.ClientToServer var result = new WebResult(); try { - var languages = await DataService.GetLanguages(cancellationToken); + var languages = await dataService.GetLanguages(cancellationToken); var viewLanguages = new List(); viewLanguages.AddRange(languages.Select(l => new ViewLanguage @@ -47,7 +39,7 @@ namespace PrivaPub.Controllers.ClientToServer } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(DataController)}.{nameof(Languages)}()"); + logger.LogError(ex, $"{nameof(DataController)}.{nameof(Languages)}()"); return BadRequest(result.Invalidate("Something went wrong.", exception: ex)); } } diff --git a/PrivaPub/Controllers/ClientToServer/DomainBlockController.cs b/PrivaPub/Controllers/ClientToServer/DomainBlockController.cs index 1a28e73..03948f0 100644 --- a/PrivaPub/Controllers/ClientToServer/DomainBlockController.cs +++ b/PrivaPub/Controllers/ClientToServer/DomainBlockController.cs @@ -18,24 +18,13 @@ namespace PrivaPub.Controllers.ClientToServer [ApiController, Route("clientapi/admin/domainblocks"), Authorize(Policy = Policies.IsAdmin)] - public class DomainBlockController : ControllerBase + public class DomainBlockController( + IDomainBlocks domainBlocks, + IStringLocalizer localizer, + Domain.Media.IMediaProxy mediaProxy, + IModerationLog log, + IAccountModeration moderation) : ControllerBase { - readonly IDomainBlocks _domainBlocks; - readonly IStringLocalizer _localizer; - readonly Domain.Media.IMediaProxy _proxy; - readonly IModerationLog _log; - readonly IAccountModeration _moderation; - - public DomainBlockController(IDomainBlocks domainBlocks, IStringLocalizer localizer, Domain.Media.IMediaProxy proxy, IModerationLog log, - IAccountModeration moderation) - { - _moderation = moderation; - _domainBlocks = domainBlocks; - _localizer = localizer; - _proxy = proxy; - _log = log; - } - [HttpGet, Route("/clientapi/admin/domainblocks/list")] public async Task List(CancellationToken token) => Ok((await DB.Default.Find().Sort(b => b.Domain, Order.Ascending).ExecuteAsync(token)).Select(ToView).ToList()); @@ -45,7 +34,7 @@ namespace PrivaPub.Controllers.ClientToServer { var domain = DomainBlocks.Normalise(form.Domain); if (!ModelState.IsValid || Uri.CheckHostName(domain) != UriHostNameType.Dns) - return BadRequest(new WebResult().Invalidate(_localizer["Invalid model."])); + return BadRequest(new WebResult().Invalidate(localizer["Invalid model."])); var block = await DB.Default.UpdateAndGet() .Match(b => b.Domain == domain) @@ -59,13 +48,13 @@ namespace PrivaPub.Controllers.ClientToServer .Modify(b => b.SetOnInsert(x => x.CreatedAt, DateTime.UtcNow)) .Option(o => o.IsUpsert = true) .ExecuteAsync(token); - await _domainBlocks.Reload(token); + await domainBlocks.Reload(token); // a silenced server's posts are limited from now on, and no longer once it is not (R6) - await _moderation.DomainChanged(domain, token); + await moderation.DomainChanged(domain, token); // what the media proxy holds of it goes with the block if (block.Severity == DomainBlockSeverity.Suspend || block.RejectMedia) - _proxy.Purge(domain); - await _log.Write(User.GetUserId(), AdminActions.DomainBlockInsert, AdminTargets.Domain, domain, domain, + mediaProxy.Purge(domain); + await log.Write(User.GetUserId(), AdminActions.DomainBlockInsert, AdminTargets.Domain, domain, domain, note: string.Join(", ", new[] { block.Severity.ToString().ToLowerInvariant(), block.RejectMedia ? "media rejected" : default, block.Published ? (block.Obfuscate ? "published, obfuscated" : "published") : default }.Where(n => n != default)), token: token); return Ok(ToView(block)); @@ -76,11 +65,11 @@ namespace PrivaPub.Controllers.ClientToServer { domain = DomainBlocks.Normalise(domain); var deleted = await DB.Default.DeleteAsync(b => b.Domain == domain); - await _domainBlocks.Reload(token); + await domainBlocks.Reload(token); if (deleted.DeletedCount > 0) - await _moderation.DomainChanged(domain, token); + await moderation.DomainChanged(domain, token); if (deleted.DeletedCount > 0) - await _log.Write(User.GetUserId(), AdminActions.DomainBlockDelete, AdminTargets.Domain, domain, domain, token: token); + await log.Write(User.GetUserId(), AdminActions.DomainBlockDelete, AdminTargets.Domain, domain, domain, token: token); return Ok(); } diff --git a/PrivaPub/Controllers/ClientToServer/EmojiAdminController.cs b/PrivaPub/Controllers/ClientToServer/EmojiAdminController.cs index b8a8e0f..cf75b85 100644 --- a/PrivaPub/Controllers/ClientToServer/EmojiAdminController.cs +++ b/PrivaPub/Controllers/ClientToServer/EmojiAdminController.cs @@ -26,23 +26,15 @@ namespace PrivaPub.Controllers.ClientToServer [ApiController, Route("clientapi/admin/emoji"), Authorize(Policy = Policies.IsAdmin)] - public class EmojiAdminController : ControllerBase + public class EmojiAdminController( + IModerationLog log, + IStringLocalizer localizer, + IMediaService media, + ILocalActorService localActors) : ControllerBase { // a picture up to a megabyte reaches EmojiImage, which refuses one over 256 KB with its reason const long MaxRequestBytes = 1024 * 1024; - readonly IModerationLog _log; - readonly IStringLocalizer _localizer; - readonly IMediaService _media; - readonly ILocalActorService _localActors; - - public EmojiAdminController(IModerationLog log, IStringLocalizer localizer, IMediaService media, ILocalActorService localActors) - { - _log = log; - _localizer = localizer; - _media = media; - _localActors = localActors; - } // the token says administrator; the database has the last word async Task Administrator(CancellationToken token) @@ -51,7 +43,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)); [HttpGet, Route("list")] public async Task List(CancellationToken token) @@ -73,7 +65,7 @@ namespace PrivaPub.Controllers.ClientToServer var existing = await DB.Default.Find().Match(e => e.Key == key).ExecuteFirstAsync(token); if (existing != default && (existing.DeletedAt == default || existing.Shortcode != form.Shortcode)) return Refused(StatusCodes.Status409Conflict, "This shortcode is taken."); - var outcome = await _media.EmojiImage(form.Shortcode, await Picture(token), token); + var outcome = await media.EmojiImage(form.Shortcode, await Picture(token), token); if (!outcome.Ok) return StatusCode(outcome.Status, new WebResult().Invalidate(outcome.Error, outcome.Status)); @@ -100,12 +92,12 @@ namespace PrivaPub.Controllers.ClientToServer .ModifiedCount > 0; if (!saved) { - await _media.Trash(m => m.ID == outcome.Attachment.ID, "emoji not saved", token); + await media.Trash(m => m.ID == outcome.Attachment.ID, "emoji not saved", token); return Refused(StatusCodes.Status409Conflict, "This shortcode is taken."); } await LocalEmojis.Reload(CancellationToken.None); var notes = new[] { existing != default ? "added again" : default, emoji.Disabled ? "disabled" : default, Animated(emoji) }.Where(n => n != default).ToList(); - await _log.Write(admin.ID, AdminActions.EmojiInsert, AdminTargets.Emoji, emoji.ID, $":{emoji.Shortcode}:", + await log.Write(admin.ID, AdminActions.EmojiInsert, AdminTargets.Emoji, emoji.ID, $":{emoji.Shortcode}:", note: notes.Count > 0 ? string.Join(", ", notes) : default, token: token); return Ok(View(emoji)); } @@ -139,7 +131,7 @@ namespace PrivaPub.Controllers.ClientToServer MediaOutcome outcome = default; if (image != default) { - outcome = await _media.EmojiImage(emoji.Shortcode, image, token); + outcome = await media.EmojiImage(emoji.Shortcode, image, token); if (!outcome.Ok) return StatusCode(outcome.Status, new WebResult().Invalidate(outcome.Error, outcome.Status)); Picture(emoji, outcome.Attachment, now); @@ -151,14 +143,14 @@ namespace PrivaPub.Controllers.ClientToServer if ((await DB.Default.Update().Match(e => e.ID == emoji.ID && e.DeletedAt == null).ModifyWith(emoji).ExecuteAsync(token)).ModifiedCount == 0) { if (outcome != default) - await _media.Trash(m => m.ID == outcome.Attachment.ID, "emoji not saved", token); + await media.Trash(m => m.ID == outcome.Attachment.ID, "emoji not saved", token); return NotFound();//deleted meanwhile } if (outcome != default) { var use = LocalEmojis.ServerUse(emoji.Shortcode); if (previous.MediaId != default) - await _media.Trash(m => m.ID == previous.MediaId && m.ServerUse == use, "emoji image replaced", token); + await media.Trash(m => m.ID == previous.MediaId && m.ServerUse == use, "emoji image replaced", token); // the reactions made with it show the picture it has now if (previous.Url != default) { @@ -169,7 +161,7 @@ namespace PrivaPub.Controllers.ClientToServer } } await LocalEmojis.Reload(CancellationToken.None); - await _log.Write(admin.ID, AdminActions.EmojiUpdate, AdminTargets.Emoji, emoji.ID, $":{emoji.Shortcode}:", note: string.Join(", ", changed), token: token); + await log.Write(admin.ID, AdminActions.EmojiUpdate, AdminTargets.Emoji, emoji.ID, $":{emoji.Shortcode}:", note: string.Join(", ", changed), token: token); return Ok(View(emoji)); } @@ -189,9 +181,9 @@ namespace PrivaPub.Controllers.ClientToServer .Modify(e => e.DeletedAt, now).Modify(e => e.UpdatedAt, now).ExecuteAsync(token)).ModifiedCount == 0) return NotFound(); var use = LocalEmojis.ServerUse(emoji.Shortcode); - await _media.Trash(m => m.ID == emoji.MediaId && m.ServerUse == use, "emoji deleted", token); + await media.Trash(m => m.ID == emoji.MediaId && m.ServerUse == use, "emoji deleted", token); await LocalEmojis.Reload(CancellationToken.None); - await _log.Write(admin.ID, AdminActions.EmojiDelete, AdminTargets.Emoji, emoji.ID, $":{emoji.Shortcode}:", token: token); + await log.Write(admin.ID, AdminActions.EmojiDelete, AdminTargets.Emoji, emoji.ID, $":{emoji.Shortcode}:", token: token); return Ok(); } @@ -211,8 +203,8 @@ namespace PrivaPub.Controllers.ClientToServer void Picture(LocalEmoji emoji, Models.Media.MediaAttachment attachment, DateTime now) { emoji.MediaId = attachment.ID; - emoji.Url = _media.Url(attachment.FilePath); - emoji.StaticUrl = attachment.PreviewPath == default ? emoji.Url : _media.Url(attachment.PreviewPath); + emoji.Url = media.Url(attachment.FilePath); + emoji.StaticUrl = attachment.PreviewPath == default ? emoji.Url : media.Url(attachment.PreviewPath); emoji.ContentType = attachment.ContentType; emoji.Width = attachment.Width; emoji.Height = attachment.Height; @@ -237,7 +229,7 @@ namespace PrivaPub.Controllers.ClientToServer Width = emoji.Width, Height = emoji.Height, Size = emoji.Size, - Uri = LocalEmojis.Uri(_localActors.BaseAddress, emoji.Shortcode), + Uri = LocalEmojis.Uri(localActors.BaseAddress, emoji.Shortcode), CreatedAt = emoji.CreatedAt, UpdatedAt = emoji.UpdatedAt, ImageUpdatedAt = emoji.ImageUpdatedAt diff --git a/PrivaPub/Controllers/ClientToServer/GroupController.cs b/PrivaPub/Controllers/ClientToServer/GroupController.cs index f369cb8..4875d12 100644 --- a/PrivaPub/Controllers/ClientToServer/GroupController.cs +++ b/PrivaPub/Controllers/ClientToServer/GroupController.cs @@ -13,52 +13,45 @@ namespace PrivaPub.Controllers.ClientToServer [ApiController, Route("clientapi/group"), Authorize(Policy = Policies.IsUser)] - public class GroupController : ControllerBase + public class GroupController( + IGroupUsersService groupUsersService, + IStringLocalizer localizer) : ControllerBase { - readonly IGroupUsersService _groupUsersService; - readonly IStringLocalizer _localizer; - - public GroupController(IGroupUsersService groupUsersService, IStringLocalizer localizer) - { - _groupUsersService = groupUsersService; - _localizer = localizer; - } - [HttpGet, Route("/clientapi/group/list")] public async Task List([FromQuery] string avatarId, CancellationToken token) => - Answer(await _groupUsersService.GetGroups(User.GetUserId(), avatarId, token)); + Answer(await groupUsersService.GetGroups(User.GetUserId(), avatarId, token)); [HttpPost, Route("/clientapi/group/insert")] public async Task Insert(InsertGroupForm form, CancellationToken token) => - !ModelState.IsValid ? Invalid() : Answer(await _groupUsersService.InsertGroup(User.GetUserId(), form, token)); + !ModelState.IsValid ? Invalid() : Answer(await groupUsersService.InsertGroup(User.GetUserId(), form, token)); [HttpPost, Route("/clientapi/group/update")] public async Task Update(UpdateGroupForm form, CancellationToken token) => - !ModelState.IsValid ? Invalid() : Answer(await _groupUsersService.UpdateGroup(User.GetUserId(), form, token)); + !ModelState.IsValid ? Invalid() : Answer(await groupUsersService.UpdateGroup(User.GetUserId(), form, token)); [HttpPost, Route("/clientapi/group/join")] public async Task Join(JoinGroupForm form, CancellationToken token) => - !ModelState.IsValid ? Invalid() : Answer(await _groupUsersService.JoinGroup(User.GetUserId(), form, token)); + !ModelState.IsValid ? Invalid() : Answer(await groupUsersService.JoinGroup(User.GetUserId(), form, token)); [HttpPost, Route("/clientapi/group/leave")] public async Task Leave(GroupMembershipForm form, CancellationToken token) => - !ModelState.IsValid ? Invalid() : Answer(await _groupUsersService.LeaveGroup(User.GetUserId(), form, token)); + !ModelState.IsValid ? Invalid() : Answer(await groupUsersService.LeaveGroup(User.GetUserId(), form, token)); [HttpPost, Route("/clientapi/group/approve")] public async Task Approve(GroupMembershipForm form, CancellationToken token) => - !ModelState.IsValid ? Invalid() : Answer(await _groupUsersService.ApproveMember(User.GetUserId(), form, token)); + !ModelState.IsValid ? Invalid() : Answer(await groupUsersService.ApproveMember(User.GetUserId(), form, token)); [HttpGet, Route("/clientapi/group/members")] public async Task Members([FromQuery] string avatarId, [FromQuery] string groupId, CancellationToken token) => - Answer(await _groupUsersService.GetMembers(User.GetUserId(), avatarId, groupId, token)); + Answer(await groupUsersService.GetMembers(User.GetUserId(), avatarId, groupId, token)); [HttpPost, Route("/clientapi/group/reject")] public async Task Reject(GroupMembershipForm form, CancellationToken token) => - !ModelState.IsValid ? Invalid() : Answer(await _groupUsersService.RejectMember(User.GetUserId(), form, token)); + !ModelState.IsValid ? Invalid() : Answer(await groupUsersService.RejectMember(User.GetUserId(), form, token)); [HttpPost, Route("/clientapi/group/remove")] public async Task Remove(GroupMembershipForm form, CancellationToken token) => - !ModelState.IsValid ? Invalid() : Answer(await _groupUsersService.RemoveMember(User.GetUserId(), form, token)); + !ModelState.IsValid ? Invalid() : Answer(await groupUsersService.RemoveMember(User.GetUserId(), form, token)); // the group's owner deletes it, with the login's password (R6): its members and followers are told, its name stays // taken (GroupRemoval) @@ -69,19 +62,19 @@ namespace PrivaPub.Controllers.ClientToServer if (!ModelState.IsValid) return Invalid(); var rootId = User.GetUserId(); - if (!await users.PasswordMatches(rootId, form.Password)) - return StatusCode(StatusCodes.Status403Forbidden, new WebResult().Invalidate(_localizer[RootUsersService.NoMatch], StatusCodes.Status403Forbidden)); + if (!await users.PasswordMatches(rootId, form.Password, token)) + return StatusCode(StatusCodes.Status403Forbidden, new WebResult().Invalidate(localizer[RootUsersService.NoMatch], StatusCodes.Status403Forbidden)); var owns = await dbEntities.RootToAvatars.Match(ra => ra.RootId == rootId && ra.AvatarId == form.AvatarId).ExecuteAnyAsync(token); var group = owns ? await dbEntities.Groups.MatchID(form.GroupId).Match(g => !g.DeletionAt.HasValue).ExecuteFirstAsync(token) : default; if (group == default) - return NotFound(new WebResult().Invalidate(_localizer["Group not found."], StatusCodes.Status404NotFound)); + return NotFound(new WebResult().Invalidate(localizer["Group not found."], StatusCodes.Status404NotFound)); if (group.OwnerAvatarId != form.AvatarId) - return StatusCode(StatusCodes.Status403Forbidden, new WebResult().Invalidate(_localizer["Only the group's owner can delete it."], StatusCodes.Status403Forbidden)); + return StatusCode(StatusCodes.Status403Forbidden, new WebResult().Invalidate(localizer["Only the group's owner can delete it."], StatusCodes.Status403Forbidden)); await groups.Remove(group.ID, CancellationToken.None); return Ok(); } - IActionResult Invalid() => BadRequest(new WebResult().Invalidate(_localizer["Invalid model."])); + IActionResult Invalid() => BadRequest(new WebResult().Invalidate(localizer["Invalid model."])); IActionResult Answer(WebResult result) => result.IsValid ? Ok(result.Data) : StatusCode(result.StatusCode, result); } diff --git a/PrivaPub/Controllers/ClientToServer/InstanceAdminController.cs b/PrivaPub/Controllers/ClientToServer/InstanceAdminController.cs index 1c689d1..a8d6228 100644 --- a/PrivaPub/Controllers/ClientToServer/InstanceAdminController.cs +++ b/PrivaPub/Controllers/ClientToServer/InstanceAdminController.cs @@ -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 localizer, + ILocalActorService localActors, + ILogger logger) : ControllerBase { const int MaxSettingsRelays = 20; const string Thumbnail = "thumbnail"; - readonly IInstanceSettings _settings; - readonly IModerationLog _log; - readonly IStringLocalizer _localizer; - readonly ILocalActorService _localActors; - readonly ILogger _logger; - - public InstanceAdminController(IInstanceSettings settings, IModerationLog log, IStringLocalizer localizer, ILocalActorService localActors, - ILogger logger) - { - _settings = settings; - _log = log; - _localizer = localizer; - _localActors = localActors; - _logger = logger; - } // the token says administrator; the database has the last word async Task 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(); 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 get, Action 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().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().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); diff --git a/PrivaPub/Controllers/ClientToServer/ModeratorController.cs b/PrivaPub/Controllers/ClientToServer/ModeratorController.cs index 5ba95db..ddc21ae 100644 --- a/PrivaPub/Controllers/ClientToServer/ModeratorController.cs +++ b/PrivaPub/Controllers/ClientToServer/ModeratorController.cs @@ -17,32 +17,22 @@ namespace PrivaPub.Controllers.ClientToServer [ApiController, Route("clientapi/moderator"), Authorize(Policy = Policies.IsModerator)] - public class ModeratorController : ControllerBase + public class ModeratorController( + IInstanceSettings settings, + IModerationLog moderationLog, + IAccountModeration accountModeration, + Federation.Actors.ILocalActorService localActors, + Microsoft.Extensions.Localization.IStringLocalizer localizer) : ControllerBase { const int MaxLogPage = 100; const int MaxAccountsPage = 100; - readonly IInstanceSettings _settings; - readonly IModerationLog _log; - readonly IAccountModeration _moderation; - readonly Federation.Actors.ILocalActorService _localActors; - readonly Microsoft.Extensions.Localization.IStringLocalizer _localizer; - - public ModeratorController(IInstanceSettings settings, IModerationLog log, IAccountModeration moderation, - Federation.Actors.ILocalActorService localActors, Microsoft.Extensions.Localization.IStringLocalizer localizer) - { - _settings = settings; - _log = log; - _moderation = moderation; - _localActors = localActors; - _localizer = localizer; - } [HttpGet, Route("/clientapi/moderator/reports")] public async Task Reports([FromQuery] bool resolved, CancellationToken token) { - var rules = _settings.Current.Rules.ToDictionary(r => r.Id, r => r.Text ?? string.Empty); + var rules = settings.Current.Rules.ToDictionary(r => r.Id, r => r.Text ?? string.Empty); return Ok((await DB.Default.Find().Match(r => r.IsResolved == resolved).Sort(r => r.ID, Order.Descending).Limit(100).ExecuteAsync(token)) .Select(r => new ViewReport { @@ -77,7 +67,7 @@ namespace PrivaPub.Controllers.ClientToServer form ??= new ResolveReportForm(); var action = string.IsNullOrWhiteSpace(form.Action) ? ModerationActions.None : form.Action.Trim().ToLowerInvariant(); if (!ModerationActions.IsResolution(action)) - return UnprocessableEntity(new WebResult().Invalidate(_localizer["Unknown moderation action."], StatusCodes.Status422UnprocessableEntity)); + return UnprocessableEntity(new WebResult().Invalidate(localizer["Unknown moderation action."], StatusCodes.Status422UnprocessableEntity)); var by = User.GetUserId(); var report = await DB.Default.Find().MatchID(id).ExecuteFirstAsync(token); if (report == default) @@ -85,16 +75,16 @@ namespace PrivaPub.Controllers.ClientToServer switch (action) { case ModerationActions.Silence or ModerationActions.Suspend: - var moderated = await _moderation.Moderate(by, report.TargetAccountId, action, form.Note, form.Warning, report.ID, token); + var moderated = await accountModeration.Moderate(by, report.TargetAccountId, action, form.Note, form.Warning, report.ID, token); if (!moderated.IsValid) return StatusCode(moderated.StatusCode, moderated); break; case ModerationActions.RemovePosts: if (report.PostIds.Count == 0) - return UnprocessableEntity(new WebResult().Invalidate(_localizer["The report names no posts."], StatusCodes.Status422UnprocessableEntity)); + return UnprocessableEntity(new WebResult().Invalidate(localizer["The report names no posts."], StatusCodes.Status422UnprocessableEntity)); foreach (var postId in report.PostIds) { - var removed = await _moderation.RemovePost(by, postId, form.Note, form.Warning, report.ID, token); + var removed = await accountModeration.RemovePost(by, postId, form.Note, form.Warning, report.ID, token); if (!removed.IsValid && removed.StatusCode != StatusCodes.Status404NotFound)//one already gone is removed return StatusCode(removed.StatusCode, removed); } @@ -107,7 +97,7 @@ namespace PrivaPub.Controllers.ClientToServer .Modify(r => r.Resolution, action) .Modify(r => r.ResolutionNote, string.IsNullOrWhiteSpace(form.Note) ? null : form.Note.Trim()) .ExecuteAsync(CancellationToken.None); - await _log.Write(by, AdminActions.ReportResolve, AdminTargets.Report, id, report.Category, reportId: id, + await moderationLog.Write(by, AdminActions.ReportResolve, AdminTargets.Report, id, report.Category, reportId: id, note: action == ModerationActions.None ? form.Note : string.IsNullOrWhiteSpace(form.Note) ? action : $"{action}: {form.Note.Trim()}", token: CancellationToken.None); return Ok(); @@ -125,21 +115,21 @@ namespace PrivaPub.Controllers.ClientToServer return Ok(new ViewModeratedAccountsPage { Items = items }); if (Uri.TryCreate(q, UriKind.Absolute, out var address) && address.Scheme is "https" or "http") { - if (await _localActors.FindByUri(q, token) is { Kind: Models.Federation.LocalActorKind.Person } local + if (await localActors.FindByUri(q, token) is { Kind: Models.Federation.LocalActorKind.Person } local && await DB.Default.Find().MatchID(local.Id).ExecuteFirstAsync(token) is { } persona) - items.Add(_moderation.View(persona)); - items.AddRange((await DB.Default.Find().Match(f => f.ActorURI == q || f.Url == q).Limit(limit).ExecuteAsync(token)).Select(_moderation.View)); + items.Add(accountModeration.View(persona)); + items.AddRange((await DB.Default.Find().Match(f => f.ActorURI == q || f.Url == q).Limit(limit).ExecuteAsync(token)).Select(accountModeration.View)); return Ok(new ViewModeratedAccountsPage { Items = items.Take(limit).ToList() }); } var parts = q.Split('@', 2); var name = parts[0]; var domain = parts.Length > 1 ? parts[1].ToLowerInvariant() : default; - var here = new Uri(_localActors.BaseAddress).Authority; + var here = new Uri(localActors.BaseAddress).Authority; if (domain == default || domain == here) { var lowered = name.ToLowerInvariant(); items.AddRange((await DB.Default.Find().Match(a => a.UserName.StartsWith(lowered) && !a.DeletionAt.HasValue) - .Sort(a => a.UserName, Order.Ascending).Limit(limit).ExecuteAsync(token)).Select(_moderation.View)); + .Sort(a => a.UserName, Order.Ascending).Limit(limit).ExecuteAsync(token)).Select(accountModeration.View)); } if (domain != here && items.Count < limit && name.Length > 0) { @@ -148,7 +138,7 @@ namespace PrivaPub.Controllers.ClientToServer if (domain != default) remote.Match(f => f.Regex(a => a.Domain, new MongoDB.Bson.BsonRegularExpression("^" + System.Text.RegularExpressions.Regex.Escape(domain), "i"))); items.AddRange((await remote.Match(f => !f.DeletionAt.HasValue).Sort(f => f.UserName, Order.Ascending).Limit(limit - items.Count).ExecuteAsync(token)) - .Select(_moderation.View)); + .Select(accountModeration.View)); } return Ok(new ViewModeratedAccountsPage { Items = items }); } @@ -162,7 +152,7 @@ namespace PrivaPub.Controllers.ClientToServer limit = Math.Clamp(limit, 1, MaxAccountsPage); var locals = await DB.Default.Find().Match(a => (a.SilencedAt != null || a.SuspendedAt != null) && a.DeletionAt == null).ExecuteAsync(token); var remotes = await DB.Default.Find().Match(f => f.SilencedAt != null || f.SuspendedAt != null).ExecuteAsync(token); - var all = locals.Select(_moderation.View).Concat(remotes.Select(_moderation.View)) + var all = locals.Select(accountModeration.View).Concat(remotes.Select(accountModeration.View)) .OrderByDescending(a => Latest(a.SilencedAt, a.SuspendedAt)).ThenBy(a => a.Id, StringComparer.Ordinal).ToList(); return Ok(new ViewModeratedAccountsPage { @@ -175,15 +165,15 @@ namespace PrivaPub.Controllers.ClientToServer [HttpGet, Route("/clientapi/moderator/accounts/{id}")] public async Task Account(string id, CancellationToken token) => - await _moderation.View(id, token) is { } account ? Ok(account) : NotFound(); + await accountModeration.View(id, token) is { } account ? Ok(account) : NotFound(); // silence, unsilence, suspend or unsuspend a persona here or an account elsewhere [HttpPost, Route("/clientapi/moderator/accounts/moderate")] public async Task Moderate(ModerateAccountForm form, CancellationToken token) { if (!ModelState.IsValid) - return BadRequest(new WebResult().Invalidate(_localizer["Invalid model."])); - var result = await _moderation.Moderate(User.GetUserId(), form.AccountId, form.Action.Trim().ToLowerInvariant(), form.Note, form.Warning, default, token); + return BadRequest(new WebResult().Invalidate(localizer["Invalid model."])); + var result = await accountModeration.Moderate(User.GetUserId(), form.AccountId, form.Action.Trim().ToLowerInvariant(), form.Note, form.Warning, default, token); return result.IsValid ? Ok(result.Data) : StatusCode(result.StatusCode, result); } @@ -192,8 +182,8 @@ namespace PrivaPub.Controllers.ClientToServer public async Task RemovePost(RemovePostForm form, CancellationToken token) { if (!ModelState.IsValid) - return BadRequest(new WebResult().Invalidate(_localizer["Invalid model."])); - var result = await _moderation.RemovePost(User.GetUserId(), form.PostId, form.Note, form.Warning, default, token); + return BadRequest(new WebResult().Invalidate(localizer["Invalid model."])); + var result = await accountModeration.RemovePost(User.GetUserId(), form.PostId, form.Note, form.Warning, default, token); return result.IsValid ? Ok() : StatusCode(result.StatusCode, result); } diff --git a/PrivaPub/Controllers/ClientToServer/PostController.cs b/PrivaPub/Controllers/ClientToServer/PostController.cs index 2af3ea4..0ccdbdc 100644 --- a/PrivaPub/Controllers/ClientToServer/PostController.cs +++ b/PrivaPub/Controllers/ClientToServer/PostController.cs @@ -13,46 +13,39 @@ namespace PrivaPub.Controllers.ClientToServer [ApiController, Route("clientapi/post"), Authorize(Policy = Policies.IsUser)] - public class PostController : ControllerBase + public class PostController( + IPostsService postsService, + IStringLocalizer localizer) : ControllerBase { - readonly IPostsService _postsService; - readonly IStringLocalizer _localizer; - - public PostController(IPostsService postsService, IStringLocalizer localizer) - { - _postsService = postsService; - _localizer = localizer; - } - [HttpGet, Route("/clientapi/post/list")] public async Task List([FromQuery] string avatarId, [FromQuery] string groupId, CancellationToken token) => - Answer(await _postsService.GetPosts(User.GetUserId(), avatarId, groupId, token)); + Answer(await postsService.GetPosts(User.GetUserId(), avatarId, groupId, token)); [HttpPost, Route("/clientapi/post/insert")] public async Task Insert(InsertPostForm form, CancellationToken token) => - !ModelState.IsValid ? Invalid() : Answer(await _postsService.InsertPost(User.GetUserId(), form, token)); + !ModelState.IsValid ? Invalid() : Answer(await postsService.InsertPost(User.GetUserId(), form, token)); [HttpGet, Route("/clientapi/post/nearby")] public async Task Nearby([FromQuery] string avatarId, [FromQuery] double latitude, [FromQuery] double longitude, CancellationToken token) => - Answer(await _postsService.Nearby(User.GetUserId(), avatarId, latitude, longitude, token)); + Answer(await postsService.Nearby(User.GetUserId(), avatarId, latitude, longitude, token)); [HttpPost, Route("/clientapi/post/update")] public async Task Update(UpdatePostForm form, CancellationToken token) => - !ModelState.IsValid ? Invalid() : Answer(await _postsService.UpdatePost(User.GetUserId(), form, token)); + !ModelState.IsValid ? Invalid() : Answer(await postsService.UpdatePost(User.GetUserId(), form, token)); [HttpPost, Route("/clientapi/post/delete")] public async Task Delete(DeletePostForm form, CancellationToken token) => - !ModelState.IsValid ? Invalid() : Answer(await _postsService.DeletePost(User.GetUserId(), form, token)); + !ModelState.IsValid ? Invalid() : Answer(await postsService.DeletePost(User.GetUserId(), form, token)); [HttpGet, Route("/clientapi/dm/list")] public async Task Dms([FromQuery] string avatarId, [FromQuery] string dmGroupId, CancellationToken token) => - Answer(await _postsService.GetDms(User.GetUserId(), avatarId, dmGroupId, token)); + Answer(await postsService.GetDms(User.GetUserId(), avatarId, dmGroupId, token)); [HttpPost, Route("/clientapi/dm/insert")] public async Task InsertDm(InsertDmForm form, CancellationToken token) => - !ModelState.IsValid ? Invalid() : Answer(await _postsService.InsertDm(User.GetUserId(), form, token)); + !ModelState.IsValid ? Invalid() : Answer(await postsService.InsertDm(User.GetUserId(), form, token)); - IActionResult Invalid() => BadRequest(new WebResult().Invalidate(_localizer["Invalid model."])); + IActionResult Invalid() => BadRequest(new WebResult().Invalidate(localizer["Invalid model."])); IActionResult Answer(WebResult result) => result.IsValid ? Ok(result.Data) : StatusCode(result.StatusCode, result); } diff --git a/PrivaPub/Controllers/ClientToServer/PrivateAvatarController.cs b/PrivaPub/Controllers/ClientToServer/PrivateAvatarController.cs index ad57121..95cf27b 100644 --- a/PrivaPub/Controllers/ClientToServer/PrivateAvatarController.cs +++ b/PrivaPub/Controllers/ClientToServer/PrivateAvatarController.cs @@ -13,38 +13,28 @@ namespace PrivaPub.Controllers.ClientToServer [ApiController, Route("clientapi/avatar/private"), Authorize(Policy = Policies.IsUser)] - public class PrivateAvatarController : ControllerBase + public class PrivateAvatarController( + IPrivateAvatarUsersService privateAvatarUsersService, + IStringLocalizer localizer, + ILogger logger) : ControllerBase { - readonly ILogger _logger; - readonly IPrivateAvatarUsersService _privateAvatarUsersService; - readonly IStringLocalizer _localizer; - - public PrivateAvatarController(IPrivateAvatarUsersService privateAvatarUsersService, - IStringLocalizer localizer, - ILogger logger) - { - _privateAvatarUsersService = privateAvatarUsersService; - _localizer = localizer; - _logger = logger; - } - [HttpGet, Route("/clientapi/avatar/private/list")] public async Task GetAvatars(CancellationToken token) { - var result = await _privateAvatarUsersService.GetRootAvatars(User.GetUserId(), token); + var result = await privateAvatarUsersService.GetRootAvatars(User.GetUserId(), token); return result.IsValid ? Ok(result.Data) : StatusCode(result.StatusCode, result); } [HttpPost, Route("/clientapi/avatar/private/insert")] - public async Task InsertAvatar(InsertAvatarForm model) + public async Task InsertAvatar(InsertAvatarForm model, CancellationToken token = default) { var result = new WebResult(); if (!ModelState.IsValid) - return BadRequest(result.Invalidate(_localizer["Invalid model."])); + return BadRequest(result.Invalidate(localizer["Invalid model."])); try { model.RootId = User.GetUserId(); - result = await _privateAvatarUsersService.InsertAvatar(model); + result = await privateAvatarUsersService.InsertAvatar(model, token); if (!result.IsValid) return StatusCode(result.StatusCode, result); @@ -52,8 +42,8 @@ namespace PrivaPub.Controllers.ClientToServer } catch (Exception ex) { - _logger.LogError(ex, $"{nameof(PrivateAvatarController)}.{nameof(InsertAvatar)}()"); - return BadRequest(result.Invalidate(_localizer["Something went wrong."])); + logger.LogError(ex, $"{nameof(PrivateAvatarController)}.{nameof(InsertAvatar)}()"); + return BadRequest(result.Invalidate(localizer["Something went wrong."])); } } @@ -64,13 +54,13 @@ namespace PrivaPub.Controllers.ClientToServer [FromServices] Services.IPersonaRemoval personas, [FromServices] StaticServices.DbEntities dbEntities, CancellationToken token) { if (!ModelState.IsValid) - return BadRequest(new WebResult().Invalidate(_localizer["Invalid model."])); + return BadRequest(new WebResult().Invalidate(localizer["Invalid model."])); var rootId = User.GetUserId(); - if (!await users.PasswordMatches(rootId, form.Password)) - return StatusCode(StatusCodes.Status403Forbidden, new WebResult().Invalidate(_localizer[Services.RootUsersService.NoMatch], StatusCodes.Status403Forbidden)); + if (!await users.PasswordMatches(rootId, form.Password, token)) + return StatusCode(StatusCodes.Status403Forbidden, new WebResult().Invalidate(localizer[Services.RootUsersService.NoMatch], StatusCodes.Status403Forbidden)); if (!await dbEntities.RootToAvatars.Match(ra => ra.RootId == rootId && ra.AvatarId == form.AvatarId).ExecuteAnyAsync(token) || !await personas.Remove(form.AvatarId, CancellationToken.None)) - return NotFound(new WebResult().Invalidate(_localizer["Avatar not found."], StatusCodes.Status404NotFound)); + return NotFound(new WebResult().Invalidate(localizer["Avatar not found."], StatusCodes.Status404NotFound)); return Ok(); } @@ -80,7 +70,7 @@ namespace PrivaPub.Controllers.ClientToServer { var avatar = await OwnPersona(avatarId, dbEntities, token); return avatar == default - ? NotFound(new WebResult().Invalidate(_localizer["Avatar not found."], StatusCodes.Status404NotFound)) + ? NotFound(new WebResult().Invalidate(localizer["Avatar not found."], StatusCodes.Status404NotFound)) : Ok(PreferencesOf(avatar)); } @@ -88,12 +78,12 @@ namespace PrivaPub.Controllers.ClientToServer public async Task SavePreferences(PersonaPreferencesForm form, [FromServices] StaticServices.DbEntities dbEntities, CancellationToken token) { if (!ModelState.IsValid) - return BadRequest(new WebResult().Invalidate(_localizer["Invalid model."])); + return BadRequest(new WebResult().Invalidate(localizer["Invalid model."])); if (!Models.User.ExpandMediaModes.IsKnown(form.ExpandMedia)) - return UnprocessableEntity(new WebResult().Invalidate(_localizer["Media are shown as default, show_all or hide_all."], StatusCodes.Status422UnprocessableEntity)); + return UnprocessableEntity(new WebResult().Invalidate(localizer["Media are shown as default, show_all or hide_all."], StatusCodes.Status422UnprocessableEntity)); var avatar = await OwnPersona(form.AvatarId, dbEntities, token); if (avatar == default) - return NotFound(new WebResult().Invalidate(_localizer["Avatar not found."], StatusCodes.Status404NotFound)); + return NotFound(new WebResult().Invalidate(localizer["Avatar not found."], StatusCodes.Status404NotFound)); await MongoDB.Entities.DB.Default.Update().MatchID(avatar.ID) .Modify(a => a.Settings.ExpandMedia, form.ExpandMedia) .Modify(a => a.Settings.ExpandSpoilers, form.ExpandSpoilers) @@ -120,15 +110,15 @@ namespace PrivaPub.Controllers.ClientToServer }; [HttpPost, Route("/clientapi/avatar/private/update")] - public async Task UpdateAvatar(UpdateAvatarForm model) + public async Task UpdateAvatar(UpdateAvatarForm model, CancellationToken token = default) { var result = new WebResult(); if (!ModelState.IsValid) - return BadRequest(result.Invalidate(_localizer["Invalid model."])); + return BadRequest(result.Invalidate(localizer["Invalid model."])); try { model.RootId = User.GetUserId(); - result = await _privateAvatarUsersService.UpdateAvatar(model); + result = await privateAvatarUsersService.UpdateAvatar(model, token); if (!result.IsValid) return StatusCode(result.StatusCode, result); @@ -136,8 +126,8 @@ namespace PrivaPub.Controllers.ClientToServer } catch (Exception ex) { - _logger.LogError(ex, $"{nameof(PrivateAvatarController)}.{nameof(UpdateAvatar)}()"); - return BadRequest(result.Invalidate(_localizer["Something went wrong."])); + logger.LogError(ex, $"{nameof(PrivateAvatarController)}.{nameof(UpdateAvatar)}()"); + return BadRequest(result.Invalidate(localizer["Something went wrong."])); } } diff --git a/PrivaPub/Controllers/ClientToServer/RootUserController.cs b/PrivaPub/Controllers/ClientToServer/RootUserController.cs index 26f271e..028de9f 100644 --- a/PrivaPub/Controllers/ClientToServer/RootUserController.cs +++ b/PrivaPub/Controllers/ClientToServer/RootUserController.cs @@ -28,90 +28,68 @@ namespace PrivaPub.Controllers.ClientToServer { [ApiController, Route("clientapi/user")] - public class RootUserController : ControllerBase + public class RootUserController( + IRootUsersService usersService, + IGroupUsersService groupUsersService, + IPrivateAvatarUsersService avatarUsersService, + ILocalActorService localActors, + AuthTokenManager authTokenManager, + IOptionsMonitor appConfiguration, + IOptionsMonitor registrations, + IStringLocalizer localizer, + ILogger logger) : ControllerBase { - readonly IRootUsersService UsersService; - readonly IGroupUsersService GroupUsersService; - readonly IPrivateAvatarUsersService AvatarUsersService; - readonly ILocalActorService LocalActors; - readonly AuthTokenManager AuthTokenManager; - readonly IOptionsMonitor AppConfiguration; - readonly IOptionsMonitor Registrations; - readonly ILogger Logger; - readonly IStringLocalizer Localizer; - - public RootUserController(IRootUsersService usersService, - IGroupUsersService groupUsersService, - IPrivateAvatarUsersService avatarUsersService, - ILocalActorService localActors, - AuthTokenManager authTokenManager, - IOptionsMonitor appConfiguration, - IOptionsMonitor registrations, - IStringLocalizer localizer, - ILogger logger) - { - Registrations = registrations; - UsersService = usersService; - GroupUsersService = groupUsersService; - AvatarUsersService = avatarUsersService; - LocalActors = localActors; - AuthTokenManager = authTokenManager; - AppConfiguration = appConfiguration; - Localizer = localizer; - Logger = logger; - } - #region User endpoints [HttpPost, Route("/clientapi/user/signup"), EnableRateLimiting(RateLimiting.Accounts), Authorize(Policy = Policies.IsUser), AllowAnonymous] - public async Task SignUp(LoginForm signUpForm) + public async Task SignUp(LoginForm signUpForm, CancellationToken token = default) { if (User.Identity?.IsAuthenticated ?? false) return Redirect("/"); var result = new WebResult(); - if (!Registrations.CurrentValue.IsOpen) - return StatusCode(StatusCodes.Status403Forbidden, result.Invalidate(Localizer[RegistrationOptions.ClosedMessage], StatusCodes.Status403Forbidden)); + if (!registrations.CurrentValue.IsOpen) + return StatusCode(StatusCodes.Status403Forbidden, result.Invalidate(localizer[RegistrationOptions.ClosedMessage], StatusCodes.Status403Forbidden)); if (!ModelState.IsValid) - return BadRequest(result.Invalidate(Localizer["Invalid model."])); + return BadRequest(result.Invalidate(localizer["Invalid model."])); try { - result = await UsersService.SignUpAsync(signUpForm); + result = await usersService.SignUpAsync(signUpForm, token); if (!result.IsValid) return StatusCode(result.StatusCode, result); (var user, var userSettings) = ((RootUser, ViewUserSettings))result.Data; - var jwtUser = AuthTokenManager.GenerateToken(user, userSettings); + var jwtUser = authTokenManager.GenerateToken(user, userSettings); return Ok(jwtUser); } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(User)}.{nameof(SignUp)}()"); - return BadRequest(result.Invalidate(Localizer["Something went wrong."])); + logger.LogError(ex, $"{nameof(User)}.{nameof(SignUp)}()"); + return BadRequest(result.Invalidate(localizer["Something went wrong."])); } } [HttpPost, Route("/clientapi/user/login"), EnableRateLimiting(RateLimiting.Accounts), Authorize(Policy = Policies.IsUser), AllowAnonymous] - public async Task Login(LoginForm loginForm) + public async Task Login(LoginForm loginForm, CancellationToken token = default) { if (User.Identity?.IsAuthenticated ?? false) return Redirect("/"); var result = new WebResult(); if (!ModelState.IsValid) - return BadRequest(result.Invalidate(Localizer["Invalid model."])); + return BadRequest(result.Invalidate(localizer["Invalid model."])); try { - result = await UsersService.LoginAsync(loginForm); + result = await usersService.LoginAsync(loginForm, token); if (!result.IsValid) return StatusCode(result.StatusCode, result); var (user, userSettings) = ((RootUser, ViewUserSettings))result.Data; - var jwtUser = AuthTokenManager.GenerateToken(user, userSettings); + var jwtUser = authTokenManager.GenerateToken(user, userSettings); return Ok(jwtUser); } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(User)}.{nameof(Login)}()"); - return BadRequest(result.Invalidate(Localizer["Something went wrong."])); + logger.LogError(ex, $"{nameof(User)}.{nameof(Login)}()"); + return BadRequest(result.Invalidate(localizer["Something went wrong."])); } } @@ -120,10 +98,10 @@ namespace PrivaPub.Controllers.ClientToServer { var result = new WebResult(); if (!ModelState.IsValid) - return BadRequest(result.Invalidate(Localizer["Invalid model."])); + return BadRequest(result.Invalidate(localizer["Invalid model."])); try { - var invitation = await GroupUsersService.GetInvitation(signUpForm.InvitationCode, signUpForm.InvitationPassword, token); + var invitation = await groupUsersService.GetInvitation(signUpForm.InvitationCode, signUpForm.InvitationPassword, token); if (!invitation.IsValid) return StatusCode(invitation.StatusCode, invitation); @@ -132,16 +110,16 @@ namespace PrivaPub.Controllers.ClientToServer if (personaProblem != default) return BadRequest(result.Invalidate(personaProblem)); - result = await UsersService.SignUpAsync(signUpForm); + result = await usersService.SignUpAsync(signUpForm, token); if (!result.IsValid) return StatusCode(result.StatusCode, result); var (user, userSettings) = ((RootUser, ViewUserSettings))result.Data; - var avatar = await InsertPersona(user.ID, avatarUserName, signUpForm.AvatarName); + var avatar = await InsertPersona(user.ID, avatarUserName, signUpForm.AvatarName, token); if (!avatar.IsValid) return StatusCode(avatar.StatusCode, avatar); - var joined = await GroupUsersService.JoinGroup(user.ID, new JoinGroupForm + var joined = await groupUsersService.JoinGroup(user.ID, new JoinGroupForm { AvatarId = ((ViewAvatar)avatar.Data).Id, InvitationCode = signUpForm.InvitationCode, @@ -150,12 +128,12 @@ namespace PrivaPub.Controllers.ClientToServer if (!joined.IsValid) return StatusCode(joined.StatusCode, joined); - return Ok(AuthTokenManager.GenerateToken(user, userSettings)); + return Ok(authTokenManager.GenerateToken(user, userSettings)); } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(User)}.{nameof(InvitationSignUp)}()"); - return BadRequest(result.Invalidate(Localizer["Something went wrong."])); + logger.LogError(ex, $"{nameof(User)}.{nameof(InvitationSignUp)}()"); + return BadRequest(result.Invalidate(localizer["Something went wrong."])); } } @@ -164,19 +142,19 @@ namespace PrivaPub.Controllers.ClientToServer { var result = new WebResult(); if (!ModelState.IsValid) - return BadRequest(result.Invalidate(Localizer["Invalid model."])); + return BadRequest(result.Invalidate(localizer["Invalid model."])); try { - var invitation = await GroupUsersService.GetInvitation(loginForm.InvitationCode, loginForm.InvitationPassword, token); + var invitation = await groupUsersService.GetInvitation(loginForm.InvitationCode, loginForm.InvitationPassword, token); if (!invitation.IsValid) return StatusCode(invitation.StatusCode, invitation); - result = await UsersService.LoginAsync(loginForm); + result = await usersService.LoginAsync(loginForm, token); if (!result.IsValid) return StatusCode(result.StatusCode, result); var (user, userSettings) = ((RootUser, ViewUserSettings))result.Data; - var avatars = await AvatarUsersService.GetRootAvatars(user.ID, token); + var avatars = await avatarUsersService.GetRootAvatars(user.ID, token); var avatarUserName = loginForm.AvatarUserName?.Trim().ToLowerInvariant(); var avatar = string.IsNullOrEmpty(avatarUserName) ? (avatars.Data as List)?.FirstOrDefault() @@ -186,13 +164,13 @@ namespace PrivaPub.Controllers.ClientToServer var personaProblem = await PersonaProblem(avatarUserName, user.UserName, token); if (personaProblem != default) return BadRequest(new WebResult().Invalidate(personaProblem)); - var inserted = await InsertPersona(user.ID, avatarUserName, loginForm.AvatarName); + var inserted = await InsertPersona(user.ID, avatarUserName, loginForm.AvatarName, token); if (!inserted.IsValid) return StatusCode(inserted.StatusCode, inserted); avatar = (ViewAvatar)inserted.Data; } - var joined = await GroupUsersService.JoinGroup(user.ID, new JoinGroupForm + var joined = await groupUsersService.JoinGroup(user.ID, new JoinGroupForm { AvatarId = avatar.Id, InvitationCode = loginForm.InvitationCode, @@ -201,12 +179,12 @@ namespace PrivaPub.Controllers.ClientToServer if (!joined.IsValid) return StatusCode(joined.StatusCode, joined); - return Ok(AuthTokenManager.GenerateToken(user, userSettings)); + return Ok(authTokenManager.GenerateToken(user, userSettings)); } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(User)}.{nameof(InvitationLogin)}()"); - return BadRequest(result.Invalidate(Localizer["Something went wrong."])); + logger.LogError(ex, $"{nameof(User)}.{nameof(InvitationLogin)}()"); + return BadRequest(result.Invalidate(localizer["Something went wrong."])); } } @@ -216,14 +194,14 @@ namespace PrivaPub.Controllers.ClientToServer // The server's first login, made while it has no administrator (owner decision 2026-10-16: first come, first served): // it is made the administrator, with its first persona, and setup closes for good. Sign-up stays closed to everyone - // else (Registrations), so NodeInfo and the instance API don't change. + // else (registrations), so NodeInfo and the instance API don't change. [HttpPost, Route("/clientapi/user/setup"), EnableRateLimiting(RateLimiting.Accounts), AllowAnonymous] public async Task SetUp(SetupForm setupForm, CancellationToken token) { if (User.Identity?.IsAuthenticated ?? false) return Redirect("/"); var result = new WebResult(); if (!ModelState.IsValid) - return BadRequest(result.Invalidate(Localizer["Invalid model."])); + return BadRequest(result.Invalidate(localizer["Invalid model."])); var claimed = false; var adminId = default(string); try @@ -240,10 +218,10 @@ namespace PrivaPub.Controllers.ClientToServer if (!claimed) return SetUpAlready(); - result = await UsersService.SignUpAsync(setupForm); + result = await usersService.SignUpAsync(setupForm, token); if (!result.IsValid) { - await ServerSetup.Release(); + await ServerSetup.Release(CancellationToken.None); return StatusCode(result.StatusCode, result); } var (user, userSettings) = ((RootUser, ViewUserSettings))result.Data; @@ -253,42 +231,42 @@ namespace PrivaPub.Controllers.ClientToServer await ServerSetup.Claimed(adminId, CancellationToken.None); // set up from here, whatever happens to the persona: it can be made in the client's settings - var avatar = await InsertPersona(user.ID, avatarUserName, setupForm.AvatarName); + var avatar = await InsertPersona(user.ID, avatarUserName, setupForm.AvatarName, token); if (!avatar.IsValid) return StatusCode(avatar.StatusCode, avatar); - return Ok(AuthTokenManager.GenerateToken(user, userSettings)); + return Ok(authTokenManager.GenerateToken(user, userSettings)); } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(User)}.{nameof(SetUp)}()"); + logger.LogError(ex, $"{nameof(User)}.{nameof(SetUp)}()"); if (claimed && adminId == default) - await ServerSetup.Release(); - return BadRequest(result.Invalidate(Localizer["Something went wrong."])); + await ServerSetup.Release(CancellationToken.None); + return BadRequest(result.Invalidate(localizer["Something went wrong."])); } } IActionResult SetUpAlready() => StatusCode(StatusCodes.Status403Forbidden, - new WebResult().Invalidate(Localizer["This server is already set up: joining it takes a group invitation."], StatusCodes.Status403Forbidden)); + new WebResult().Invalidate(localizer["This server is already set up: joining it takes a group invitation."], StatusCodes.Status403Forbidden)); - Task InsertPersona(string rootId, string avatarUserName, string avatarName) => - AvatarUsersService.InsertAvatar(new InsertAvatarForm + Task InsertPersona(string rootId, string avatarUserName, string avatarName, CancellationToken token = default) => + avatarUsersService.InsertAvatar(new InsertAvatarForm { RootId = rootId, Name = string.IsNullOrWhiteSpace(avatarName) ? avatarUserName : avatarName.Trim(), UserName = avatarUserName, Biography = string.Empty - }); + }, token); async Task PersonaProblem(string avatarUserName, string rootUserName, CancellationToken token) { if (string.IsNullOrEmpty(avatarUserName)) - return Localizer["Choose a username for your persona."]; + return localizer["Choose a username for your persona."]; if (string.Equals(avatarUserName, rootUserName?.Trim(), StringComparison.OrdinalIgnoreCase)) - return Localizer["Your persona's username must differ from your login."]; - if (await LocalActors.IsUserNameTaken(avatarUserName, token)) - return Localizer["The username '{0}' is already taken.", avatarUserName]; + return localizer["Your persona's username must differ from your login."]; + if (await localActors.IsUserNameTaken(avatarUserName, token)) + return localizer["The username '{0}' is already taken.", avatarUserName]; return default; } @@ -309,8 +287,8 @@ namespace PrivaPub.Controllers.ClientToServer } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(User)}.{nameof(Logout)}()"); - return BadRequest(result.Invalidate(Localizer["Something went wrong."])); + logger.LogError(ex, $"{nameof(User)}.{nameof(Logout)}()"); + return BadRequest(result.Invalidate(localizer["Something went wrong."])); } } @@ -325,8 +303,8 @@ namespace PrivaPub.Controllers.ClientToServer } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(User)}.{nameof(LogoutEverywhere)}()"); - return BadRequest(result.Invalidate(Localizer["Something went wrong."])); + logger.LogError(ex, $"{nameof(User)}.{nameof(LogoutEverywhere)}()"); + return BadRequest(result.Invalidate(localizer["Something went wrong."])); } } @@ -335,82 +313,82 @@ namespace PrivaPub.Controllers.ClientToServer [HttpPost, Route("/clientapi/user/update"), Authorize(Policy = Policies.IsUser)] public IActionResult UpdateUser(UserForm userEmailForm) => StatusCode(StatusCodes.Status422UnprocessableEntity, - new WebResult().Invalidate(Localizer["Changing the address takes your password and a code sent to it."], StatusCodes.Status422UnprocessableEntity)); + new WebResult().Invalidate(localizer["Changing the address takes your password and a code sent to it."], StatusCodes.Status422UnprocessableEntity)); [HttpGet, Route("/clientapi/user/account"), Authorize(Policy = Policies.IsUser)] - public async Task Account() + public async Task Account(CancellationToken token = default) { - var result = await UsersService.AccountAsync(User.GetUserId()); + var result = await usersService.AccountAsync(User.GetUserId(), token); return result.IsValid ? Ok(result.Data) : StatusCode(result.StatusCode, result); } [HttpPost, Route("/clientapi/user/email"), EnableRateLimiting(RateLimiting.Accounts), Authorize(Policy = Policies.IsUser)] - public async Task RequestEmailChange(EmailChangeForm form) + public async Task RequestEmailChange(EmailChangeForm form, CancellationToken token = default) { if (!ModelState.IsValid) - return BadRequest(new WebResult().Invalidate(Localizer["Invalid model."])); - var result = await UsersService.RequestEmailChangeAsync(User.GetUserId(), form); + return BadRequest(new WebResult().Invalidate(localizer["Invalid model."])); + var result = await usersService.RequestEmailChangeAsync(User.GetUserId(), form, token); return result.IsValid ? Ok(result.Data) : StatusCode(result.StatusCode, result); } [HttpPost, Route("/clientapi/user/email/verify"), EnableRateLimiting(RateLimiting.Accounts), Authorize(Policy = Policies.IsUser)] - public async Task VerifyEmail(EmailCodeForm form) + public async Task VerifyEmail(EmailCodeForm form, CancellationToken token = default) { if (!ModelState.IsValid) - return BadRequest(new WebResult().Invalidate(Localizer["Invalid model."])); - var result = await UsersService.VerifyEmailAsync(User.GetUserId(), form.Code); + return BadRequest(new WebResult().Invalidate(localizer["Invalid model."])); + var result = await usersService.VerifyEmailAsync(User.GetUserId(), form.Code, token); return result.IsValid ? Ok(result.Data) : StatusCode(result.StatusCode, result); } [HttpPost, Route("/clientapi/user/totp/setup"), EnableRateLimiting(RateLimiting.Accounts), Authorize(Policy = Policies.IsUser)] - public async Task TotpSetup(PasswordForm form) + public async Task TotpSetup(PasswordForm form, CancellationToken token = default) { if (!ModelState.IsValid) - return BadRequest(new WebResult().Invalidate(Localizer["Invalid model."])); - var result = await UsersService.TotpSetupAsync(User.GetUserId(), form.Password); + return BadRequest(new WebResult().Invalidate(localizer["Invalid model."])); + var result = await usersService.TotpSetupAsync(User.GetUserId(), form.Password, token); return result.IsValid ? Ok(result.Data) : StatusCode(result.StatusCode, result); } // on with the app's first code; every other session ends, and this device goes on with a new one [HttpPost, Route("/clientapi/user/totp/enable"), EnableRateLimiting(RateLimiting.Accounts), Authorize(Policy = Policies.IsUser)] - public async Task TotpEnable(TotpCodeForm form) + public async Task TotpEnable(TotpCodeForm form, CancellationToken token = default) { if (!ModelState.IsValid) - return BadRequest(new WebResult().Invalidate(Localizer["Invalid model."])); - var result = await UsersService.TotpEnableAsync(User.GetUserId(), form.Code); + return BadRequest(new WebResult().Invalidate(localizer["Invalid model."])); + var result = await usersService.TotpEnableAsync(User.GetUserId(), form.Code, token); if (!result.IsValid) return StatusCode(result.StatusCode, result); var (user, userSettings, codes) = ((RootUser, ViewUserSettings, List))result.Data; - return Ok(new ViewTotpEnabled { RecoveryCodes = codes, Session = AuthTokenManager.GenerateToken(user, userSettings) }); + return Ok(new ViewTotpEnabled { RecoveryCodes = codes, Session = authTokenManager.GenerateToken(user, userSettings) }); } [HttpPost, Route("/clientapi/user/totp/disable"), EnableRateLimiting(RateLimiting.Accounts), Authorize(Policy = Policies.IsUser)] - public async Task TotpDisable(TotpDisableForm form) + public async Task TotpDisable(TotpDisableForm form, CancellationToken token = default) { if (!ModelState.IsValid) - return BadRequest(new WebResult().Invalidate(Localizer["Invalid model."])); - var result = await UsersService.TotpDisableAsync(User.GetUserId(), form.Password, form.Code); + return BadRequest(new WebResult().Invalidate(localizer["Invalid model."])); + var result = await usersService.TotpDisableAsync(User.GetUserId(), form.Password, form.Code, token); return result.IsValid ? Ok(result.Data) : StatusCode(result.StatusCode, result); } [HttpPost, Route("/clientapi/user/email/remove"), EnableRateLimiting(RateLimiting.Accounts), Authorize(Policy = Policies.IsUser)] - public async Task RemoveEmail(PasswordForm form) + public async Task RemoveEmail(PasswordForm form, CancellationToken token = default) { if (!ModelState.IsValid) - return BadRequest(new WebResult().Invalidate(Localizer["Invalid model."])); - var result = await UsersService.RemoveEmailAsync(User.GetUserId(), form.Password); + return BadRequest(new WebResult().Invalidate(localizer["Invalid model."])); + var result = await usersService.RemoveEmailAsync(User.GetUserId(), form.Password, token); return result.IsValid ? Ok(result.Data) : StatusCode(result.StatusCode, result); } [HttpPost, Route("/clientapi/user/update/settings"), Authorize(Policy = Policies.IsUser)] - public async Task UpdateUserSettings(ViewUserSettings userSettings) + public async Task UpdateUserSettings(ViewUserSettings userSettings, CancellationToken token = default) { var result = new WebResult(); if (!ModelState.IsValid) - return BadRequest(result.Invalidate(Localizer["Invalid model."])); + return BadRequest(result.Invalidate(localizer["Invalid model."])); try { - result = await UsersService.UpdateUserSettingsAsync(userSettings, User.GetUserId()); + result = await usersService.UpdateUserSettingsAsync(userSettings, User.GetUserId(), token); if (!result.IsValid) return StatusCode(result.StatusCode, result); @@ -418,31 +396,31 @@ namespace PrivaPub.Controllers.ClientToServer } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(User)}.{nameof(UpdateUserSettings)}()"); - return BadRequest(result.Invalidate(Localizer["Something went wrong."])); + logger.LogError(ex, $"{nameof(User)}.{nameof(UpdateUserSettings)}()"); + return BadRequest(result.Invalidate(localizer["Something went wrong."])); } } [HttpPost, Route("/clientapi/user/update/password"), Authorize(Policy = Policies.IsUser)] - public async Task UpdatePassword(UserPasswordForm userPasswordForm) + public async Task UpdatePassword(UserPasswordForm userPasswordForm, CancellationToken token = default) { var result = new WebResult(); if (!ModelState.IsValid) - return BadRequest(result.Invalidate(Localizer["Invalid model."])); + return BadRequest(result.Invalidate(localizer["Invalid model."])); try { - result = await UsersService.UpdateUserPasswordAsync(userPasswordForm, User.GetUserId()); + result = await usersService.UpdateUserPasswordAsync(userPasswordForm, User.GetUserId(), token); if (!result.IsValid) return StatusCode(result.StatusCode, result); // every session ended with the change; this device goes on with a new one var (user, userSettings) = ((RootUser, ViewUserSettings))result.Data; - return Ok(AuthTokenManager.GenerateToken(user, userSettings)); + return Ok(authTokenManager.GenerateToken(user, userSettings)); } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(User)}.{nameof(UpdatePassword)}()"); - return BadRequest(result.Invalidate(Localizer["Something went wrong."])); + logger.LogError(ex, $"{nameof(User)}.{nameof(UpdatePassword)}()"); + return BadRequest(result.Invalidate(localizer["Something went wrong."])); } } @@ -456,35 +434,35 @@ namespace PrivaPub.Controllers.ClientToServer } [HttpGet, Route("/clientapi/user/settings"), Authorize(Policy = Policies.IsUser)] - public async Task GetUserSettings() + public async Task GetUserSettings(CancellationToken token = default) { var result = new WebResult(); try { - result = await UsersService.GetUserSettingsAsync(User.GetUserId()); + result = await usersService.GetUserSettingsAsync(User.GetUserId(), token: token); if (!result.IsValid) return StatusCode(result.StatusCode, result); return Ok(result.Data); } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(User)}.{nameof(GetUserSettings)}()"); - return BadRequest(result.Invalidate(Localizer["Something went wrong."])); + logger.LogError(ex, $"{nameof(User)}.{nameof(GetUserSettings)}()"); + return BadRequest(result.Invalidate(localizer["Something went wrong."])); } } [HttpPost, Route("/clientapi/user/recover/password"), EnableRateLimiting(RateLimiting.Accounts), AllowAnonymous] - public async Task RecoverPassword(PasswordRecoveryForm passwordRecoveryForm) + public async Task RecoverPassword(PasswordRecoveryForm passwordRecoveryForm, CancellationToken token = default) { var result = new WebResult(); if (!ModelState.IsValid) - return BadRequest(result.Invalidate(Localizer["Invalid model."])); + return BadRequest(result.Invalidate(localizer["Invalid model."])); try { - var host = string.IsNullOrEmpty(AppConfiguration.CurrentValue.FrontendBaseAddress) + var host = string.IsNullOrEmpty(appConfiguration.CurrentValue.FrontendBaseAddress) ? $"{Request.Scheme}://{Request.Host.Host}" - : AppConfiguration.CurrentValue.FrontendBaseAddress.TrimEnd('/'); - result = await UsersService.SetupAndSendRecoveryEmail(passwordRecoveryForm, host); + : appConfiguration.CurrentValue.FrontendBaseAddress.TrimEnd('/'); + result = await usersService.SetupAndSendRecoveryEmail(passwordRecoveryForm, host, token); if (!result.IsValid) return StatusCode(result.StatusCode, result); @@ -492,8 +470,8 @@ namespace PrivaPub.Controllers.ClientToServer } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(User)}.{nameof(RecoverPassword)}()"); - return BadRequest(result.Invalidate(Localizer["Something went wrong."])); + logger.LogError(ex, $"{nameof(User)}.{nameof(RecoverPassword)}()"); + return BadRequest(result.Invalidate(localizer["Something went wrong."])); } } @@ -502,12 +480,12 @@ namespace PrivaPub.Controllers.ClientToServer [FromBody, Required(ErrorMessageResourceName = "Required", ErrorMessageResourceType = typeof(ErrorsResource)), Display(Name = "RecoveryCode", ResourceType = typeof(FieldsNameResource))] - string recoveryCode) + string recoveryCode, CancellationToken token = default) { var result = new WebResult(); try { - result = await UsersService.IsValidRecoveryCode(recoveryCode); + result = await usersService.IsValidRecoveryCode(recoveryCode, token); if (!result.IsValid) return StatusCode(result.StatusCode, result); @@ -515,20 +493,20 @@ namespace PrivaPub.Controllers.ClientToServer } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(User)}.{nameof(IsValidRecoveryCode)}()"); - return BadRequest(result.Invalidate(Localizer["Something went wrong."])); + logger.LogError(ex, $"{nameof(User)}.{nameof(IsValidRecoveryCode)}()"); + return BadRequest(result.Invalidate(localizer["Something went wrong."])); } } [HttpPost, Route("/clientapi/user/recover/update/password"), EnableRateLimiting(RateLimiting.Accounts), AllowAnonymous] - public async Task ChangePassword(NewPasswordForm newPasswordForm) + public async Task ChangePassword(NewPasswordForm newPasswordForm, CancellationToken token = default) { var result = new WebResult(); if (!ModelState.IsValid) - return BadRequest(result.Invalidate(Localizer["Invalid model."])); + return BadRequest(result.Invalidate(localizer["Invalid model."])); try { - result = await UsersService.ChangePassword(newPasswordForm); + result = await usersService.ChangePassword(newPasswordForm, token); if (!result.IsValid) return StatusCode(result.StatusCode, result); @@ -536,26 +514,26 @@ namespace PrivaPub.Controllers.ClientToServer } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(User)}.{nameof(ChangePassword)}()"); - return BadRequest(result.Invalidate(Localizer["Something went wrong."])); + logger.LogError(ex, $"{nameof(User)}.{nameof(ChangePassword)}()"); + return BadRequest(result.Invalidate(localizer["Something went wrong."])); } } [HttpPost, Route("/clientapi/user/delete"), EnableRateLimiting(RateLimiting.Accounts), Authorize(Policy = Policies.IsUser)] - public async Task RemoveSelf(RemoveSelfForm form) + public async Task RemoveSelf(RemoveSelfForm form, CancellationToken token = default) { var result = new WebResult(); if (!ModelState.IsValid) - return BadRequest(result.Invalidate(Localizer["Invalid model."])); + return BadRequest(result.Invalidate(localizer["Invalid model."])); try { - result = await UsersService.RemoveSelfAsync(User.GetUserId(), form.Password); + result = await usersService.RemoveSelfAsync(User.GetUserId(), form.Password, token); return result.IsValid ? Ok() : StatusCode(result.StatusCode, result); } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(User)}.{nameof(RemoveSelf)}()"); - return BadRequest(result.Invalidate(Localizer["Something went wrong."])); + logger.LogError(ex, $"{nameof(User)}.{nameof(RemoveSelf)}()"); + return BadRequest(result.Invalidate(localizer["Something went wrong."])); } } @@ -571,17 +549,17 @@ namespace PrivaPub.Controllers.ClientToServer { var user = await dbEntities.RootUsers.MatchID(User.GetUserId()).ExecuteFirstAsync(token); if (user is not { IsBanned: false, DeletedAt: null }) - return Unauthorized(result.Invalidate(Localizer["Unauthorized."], StatusCodes.Status401Unauthorized)); - result = await UsersService.GetUserSettingsAsync(user.ID); + return Unauthorized(result.Invalidate(localizer["Unauthorized."], StatusCodes.Status401Unauthorized)); + result = await usersService.GetUserSettingsAsync(user.ID, token: token); if (!result.IsValid) return StatusCode(result.StatusCode, result); - return Ok(AuthTokenManager.GenerateToken(user, (ViewUserSettings)result.Data, User.FindFirst(AuthTokenManager.SessionId)?.Value)); + return Ok(authTokenManager.GenerateToken(user, (ViewUserSettings)result.Data, User.FindFirst(AuthTokenManager.SessionId)?.Value)); } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(User)}.{nameof(SniffAgain)}()"); - return BadRequest(result.Invalidate(Localizer["Something went wrong."])); + logger.LogError(ex, $"{nameof(User)}.{nameof(SniffAgain)}()"); + return BadRequest(result.Invalidate(localizer["Something went wrong."])); } } diff --git a/PrivaPub/Controllers/ClientToServer/SocialController.cs b/PrivaPub/Controllers/ClientToServer/SocialController.cs index 5c144f0..e060949 100644 --- a/PrivaPub/Controllers/ClientToServer/SocialController.cs +++ b/PrivaPub/Controllers/ClientToServer/SocialController.cs @@ -13,30 +13,23 @@ namespace PrivaPub.Controllers.ClientToServer [ApiController, Route("clientapi/social"), Authorize(Policy = Policies.IsUser)] - public class SocialController : ControllerBase + public class SocialController( + IFollowService follows, + IStringLocalizer localizer) : ControllerBase { - readonly IFollowService _follows; - readonly IStringLocalizer _localizer; - - public SocialController(IFollowService follows, IStringLocalizer localizer) - { - _follows = follows; - _localizer = localizer; - } - [HttpPost, Route("/clientapi/follow")] public async Task Follow(FollowForm form, CancellationToken token) => - !ModelState.IsValid ? Invalid() : Answer(await _follows.Follow(User.GetUserId(), form, token)); + !ModelState.IsValid ? Invalid() : Answer(await follows.Follow(User.GetUserId(), form, token)); [HttpPost, Route("/clientapi/unfollow")] public async Task Unfollow(FollowForm form, CancellationToken token) => - !ModelState.IsValid ? Invalid() : Answer(await _follows.Unfollow(User.GetUserId(), form, token)); + !ModelState.IsValid ? Invalid() : Answer(await follows.Unfollow(User.GetUserId(), form, token)); [HttpGet, Route("/clientapi/following")] public async Task Following([FromQuery] string avatarId, CancellationToken token) => - Answer(await _follows.Followings(User.GetUserId(), avatarId, token)); + Answer(await follows.Followings(User.GetUserId(), avatarId, token)); - IActionResult Invalid() => BadRequest(new WebResult().Invalidate(_localizer["Invalid model."])); + IActionResult Invalid() => BadRequest(new WebResult().Invalidate(localizer["Invalid model."])); IActionResult Answer(WebResult result) => result.IsValid ? Ok(result.Data) : StatusCode(result.StatusCode, result); } diff --git a/PrivaPub/Controllers/ClientToServer/StatisticsController.cs b/PrivaPub/Controllers/ClientToServer/StatisticsController.cs index 2b0f58b..aa585e6 100644 --- a/PrivaPub/Controllers/ClientToServer/StatisticsController.cs +++ b/PrivaPub/Controllers/ClientToServer/StatisticsController.cs @@ -14,27 +14,19 @@ namespace PrivaPub.Controllers.ClientToServer [ApiController, Route("clientapi/admin/statistics"), Authorize(Policy = Policies.IsAdmin)] - public class StatisticsController : ControllerBase + public class StatisticsController( + StatisticsQueries queries, + IJobQueue queue, + Microsoft.Extensions.Options.IOptionsMonitor options) : ControllerBase { - readonly StatisticsQueries _queries; - readonly IJobQueue _queue; - readonly Microsoft.Extensions.Options.IOptionsMonitor _options; - - public StatisticsController(StatisticsQueries queries, IJobQueue queue, Microsoft.Extensions.Options.IOptionsMonitor options) - { - _queries = queries; - _queue = queue; - _options = options; - } - [HttpGet, Route("/clientapi/admin/statistics/crawler")] public async Task Crawler(CancellationToken token) => - Ok(await _queries.Crawler(_options.CurrentValue.Crawler.Enabled, _options.CurrentValue.Crawler.RevisitDays, token)); + Ok(await queries.Crawler(options.CurrentValue.Crawler.Enabled, options.CurrentValue.Crawler.RevisitDays, token)); [HttpGet, Route("/clientapi/admin/statistics/overview")] public async Task Overview([FromServices] Domain.Media.IMediaService media, [FromQuery] int days = 30, CancellationToken token = default) { - var overview = await _queries.Overview(days, token); + var overview = await queries.Overview(days, token); overview.Media.ProxyCacheBytes = Bytes(media.ProxyRoot); overview.Media.TrashBytes = Bytes(media.TrashRoot); return Ok(overview); @@ -46,20 +38,20 @@ namespace PrivaPub.Controllers.ClientToServer [HttpGet, Route("/clientapi/admin/statistics/hosts")] public async Task Hosts([FromQuery] int days = 30, [FromQuery] string sort = default, [FromQuery] string software = default, [FromQuery] int page = 1, [FromQuery] int limit = 50, CancellationToken token = default) => - Ok(await _queries.Hosts(days, sort, software, page, limit, token)); + Ok(await queries.Hosts(days, sort, software, page, limit, token)); [HttpGet, Route("/clientapi/admin/statistics/hosts/{host}")] public async Task Host(string host, [FromQuery] int days = 90, CancellationToken token = default) => - await _queries.Host(host, days, token) is { } found ? Ok(found) : NotFound(); + await queries.Host(host, days, token) is { } found ? Ok(found) : NotFound(); [HttpGet, Route("/clientapi/admin/statistics/events")] public async Task Events([FromQuery] string host = default, [FromQuery] string channel = default, [FromQuery] string outcome = default, [FromQuery] string reason = default, [FromQuery] DateTime? before = default, [FromQuery] int limit = 100, CancellationToken token = default) => - Ok(await _queries.Events(host, channel, outcome, reason, before, limit, token)); + Ok(await queries.Events(host, channel, outcome, reason, before, limit, token)); [HttpGet, Route("/clientapi/admin/statistics/server")] public async Task Server([FromQuery] int days = 30, CancellationToken token = default) => - Ok(await _queries.Server(days, token)); + Ok(await queries.Server(days, token)); [HttpPost, Route("/clientapi/admin/statistics/rollups/{day}")] public async Task Rollup(string day, CancellationToken token) @@ -69,7 +61,7 @@ namespace PrivaPub.Controllers.ClientToServer return BadRequest(); var job = RollupJob.For(parsed.Date, $"rollup|{day}|rerun|{DateTime.UtcNow.Ticks}"); job.RunAt = DateTime.UtcNow; - await _queue.EnqueueMany(new[] { job }, token); + await queue.EnqueueMany(new[] { job }, token); return Accepted(); } @@ -79,7 +71,7 @@ namespace PrivaPub.Controllers.ClientToServer host = Interactions.Host(host); if (host == Interactions.Unknown) return BadRequest(); - await _queue.Enqueue(JobKind.DescribeInstance, host, host, $"describe|{host}|admin|{DateTime.UtcNow.Ticks}", token); + await queue.Enqueue(JobKind.DescribeInstance, host, host, $"describe|{host}|admin|{DateTime.UtcNow.Ticks}", token); return Accepted(); } } diff --git a/PrivaPub/Controllers/ClientToServer/TimelineController.cs b/PrivaPub/Controllers/ClientToServer/TimelineController.cs index fad1418..5fde29c 100644 --- a/PrivaPub/Controllers/ClientToServer/TimelineController.cs +++ b/PrivaPub/Controllers/ClientToServer/TimelineController.cs @@ -10,28 +10,22 @@ namespace PrivaPub.Controllers.ClientToServer [ApiController, Route("clientapi/timeline"), Authorize(Policy = Policies.IsUser)] - public class TimelineController : ControllerBase + public class TimelineController( + ITimelineService timelines) : ControllerBase { - readonly ITimelineService _timelines; - - public TimelineController(ITimelineService timelines) - { - _timelines = timelines; - } - [HttpGet, Route("/clientapi/timeline/home")] public async Task Home([FromQuery] string avatarId, [FromQuery(Name = "max_id")] string maxId, [FromQuery] int limit = 20, CancellationToken token = default) => - Answer(await _timelines.Home(User.GetUserId(), avatarId, maxId, limit, token)); + Answer(await timelines.Home(User.GetUserId(), avatarId, maxId, limit, token)); [HttpGet, Route("/clientapi/notifications")] public async Task Notifications([FromQuery] string avatarId, [FromQuery(Name = "max_id")] string maxId, [FromQuery] int limit = 20, CancellationToken token = default) => - Answer(await _timelines.Notifications(User.GetUserId(), avatarId, maxId, limit, token)); + Answer(await timelines.Notifications(User.GetUserId(), avatarId, maxId, limit, token)); [HttpPost, Route("/clientapi/notifications/read")] public async Task Read([FromQuery] string avatarId, CancellationToken token) => - Answer(await _timelines.MarkNotificationsRead(User.GetUserId(), avatarId, token)); + Answer(await timelines.MarkNotificationsRead(User.GetUserId(), avatarId, token)); IActionResult Answer(WebResult result) => result.IsValid ? Ok(result.Data) : StatusCode(result.StatusCode, result); } diff --git a/PrivaPub/Data/InitDb.cs b/PrivaPub/Data/InitDb.cs index 58ab623..da335f3 100644 --- a/PrivaPub/Data/InitDb.cs +++ b/PrivaPub/Data/InitDb.cs @@ -10,17 +10,17 @@ namespace PrivaPub.Data { public static class InitDb { - public static async Task Init(this DbEntities dbClient) + public static async Task Init(this DbEntities dbClient, CancellationToken token = default) { - await SyncLanguages(dbClient); - await UpdateNewLanguages(dbClient); + await SyncLanguages(dbClient, token); + await UpdateNewLanguages(dbClient, token); } - static async Task SyncLanguages(DbEntities dbClient) + static async Task SyncLanguages(DbEntities dbClient, CancellationToken token = default) { - if (await dbClient.Languages.ExecuteAnyAsync()) return; + if (await dbClient.Languages.ExecuteAnyAsync(token)) return; - var languagesJson = await File.ReadAllTextAsync(Path.Combine(Directory.GetCurrentDirectory(), "Data", "languagesNative.json"), Encoding.UTF8); + var languagesJson = await File.ReadAllTextAsync(Path.Combine(Directory.GetCurrentDirectory(), "Data", "languagesNative.json"), Encoding.UTF8, token); var languagesRows = JsonSerializer.Deserialize>(languagesJson); var languages = new List(); @@ -34,12 +34,12 @@ namespace PrivaPub.Data International2Code = languageRow.International2Code }); - await DB.Default.SaveAsync(languages); + await DB.Default.SaveAsync(languages, token); } - static async Task UpdateNewLanguages(DbEntities dbClient) + static async Task UpdateNewLanguages(DbEntities dbClient, CancellationToken token = default) { - var bulgarianLanguage = await dbClient.Languages.Match(l => l.International2Code == "bg").ExecuteFirstAsync(); + var bulgarianLanguage = await dbClient.Languages.Match(l => l.International2Code == "bg").ExecuteFirstAsync(token); if (bulgarianLanguage.NativeName == "Български") return; var languagesToUpdate = new Dictionary() @@ -96,9 +96,9 @@ namespace PrivaPub.Data foreach (var languageToUpdate in languagesToUpdate) { - var bgLang = await dbClient.Languages.Match(l => l.International2Code == languageToUpdate.Key).ExecuteFirstAsync(); + var bgLang = await dbClient.Languages.Match(l => l.International2Code == languageToUpdate.Key).ExecuteFirstAsync(token); bgLang.NativeName = languageToUpdate.Value; - await DB.Default.SaveAsync(bgLang); + await DB.Default.SaveAsync(bgLang, token); } } } diff --git a/PrivaPub/Domain/Content/ContentRenderer.cs b/PrivaPub/Domain/Content/ContentRenderer.cs index 33fe474..774f8ba 100644 --- a/PrivaPub/Domain/Content/ContentRenderer.cs +++ b/PrivaPub/Domain/Content/ContentRenderer.cs @@ -26,22 +26,16 @@ namespace PrivaPub.Domain.Content string TagUrl(string tag); } - public partial class ContentRenderer : IContentRenderer + public partial class ContentRenderer( + ILocalActorService localActors, + IRemoteActorService remoteActors) : IContentRenderer { const int MaxMentions = 20; static readonly MarkdownPipeline Pipeline = new MarkdownPipelineBuilder().DisableHtml().UseAutoLinks().UseEmphasisExtras().Build(); static readonly HtmlParser Parser = new(); - readonly ILocalActorService _localActors; - readonly IRemoteActorService _remoteActors; - public ContentRenderer(ILocalActorService localActors, IRemoteActorService remoteActors) - { - _localActors = localActors; - _remoteActors = remoteActors; - } - - public string TagUrl(string tag) => $"{_localActors.BaseAddress}/tags/{Uri.EscapeDataString(tag)}"; + public string TagUrl(string tag) => $"{localActors.BaseAddress}/tags/{Uri.EscapeDataString(tag)}"; /// A text of the server's own (its description, privacy policy, terms, an announcement) from Markdown to /// sanitized HTML: the posts' pipeline (raw HTML off), without mentions or hashtags, so nothing is looked up. @@ -123,17 +117,17 @@ namespace PrivaPub.Domain.Content async Task Resolve(string handle, CancellationToken token) { var parts = handle.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)) { - var local = await _localActors.FindByUserName(parts[0], token); + var local = await localActors.FindByUserName(parts[0], token); return local is { IsFederated: true, IsCircle: false, IsServerActor: false } ? new ResolvedMention(local.Uri, local.UserName, local.Domain, local.Uri, true, local.Id, local.Inbox) : default; } - var actorUri = await _remoteActors.ResolveHandle($"{parts[0]}@{parts[1]}", token); - var actor = actorUri == default ? default : await _remoteActors.GetActor(actorUri, refresh: false, token); + var actorUri = await remoteActors.ResolveHandle($"{parts[0]}@{parts[1]}", token); + var actor = actorUri == default ? default : await remoteActors.GetActor(actorUri, refresh: false, token); return actor == default ? default : new ResolvedMention(actor.ActorURI, actor.UserName ?? parts[0], parts[1].ToLowerInvariant(), actor.Url ?? actor.ActorURI, false, actor.ID, diff --git a/PrivaPub/Domain/Content/LinkPreviews.cs b/PrivaPub/Domain/Content/LinkPreviews.cs index 3fd9faf..a8adbfc 100644 --- a/PrivaPub/Domain/Content/LinkPreviews.cs +++ b/PrivaPub/Domain/Content/LinkPreviews.cs @@ -37,30 +37,19 @@ namespace PrivaPub.Domain.Content Task Wanted(PostEntity post, CancellationToken token); } - public class LinkPreviews : ILinkPreviews, IJobHandler + public class LinkPreviews( + DbEntities dbEntities, + ILocalActorService localActors, + IFederationHttp federationHttp, + IJobQueue queue, + IOptionsMonitor options, + IInteractionLedger ledger = default) : ILinkPreviews, IJobHandler { const int MaxJitterSeconds = 60; static readonly TimeSpan Freshness = TimeSpan.FromDays(7); static readonly HtmlParser Parser = new(); - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - readonly IFederationHttp _http; - readonly IJobQueue _queue; - readonly IOptionsMonitor _options; - readonly IInteractionLedger _ledger; - - public LinkPreviews(DbEntities dbEntities, ILocalActorService localActors, IFederationHttp http, IJobQueue queue, - IOptionsMonitor options, IInteractionLedger ledger = default) - { - _dbEntities = dbEntities; - _localActors = localActors; - _http = http; - _queue = queue; - _options = options; - _ledger = ledger; - } public JobKind Kind => JobKind.FetchPreview; public int Concurrency => 2; @@ -69,12 +58,12 @@ namespace PrivaPub.Domain.Content public async Task Wanted(PostEntity post, CancellationToken token) { - if (!_options.CurrentValue.FetchLinkPreviews || !Previewable(post) || post.Link == default && post.Media.Count > 0) + if (!options.CurrentValue.FetchLinkPreviews || !Previewable(post) || post.Link == default && post.Media.Count > 0) return; - var url = post.Link?.Href ?? FirstLink(post, _localActors.BaseAddress); + var url = post.Link?.Href ?? FirstLink(post, localActors.BaseAddress); if (url == default) return; - await _queue.EnqueueMany(new[] + await queue.EnqueueMany(new[] { new Job { @@ -86,10 +75,10 @@ namespace PrivaPub.Domain.Content public async Task Handle(Job job, CancellationToken token) { - var post = await _dbEntities.Posts.MatchID(job.Payload).ExecuteFirstAsync(token); + var post = await dbEntities.Posts.MatchID(job.Payload).ExecuteFirstAsync(token); if (!VisibilityPolicy.Shown(post) || !Previewable(post)) return JobOutcome.Done; - var url = post.Link?.Href ?? FirstLink(post, _localActors.BaseAddress); + var url = post.Link?.Href ?? FirstLink(post, localActors.BaseAddress); if (url == default) return JobOutcome.Done; @@ -110,9 +99,9 @@ namespace PrivaPub.Domain.Content async Task Fetch(string url, CancellationToken token) { var started = System.Diagnostics.Stopwatch.GetTimestamp(); - var (finalUri, html) = await _http.GetPage(url, token); + var (finalUri, html) = await federationHttp.GetPage(url, token); var preview = html == default ? new LinkPreview { Url = url, Failed = true } : Read(url, finalUri, html); - _ledger?.Record(new InteractionEvent + ledger?.Record(new InteractionEvent { Channel = Interactions.Preview, Host = Interactions.HostOf(url), diff --git a/PrivaPub/Domain/Instance/InstanceSettings.cs b/PrivaPub/Domain/Instance/InstanceSettings.cs index 55c0860..60f2144 100644 --- a/PrivaPub/Domain/Instance/InstanceSettings.cs +++ b/PrivaPub/Domain/Instance/InstanceSettings.cs @@ -25,19 +25,14 @@ namespace PrivaPub.Domain.Instance // The server's own settings (Models/ServerSettings.cs) in memory: read at start, saved from the administrator's page, and // read again every five minutes (InstanceSettingsRefresher), so an edit made elsewhere takes too. What reads them reads // Current, which is never null and never changed in place. - public class InstanceSettings : IInstanceSettings + public class InstanceSettings( + ILogger logger) : IInstanceSettings { - readonly ILogger _logger; readonly SemaphoreSlim _saving = new(1, 1); volatile ServerSettings _current = ServerSettings.Defaults(); volatile bool _stored;//whether Current came from the document (or is the defaults) CancellationTokenSource _changed = new(); - public InstanceSettings(ILogger logger) - { - _logger = logger; - } - public ServerSettings Current => _current; public IChangeToken ChangeToken() => new CancellationChangeToken(Volatile.Read(ref _changed).Token); @@ -85,7 +80,7 @@ namespace PrivaPub.Domain.Instance } catch (AggregateException ex) { - _logger.LogWarning(ex, "A listener to the server's settings failed"); + logger.LogWarning(ex, "A listener to the server's settings failed"); } //(not disposed: a reader may still be registering on its token) } diff --git a/PrivaPub/Domain/Media/Blurhash.cs b/PrivaPub/Domain/Media/Blurhash.cs index 1ca75fe..0f691f1 100644 --- a/PrivaPub/Domain/Media/Blurhash.cs +++ b/PrivaPub/Domain/Media/Blurhash.cs @@ -36,7 +36,7 @@ namespace PrivaPub.Domain.Media if (i != 0 || j != 0) for (var c = 0; c < 3; c++) maximum = Math.Max(maximum, Math.Abs(factors[j, i, c])); - double maximumValue; + var maximumValue = default(double); if (componentsX * componentsY > 1) { var quantised = (int)Math.Max(0, Math.Min(82, Math.Floor(maximum * 166 - 0.5))); diff --git a/PrivaPub/Domain/Media/MediaProxy.cs b/PrivaPub/Domain/Media/MediaProxy.cs index 64ce5ea..cb51561 100644 --- a/PrivaPub/Domain/Media/MediaProxy.cs +++ b/PrivaPub/Domain/Media/MediaProxy.cs @@ -44,17 +44,17 @@ namespace PrivaPub.Domain.Media // - what is too big to cache is remembered for an hour (it is streamed instead), what failed for five minutes; // - the cache's size is counted as it grows, and trimmed as soon as it passes the cap; // - nothing of a suspended server, or of one whose media are rejected, is proxied, and blocking one purges its files. - public class MediaProxy : IMediaProxy + public class MediaProxy( + ILocalActorService localActors, + IFederationHttp http, + IMediaService mediaService, + IOptionsMonitor options, + Federation.Moderation.IDomainBlocks domainBlocks = default) : IMediaProxy { static readonly TimeSpan TooBigFor = TimeSpan.FromHours(1); static readonly TimeSpan FailedFor = TimeSpan.FromMinutes(5); const int Downloads = 8;//remote files fetched at once, however many clients ask - readonly ILocalActorService _localActors; - readonly IFederationHttp _http; - readonly IMediaService _media; - readonly IOptionsMonitor _options; - readonly Federation.Moderation.IDomainBlocks _domainBlocks; // Lazy: GetOrAdd may run its factory more than once when asked at the same time, but only one Lazy is ever evaluated readonly ConcurrentDictionary>> _inFlight = new(); readonly ConcurrentDictionary _refused = new(); @@ -64,16 +64,6 @@ namespace PrivaPub.Domain.Media long _bytes = -1;//what the cache holds, counted once from the disk and then as it changes int _trimming; - public MediaProxy(ILocalActorService localActors, IFederationHttp http, IMediaService media, IOptionsMonitor options, - Federation.Moderation.IDomainBlocks domainBlocks = default) - { - _localActors = localActors; - _http = http; - _media = media; - _options = options; - _domainBlocks = domainBlocks; - } - byte[] Key { get @@ -87,15 +77,15 @@ namespace PrivaPub.Domain.Media public string Wrap(string remoteUrl) { - if (string.IsNullOrEmpty(remoteUrl) || remoteUrl.StartsWith(_localActors.BaseAddress + "/", StringComparison.OrdinalIgnoreCase)) + if (string.IsNullOrEmpty(remoteUrl) || remoteUrl.StartsWith(localActors.BaseAddress + "/", StringComparison.OrdinalIgnoreCase)) return remoteUrl; var encoded = Base64Url(Encoding.UTF8.GetBytes(remoteUrl)); - return $"{_localActors.BaseAddress}/media/proxy/{Sign(remoteUrl)}/{encoded}"; + return $"{localActors.BaseAddress}/media/proxy/{Sign(remoteUrl)}/{encoded}"; } public string Verified(string signature, string encodedUrl) { - string url; + var url = default(string); try { url = Encoding.UTF8.GetString(FromBase64Url(encodedUrl)); @@ -109,9 +99,9 @@ namespace PrivaPub.Domain.Media public bool Refuses(string url) { - if (_domainBlocks == default || !Uri.TryCreate(url, UriKind.Absolute, out var target)) + if (domainBlocks == default || !Uri.TryCreate(url, UriKind.Absolute, out var target)) return false; - var block = _domainBlocks.Find(target.Host); + var block = domainBlocks.Find(target.Host); return block is { Severity: DomainBlockSeverity.Suspend } or { RejectMedia: true }; } @@ -132,7 +122,7 @@ namespace PrivaPub.Domain.Media } public Task Open(string url, System.Net.Http.Headers.RangeHeaderValue range, CancellationToken token) => - _http.OpenMedia(url, range, token); + http.OpenMedia(url, range, token); public async Task<(string Path, string ContentType)> Fetch(string signature, string encodedUrl, CancellationToken token) { @@ -166,10 +156,10 @@ namespace PrivaPub.Domain.Media } } - async Task<(ProxyOutcome, string, string)> DownloadOnce(string url) + async Task<(ProxyOutcome, string, string)> DownloadOnce(string url, CancellationToken token = default) { await Task.Yield(); - if (!await _downloads.WaitAsync(TimeSpan.FromSeconds(30))) + if (!await _downloads.WaitAsync(TimeSpan.FromSeconds(30), token)) return (ProxyOutcome.Failed, default, default);//too busy: the client tries again // cached by a download that ended just before this one began if (Cached(url) is { Path: not null } done) @@ -182,16 +172,17 @@ namespace PrivaPub.Domain.Media try { Directory.CreateDirectory(System.IO.Path.GetDirectoryName(path)!); - string contentType, refusal; + var contentType = default(string); + var refusal = default(string); await using (var file = new FileStream(part, FileMode.CreateNew, FileAccess.Write, FileShare.None, 64 * 1024, useAsync: true)) - (contentType, refusal) = await _http.DownloadMedia(url, _options.CurrentValue.MaxProxiedBytes, file, CancellationToken.None); + (contentType, refusal) = await http.DownloadMedia(url, options.CurrentValue.MaxProxiedBytes, file, CancellationToken.None); if (contentType == default) { var outcome = refusal == "too-large" ? ProxyOutcome.TooBig : ProxyOutcome.Failed; _refused[url] = (outcome, DateTime.UtcNow + (outcome == ProxyOutcome.TooBig ? TooBigFor : FailedFor)); return (outcome, default, default); } - await File.WriteAllTextAsync(typePath, contentType + "\n" + new Uri(url).Host); + await File.WriteAllTextAsync(typePath, contentType + "\n" + new Uri(url).Host, token); var size = new FileInfo(part).Length; File.Move(part, path, overwrite: true); Grew(size); @@ -209,7 +200,7 @@ namespace PrivaPub.Domain.Media { if (Interlocked.Read(ref _bytes) < 0) Interlocked.CompareExchange(ref _bytes, Measure(), -1); - if (Interlocked.Add(ref _bytes, bytes) > _options.CurrentValue.ProxyCacheBytes) + if (Interlocked.Add(ref _bytes, bytes) > options.CurrentValue.ProxyCacheBytes) _ = Task.Run(Trim); } @@ -219,7 +210,7 @@ namespace PrivaPub.Domain.Media return; try { - Interlocked.Exchange(ref _bytes, TrimDirectory(_media.ProxyRoot, _options.CurrentValue.ProxyCacheBytes)); + Interlocked.Exchange(ref _bytes, TrimDirectory(mediaService.ProxyRoot, options.CurrentValue.ProxyCacheBytes)); } finally { @@ -229,7 +220,7 @@ namespace PrivaPub.Domain.Media public int Purge(string domain) { - var directory = new DirectoryInfo(_media.ProxyRoot); + var directory = new DirectoryInfo(mediaService.ProxyRoot); if (string.IsNullOrEmpty(domain) || !directory.Exists) return 0; var purged = 0; @@ -256,7 +247,7 @@ namespace PrivaPub.Domain.Media long Measure() { - var directory = new DirectoryInfo(_media.ProxyRoot); + var directory = new DirectoryInfo(mediaService.ProxyRoot); return directory.Exists ? directory.EnumerateFiles("*", SearchOption.AllDirectories).Where(f => f.Extension is not (".type" or ".part")).Sum(f => f.Length) : 0; } @@ -290,7 +281,7 @@ namespace PrivaPub.Domain.Media (string Path, string TypePath) CachePaths(string url) { var name = Convert.ToHexStringLower(SHA256.HashData(Encoding.UTF8.GetBytes(url))); - var path = System.IO.Path.Combine(_media.ProxyRoot, name[..2], name); + var path = System.IO.Path.Combine(mediaService.ProxyRoot, name[..2], name); return (path, path + ".type"); } @@ -317,7 +308,10 @@ namespace PrivaPub.Domain.Media } } - public class MediaJanitor : BackgroundService + public class MediaJanitor( + IMediaService mediaService, + IOptionsMonitor options, + ILogger logger) : BackgroundService { static readonly TimeSpan FirstPass = TimeSpan.FromMinutes(5); static readonly TimeSpan Interval = TimeSpan.FromHours(1); @@ -325,16 +319,6 @@ namespace PrivaPub.Domain.Media // a trashed file waits this long before it is deleted, already out of what /media/files serves public static readonly TimeSpan TrashGrace = TimeSpan.FromDays(1); - readonly IMediaService _media; - readonly IOptionsMonitor _options; - readonly ILogger _logger; - - public MediaJanitor(IMediaService media, IOptionsMonitor options, ILogger logger) - { - _media = media; - _options = options; - _logger = logger; - } protected override async Task ExecuteAsync(CancellationToken stoppingToken) { @@ -353,7 +337,7 @@ namespace PrivaPub.Domain.Media } catch (Exception ex) { - _logger.LogWarning(ex, "{Service} pass failed", nameof(MediaJanitor)); + logger.LogWarning(ex, "{Service} pass failed", nameof(MediaJanitor)); } } } @@ -368,7 +352,7 @@ namespace PrivaPub.Domain.Media public async Task Sweep(CancellationToken token) { var cutoff = DateTime.UtcNow - UnattachedLifetime; - var unattached = await _media.Trash(m => m.PostId == null && m.ScheduledStatusId == null && m.ProfileOfAvatarId == null && m.ServerUse == null + var unattached = await mediaService.Trash(m => m.PostId == null && m.ScheduledStatusId == null && m.ProfileOfAvatarId == null && m.ServerUse == null && m.CreatedAt < cutoff, "never posted", token); var trashed = await DB.Default.Find().Match(m => m.TrashedAt != null).Limit(2000).ExecuteAsync(token); @@ -379,18 +363,18 @@ namespace PrivaPub.Domain.Media { if (row.TrashedAt < purgeBefore && !maintenance) { - await _media.Purge(row, token); + await mediaService.Purge(row, token); purged++; } else - _media.Hide(row); + mediaService.Hide(row); } if (unattached > 0 || purged > 0) - _logger.LogInformation("{Service}: {Unattached} uploads never posted trashed, {Purged} trashed files deleted", + logger.LogInformation("{Service}: {Unattached} uploads never posted trashed, {Purged} trashed files deleted", nameof(MediaJanitor), unattached, purged); TrimProxyCache(); } - void TrimProxyCache() => MediaProxy.TrimDirectory(_media.ProxyRoot, _options.CurrentValue.ProxyCacheBytes); + void TrimProxyCache() => MediaProxy.TrimDirectory(mediaService.ProxyRoot, options.CurrentValue.ProxyCacheBytes); } } diff --git a/PrivaPub/Domain/Media/MediaService.cs b/PrivaPub/Domain/Media/MediaService.cs index 6b0ebe8..e3621ce 100644 --- a/PrivaPub/Domain/Media/MediaService.cs +++ b/PrivaPub/Domain/Media/MediaService.cs @@ -62,8 +62,14 @@ namespace PrivaPub.Domain.Media Task Purge(MediaAttachment trashed, CancellationToken token); } - public class MediaService : IMediaService + public class MediaService( + IOptionsMonitor mediaOptions, + ILocalActorService localActors, + IWebHostEnvironment environment, + ILogger logger) : IMediaService { + readonly SemaphoreSlim _processing = new(Math.Max(1, mediaOptions.CurrentValue.Concurrency)); + // HEIC and HEIF are not among them: the libvips bundled here decodes AVIF but has no HEVC decoder static readonly string[] ImageTypes = { "image/jpeg", "image/png", "image/gif", "image/webp", "image/avif" }; // the only loaders an upload ever reaches: everything else libvips could read (SVG, PDF, TIFF, ImageMagick, ...) is @@ -94,22 +100,7 @@ namespace PrivaPub.Domain.Media Cache.Max = 0;//an upload is decoded once: nothing to keep between operations } - readonly IOptionsMonitor _options; - readonly ILocalActorService _localActors; - readonly SemaphoreSlim _processing; - readonly IWebHostEnvironment _environment; - readonly ILogger _logger; - - public MediaService(IOptionsMonitor options, ILocalActorService localActors, IWebHostEnvironment environment, ILogger logger) - { - _options = options; - _localActors = localActors; - _processing = new SemaphoreSlim(Math.Max(1, options.CurrentValue.Concurrency)); - _environment = environment; - _logger = logger; - } - - public string Root => Path.GetFullPath(_options.CurrentValue.Root ?? Path.Combine(_environment.ContentRootPath, "media-store")); + public string Root => Path.GetFullPath(mediaOptions.CurrentValue.Root ?? Path.Combine(environment.ContentRootPath, "media-store")); public string ProxyRoot => Root.TrimEnd(Path.DirectorySeparatorChar) + "-proxy"; @@ -119,13 +110,13 @@ namespace PrivaPub.Domain.Media string Incoming(string id) => Path.Combine(IncomingRoot, id + ".in"); - public string Url(string relativePath) => relativePath == default ? default : $"{_localActors.BaseAddress}/media/files/{relativePath.Replace('\\', '/')}"; + public string Url(string relativePath) => relativePath == default ? default : $"{localActors.BaseAddress}/media/files/{relativePath.Replace('\\', '/')}"; public async Task Upload(LocalActor owner, IFormFile file, string description, string focus, bool later, CancellationToken token) { if (file == default || file.Length == 0) return MediaOutcome.Fail(StatusCodes.Status422UnprocessableEntity, "Validation failed: File can't be blank"); - var options = _options.CurrentValue; + var options = mediaOptions.CurrentValue; var contentType = file.ContentType?.Split(';')[0].Trim().ToLowerInvariant(); if (await OverQuota(owner.Id, file.Length, token) is { } full) return full; @@ -168,7 +159,7 @@ namespace PrivaPub.Domain.Media } catch (VipsException ex) { - _logger.LogInformation("Refused an image upload: {Error}", ex.Message); + logger.LogInformation("Refused an image upload: {Error}", ex.Message); return MediaOutcome.Fail(StatusCodes.Status422UnprocessableEntity, "Validation failed: The file is not a readable image"); } finally @@ -210,15 +201,16 @@ namespace PrivaPub.Domain.Media return MediaOutcome.Fail(StatusCodes.Status422UnprocessableEntity, "Validation failed: File can't be blank"); if (!ImageTypes.Contains(contentType)) return MediaOutcome.Fail(StatusCodes.Status422UnprocessableEntity, "Validation failed: File type is not supported"); - if (file.Length > _options.CurrentValue.MaxImageBytes) + if (file.Length > mediaOptions.CurrentValue.MaxImageBytes) return MediaOutcome.Fail(StatusCodes.Status422UnprocessableEntity, "Validation failed: File is too big"); if (await OverQuota(avatarId, file.Length, token) is { } full) return full; var input = await Read(file, token); - if (Refusal(input, _options.CurrentValue) is { } refused) + if (Refusal(input, mediaOptions.CurrentValue) is { } refused) return refused; - byte[] bytes; - int outWidth, outHeight; + var bytes = default(byte[]); + var outWidth = default(int); + var outHeight = default(int); await _processing.WaitAsync(token); try { @@ -229,7 +221,7 @@ namespace PrivaPub.Domain.Media } catch (VipsException ex) { - _logger.LogInformation("Refused a profile picture: {Error}", ex.Message); + logger.LogInformation("Refused a profile picture: {Error}", ex.Message); return MediaOutcome.Fail(StatusCodes.Status422UnprocessableEntity, "Validation failed: The file is not a readable image"); } finally @@ -264,13 +256,14 @@ namespace PrivaPub.Domain.Media return MediaOutcome.Fail(StatusCodes.Status422UnprocessableEntity, "Validation failed: File can't be blank"); if (!ImageTypes.Contains(contentType)) return MediaOutcome.Fail(StatusCodes.Status422UnprocessableEntity, "Validation failed: File type is not supported"); - if (file.Length > _options.CurrentValue.MaxImageBytes) + if (file.Length > mediaOptions.CurrentValue.MaxImageBytes) return MediaOutcome.Fail(StatusCodes.Status422UnprocessableEntity, "Validation failed: File is too big"); var input = await Read(file, token); - if (Refusal(input, _options.CurrentValue) is { } refused) + if (Refusal(input, mediaOptions.CurrentValue) is { } refused) return refused; - byte[] bytes; - int outWidth, outHeight; + var bytes = default(byte[]); + var outWidth = default(int); + var outHeight = default(int); await _processing.WaitAsync(token); try { @@ -281,7 +274,7 @@ namespace PrivaPub.Domain.Media } catch (VipsException ex) { - _logger.LogInformation("Refused a server picture: {Error}", ex.Message); + logger.LogInformation("Refused a server picture: {Error}", ex.Message); return MediaOutcome.Fail(StatusCodes.Status422UnprocessableEntity, "Validation failed: The file is not a readable image"); } finally @@ -327,11 +320,13 @@ namespace PrivaPub.Domain.Media if (file.Length > EmojiMaxUploadBytes) return MediaOutcome.Fail(StatusCodes.Status422UnprocessableEntity, "Validation failed: An emoji's image is at most 256 KB"); var input = await Read(file, token); - if (Refusal(input, _options.CurrentValue) is { } refused) + if (Refusal(input, mediaOptions.CurrentValue) is { } refused) return refused; - byte[] bytes, still = default; - int width, height; - bool animated; + var bytes = default(byte[]); + var still = default(byte[]); + var width = default(int); + var height = default(int); + var animated = default(bool); await _processing.WaitAsync(token); try { @@ -342,7 +337,7 @@ namespace PrivaPub.Domain.Media } catch (VipsException ex) { - _logger.LogInformation("Refused an emoji's picture: {Error}", ex.Message); + logger.LogInformation("Refused an emoji's picture: {Error}", ex.Message); return MediaOutcome.Fail(StatusCodes.Status422UnprocessableEntity, "Validation failed: The file is not a readable image"); } finally @@ -408,7 +403,7 @@ namespace PrivaPub.Domain.Media // a login over its quota (Media:QuotaBytesPerRoot; none when 0) uploads nothing more async Task OverQuota(string avatarId, long incoming, CancellationToken token) { - var quota = _options.CurrentValue.QuotaBytesPerRoot; + var quota = mediaOptions.CurrentValue.QuotaBytesPerRoot; if (quota <= 0) return default; var rootId = (await DB.Default.Find().Match(r => r.AvatarId == avatarId).ExecuteFirstAsync(token))?.RootId; @@ -472,7 +467,7 @@ namespace PrivaPub.Domain.Media // an upload refused before anything is decoded: no loader takes it, or it would decode to too many pixels or frames static MediaOutcome Refusal(byte[] input, MediaOptions options) { - ImageHeader header; + var header = default(ImageHeader); try { header = Inspect(input); @@ -511,7 +506,7 @@ namespace PrivaPub.Domain.Media // its first frame the poster async Task ProcessAnimation(byte[] input, ImageHeader header, MediaAttachment attachment, CancellationToken token) { - var options = _options.CurrentValue; + var options = mediaOptions.CurrentValue; var temp = Path.Combine(Path.GetTempPath(), $"privapub-{Guid.NewGuid():N}"); var gif = temp + ".gif"; var mp4 = temp + ".mp4"; @@ -538,7 +533,7 @@ namespace PrivaPub.Domain.Media } catch (Exception ex) when (ex is not OperationCanceledException) { - _logger.LogInformation(ex, "Refused a GIF upload"); + logger.LogInformation(ex, "Refused a GIF upload"); return MediaOutcome.Fail(StatusCodes.Status422UnprocessableEntity, "Validation failed: The file could not be processed"); } finally @@ -598,7 +593,7 @@ namespace PrivaPub.Domain.Media // saved until everything succeeded, and every temporary file goes, the stored upload too. async Task ProcessIncoming(MediaAttachment attachment, CancellationToken token) { - var options = _options.CurrentValue; + var options = mediaOptions.CurrentValue; var input = Incoming(attachment.ID); var temp = Path.Combine(Path.GetTempPath(), $"privapub-{Guid.NewGuid():N}"); var frame = temp + ".png"; @@ -615,7 +610,7 @@ namespace PrivaPub.Domain.Media return MediaOutcome.Fail(StatusCodes.Status422UnprocessableEntity, "Validation failed: The file could not be processed"); var extension = AvTypes[attachment.ContentType]; var format = probe.Format.FormatName.Split(',')[0]; - string arguments; + var arguments = default(string); if (video == default) arguments = "-map 0:a:0 -vn -dn -sn -map_metadata -1 -map_chapters -1 -c copy" + (extension == "m4a" ? " -movflags +faststart" : string.Empty); else if (video.CodecName is "h264" or "vp8" or "vp9" or "av1" && (long)video.Width * video.Height <= options.MaxVideoPixels @@ -642,7 +637,7 @@ namespace PrivaPub.Domain.Media { attachment.Width = made.PrimaryVideoStream?.Width; attachment.Height = made.PrimaryVideoStream?.Height; - await FFMpeg.SnapshotAsync(output, frame, captureTime: TimeSpan.FromSeconds(Math.Min(1, made.Duration.TotalSeconds / 2))); + await FFMpeg.SnapshotAsync(output, frame, captureTime: TimeSpan.FromSeconds(Math.Min(1, made.Duration.TotalSeconds / 2)), cancellationToken: token); var still = ProcessImage(await File.ReadAllBytesAsync(frame, token), 640, options.PreviewSide); poster = still.Preview; attachment.Blurhash = still.Blurhash; @@ -668,7 +663,7 @@ namespace PrivaPub.Domain.Media } catch (Exception ex) when (ex is not OperationCanceledException) { - _logger.LogInformation(ex, "Refused an audio or video upload"); + logger.LogInformation(ex, "Refused an audio or video upload"); return MediaOutcome.Fail(StatusCodes.Status422UnprocessableEntity, "Validation failed: The file could not be processed"); } finally diff --git a/PrivaPub/Domain/Media/ProcessMediaJob.cs b/PrivaPub/Domain/Media/ProcessMediaJob.cs index a1c266f..bd27f08 100644 --- a/PrivaPub/Domain/Media/ProcessMediaJob.cs +++ b/PrivaPub/Domain/Media/ProcessMediaJob.cs @@ -8,17 +8,10 @@ namespace PrivaPub.Domain.Media { // Audio and video sent to /api/v2/media, processed off the request (its lease renewed while ffmpeg runs): playable, or // marked failed with why. One at a time, since a transcode takes the machine's cores. - public class ProcessMediaJob : IJobHandler + public class ProcessMediaJob( + IMediaService mediaService, + ILogger logger) : IJobHandler { - readonly IMediaService _media; - readonly ILogger _logger; - - public ProcessMediaJob(IMediaService media, ILogger logger) - { - _media = media; - _logger = logger; - } - public JobKind Kind => JobKind.ProcessMedia; public int Concurrency => 1; public int MaxAttempts => 3; @@ -37,8 +30,8 @@ namespace PrivaPub.Domain.Media var pending = await DB.Default.Find().Match(m => m.ID == job.Payload && m.ProcessingState == "pending" && m.TrashedAt == null).ExecuteFirstAsync(token); if (pending == default) return JobOutcome.Done;//processed already, or trashed meanwhile - if (!await _media.ProcessPending(pending, token)) - _logger.LogInformation("Upload {Id} could not be processed", pending.ID); + if (!await mediaService.ProcessPending(pending, token)) + logger.LogInformation("Upload {Id} could not be processed", pending.ID); return JobOutcome.Done; } } diff --git a/PrivaPub/Domain/Moderation/AccountModeration.cs b/PrivaPub/Domain/Moderation/AccountModeration.cs index e1c96d4..93a043e 100644 --- a/PrivaPub/Domain/Moderation/AccountModeration.cs +++ b/PrivaPub/Domain/Moderation/AccountModeration.cs @@ -53,57 +53,41 @@ namespace PrivaPub.Domain.Moderation // and nothing is delivered to its own inbox. It is told nothing. // // Every act is kept in the staff's log (ModerationLog), without who acted when the persona is the acting login's own. - public class AccountModeration : IAccountModeration + public class AccountModeration( + DbEntities dbEntities, + ILocalActorService localActors, + IModerationLog log, + IOpenIddictTokenManager openIddictTokenManager, + IOpenIddictAuthorizationManager authorizations, + IStatusService statuses, + IDomainBlocks domainBlocks, + IStringLocalizer localizer, + ILogger logger) : IAccountModeration { - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - readonly IModerationLog _log; - readonly IOpenIddictTokenManager _tokens; - readonly IOpenIddictAuthorizationManager _authorizations; - readonly IStatusService _statuses; - readonly IDomainBlocks _domainBlocks; - readonly IStringLocalizer _localizer; - readonly ILogger _logger; - - public AccountModeration(DbEntities dbEntities, ILocalActorService localActors, IModerationLog log, IOpenIddictTokenManager tokens, - IOpenIddictAuthorizationManager authorizations, IStatusService statuses, IDomainBlocks domainBlocks, IStringLocalizer localizer, - ILogger logger) - { - _dbEntities = dbEntities; - _localActors = localActors; - _log = log; - _tokens = tokens; - _authorizations = authorizations; - _statuses = statuses; - _domainBlocks = domainBlocks; - _localizer = localizer; - _logger = logger; - } - public async Task Moderate(string byRootId, string accountId, string action, string note, string warning, string reportId, CancellationToken token) { var result = new WebResult(); if (!ModerationActions.IsAccountAction(action)) - return result.Invalidate(_localizer["Unknown moderation action."], StatusCodes.Status422UnprocessableEntity); + return result.Invalidate(localizer["Unknown moderation action."], StatusCodes.Status422UnprocessableEntity); try { - var avatar = string.IsNullOrEmpty(accountId) ? default : await _dbEntities.Avatars.MatchID(accountId).Match(a => !a.DeletionAt.HasValue).ExecuteFirstAsync(token); + var avatar = string.IsNullOrEmpty(accountId) ? default : await dbEntities.Avatars.MatchID(accountId).Match(a => !a.DeletionAt.HasValue).ExecuteFirstAsync(token); if (avatar != default) { result.Data = await Persona(byRootId, avatar, action, note, warning, reportId, token); return result; } - var account = string.IsNullOrEmpty(accountId) ? default : await _dbEntities.ForeignAvatars.MatchID(accountId).ExecuteFirstAsync(token); + var account = string.IsNullOrEmpty(accountId) ? default : await dbEntities.ForeignAvatars.MatchID(accountId).ExecuteFirstAsync(token); if (account == default) - return result.Invalidate(_localizer["Account not found."], StatusCodes.Status404NotFound); + return result.Invalidate(localizer["Account not found."], StatusCodes.Status404NotFound); result.Data = await Remote(byRootId, account, action, note, reportId, token); return result; } catch (Exception ex) { - _logger.LogError(ex, "{Service}.{Method}({Action})", nameof(AccountModeration), nameof(Moderate), action); - return result.Invalidate(_localizer["Something went wrong."], exception: ex); + logger.LogError(ex, "{Service}.{Method}({Action})", nameof(AccountModeration), nameof(Moderate), action); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } @@ -148,18 +132,18 @@ namespace PrivaPub.Domain.Moderation .Modify(p => p.AuthorLimited, silenced.HasValue) .ExecuteAsync(CancellationToken.None); await Restrictions.Reload(CancellationToken.None); - var persona = _localActors.FromAvatar(avatar); + var persona = localActors.FromAvatar(avatar); if (action == ModerationActions.Suspend) { // nothing acts as it from now on: its Mastodon tokens end and its open streams close - await _tokens.RevokeBySubjectAsync(avatar.ID, CancellationToken.None); - await _authorizations.RevokeBySubjectAsync(avatar.ID, CancellationToken.None); - await Social.WebPush.Forget(new[] { avatar.ID });//and its Web Push subscriptions with them (R9): it is pushed nothing + await openIddictTokenManager.RevokeBySubjectAsync(avatar.ID, CancellationToken.None); + await authorizations.RevokeBySubjectAsync(avatar.ID, CancellationToken.None); + await Social.WebPush.Forget(new[] { avatar.ID }, token);//and its Web Push subscriptions with them (R9): it is pushed nothing Streams.CloseFor(avatar.ID); } if (action is ModerationActions.Silence or ModerationActions.Suspend) await Social.Notifications.Warn(avatar.ID, persona.Uri, action, warning, default, token); - await _log.Write(byRootId, action switch + await log.Write(byRootId, action switch { ModerationActions.Silence => AdminActions.PersonaSilence, ModerationActions.Unsilence => AdminActions.PersonaUnsilence, @@ -212,7 +196,7 @@ namespace PrivaPub.Domain.Moderation .Modify(p => p.AuthorLimited, limited) .ExecuteAsync(CancellationToken.None); await Restrictions.Reload(CancellationToken.None); - await _log.Write(byRootId, action switch + await log.Write(byRootId, action switch { ModerationActions.Silence => AdminActions.AccountSilence, ModerationActions.Unsilence => AdminActions.AccountUnsilence, @@ -227,22 +211,22 @@ namespace PrivaPub.Domain.Moderation var result = new WebResult(); try { - var post = string.IsNullOrEmpty(postId) ? default : await _dbEntities.Posts.MatchID(postId).ExecuteFirstAsync(token); + var post = string.IsNullOrEmpty(postId) ? default : await dbEntities.Posts.MatchID(postId).ExecuteFirstAsync(token); if (post == default || post.DeletedAt.HasValue || post.ModeratedAt.HasValue) - return result.Invalidate(_localizer["Post not found."], StatusCodes.Status404NotFound); + return result.Invalidate(localizer["Post not found."], StatusCodes.Status404NotFound); if (!post.IsFederatedCopy) { - var author = await _localActors.FindById(LocalActorKind.Person, post.GroupUserId, token); + var author = await localActors.FindById(LocalActorKind.Person, post.GroupUserId, token); if (author == default) - return result.Invalidate(_localizer["Post not found."], StatusCodes.Status404NotFound); + return result.Invalidate(localizer["Post not found."], StatusCodes.Status404NotFound); // deleted as its author deletes it: emptied, out of every timeline, and a Delete to its audience (but from a // suspended persona, which delivers nothing) - var outcome = await _statuses.Remove(author, post.ID, CancellationToken.None); + var outcome = await statuses.Remove(author, post.ID, CancellationToken.None); if (!outcome.Ok) - return result.Invalidate(_localizer["Post not found."], outcome.Status); + return result.Invalidate(localizer["Post not found."], outcome.Status); await Social.Notifications.Warn(author.Id, author.Uri, "delete_statuses", warning, new[] { post.ID }, token); - await _log.Write(byRootId, AdminActions.PostRemove, AdminTargets.Post, post.ID, $"@{author.Handle}: {post.ObjectURI}", reportId, note, + await log.Write(byRootId, AdminActions.PostRemove, AdminTargets.Post, post.ID, $"@{author.Handle}: {post.ObjectURI}", reportId, note, CancellationToken.None); return result; } @@ -250,13 +234,13 @@ namespace PrivaPub.Domain.Moderation // a copy of a post from elsewhere: kept (its address stays known, so it is never taken in again), hidden here await DB.Default.Update().MatchID(post.ID).Modify(p => p.ModeratedAt, DateTime.UtcNow).ExecuteAsync(CancellationToken.None); await Fanout.Deleting(post, CancellationToken.None); - await _log.Write(byRootId, AdminActions.PostRemove, AdminTargets.Post, post.ID, post.Url ?? post.ObjectURI, reportId, note, CancellationToken.None); + await log.Write(byRootId, AdminActions.PostRemove, AdminTargets.Post, post.ID, post.Url ?? post.ObjectURI, reportId, note, CancellationToken.None); return result; } catch (Exception ex) { - _logger.LogError(ex, "{Service}.{Method}()", nameof(AccountModeration), nameof(RemovePost)); - return result.Invalidate(_localizer["Something went wrong."], exception: ex); + logger.LogError(ex, "{Service}.{Method}()", nameof(AccountModeration), nameof(RemovePost)); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } @@ -265,7 +249,7 @@ namespace PrivaPub.Domain.Moderation domain = DomainBlocks.Normalise(domain); if (string.IsNullOrEmpty(domain)) return; - var silenced = _domainBlocks.Find(domain)?.Severity == DomainBlockSeverity.Silence; + var silenced = domainBlocks.Find(domain)?.Severity == DomainBlockSeverity.Silence; // the posts of that server and of its subdomains, by their authors' addresses var pattern = ModerationFlags.OfDomain(domain); await DB.Default.Update().Match(f => f.Regex(p => p.ActorURI, pattern) & f.Eq(p => p.IsFederatedCopy, true)) @@ -283,21 +267,21 @@ namespace PrivaPub.Domain.Moderation } bool IsDomainSilenced(string actorUri) => - Uri.TryCreate(actorUri, UriKind.Absolute, out var uri) && _domainBlocks.Find(uri.Host)?.Severity == DomainBlockSeverity.Silence; + Uri.TryCreate(actorUri, UriKind.Absolute, out var uri) && domainBlocks.Find(uri.Host)?.Severity == DomainBlockSeverity.Silence; public async Task View(string accountId, CancellationToken token) { - var avatar = await _dbEntities.Avatars.MatchID(accountId).ExecuteFirstAsync(token); + var avatar = await dbEntities.Avatars.MatchID(accountId).ExecuteFirstAsync(token); if (avatar != default) return View(avatar); - var account = await _dbEntities.ForeignAvatars.MatchID(accountId).ExecuteFirstAsync(token); + var account = await dbEntities.ForeignAvatars.MatchID(accountId).ExecuteFirstAsync(token); return account == default ? default : View(account); } // a persona as moderators see it: never its login public ViewModeratedAccount View(Avatar avatar) { - var persona = _localActors.FromAvatar(avatar); + var persona = localActors.FromAvatar(avatar); return new ViewModeratedAccount { Id = avatar.ID, @@ -315,7 +299,7 @@ namespace PrivaPub.Domain.Moderation public ViewModeratedAccount View(ForeignAvatar account) { - var block = Uri.TryCreate(account.ActorURI, UriKind.Absolute, out var uri) ? _domainBlocks.Find(uri.Host) : default; + var block = Uri.TryCreate(account.ActorURI, UriKind.Absolute, out var uri) ? domainBlocks.Find(uri.Host) : default; return new ViewModeratedAccount { Id = account.ID, diff --git a/PrivaPub/Domain/Moderation/ModerationLog.cs b/PrivaPub/Domain/Moderation/ModerationLog.cs index dc1d092..1dc1404 100644 --- a/PrivaPub/Domain/Moderation/ModerationLog.cs +++ b/PrivaPub/Domain/Moderation/ModerationLog.cs @@ -17,17 +17,12 @@ namespace PrivaPub.Domain.Moderation // (ModeratorController's /clientapi/moderator/log). An entry never holds an IP address, and never pairs a root with its // own personas: an act on a persona that the acting root owns, on a post of it, a group it owns or a report about it // (R6), is kept without who acted. - public class ModerationLog : IModerationLog + public class ModerationLog( + ILogger logger) : IModerationLog { const int MaxLabel = 200; const int MaxNote = 1000; - readonly ILogger _logger; - - public ModerationLog(ILogger logger) - { - _logger = logger; - } public async Task Write(string byRootId, string action, string targetKind, string targetId, string targetLabel, string reportId = default, string note = default, CancellationToken token = default) @@ -49,7 +44,7 @@ namespace PrivaPub.Domain.Moderation } catch (Exception ex) { - _logger.LogWarning(ex, "The staff's log could not keep a {Action}", action); + logger.LogWarning(ex, "The staff's log could not keep a {Action}", action); } } diff --git a/PrivaPub/Domain/Portability/ImportArchiveJob.cs b/PrivaPub/Domain/Portability/ImportArchiveJob.cs index ac66c18..ef4f2da 100644 --- a/PrivaPub/Domain/Portability/ImportArchiveJob.cs +++ b/PrivaPub/Domain/Portability/ImportArchiveJob.cs @@ -118,7 +118,7 @@ namespace PrivaPub.Domain.Portability state.ImportFrom = actorId; state.ImportSameActor = run.SameActor; state.ImportCounts = []; - await Save(run, token, force: true); + await Save(run, force: true, token); var parts = state.ImportParts.ToHashSet(StringComparer.Ordinal); var privapub = Text((archive.Json("privapub/archive.json") as JsonObject)?["software"]) == "privapub"; @@ -185,7 +185,7 @@ namespace PrivaPub.Domain.Portability .ExecuteAsync(token); // progress written at most every two seconds; the answer to whether the root asked to stop - static async Task Save(Run run, CancellationToken token, bool force = false) + static async Task Save(Run run, bool force = false, CancellationToken token = default) { if (!force && DateTime.UtcNow - run.LastSaved < TimeSpan.FromSeconds(2)) return; @@ -199,7 +199,7 @@ namespace PrivaPub.Domain.Portability static async Task Stopped(Run run, CancellationToken token) { - await Save(run, token); + await Save(run, token: token); return await DB.Default.Find().MatchID(run.State.ID).Match(a => a.StopAsked).ExecuteAnyAsync(token); } @@ -710,7 +710,7 @@ namespace PrivaPub.Domain.Portability // Mastodon's columns: notify on new posts, and the languages (", " between them) its posts reach the home in (R8) var notify = cells.Length >= 3 && cells[2].Trim().Equals("true", StringComparison.OrdinalIgnoreCase); var languages = cells.Length >= 4 ? cells[3].Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries) : []; - return await run.Services.GetRequiredService().FollowAs(run.Me, uri, boosts, token, notify, languages) != default; + return await run.Services.GetRequiredService().FollowAs(run.Me, uri, boosts, notify, languages, token) != default; } // lists by title, with only the accounts the persona follows diff --git a/PrivaPub/Domain/Portability/SafeArchive.cs b/PrivaPub/Domain/Portability/SafeArchive.cs index 0da4b14..613f92f 100644 --- a/PrivaPub/Domain/Portability/SafeArchive.cs +++ b/PrivaPub/Domain/Portability/SafeArchive.cs @@ -29,7 +29,7 @@ namespace PrivaPub.Domain.Portability public static (SafeArchive Archive, string Error) Open(string path) { - ZipArchive zip; + var zip = default(ZipArchive); try { zip = ZipFile.OpenRead(path); diff --git a/PrivaPub/Domain/Relationships/RelationshipService.cs b/PrivaPub/Domain/Relationships/RelationshipService.cs index e021123..43dcf35 100644 --- a/PrivaPub/Domain/Relationships/RelationshipService.cs +++ b/PrivaPub/Domain/Relationships/RelationshipService.cs @@ -25,19 +25,11 @@ namespace PrivaPub.Domain.Relationships Task UnblockDomain(LocalActor me, string domain, CancellationToken token); } - public class RelationshipService : IRelationshipService + public class RelationshipService( + DbEntities dbEntities, + IFollowService follows, + IDeliveryService delivery) : IRelationshipService { - readonly DbEntities _dbEntities; - readonly IFollowService _follows; - readonly IDeliveryService _delivery; - - public RelationshipService(DbEntities dbEntities, IFollowService follows, IDeliveryService delivery) - { - _dbEntities = dbEntities; - _follows = follows; - _delivery = delivery; - } - public async Task Block(LocalActor me, string targetActorUri, string targetAccountId, CancellationToken token) { var block = new Block { AvatarId = me.Id, TargetAccountId = targetAccountId, TargetActorURI = targetActorUri }; @@ -50,7 +42,7 @@ namespace PrivaPub.Domain.Relationships block = await DB.Default.Find().Match(b => b.AvatarId == me.Id && b.TargetActorURI == targetActorUri).ExecuteFirstAsync(token); } - await _follows.UnfollowAs(me, targetActorUri, token); + await follows.UnfollowAs(me, targetActorUri, token); await RemoveFollower(me, targetActorUri, targetAccountId, token); await Forget(me, targetAccountId, token); if (block != default) @@ -59,7 +51,7 @@ namespace PrivaPub.Domain.Relationships public async Task RemoveFollower(LocalActor me, string followerActorUri, string followerAccountId, CancellationToken token) { - var follower = await _dbEntities.Followers.Match(f => f.LocalActorId == me.Id && f.ActorURI == followerActorUri).ExecuteFirstAsync(token); + var follower = await dbEntities.Followers.Match(f => f.LocalActorId == me.Id && f.ActorURI == followerActorUri).ExecuteFirstAsync(token); if (follower == default) return; await DB.Default.DeleteAsync(follower.ID); @@ -73,7 +65,7 @@ namespace PrivaPub.Domain.Relationships ["actor"] = me.Uri, ["object"] = new JsonObject { ["id"] = follower.FollowActivityURI, ["type"] = "Follow", ["actor"] = followerActorUri, ["object"] = me.Uri } }; - await _delivery.Enqueue(me, new[] { follower.InboxURL }, reject, token); + await delivery.Enqueue(me, new[] { follower.InboxURL }, reject, token: token); } else await DB.Default.DeleteAsync(f => f.TargetActorURI == me.Uri && f.AvatarId == followerAccountId); @@ -109,9 +101,9 @@ namespace PrivaPub.Domain.Relationships { if (targetActorUri.StartsWith(me.BaseAddress + "/", StringComparison.OrdinalIgnoreCase)) return; - var target = await _dbEntities.ForeignAvatars.Match(f => f.ActorURI == targetActorUri).ExecuteFirstAsync(token); + var target = await dbEntities.ForeignAvatars.Match(f => f.ActorURI == targetActorUri).ExecuteFirstAsync(token); if (!string.IsNullOrEmpty(target?.InboxURL)) - await _delivery.Enqueue(me, new[] { target.InboxURL }, activity, token); + await delivery.Enqueue(me, new[] { target.InboxURL }, activity, token: token); } public async Task Mute(LocalActor me, string targetActorUri, string targetAccountId, bool hideNotifications, TimeSpan? duration, CancellationToken token) @@ -142,12 +134,12 @@ namespace PrivaPub.Domain.Relationships catch (MongoWriteException ex) when (ex.WriteError?.Category == ServerErrorCategory.DuplicateKey) { } - var followings = await _dbEntities.Followings.Match(f => f.AvatarId == me.Id && !f.TargetIsLocal).ExecuteAsync(token); - var followers = await _dbEntities.Followers.Match(f => f.LocalActorId == me.Id).ExecuteAsync(token); + var followings = await dbEntities.Followings.Match(f => f.AvatarId == me.Id && !f.TargetIsLocal).ExecuteAsync(token); + var followers = await dbEntities.Followers.Match(f => f.LocalActorId == me.Id).ExecuteAsync(token); var handles = await Hidden.HandleDomains(followings.Select(f => f.TargetActorURI).Concat(followers.Select(f => f.ActorURI)).ToList(), token); foreach (var following in followings) if (Hidden.Blocks(domain, following.TargetActorURI, handles.GetValueOrDefault(following.TargetActorURI))) - await _follows.UnfollowAs(me, following.TargetActorURI, token); + await follows.UnfollowAs(me, following.TargetActorURI, token); foreach (var follower in followers) if (Hidden.Blocks(domain, follower.ActorURI, handles.GetValueOrDefault(follower.ActorURI))) await DB.Default.DeleteAsync(follower.ID); diff --git a/PrivaPub/Domain/Relationships/ReportService.cs b/PrivaPub/Domain/Relationships/ReportService.cs index 697bdc8..ab12372 100644 --- a/PrivaPub/Domain/Relationships/ReportService.cs +++ b/PrivaPub/Domain/Relationships/ReportService.cs @@ -18,27 +18,18 @@ namespace PrivaPub.Domain.Relationships IReadOnlyList 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 File(LocalActor reporter, string targetAccountId, IReadOnlyList postIds, string comment, string category, IReadOnlyList 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()).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() - : 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) diff --git a/PrivaPub/Domain/Social/FeaturedTags.cs b/PrivaPub/Domain/Social/FeaturedTags.cs index e0ae3c5..2d29dda 100644 --- a/PrivaPub/Domain/Social/FeaturedTags.cs +++ b/PrivaPub/Domain/Social/FeaturedTags.cs @@ -44,19 +44,13 @@ namespace PrivaPub.Domain.Social // followers, unfeaturing it Remove{Hashtag}, both with its `featured` collection (/trophies) as the target: that is how // Mastodon sends them (its AddHashtagSerializer), and the only target Mastodon takes a Hashtag from. Received the same // way, with either collection as the target, and read from an account's featuredTags collection with its counts. - public class FeaturedTags : IFeaturedTags + public class FeaturedTags( + IDeliveryService delivery, + IRemoteActorService remoteActors) : IFeaturedTags { public const int MaxFeatured = 10;//the instance API's max_featured_tags, Mastodon's FeaturedTag::LIMIT public const int MaxRemote = 20;//what we keep of an account elsewhere, whatever its server allows - readonly IDeliveryService _delivery; - readonly IRemoteActorService _remoteActors; - - public FeaturedTags(IDeliveryService delivery, IRemoteActorService remoteActors) - { - _delivery = delivery; - _remoteActors = remoteActors; - } // a featured hashtag as Mastodon renders it (its HashtagSerializer): the link to this server's page of the tag, which // is what our posts' Hashtag tags link to, and the name as the persona wrote it @@ -119,7 +113,7 @@ namespace PrivaPub.Domain.Social { if (persona is not { IsFederated: true, Kind: Models.Federation.LocalActorKind.Person }) return; - await _delivery.EnqueueToFollowers(persona, new JsonObject + await delivery.EnqueueToFollowers(persona, new JsonObject { ["@context"] = ActivityPubRenderer.Context(), ["id"] = persona.ActivityUri($"{(add ? "feature" : "unfeature")}-tag-{tag.ID}-{DateTime.UtcNow.Ticks}"), @@ -129,7 +123,7 @@ namespace PrivaPub.Domain.Social ["target"] = persona.Featured, ["to"] = new JsonArray(ActivityPubRenderer.Public), ["cc"] = new JsonArray(persona.Followers) - }, token); + }, token: token); } // what posts carry the tag: a persona's own public and unlisted posts, or the public and unlisted posts we hold of an @@ -257,7 +251,7 @@ namespace PrivaPub.Domain.Social async Task Fetch(string uri, CancellationToken token) { - using var fetched = await _remoteActors.FetchObject(uri, token); + using var fetched = await remoteActors.FetchObject(uri, token); return fetched == default || fetched.Root.ValueKind != JsonValueKind.Object ? default : JsonNode.Parse(fetched.Root.GetRawText()) as JsonObject; } } diff --git a/PrivaPub/Domain/Social/FeedFollows.cs b/PrivaPub/Domain/Social/FeedFollows.cs index 92b2ba2..e5c04ac 100644 --- a/PrivaPub/Domain/Social/FeedFollows.cs +++ b/PrivaPub/Domain/Social/FeedFollows.cs @@ -21,25 +21,16 @@ namespace PrivaPub.Domain.Social // server's reader (LocalActorService.ReaderUserName) follows every community in the feeds anyone reads, as Lemmy's own // follower of multi-communities does, and stops following one no feed holds any more. What it follows arrives as any // community's posts do; nobody's home shows them, the feed's timeline does. - public class FeedFollows : IFeedFollows + public class FeedFollows( + DbEntities dbEntities, + ILocalActorService localActors, + IRemoteActorService remoteActors, + IFollowService followService, + IJobQueue jobQueue) : IFeedFollows { public const int MaxCommunities = 500; static readonly TimeSpan Stale = TimeSpan.FromDays(1); - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - readonly IRemoteActorService _remoteActors; - readonly IFollowService _follows; - readonly IJobQueue _jobs; - - public FeedFollows(DbEntities dbEntities, ILocalActorService localActors, IRemoteActorService remoteActors, IFollowService follows, IJobQueue jobs) - { - _dbEntities = dbEntities; - _localActors = localActors; - _remoteActors = remoteActors; - _follows = follows; - _jobs = jobs; - } public static Task Sync(IJobQueue jobs, CancellationToken token) => jobs.Enqueue(JobKind.SyncFeeds, string.Empty, default, $"feeds|{Guid.NewGuid():N}", token); @@ -59,7 +50,7 @@ namespace PrivaPub.Domain.Social } else if ((await DB.Default.DeleteAsync(s => s.AvatarId == me.Id && s.FeedActorURI == feed.ActorURI)).DeletedCount == 0) return true; - await Sync(_jobs, token); + await Sync(jobQueue, token); return true; } @@ -69,26 +60,26 @@ namespace PrivaPub.Domain.Social public async Task Reconcile(CancellationToken token) { var read = (await DB.Default.Find().Project(s => s.FeedActorURI).ExecuteAsync(token)).Distinct().ToList(); - var feeds = await _dbEntities.ForeignAvatars.Match(a => read.Contains(a.ActorURI) && a.AvatarType == AvatarType.Feed && !a.DeletionAt.HasValue) + var feeds = await dbEntities.ForeignAvatars.Match(a => read.Contains(a.ActorURI) && a.AvatarType == AvatarType.Feed && !a.DeletionAt.HasValue) .ExecuteAsync(token); // a feed's communities are as its server listed them a day ago at most (AccountCountsJob reads them, then asks // for this again) foreach (var stale in feeds.Where(f => !(DateTime.UtcNow - f.CountedAt < Stale))) if (Uri.TryCreate(stale.ActorURI, UriKind.Absolute, out var uri)) - await _jobs.Enqueue(JobKind.CountAccount, stale.ActorURI, uri.Host.ToLowerInvariant(), AccountCountsJob.DedupeKey(stale.ActorURI, DateTime.UtcNow), token); + await jobQueue.Enqueue(JobKind.CountAccount, stale.ActorURI, uri.Host.ToLowerInvariant(), AccountCountsJob.DedupeKey(stale.ActorURI, DateTime.UtcNow), token); - var ours = _localActors.BaseAddress + "/"; + var ours = localActors.BaseAddress + "/"; var wanted = feeds.SelectMany(f => f.FeedCommunities).Where(c => !c.StartsWith(ours, StringComparison.Ordinal)) .Distinct(StringComparer.Ordinal).Take(MaxCommunities).ToHashSet(StringComparer.Ordinal); - var reader = await _localActors.GetReaderActor(token); - var following = await _dbEntities.Followings.Match(f => f.AvatarId == reader.Id).ExecuteAsync(token); + var reader = await localActors.GetReaderActor(token); + var following = await dbEntities.Followings.Match(f => f.AvatarId == reader.Id).ExecuteAsync(token); foreach (var gone in following.Where(f => !wanted.Contains(f.TargetActorURI))) - await _follows.UnfollowAs(reader, gone.TargetActorURI, token); + await followService.UnfollowAs(reader, gone.TargetActorURI, token); var followed = following.Select(f => f.TargetActorURI).ToHashSet(StringComparer.Ordinal); foreach (var community in wanted.Where(c => !followed.Contains(c))) // only a community: a feed lists nothing else, and the reader follows nothing else - if (await _remoteActors.GetActor(community, refresh: false, token) is { AvatarType: AvatarType.Group }) - await _follows.FollowAs(reader, community, showReblogs: false, token); + if (await remoteActors.GetActor(community, refresh: false, token) is { AvatarType: AvatarType.Group }) + await followService.FollowAs(reader, community, showReblogs: false, token: token); } } diff --git a/PrivaPub/Domain/Social/FollowService.cs b/PrivaPub/Domain/Social/FollowService.cs index 500e389..d6101b7 100644 --- a/PrivaPub/Domain/Social/FollowService.cs +++ b/PrivaPub/Domain/Social/FollowService.cs @@ -28,8 +28,9 @@ namespace PrivaPub.Domain.Social Task Followings(string rootUserId, string avatarId, CancellationToken token); /// Follows an account, or changes how a follow already made shows it: notify and languages (R8) change only /// when given (languages empty: every language). - Task FollowAs(LocalActor follower, string target, bool showReblogs, CancellationToken token, bool? notify = default, - IReadOnlyList languages = default); + Task FollowAs(LocalActor follower, string target, bool showReblogs, bool? notify = default, + IReadOnlyList languages = default, + CancellationToken token = default); Task UnfollowAs(LocalActor follower, string target, CancellationToken token); Task Decide(LocalActor me, string followerAccountId, bool accept, CancellationToken token); Task 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 localizer, + ILogger logger) : IFollowService { - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - readonly IRemoteActorService _remoteActors; - readonly IDeliveryService _delivery; - readonly IStringLocalizer _localizer; - readonly ILogger _logger; - - public FollowService(DbEntities dbEntities, ILocalActorService localActors, IRemoteActorService remoteActors, IDeliveryService delivery, - IStringLocalizer localizer, ILogger logger) - { - _dbEntities = dbEntities; - _localActors = localActors; - _remoteActors = remoteActors; - _delivery = delivery; - _localizer = localizer; - _logger = logger; - } - public async Task 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 FollowAs(LocalActor follower, string target, bool showReblogs, CancellationToken token, bool? notify = default, - IReadOnlyList languages = default) + public async Task FollowAs(LocalActor follower, string target, bool showReblogs, bool? notify = default, + IReadOnlyList 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(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 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().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() diff --git a/PrivaPub/Domain/Social/Notifications.cs b/PrivaPub/Domain/Social/Notifications.cs index 2d66f85..480cd60 100644 --- a/PrivaPub/Domain/Social/Notifications.cs +++ b/PrivaPub/Domain/Social/Notifications.cs @@ -26,8 +26,7 @@ namespace PrivaPub.Domain.Social } } - public static async Task Add(string avatarId, NotificationType type, string fromAccountId, string fromActorUri, string postId, - CancellationToken token, string emoji = default, string emojiUrl = default, string text = default) + public static async Task Add(string avatarId, NotificationType type, string fromAccountId, string fromActorUri, string postId, string emoji = default, string emojiUrl = default, string text = default, CancellationToken token = default) { if (string.IsNullOrEmpty(avatarId) || avatarId == fromAccountId && type != NotificationType.Poll) return; diff --git a/PrivaPub/Domain/Social/Reactions.cs b/PrivaPub/Domain/Social/Reactions.cs index 8f6ebb4..fe8d15b 100644 --- a/PrivaPub/Domain/Social/Reactions.cs +++ b/PrivaPub/Domain/Social/Reactions.cs @@ -27,18 +27,12 @@ namespace PrivaPub.Domain.Social Task Unreact(LocalActor me, PostEntity post, string emoji, CancellationToken token); } - public class Reactions : IReactions + public class Reactions( + DbEntities dbEntities, + IDeliveryService delivery) : IReactions { static readonly string[] Hearts = { "❤", "❤️", "♥", "♥️" }; - readonly DbEntities _dbEntities; - readonly IDeliveryService _delivery; - - public Reactions(DbEntities dbEntities, IDeliveryService delivery) - { - _dbEntities = dbEntities; - _delivery = delivery; - } public static bool IsHeart(string content) => content == default || Hearts.Contains(content.Trim()); @@ -64,7 +58,7 @@ namespace PrivaPub.Domain.Social } Arrival.Accept("reaction"); if (!post.IsFederatedCopy) - await Notifications.Add(post.GroupUserId, NotificationType.Reaction, actor.ID, actor.ActorURI, post.ID, token, emoji.Name, emoji.Url); + await Notifications.Add(post.GroupUserId, NotificationType.Reaction, actor.ID, actor.ActorURI, post.ID, emoji.Name, emoji.Url, token: token); } public async Task Withdraw(ForeignAvatar actor, string activityId, string objectUri, string content, CancellationToken token) @@ -74,7 +68,7 @@ namespace PrivaPub.Domain.Social : await DB.Default.Find().Match(r => r.ActivityURI == activityId && r.ActorURI == actor.ActorURI).ExecuteFirstAsync(token); if (reaction == default && objectUri != default && Normalise(content, new()) is { } emoji) { - var post = await _dbEntities.Posts.Match(p => p.ObjectURI == objectUri).ExecuteFirstAsync(token); + var post = await dbEntities.Posts.Match(p => p.ObjectURI == objectUri).ExecuteFirstAsync(token); reaction = post == default ? default : await DB.Default.Find().Match(r => r.PostId == post.ID && r.ActorURI == actor.ActorURI && r.Emoji == emoji.Name).ExecuteFirstAsync(token); @@ -114,7 +108,7 @@ namespace PrivaPub.Domain.Social return true; } if (!post.IsFederatedCopy) - await Notifications.Add(post.GroupUserId, NotificationType.Reaction, me.Id, me.Uri, post.ID, token, picked.Name, picked.Url); + await Notifications.Add(post.GroupUserId, NotificationType.Reaction, me.Id, me.Uri, post.ID, picked.Name, picked.Url, token: token); else await Tell(me, post, Activity(me, post, reaction), token); return true; @@ -169,9 +163,9 @@ namespace PrivaPub.Domain.Social async Task Tell(LocalActor me, PostEntity post, JsonObject activity, CancellationToken token) { - var author = await _dbEntities.ForeignAvatars.Match(f => f.ActorURI == post.ActorURI).ExecuteFirstAsync(token); + var author = await dbEntities.ForeignAvatars.Match(f => f.ActorURI == post.ActorURI).ExecuteFirstAsync(token); if (!string.IsNullOrEmpty(author?.InboxURL)) - await _delivery.Enqueue(me, new[] { author.InboxURL }, activity, token); + await delivery.Enqueue(me, new[] { author.InboxURL }, activity, token: token); } public sealed record Picked(string Name, string Url); diff --git a/PrivaPub/Domain/Social/Trends.cs b/PrivaPub/Domain/Social/Trends.cs index 9a1fe8e..92e8d4d 100644 --- a/PrivaPub/Domain/Social/Trends.cs +++ b/PrivaPub/Domain/Social/Trends.cs @@ -13,26 +13,20 @@ namespace PrivaPub.Domain.Social // and fetch nothing). Hashtags and links rise with the number of different authors using them today against the // week before; posts with their favourites, boosts and replies, halving every twelve hours. A post trends only if its // author is discoverable, and nothing warned about (content warning) trends. Computed at most every ten minutes. - public sealed class Trends + public sealed class Trends( + DbEntities dbEntities, + IMemoryCache cache) { public static readonly TimeSpan Fresh = TimeSpan.FromMinutes(10); const int MinAuthors = 2;//one account alone never makes a trend const int Kept = 40; - readonly DbEntities _dbEntities; - readonly IMemoryCache _cache; - - public Trends(DbEntities dbEntities, IMemoryCache cache) - { - _dbEntities = dbEntities; - _cache = cache; - } // what is computed is forgotten: the next read computes it again public void Forget() { foreach (var key in new[] { "trends:tags", "trends:links", "trends:statuses" }) - _cache.Remove(key); + cache.Remove(key); } public sealed record DayUse(DateTime Day, int Uses, int Accounts); @@ -40,7 +34,7 @@ namespace PrivaPub.Domain.Social public sealed record Trend(string Key, List History, string SamplePostId); public Task> Tags(CancellationToken token) => - _cache.GetOrCreateAsync("trends:tags", async entry => + cache.GetOrCreateAsync("trends:tags", async entry => { entry.AbsoluteExpirationRelativeToNow = Fresh; var posts = await Week(p => p.Tags.Count > 0, token); @@ -48,7 +42,7 @@ namespace PrivaPub.Domain.Social }); public Task> Links(CancellationToken token) => - _cache.GetOrCreateAsync("trends:links", async entry => + cache.GetOrCreateAsync("trends:links", async entry => { entry.AbsoluteExpirationRelativeToNow = Fresh; var posts = await Week(p => p.Link != null, token); @@ -58,12 +52,12 @@ namespace PrivaPub.Domain.Social // the ids of the trending posts, best first public Task> Statuses(CancellationToken token) => - _cache.GetOrCreateAsync("trends:statuses", async entry => + cache.GetOrCreateAsync("trends:statuses", async entry => { entry.AbsoluteExpirationRelativeToNow = Fresh; var now = DateTime.UtcNow; var since = now.AddHours(-48); - var posts = await _dbEntities.Posts + var posts = await dbEntities.Posts .Match(p => p.Visibility == PostVisibility.Public && !p.DeletedAt.HasValue && !p.AuthorGone && !p.HasContentWarning && !p.IsLocalOnly && p.ReblogOfPostId == null && p.InReplyToURI == null && p.AnsweringToPostId == null && p.CreationDate >= since && p.FavouritesCount + p.ReblogsCount + p.RepliesCount > 0) @@ -78,7 +72,7 @@ namespace PrivaPub.Domain.Social Task> Week(System.Linq.Expressions.Expression> with, CancellationToken token) { var since = DateTime.UtcNow.Date.AddDays(-6); - return _dbEntities.Posts + return dbEntities.Posts .Match(p => p.Visibility == PostVisibility.Public && !p.DeletedAt.HasValue && !p.AuthorGone && !p.HasContentWarning && !p.IsLocalOnly && p.ReblogOfPostId == null && p.CreationDate >= since) .Match(Privacy.VisibilityPolicy.IsPublic).Match(Privacy.VisibilityPolicy.IsListed) diff --git a/PrivaPub/Domain/Social/WebPush.cs b/PrivaPub/Domain/Social/WebPush.cs index cc01e15..1fd8580 100644 --- a/PrivaPub/Domain/Social/WebPush.cs +++ b/PrivaPub/Domain/Social/WebPush.cs @@ -83,7 +83,7 @@ namespace PrivaPub.Domain.Social } /// Every subscription of these personas goes (their tokens ended, or they did). - public static async Task Forget(IReadOnlyCollection avatarIds) + public static async Task Forget(IReadOnlyCollection avatarIds, CancellationToken token = default) { var ids = avatarIds?.Where(id => !string.IsNullOrEmpty(id)).Distinct().ToList() ?? new List(); if (ids.Count > 0) @@ -91,7 +91,7 @@ namespace PrivaPub.Domain.Social } /// The subscription made with this token goes (the token was revoked). - public static async Task ForgetToken(string tokenId) + public static async Task ForgetToken(string tokenId, CancellationToken token = default) { if (!string.IsNullOrEmpty(tokenId)) await DB.Default.DeleteAsync(s => s.TokenId == tokenId); @@ -100,17 +100,10 @@ namespace PrivaPub.Domain.Social // Hangs on Notifications.Told while the host runs and queues one SendPush job per subscription the notification goes to // (WebPushJob sends it, encrypted). Queueing is a few indexed reads and inserts; nothing leaves the server here. - public class WebPushDispatcher : IHostedService + public class WebPushDispatcher( + IJobQueue jobQueue, + ILogger logger) : IHostedService { - readonly IJobQueue _jobs; - readonly ILogger _logger; - - public WebPushDispatcher(IJobQueue jobs, ILogger logger) - { - _jobs = jobs; - _logger = logger; - } - public Task StartAsync(CancellationToken cancellationToken) { Notifications.Told = Dispatch; @@ -145,11 +138,11 @@ namespace PrivaPub.Domain.Social DedupeKey = $"push|{subscription.ID}|{notification.ID}" }); if (jobs.Count > 0) - await _jobs.EnqueueMany(jobs, token); + await jobQueue.EnqueueMany(jobs, token); } catch (Exception ex) when (ex is not OperationCanceledException || !token.IsCancellationRequested) { - _logger.LogWarning(ex, "{Service} could not queue the pushes of a notification", nameof(WebPushDispatcher)); + logger.LogWarning(ex, "{Service} could not queue the pushes of a notification", nameof(WebPushDispatcher)); } } } diff --git a/PrivaPub/Domain/Statistics/SelfLocation.cs b/PrivaPub/Domain/Statistics/SelfLocation.cs index f6d5537..c595e64 100644 --- a/PrivaPub/Domain/Statistics/SelfLocation.cs +++ b/PrivaPub/Domain/Statistics/SelfLocation.cs @@ -19,33 +19,23 @@ namespace PrivaPub.Domain.Statistics // This server's own place, for the instance API (the client's globe draws every server from it). The owner may set it, // for a server behind a proxy or a CDN; otherwise the server's own host name is resolved and located like any other // server's, once a day. Never the address of a request. - public class SelfLocation : ISelfLocation + public class SelfLocation( + IGeoLocator geo, + IOptionsMonitor options, + IOptionsMonitor app, + ILogger logger, + ICdnRanges cdnRanges = default) : ISelfLocation { static readonly TimeSpan Lifetime = TimeSpan.FromDays(1); - readonly IGeoLocator _geo; - readonly ICdnRanges _cdnRanges; - readonly IOptionsMonitor _options; - readonly IOptionsMonitor _app; - readonly ILogger _logger; readonly SemaphoreSlim _gate = new(1, 1); InstanceGeo _located; DateTime _locatedAt = DateTime.MinValue; - public SelfLocation(IGeoLocator geo, IOptionsMonitor options, IOptionsMonitor app, ILogger logger, - ICdnRanges cdnRanges = default) - { - _geo = geo; - _cdnRanges = cdnRanges; - _options = options; - _app = app; - _logger = logger; - } - public async Task Get(CancellationToken token) { - if (_options.CurrentValue.Geo.Self is { Latitude: { } latitude, Longitude: { } longitude } self) + if (options.CurrentValue.Geo.Self is { Latitude: { } latitude, Longitude: { } longitude } self) return new InstanceGeo { Country = self.Country, @@ -77,12 +67,12 @@ namespace PrivaPub.Domain.Statistics { try { - if (!Uri.TryCreate(_app.CurrentValue.BackendBaseAddress, UriKind.Absolute, out var self)) + if (!Uri.TryCreate(app.CurrentValue.BackendBaseAddress, UriKind.Absolute, out var self)) return default; var addresses = await Dns.GetHostAddressesAsync(self.Host, token); var address = addresses.FirstOrDefault(a => a.AddressFamily == AddressFamily.InterNetwork) ?? addresses.FirstOrDefault(); - var fix = address == default ? default : _geo.Locate(address); - var (cdn, cdnSource) = Federation.Objects.InstanceDescriber.Cdn(address, self.Host, fix?.Asn, _cdnRanges, default); + var fix = address == default ? default : geo.Locate(address); + var (cdn, cdnSource) = Federation.Objects.InstanceDescriber.Cdn(address, self.Host, fix?.Asn, cdnRanges, default); return fix == default ? default : new InstanceGeo { Country = fix.Country, @@ -95,13 +85,13 @@ namespace PrivaPub.Domain.Statistics CdnDomain = cdn?.Domain, CdnSource = cdnSource, Ipv6 = address.AddressFamily == AddressFamily.InterNetworkV6, - Source = _geo.Source, + Source = geo.Source, LocatedAt = DateTime.UtcNow }; } catch (Exception ex) when (ex is SocketException or ArgumentException) { - _logger.LogInformation("{Service}: this server's host does not resolve", nameof(SelfLocation)); + logger.LogInformation("{Service}: this server's host does not resolve", nameof(SelfLocation)); return default; } } diff --git a/PrivaPub/Domain/Statistics/ServerPlaces.cs b/PrivaPub/Domain/Statistics/ServerPlaces.cs index dd78b35..ca46b74 100644 --- a/PrivaPub/Domain/Statistics/ServerPlaces.cs +++ b/PrivaPub/Domain/Statistics/ServerPlaces.cs @@ -29,20 +29,14 @@ namespace PrivaPub.Domain.Statistics // Servers through time (owner decision 2026-10-04): each server's weekly snapshots (place, CDN, size), and the servers // grouped by the CDN in front of them, named by the CDN's own domain. Read from the weekly snapshots InstanceDescriber // writes; the CDN pages are kept for half an hour, because a large CDN reads many snapshots. - public class ServerPlaces : IServerPlaces + public class ServerPlaces( + ICdnRanges cdnRanges, + IMemoryCache cache) : IServerPlaces { public const int MaxHosts = 500; const int MaxChanges = 50; static readonly TimeSpan CacheFor = TimeSpan.FromMinutes(30); - readonly ICdnRanges _ranges; - readonly IMemoryCache _cache; - - public ServerPlaces(ICdnRanges ranges, IMemoryCache cache) - { - _ranges = ranges; - _cache = cache; - } // the CDN key a server's place belongs to: the CDN's domain, or its name for a CDN that has none public static string KeyOf(InstanceGeo geo) => @@ -75,7 +69,7 @@ namespace PrivaPub.Domain.Statistics public async Task> Cdns(CancellationToken token) { var fronted = await Fronted(token); - var status = _ranges.Status; + var status = cdnRanges.Status; var keys = CdnCatalog.All.Select(p => p.Key).Concat(fronted.Select(i => KeyOf(i.Geo))).Distinct(StringComparer.OrdinalIgnoreCase); return keys.Select(key => Group(key, fronted, status)).OrderByDescending(g => g.Servers).ThenBy(g => g.Name).ToList(); } @@ -85,14 +79,14 @@ namespace PrivaPub.Domain.Statistics key = key?.Trim().ToLowerInvariant(); if (string.IsNullOrEmpty(key) || key.Length > 100) return default; - return await _cache.GetOrCreateAsync($"cdn-history|{key}|{weeks}", async entry => + return await cache.GetOrCreateAsync($"cdn-history|{key}|{weeks}", async entry => { entry.AbsoluteExpirationRelativeToNow = CacheFor; var fronted = await Fronted(token); var provider = CdnCatalog.ByKey(key); if (provider == default && fronted.All(i => KeyOf(i.Geo) != key)) return default; - var group = Group(provider?.Key ?? key, fronted, _ranges.Status); + var group = Group(provider?.Key ?? key, fronted, cdnRanges.Status); var hosts = fronted.Where(i => KeyOf(i.Geo) == group.Key).Select(i => i.Host).OrderBy(h => h).Take(MaxHosts).ToList(); return new CdnHistory(group, hosts, await Weeks(group, weeks, token)); }); diff --git a/PrivaPub/Domain/Statuses/InteractionApprovals.cs b/PrivaPub/Domain/Statuses/InteractionApprovals.cs index 999d96f..773f7d7 100644 --- a/PrivaPub/Domain/Statuses/InteractionApprovals.cs +++ b/PrivaPub/Domain/Statuses/InteractionApprovals.cs @@ -38,24 +38,13 @@ namespace PrivaPub.Domain.Statuses Task MayReply(NoteDocument reply, ForeignAvatar replier, PostEntity parent, CancellationToken token); } - public class InteractionApprovals : IInteractionApprovals + public class InteractionApprovals( + DbEntities dbEntities, + IRemoteActorService remoteActors, + ILocalActorService localActors, + IDeliveryService deliveryService, + IOutboxPublisher outbox) : IInteractionApprovals { - readonly DbEntities _dbEntities; - readonly IRemoteActorService _remoteActors; - readonly ILocalActorService _localActors; - readonly IDeliveryService _delivery; - readonly IOutboxPublisher _outbox; - - public InteractionApprovals(DbEntities dbEntities, IRemoteActorService remoteActors, ILocalActorService localActors, IDeliveryService delivery, - IOutboxPublisher outbox) - { - _dbEntities = dbEntities; - _remoteActors = remoteActors; - _localActors = localActors; - _delivery = delivery; - _outbox = outbox; - } - static string Prefix(InteractionKind kind) => kind switch { InteractionKind.Reply => "reply-request-", @@ -98,33 +87,33 @@ namespace PrivaPub.Domain.Statuses return false; if (who.Any(Addressing.IsPublic) || who.Contains(actor.Uri)) return true; - var author = await _dbEntities.ForeignAvatars.Match(f => f.ActorURI == target.ActorURI).ExecuteFirstAsync(token); + var author = await dbEntities.ForeignAvatars.Match(f => f.ActorURI == target.ActorURI).ExecuteFirstAsync(token); if (author == default) return false; if (!string.IsNullOrEmpty(author.FollowersURL) && who.Contains(author.FollowersURL) - && await _dbEntities.Followings.Match(f => f.AvatarId == actor.Id && f.TargetActorURI == author.ActorURI && f.State == FollowState.Accepted) + && await dbEntities.Followings.Match(f => f.AvatarId == actor.Id && f.TargetActorURI == author.ActorURI && f.State == FollowState.Accepted) .ExecuteAnyAsync(token)) return true; return !string.IsNullOrEmpty(author.FollowingURL) && who.Contains(author.FollowingURL) - && await _dbEntities.Followers.Match(f => f.LocalActorId == actor.Id && f.ActorURI == author.ActorURI && f.IsAccepted).ExecuteAnyAsync(token); + && await dbEntities.Followers.Match(f => f.LocalActorId == actor.Id && f.ActorURI == author.ActorURI && f.IsAccepted).ExecuteAnyAsync(token); } // asks the author, with the interaction as the request's instrument; it goes to no one else until the author agrees public async Task Ask(LocalActor actor, PostEntity target, InteractionKind kind, JsonObject interaction, string localId, CancellationToken token) { - var author = await _dbEntities.ForeignAvatars.Match(f => f.ActorURI == target.ActorURI).ExecuteFirstAsync(token); + var author = await dbEntities.ForeignAvatars.Match(f => f.ActorURI == target.ActorURI).ExecuteFirstAsync(token); if (string.IsNullOrEmpty(author?.InboxURL)) return; // FEP-5624: the reply itself is the question, to the author alone if (ApprovesReplies(target, kind)) { - await _delivery.Enqueue(actor, new[] { author.InboxURL }, ActivityPubRenderer.Create(actor, (JsonObject)interaction.DeepClone(), $"create-{localId}"), - token); + await deliveryService.Enqueue(actor, new[] { author.InboxURL }, ActivityPubRenderer.Create(actor, (JsonObject)interaction.DeepClone(), $"create-{localId}"), + token: token); return; } var instrument = (JsonObject)interaction.DeepClone(); instrument.Remove("@context"); - await _delivery.Enqueue(actor, new[] { author.InboxURL }, new JsonObject + await deliveryService.Enqueue(actor, new[] { author.InboxURL }, new JsonObject { ["@context"] = ActivityPubRenderer.Context(), ["id"] = actor.ActivityUri(Prefix(kind) + localId), @@ -133,7 +122,7 @@ namespace PrivaPub.Domain.Statuses ["to"] = target.ActorURI, ["object"] = target.ObjectURI, ["instrument"] = instrument - }, token); + }, token: token); } // an author's answer to one of our requests (the request, or the interaction itself when it was sent unasked) @@ -154,7 +143,7 @@ namespace PrivaPub.Domain.Statuses if (kind == InteractionKind.Like) { var like = await DB.Default.Find().OneAsync(localId, token); - var liked = like == default ? default : await _dbEntities.Posts.MatchID(like.PostId).ExecuteFirstAsync(token); + var liked = like == default ? default : await dbEntities.Posts.MatchID(like.PostId).ExecuteFirstAsync(token); if (like is not { Approval: ApprovalState.Pending } || liked?.ActorURI != actor.ActorURI) return true; if (!accepted) @@ -168,9 +157,9 @@ namespace PrivaPub.Domain.Statuses return true; await DB.Default.Update().MatchID(like.ID).Modify(f => f.Approval, ApprovalState.Accepted).Modify(f => f.ApprovalURI, stamp) .ExecuteAsync(token); - var liker = await _localActors.FindById(Models.Federation.LocalActorKind.Person, like.AccountId, token); + var liker = await localActors.FindById(Models.Federation.LocalActorKind.Person, like.AccountId, token); if (liker != default && !string.IsNullOrEmpty(actor.InboxURL)) - await _delivery.Enqueue(liker, new[] { actor.InboxURL }, new JsonObject + await deliveryService.Enqueue(liker, new[] { actor.InboxURL }, new JsonObject { ["@context"] = ActivityPubRenderer.Context(), ["id"] = like.ActivityURI, @@ -178,16 +167,16 @@ namespace PrivaPub.Domain.Statuses ["actor"] = liker.Uri, ["object"] = liked.ObjectURI, ["likeAuthorization"] = stamp - }, token); + }, token: token); return true; } - var post = await _dbEntities.Posts.Match(p => p.ID == localId && !p.IsFederatedCopy && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); - var target = post == default ? default : await _dbEntities.Posts.MatchID(kind == InteractionKind.Reply ? post.AnsweringToPostId : post.ReblogOfPostId) + var post = await dbEntities.Posts.Match(p => p.ID == localId && !p.IsFederatedCopy && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); + var target = post == default ? default : await dbEntities.Posts.MatchID(kind == InteractionKind.Reply ? post.AnsweringToPostId : post.ReblogOfPostId) .ExecuteFirstAsync(token); if (post is not { Approval: ApprovalState.Pending } || target?.ActorURI != actor.ActorURI) return true; - var author = await _localActors.FindById(Models.Federation.LocalActorKind.Person, post.GroupUserId, token); + var author = await localActors.FindById(Models.Federation.LocalActorKind.Person, post.GroupUserId, token); if (author == default) return true; if (!accepted) @@ -223,7 +212,7 @@ namespace PrivaPub.Domain.Statuses if (kind == InteractionKind.Reply) { var create = ActivityPubRenderer.Create(author, ActivityPubRenderer.Note(post, author, default, post.InReplyToURI), $"create-{post.ID}"); - await _outbox.Publish(author, post, create, token); + await outbox.Publish(author, post, create, token); return true; } var announce = new JsonObject @@ -238,13 +227,13 @@ namespace PrivaPub.Domain.Statuses ["object"] = target.ObjectURI, ["announceAuthorization"] = post.ApprovalURI }; - await _delivery.EnqueueToFollowers(author, announce, token, string.IsNullOrEmpty(actor.InboxURL) ? default : new[] { actor.InboxURL }); + await deliveryService.EnqueueToFollowers(author, announce, string.IsNullOrEmpty(actor.InboxURL) ? default : new[] { actor.InboxURL }, token); return true; } (InteractionKind Kind, string LocalId) Request(string requestId) { - if (requestId == default || !requestId.StartsWith(_localActors.BaseAddress + "/", StringComparison.OrdinalIgnoreCase)) + if (requestId == default || !requestId.StartsWith(localActors.BaseAddress + "/", StringComparison.OrdinalIgnoreCase)) return default; foreach (var kind in new[] { InteractionKind.Reply, InteractionKind.Like, InteractionKind.Announce }) { @@ -258,11 +247,11 @@ namespace PrivaPub.Domain.Statuses // an interaction of ours named by its own id, as an answer to one sent unasked names it async Task<(InteractionKind Kind, string LocalId)> Interaction(string uri, CancellationToken token) { - if (!uri.StartsWith(_localActors.BaseAddress + "/", StringComparison.OrdinalIgnoreCase)) + if (!uri.StartsWith(localActors.BaseAddress + "/", StringComparison.OrdinalIgnoreCase)) return default; if (await DB.Default.Find().Match(f => f.ActivityURI == uri).ExecuteFirstAsync(token) is { } like) return (InteractionKind.Like, like.ID); - if (await _dbEntities.Posts.Match(p => (p.ObjectURI == uri || p.ActivityURI == uri) && !p.IsFederatedCopy).ExecuteFirstAsync(token) is { } post) + if (await dbEntities.Posts.Match(p => (p.ObjectURI == uri || p.ActivityURI == uri) && !p.IsFederatedCopy).ExecuteFirstAsync(token) is { } post) return (post.ReblogOfPostId != default ? InteractionKind.Announce : InteractionKind.Reply, post.ID); return default; } @@ -272,7 +261,7 @@ namespace PrivaPub.Domain.Statuses { if (!Origin.Same(authorization, target.ActorURI)) return false; - using var fetched = await _remoteActors.FetchObject(authorization, token); + using var fetched = await remoteActors.FetchObject(authorization, token); if (fetched == default) return false; var stamp = JsonNode.Parse(fetched.Root.GetRawText()); @@ -288,7 +277,7 @@ namespace PrivaPub.Domain.Statuses if (parent is not { IsFederatedCopy: true, ReplyPolicy: { } rule } || replier.ActorURI == parent.ActorURI) return true; // anyone, the replier itself, or a collection (followers, following) whose members we cannot list from here - var author = await _dbEntities.ForeignAvatars.Match(f => f.ActorURI == parent.ActorURI).ExecuteFirstAsync(token); + var author = await dbEntities.ForeignAvatars.Match(f => f.ActorURI == parent.ActorURI).ExecuteFirstAsync(token); if (rule.Automatic.Any(Addressing.IsPublic) || rule.Automatic.Contains(replier.ActorURI) || author != default && (rule.Automatic.Contains(author.FollowersURL) || rule.Automatic.Contains(author.FollowingURL))) return true; diff --git a/PrivaPub/Domain/Statuses/Participations.cs b/PrivaPub/Domain/Statuses/Participations.cs index 1918b76..125462e 100644 --- a/PrivaPub/Domain/Statuses/Participations.cs +++ b/PrivaPub/Domain/Statuses/Participations.cs @@ -29,24 +29,17 @@ namespace PrivaPub.Domain.Statuses Task Answered(JsonNode answer, ForeignAvatar actor, bool accepted, CancellationToken token); } - public class Participations : IParticipations + public class Participations( + DbEntities dbEntities, + ILocalActorService localActors, + IDeliveryService delivery) : IParticipations { const string JoinPrefix = "join-"; - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - readonly IDeliveryService _delivery; - - public Participations(DbEntities dbEntities, ILocalActorService localActors, IDeliveryService delivery) - { - _dbEntities = dbEntities; - _localActors = localActors; - _delivery = delivery; - } async Task Event(LocalActor me, string postId, CancellationToken token) { - var post = await _dbEntities.Posts.Match(p => p.ID == postId && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); + var post = await dbEntities.Posts.Match(p => p.ID == postId && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); return post is { IsFederatedCopy: true, Event: not null } && await VisibilityPolicy.CanSee(post, me.Id, token) ? post : default; } @@ -105,10 +98,10 @@ namespace PrivaPub.Domain.Statuses async Task Send(LocalActor me, PostEntity post, JsonObject activity, CancellationToken token) { - var author = string.IsNullOrEmpty(post.AuthorAccountId) ? default : await _dbEntities.ForeignAvatars.MatchID(post.AuthorAccountId).ExecuteFirstAsync(token); + var author = string.IsNullOrEmpty(post.AuthorAccountId) ? default : await dbEntities.ForeignAvatars.MatchID(post.AuthorAccountId).ExecuteFirstAsync(token); var inbox = !string.IsNullOrEmpty(author?.SharedInboxURL) ? author.SharedInboxURL : author?.InboxURL; if (!string.IsNullOrEmpty(inbox)) - await _delivery.Enqueue(me, new[] { inbox }, activity, token); + await delivery.Enqueue(me, new[] { inbox }, activity, token: token); } // the event's server answering our Join: Accept or Reject, naming it or carrying it @@ -116,10 +109,10 @@ namespace PrivaPub.Domain.Statuses { var joinId = Id(answer["object"]); var marker = joinId?.LastIndexOf("/grunts/" + JoinPrefix, StringComparison.Ordinal) ?? -1; - if (marker < 0 || !joinId.StartsWith(_localActors.BaseAddress + "/", StringComparison.OrdinalIgnoreCase)) + if (marker < 0 || !joinId.StartsWith(localActors.BaseAddress + "/", StringComparison.OrdinalIgnoreCase)) return false; var participation = await DB.Default.Find().Match(p => p.ActivityURI == joinId).ExecuteFirstAsync(token); - var post = participation == default ? default : await _dbEntities.Posts.MatchID(participation.PostId).ExecuteFirstAsync(token); + var post = participation == default ? default : await dbEntities.Posts.MatchID(participation.PostId).ExecuteFirstAsync(token); if (post == default || !Origin.Same(post.ObjectURI, actor.ActorURI)) return true; await DB.Default.Update().MatchID(participation.ID) diff --git a/PrivaPub/Domain/Statuses/PollService.cs b/PrivaPub/Domain/Statuses/PollService.cs index 5a28d1d..b2e0c6a 100644 --- a/PrivaPub/Domain/Statuses/PollService.cs +++ b/PrivaPub/Domain/Statuses/PollService.cs @@ -33,7 +33,11 @@ namespace PrivaPub.Domain.Statuses Task> OwnVotes(string postId, string avatarId, CancellationToken token); } - public class PollService : IPollService + public class PollService( + DbEntities dbEntities, + ILocalActorService localActors, + IDeliveryService delivery, + IJobQueue queue) : IPollService { public const int MaxOptions = 4; public const int MaxOptionLength = 50; @@ -41,18 +45,6 @@ namespace PrivaPub.Domain.Statuses public const int MaxExpiration = 2_629_746; static readonly TimeSpan RefreshEvery = TimeSpan.FromMinutes(3); - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - readonly IDeliveryService _delivery; - readonly IJobQueue _queue; - - public PollService(DbEntities dbEntities, ILocalActorService localActors, IDeliveryService delivery, IJobQueue queue) - { - _dbEntities = dbEntities; - _localActors = localActors; - _delivery = delivery; - _queue = queue; - } public string Invalid(PollDraft draft) { @@ -81,7 +73,7 @@ namespace PrivaPub.Domain.Statuses { if (post.Poll?.ExpiresAt is not { } ends) return; - await _queue.EnqueueMany(new[] + await queue.EnqueueMany(new[] { new Job { Kind = JobKind.PollClose, Payload = post.ID, Host = LocalHost, DedupeKey = $"poll-close|{post.ID}", RunAt = ends } }, token); @@ -115,7 +107,7 @@ namespace PrivaPub.Domain.Statuses else await Refreshed(post, token); await Scheduled(post, token); - return new StatusOutcome(await _dbEntities.Posts.MatchID(post.ID).ExecuteFirstAsync(token)); + return new StatusOutcome(await dbEntities.Posts.MatchID(post.ID).ExecuteFirstAsync(token)); } public async Task Receive(PostEntity post, ForeignAvatar voter, string choice, string activityId, CancellationToken token) @@ -164,13 +156,13 @@ namespace PrivaPub.Domain.Statuses async Task SendVotes(LocalActor me, PostEntity post, IReadOnlyList choices, CancellationToken token) { - var owner = await _dbEntities.ForeignAvatars.Match(f => f.ActorURI == post.ActorURI).ExecuteFirstAsync(token); + var owner = await dbEntities.ForeignAvatars.Match(f => f.ActorURI == post.ActorURI).ExecuteFirstAsync(token); if (string.IsNullOrEmpty(owner?.InboxURL)) return; foreach (var choice in choices) { var voteId = me.Uri + $"#votes/{post.ID}/{choice}"; - await _delivery.Enqueue(me, new[] { owner.InboxURL }, new JsonObject + await delivery.Enqueue(me, new[] { owner.InboxURL }, new JsonObject { ["@context"] = ActivityPubRenderer.ActivityStreams, ["id"] = voteId + "/activity", @@ -186,14 +178,14 @@ namespace PrivaPub.Domain.Statuses ["to"] = new JsonArray(owner.ActorURI), ["inReplyTo"] = post.ObjectURI } - }, token); + }, token: token); } } async Task Refreshed(PostEntity post, CancellationToken token) { var bucket = DateTime.UtcNow.Ticks / RefreshEvery.Ticks; - await _queue.EnqueueMany(new[] + await queue.EnqueueMany(new[] { new Job { @@ -203,58 +195,48 @@ namespace PrivaPub.Domain.Statuses }, token); } - string LocalHost => new Uri(_localActors.BaseAddress).Host; + string LocalHost => new Uri(localActors.BaseAddress).Host; } - public class PollRefreshJob : IJobHandler + public class PollRefreshJob( + DbEntities dbEntities, + ILocalActorService localActors, + IOutboxPublisher outbox) : IJobHandler { - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - readonly IOutboxPublisher _outbox; - - public PollRefreshJob(DbEntities dbEntities, ILocalActorService localActors, IOutboxPublisher outbox) - { - _dbEntities = dbEntities; - _localActors = localActors; - _outbox = outbox; - } - public virtual JobKind Kind => JobKind.PollRefresh; public int Concurrency => 1; public int MaxAttempts => 3; public int PerHostLimit => 1; + protected DbEntities Entities => dbEntities; + public virtual async Task Handle(Job job, CancellationToken token) { - var post = await _dbEntities.Posts.MatchID(job.Payload).ExecuteFirstAsync(token); + var post = await dbEntities.Posts.MatchID(job.Payload).ExecuteFirstAsync(token); if (post?.Poll == default || post.IsFederatedCopy || post.DeletedAt.HasValue) return JobOutcome.Done; - var author = await _localActors.FindById(LocalActorKind.Person, post.GroupUserId, token); + var author = await localActors.FindById(LocalActorKind.Person, post.GroupUserId, token); if (author == default) return JobOutcome.Done; await Closing(post, author, token); if (!post.IsLocalOnly) - await _outbox.PublishUpdate(author, post, $"poll-{DateTime.UtcNow.Ticks}", token); + await outbox.PublishUpdate(author, post, $"poll-{DateTime.UtcNow.Ticks}", token); return JobOutcome.Done; } protected virtual Task Closing(PostEntity post, LocalActor author, CancellationToken token) => Task.CompletedTask; } - public class PollCloseJob : PollRefreshJob + public class PollCloseJob( + DbEntities dbEntities, + ILocalActorService localActors, + IOutboxPublisher outbox) : PollRefreshJob(dbEntities, localActors, outbox) { - readonly DbEntities _posts; - - public PollCloseJob(DbEntities dbEntities, ILocalActorService localActors, IOutboxPublisher outbox) : base(dbEntities, localActors, outbox) - { - _posts = dbEntities; - } - public override JobKind Kind => JobKind.PollClose; public override async Task Handle(Job job, CancellationToken token) { - var post = await _posts.Posts.MatchID(job.Payload).ExecuteFirstAsync(token); + var post = await Entities.Posts.MatchID(job.Payload).ExecuteFirstAsync(token); if (post?.Poll == default || post.DeletedAt.HasValue) return JobOutcome.Done; if (!post.IsFederatedCopy) @@ -274,9 +256,9 @@ namespace PrivaPub.Domain.Statuses { var voters = await DB.Default.Find().Match(v => v.PostId == post.ID && v.IsLocalVoter).ExecuteAsync(token); foreach (var voter in voters.Select(v => v.VoterAccountId).Distinct()) - await Notifications.Add(voter, NotificationType.Poll, authorAccountId, authorUri, post.ID, token); + await Notifications.Add(voter, NotificationType.Poll, authorAccountId, authorUri, post.ID, token: token); if (!post.IsFederatedCopy) - await Notifications.Add(post.GroupUserId, NotificationType.Poll, post.GroupUserId, authorUri, post.ID, token); + await Notifications.Add(post.GroupUserId, NotificationType.Poll, post.GroupUserId, authorUri, post.ID, token: token); } } } diff --git a/PrivaPub/Domain/Statuses/QuoteService.cs b/PrivaPub/Domain/Statuses/QuoteService.cs index ed9b4ad..d06b1ed 100644 --- a/PrivaPub/Domain/Statuses/QuoteService.cs +++ b/PrivaPub/Domain/Statuses/QuoteService.cs @@ -40,26 +40,14 @@ namespace PrivaPub.Domain.Statuses AskFirst } - public class QuoteService : IQuoteService + public class QuoteService( + DbEntities dbEntities, + IRemoteActorService remoteActors, + IRemotePosts remotePosts, + ILocalActorService localActors, + IDeliveryService delivery, + IOutboxPublisher outbox) : IQuoteService { - readonly DbEntities _dbEntities; - readonly IRemoteActorService _remoteActors; - readonly IRemotePosts _remotePosts; - readonly ILocalActorService _localActors; - readonly IDeliveryService _delivery; - readonly IOutboxPublisher _outbox; - - public QuoteService(DbEntities dbEntities, IRemoteActorService remoteActors, IRemotePosts remotePosts, ILocalActorService localActors, - IDeliveryService delivery, IOutboxPublisher outbox) - { - _dbEntities = dbEntities; - _remoteActors = remoteActors; - _remotePosts = remotePosts; - _localActors = localActors; - _delivery = delivery; - _outbox = outbox; - } - const string RequestPrefix = "quote-request-"; const string LicencePath = "/parrot-licences/"; @@ -68,7 +56,7 @@ namespace PrivaPub.Domain.Statuses async Task MayQuote(PostEntity quoted, string quoterUri, CancellationToken token) { - var author = await _localActors.FindById(LocalActorKind.Person, quoted.GroupUserId, token); + var author = await localActors.FindById(LocalActorKind.Person, quoted.GroupUserId, token); if (author == default) return false; if (quoterUri == author.Uri) @@ -83,11 +71,11 @@ namespace PrivaPub.Domain.Statuses async Task Follows(string followerUri, LocalActor author, CancellationToken token) { - if (await _dbEntities.Followers.Match(f => f.LocalActorId == author.Id && f.ActorURI == followerUri && f.IsAccepted).ExecuteAnyAsync(token)) + if (await dbEntities.Followers.Match(f => f.LocalActorId == author.Id && f.ActorURI == followerUri && f.IsAccepted).ExecuteAnyAsync(token)) return true; - var local = await _localActors.FindByUri(followerUri, token); + var local = await localActors.FindByUri(followerUri, token); return local != default - && await _dbEntities.Followings.Match(f => f.AvatarId == local.Id && f.TargetActorURI == author.Uri && f.State == FollowState.Accepted).ExecuteAnyAsync(token); + && await dbEntities.Followings.Match(f => f.AvatarId == local.Id && f.TargetActorURI == author.Uri && f.State == FollowState.Accepted).ExecuteAnyAsync(token); } public async Task Grant(LocalActor author, PostEntity quoted, string quotingUri, string quoterUri, CancellationToken token) @@ -111,8 +99,8 @@ namespace PrivaPub.Domain.Statuses Arrival.Drop("misattributed"); return; } - var quoted = await _dbEntities.Posts.Match(p => p.ObjectURI == objectUri && !p.IsFederatedCopy && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); - var author = quoted == default ? default : await _localActors.FindById(LocalActorKind.Person, quoted.GroupUserId, token); + var quoted = await dbEntities.Posts.Match(p => p.ObjectURI == objectUri && !p.IsFederatedCopy && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); + var author = quoted == default ? default : await localActors.FindById(LocalActorKind.Person, quoted.GroupUserId, token); if (author == default || string.IsNullOrEmpty(actor.InboxURL)) { Arrival.Drop("unknown-object"); @@ -139,22 +127,22 @@ namespace PrivaPub.Domain.Statuses answer["type"] = "Reject"; answer["id"] = author.ActivityUri($"reject-quote-{Guid.NewGuid():N}"); } - await _delivery.Enqueue(author, new[] { actor.InboxURL }, answer, token); + await delivery.Enqueue(author, new[] { actor.InboxURL }, answer, token: token); } public async Task RevokeLicence(PostEntity quoted, PostEntity quoting, CancellationToken token) { var licence = await DB.Default.Find().Match(l => l.PostId == quoted.ID && l.QuotingObjectURI == quoting.ObjectURI && l.RevokedAt == null).ExecuteFirstAsync(token); - var author = licence == default ? default : await _localActors.FindById(LocalActorKind.Person, quoted.GroupUserId, token); + var author = licence == default ? default : await localActors.FindById(LocalActorKind.Person, quoted.GroupUserId, token); if (author == default) return false; await DB.Default.Update().MatchID(licence.ID).Modify(l => l.RevokedAt, DateTime.UtcNow).ExecuteAsync(token); var uri = LicenceUri(author, licence.ID); await Revoke(uri, token); - var quoter = quoting.IsFederatedCopy ? await _dbEntities.ForeignAvatars.Match(f => f.ActorURI == quoting.ActorURI).ExecuteFirstAsync(token) : default; - var inboxes = (await _delivery.FollowerInboxes(author, token)).Append(quoter?.InboxURL).Where(i => !string.IsNullOrEmpty(i)).Distinct().ToList(); + var quoter = quoting.IsFederatedCopy ? await dbEntities.ForeignAvatars.Match(f => f.ActorURI == quoting.ActorURI).ExecuteFirstAsync(token) : default; + var inboxes = (await delivery.FollowerInboxes(author, token)).Append(quoter?.InboxURL).Where(i => !string.IsNullOrEmpty(i)).Distinct().ToList(); if (inboxes.Count > 0) - await _delivery.Enqueue(author, inboxes, new JsonObject + await delivery.Enqueue(author, inboxes, new JsonObject { ["@context"] = ActivityPubRenderer.Context(), ["id"] = author.ActivityUri($"revoke-quote-{licence.ID}"), @@ -162,14 +150,14 @@ namespace PrivaPub.Domain.Statuses ["actor"] = author.Uri, ["object"] = uri, ["to"] = new JsonArray(Addressing.Public) - }, token); + }, token: token); return true; } async Task OurLicence(string stampUri, PostEntity quoting, PostEntity quoted, CancellationToken token) { var marker = stampUri?.LastIndexOf(LicencePath, StringComparison.Ordinal) ?? -1; - if (marker < 0 || !stampUri.StartsWith(_localActors.BaseAddress + "/", StringComparison.OrdinalIgnoreCase)) + if (marker < 0 || !stampUri.StartsWith(localActors.BaseAddress + "/", StringComparison.OrdinalIgnoreCase)) return false; var id = stampUri[(marker + LicencePath.Length)..]; return await DB.Default.Find().Match(l => l.ID == id && l.PostId == quoted.ID && l.QuotingObjectURI == quoting.ObjectURI && l.RevokedAt == null) @@ -191,10 +179,10 @@ namespace PrivaPub.Domain.Statuses public async Task Request(LocalActor author, PostEntity post, PostEntity quoted, JsonObject note, CancellationToken token) { - var owner = await _dbEntities.ForeignAvatars.Match(f => f.ActorURI == quoted.ActorURI).ExecuteFirstAsync(token); + var owner = await dbEntities.ForeignAvatars.Match(f => f.ActorURI == quoted.ActorURI).ExecuteFirstAsync(token); if (string.IsNullOrEmpty(owner?.InboxURL)) return; - await _delivery.Enqueue(author, new[] { owner.InboxURL }, new JsonObject + await delivery.Enqueue(author, new[] { owner.InboxURL }, new JsonObject { ["@context"] = ActivityPubRenderer.Context(), ["id"] = author.ActivityUri(RequestPrefix + post.ID), @@ -203,7 +191,7 @@ namespace PrivaPub.Domain.Statuses ["object"] = quoted.ObjectURI, ["instrument"] = note.DeepClone(), ["to"] = new JsonArray(quoted.ActorURI) - }, token); + }, token: token); } public async Task Answered(JsonNode answer, ForeignAvatar actor, bool accepted, CancellationToken token) @@ -216,11 +204,11 @@ namespace PrivaPub.Domain.Statuses if (marker < 0) return true; var postId = requestId[(marker + "/grunts/".Length + RequestPrefix.Length)..]; - var post = await _dbEntities.Posts.Match(p => p.ID == postId && !p.IsFederatedCopy && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); - var author = post == default ? default : await _localActors.FindById(LocalActorKind.Person, post.GroupUserId, token); + var post = await dbEntities.Posts.Match(p => p.ID == postId && !p.IsFederatedCopy && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); + var author = post == default ? default : await localActors.FindById(LocalActorKind.Person, post.GroupUserId, token); if (author == default || author.ActivityUri(RequestPrefix + post.ID) != requestId || post.QuoteState != QuoteState.Pending) return true; - var quoted = await _dbEntities.Posts.MatchID(post.QuotedPostId).ExecuteFirstAsync(token); + var quoted = await dbEntities.Posts.MatchID(post.QuotedPostId).ExecuteFirstAsync(token); if (quoted?.ActorURI != actor.ActorURI) return true; if (!accepted) @@ -239,7 +227,7 @@ namespace PrivaPub.Domain.Statuses .ExecuteAsync(token); await DB.Default.Update().MatchID(quoted.ID).Modify(b => b.Inc(p => p.QuotesCount, 1)).ExecuteAsync(token); if (!post.IsLocalOnly) - await _outbox.PublishUpdate(author, post, $"quote-approved-{DateTime.UtcNow.Ticks}", token); + await outbox.PublishUpdate(author, post, $"quote-approved-{DateTime.UtcNow.Ticks}", token); return true; } @@ -249,8 +237,8 @@ namespace PrivaPub.Domain.Statuses return; var quoted = note.QuoteUri == default ? default - : await _dbEntities.Posts.Match(p => p.ObjectURI == note.QuoteUri && !p.DeletedAt.HasValue).ExecuteFirstAsync(token) - ?? await _remotePosts.StoreContext(note.QuoteUri, RemotePosts.MaxDepth, token); + : await dbEntities.Posts.Match(p => p.ObjectURI == note.QuoteUri && !p.DeletedAt.HasValue).ExecuteFirstAsync(token) + ?? await remotePosts.StoreContext(note.QuoteUri, RemotePosts.MaxDepth, token); var state = note.QuoteDeleted ? QuoteState.Deleted : quoted == default ? QuoteState.Pending @@ -281,13 +269,13 @@ namespace PrivaPub.Domain.Statuses { await DB.Default.Update().MatchID(nowCounted).Modify(b => b.Inc(p => p.QuotesCount, 1)).ExecuteAsync(token); if (!quoted.IsFederatedCopy) - await Notifications.Add(quoted.GroupUserId, NotificationType.Quote, post.AuthorAccountId, post.ActorURI, post.ID, token); + await Notifications.Add(quoted.GroupUserId, NotificationType.Quote, post.AuthorAccountId, post.ActorURI, post.ID, token: token); } } public async Task Revoke(string stampUri, CancellationToken token) { - var revoked = await _dbEntities.Posts.Match(p => p.QuoteAuthorizationURI == stampUri && p.QuoteState == QuoteState.Accepted).ExecuteAsync(token); + var revoked = await dbEntities.Posts.Match(p => p.QuoteAuthorizationURI == stampUri && p.QuoteState == QuoteState.Accepted).ExecuteAsync(token); foreach (var post in revoked) { await DB.Default.Update().MatchID(post.ID).Modify(p => p.QuoteState, QuoteState.Revoked).ExecuteAsync(token); @@ -300,7 +288,7 @@ namespace PrivaPub.Domain.Statuses { if (!Origin.Same(stampUri, quoted.ActorURI)) return false; - using var fetched = await _remoteActors.FetchObject(stampUri, token); + using var fetched = await remoteActors.FetchObject(stampUri, token); if (fetched == default) return false; var stamp = JsonNode.Parse(fetched.Root.GetRawText()); diff --git a/PrivaPub/Domain/Statuses/ScheduledStatuses.cs b/PrivaPub/Domain/Statuses/ScheduledStatuses.cs index 759735a..21e3ce4 100644 --- a/PrivaPub/Domain/Statuses/ScheduledStatuses.cs +++ b/PrivaPub/Domain/Statuses/ScheduledStatuses.cs @@ -83,17 +83,10 @@ namespace PrivaPub.Domain.Statuses DB.Default.Update().Match(m => m.ScheduledStatusId == scheduledId).Modify(m => m.ScheduledStatusId, null).ExecuteAsync(token); } - public class PublishScheduledJob : IJobHandler + public class PublishScheduledJob( + IServiceScopeFactory scopes, + ILogger logger) : IJobHandler { - readonly IServiceScopeFactory _scopes; - readonly ILogger _logger; - - public PublishScheduledJob(IServiceScopeFactory scopes, ILogger logger) - { - _scopes = scopes; - _logger = logger; - } - public JobKind Kind => JobKind.PublishScheduled; public int Concurrency => 2; public int MaxAttempts => 3; @@ -104,7 +97,7 @@ namespace PrivaPub.Domain.Statuses var scheduled = await DB.Default.Find().MatchID(job.Payload).ExecuteFirstAsync(token); if (scheduled == default || scheduled.ScheduledAt > DateTime.UtcNow.AddSeconds(30)) return JobOutcome.Done;//dropped, or moved to a later time that has its own job - using var scope = _scopes.CreateScope(); + using var scope = scopes.CreateScope(); // a persona suspended since, or whose login was banned, waits: lifting it publishes what came due meanwhile // (R6), unless that was a month ago if (Moderation.Restrictions.IsSuspended(scheduled.AvatarId) && scheduled.ScheduledAt > DateTime.UtcNow.AddDays(-30) @@ -122,7 +115,7 @@ namespace PrivaPub.Domain.Statuses { var outcome = await scope.ServiceProvider.GetRequiredService().Publish(author, ScheduledStatuses.Draft(scheduled.Params, scheduled.ID), token); if (!outcome.Ok) - _logger.LogWarning("Scheduled status {Id} of {Avatar} could not be published: {Error}", scheduled.ID, scheduled.AvatarId, outcome.Error); + logger.LogWarning("Scheduled status {Id} of {Avatar} could not be published: {Error}", scheduled.ID, scheduled.AvatarId, outcome.Error); } await ScheduledStatuses.Release(scheduled.ID, token); await DB.Default.DeleteAsync(scheduled.ID); diff --git a/PrivaPub/Domain/Statuses/StatusService.cs b/PrivaPub/Domain/Statuses/StatusService.cs index 396ad7f..892fc5e 100644 --- a/PrivaPub/Domain/Statuses/StatusService.cs +++ b/PrivaPub/Domain/Statuses/StatusService.cs @@ -40,6 +40,7 @@ namespace PrivaPub.Domain.Statuses public string Language { get; init; } public string ConversationId { get; init; } public IReadOnlyList Recipients { get; init; } = Array.Empty(); + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0006", Justification = "Null on an edit keeps the post's media; an empty list removes it, as on Mastodon.")] public IReadOnlyList MediaIds { get; init; } public IReadOnlyList MediaChanges { get; init; } = Array.Empty(); // the scheduled post being published, whose media are reserved for it alone @@ -68,42 +69,23 @@ namespace PrivaPub.Domain.Statuses Task Reblog(LocalActor me, string postId, bool on, PostVisibility visibility, CancellationToken token); } - public class StatusService : IStatusService + public class StatusService( + DbEntities dbEntities, + ILocalActorService localActors, + IRemoteActorService remoteActors, + IDeliveryService deliveryService, + IContentRenderer content, + IOutboxPublisher outbox, + IFanout fanout, + IMediaService mediaService, + IGroupDistributor groupDistributor, + IPollService polls, + ILinkPreviews previews, + IQuoteService quotes, + IInteractionApprovals approvals = default) : IStatusService { const int MaxRevisions = 20; - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - readonly IRemoteActorService _remoteActors; - readonly IDeliveryService _delivery; - readonly IContentRenderer _content; - readonly IOutboxPublisher _outbox; - readonly IFanout _fanout; - readonly IMediaService _media; - readonly IGroupDistributor _groups; - readonly IPollService _polls; - readonly ILinkPreviews _previews; - readonly IQuoteService _quotes; - readonly IInteractionApprovals _approvals; - - public StatusService(DbEntities dbEntities, ILocalActorService localActors, IRemoteActorService remoteActors, IDeliveryService delivery, - IContentRenderer content, IOutboxPublisher outbox, IFanout fanout, IMediaService media, IGroupDistributor groups, IPollService polls, - ILinkPreviews previews, IQuoteService quotes, IInteractionApprovals approvals = default) - { - _approvals = approvals; - _previews = previews; - _quotes = quotes; - _polls = polls; - _media = media; - _groups = groups; - _dbEntities = dbEntities; - _localActors = localActors; - _remoteActors = remoteActors; - _delivery = delivery; - _content = content; - _outbox = outbox; - _fanout = fanout; - } public const int MaxCharacters = 5000;//what the instance API advertises as max_characters, and enforced here @@ -121,16 +103,16 @@ namespace PrivaPub.Domain.Statuses return StatusOutcome.Fail(StatusCodes.Status422UnprocessableEntity, "Validation failed: Media attachments are invalid"); if (string.IsNullOrWhiteSpace(draft.Text) && media.Count == 0 && draft.Poll == default) return StatusOutcome.Fail(StatusCodes.Status422UnprocessableEntity, "Validation failed: Text can't be blank"); - if (draft.Poll != default && _polls.Invalid(draft.Poll) is { } invalidPoll) + if (draft.Poll != default && polls.Invalid(draft.Poll) is { } invalidPoll) return StatusOutcome.Fail(StatusCodes.Status422UnprocessableEntity, invalidPoll); LocalActor group = default; if (!string.IsNullOrEmpty(draft.GroupId)) { - var groupEntity = await _dbEntities.Groups.MatchID(draft.GroupId).ExecuteFirstAsync(token); + var groupEntity = await dbEntities.Groups.MatchID(draft.GroupId).ExecuteFirstAsync(token); if (groupEntity == default || groupEntity.DeletionAt.HasValue || !await MayPost(groupEntity, author, token)) return StatusOutcome.Fail(StatusCodes.Status404NotFound, "Group not found"); - group = _localActors.FromGroup(groupEntity); + group = localActors.FromGroup(groupEntity); } var parent = await Parent(draft.InReplyTo, token); @@ -147,18 +129,18 @@ namespace PrivaPub.Domain.Statuses return StatusOutcome.Fail(StatusCodes.Status422UnprocessableEntity, "Validation failed: Its author does not take replies from you"); // a reply in a circle stays in the circle, whichever client wrote it: Mastodon clients know nothing of groups if (group == default && parent is { Visibility: PostVisibility.Circle } && !string.IsNullOrEmpty(parent.GroupId) - && await _dbEntities.Groups.MatchID(parent.GroupId).ExecuteFirstAsync(token) is { DeletionAt: null } parentCircle + && await dbEntities.Groups.MatchID(parent.GroupId).ExecuteFirstAsync(token) is { DeletionAt: null } parentCircle && await MayPost(parentCircle, author, token)) - group = _localActors.FromGroup(parentCircle); + group = localActors.FromGroup(parentCircle); PostEntity quoted = default; var quotePermission = QuotePermission.Denied; if (!string.IsNullOrEmpty(draft.QuotedStatusId)) { - quoted = await _dbEntities.Posts.Match(p => p.ID == draft.QuotedStatusId && !p.DeletedAt.HasValue && p.ReblogOfPostId == null).ExecuteFirstAsync(token); + quoted = await dbEntities.Posts.Match(p => p.ID == draft.QuotedStatusId && !p.DeletedAt.HasValue && p.ReblogOfPostId == null).ExecuteFirstAsync(token); if (quoted == default || !await VisibilityPolicy.CanSee(quoted, author.Id, token)) return StatusOutcome.Fail(StatusCodes.Status404NotFound, "Record not found"); - quotePermission = await _quotes.Permission(quoted, author, token); + quotePermission = await quotes.Permission(quoted, author, token); if (quotePermission == QuotePermission.Denied) return StatusOutcome.Fail(StatusCodes.Status422UnprocessableEntity, "Validation failed: This post cannot be quoted"); } @@ -168,21 +150,21 @@ namespace PrivaPub.Domain.Statuses || draft.Visibility == PostVisibility.Direct)) return StatusOutcome.Fail(StatusCodes.Status422UnprocessableEntity, "Validation failed: A located post needs a valid position and no group or recipients"); - var rendered = draft.PlainText ? await _content.PlainText(draft.Text ?? string.Empty, token) : await _content.Markdown(draft.Text ?? string.Empty, token); + var rendered = draft.PlainText ? await content.PlainText(draft.Text ?? string.Empty, token) : await content.Markdown(draft.Text ?? string.Empty, token); string audienceUri = default; if (group == default && !located && draft.Visibility is PostVisibility.Public or PostVisibility.Unlisted) foreach (var mention in rendered.Mentions) { if (mention.IsLocal) { - var mentioned = await _dbEntities.Groups.MatchID(mention.AccountId).ExecuteFirstAsync(token); + var mentioned = await dbEntities.Groups.MatchID(mention.AccountId).ExecuteFirstAsync(token); if (mentioned is { DeletionAt: null, Kind: GroupKind.Community } && await MayPost(mentioned, author, token)) { - group = _localActors.FromGroup(mentioned); + group = localActors.FromGroup(mentioned); break; } } - else if (await _dbEntities.ForeignAvatars.MatchID(mention.AccountId).ExecuteFirstAsync(token) is { AvatarType: Models.User.AvatarType.Group } remoteGroup) + else if (await dbEntities.ForeignAvatars.MatchID(mention.AccountId).ExecuteFirstAsync(token) is { AvatarType: Models.User.AvatarType.Group } remoteGroup) { audienceUri = remoteGroup.ActorURI; break; @@ -223,7 +205,7 @@ namespace PrivaPub.Domain.Statuses InReplyToActorURI = parent is { IsFederatedCopy: true } ? parent.ActorURI : default, IsLocalOnly = isLocalOnly, ActorURI = author.Uri, - Poll = draft.Poll == default ? default : _polls.Create(draft.Poll), + Poll = draft.Poll == default ? default : polls.Create(draft.Poll), QuoteURI = quoted?.ObjectURI, QuotedPostId = quoted?.ID, QuoteByConsent = quoted != default && (quoted.QuotePolicy != default || !quoted.IsFederatedCopy), @@ -239,8 +221,8 @@ namespace PrivaPub.Domain.Statuses return StatusOutcome.Fail(StatusCodes.Status422UnprocessableEntity, "Validation failed: Media attachments are invalid"); post.LocalQuotePolicy = QuotePolicies.IsKnown(draft.QuotePolicy) ? draft.QuotePolicy : author.Settings.QuotePolicy ?? QuotePolicies.Public; if (quoted is { IsFederatedCopy: false } && post.QuoteState == QuoteState.Accepted - && await _localActors.FindById(LocalActorKind.Person, quoted.GroupUserId, token) is { } quotedAuthor) - post.QuoteAuthorizationURI = await _quotes.Grant(quotedAuthor, quoted, post.ObjectURI, author.Uri, token); + && await localActors.FindById(LocalActorKind.Person, quoted.GroupUserId, token) is { } quotedAuthor) + post.QuoteAuthorizationURI = await quotes.Grant(quotedAuthor, quoted, post.ObjectURI, author.Uri, token); if (located) { post.Geo = new Coordinates2D(Math.Round(draft.Longitude.Value, 2), Math.Round(draft.Latitude.Value, 2)); @@ -263,7 +245,7 @@ namespace PrivaPub.Domain.Statuses // to one account elsewhere, as a ChatMessage when it writes to us that way, or when its server takes a private message // no other way (Lemmy 0.19 and Mbin) post.AsChatMessage = recipients is [{ LocalId: null } recipient] && (await TakesOnlyChatMessages(recipient.Uri, token) - || await _dbEntities.Posts.Match(p => p.ActorURI == recipient.Uri && p.IsFederatedCopy && p.ObjectType == "ChatMessage").ExecuteAnyAsync(token)); + || await dbEntities.Posts.Match(p => p.ActorURI == recipient.Uri && p.IsFederatedCopy && p.ObjectType == "ChatMessage").ExecuteAnyAsync(token)); var note = ActivityPubRenderer.DirectNote(post, author, recipients.Select(r => (r.Uri, r.Handle)).ToList(), dmGroup.ConversationURI); create = ActivityPubRenderer.Create(author, note, $"create-{post.ID}"); post.To = Strings(note["to"]); @@ -284,22 +266,22 @@ namespace PrivaPub.Domain.Statuses await DB.Default.SaveAsync(post, token); if (parent != default && Counted.Reply(post)) await DB.Default.Update().MatchID(parent.ID).Modify(b => b.Inc(p => p.RepliesCount, 1)).ExecuteAsync(token); - await _fanout.Distribute(post, token); + await fanout.Distribute(post, token); if (post.Visibility == PostVisibility.Direct) await Fanout.Conversation(post.ConversationId, token);//the `direct` streams (R8), now that it is saved - await _polls.Scheduled(post, token); + await polls.Scheduled(post, token); if (post.QuoteState == QuoteState.Accepted) await DB.Default.Update().MatchID(quoted.ID).Modify(b => b.Inc(p => p.QuotesCount, 1)).ExecuteAsync(token); if (post.QuoteState == QuoteState.Pending && create?["object"] is JsonObject quotingNote) - await _quotes.Request(author, post, quoted, quotingNote, token); - await _previews.Wanted(post, token); + await quotes.Request(author, post, quoted, quotingNote, token); + await previews.Wanted(post, token); // a reply its parent's author must approve goes to that author alone, as a request, until it is approved if (create != default && post.Approval == ApprovalState.Pending) - await _approvals.Ask(author, parent, InteractionKind.Reply, create["object"].AsObject(), post.ID, token); + await approvals.Ask(author, parent, InteractionKind.Reply, create["object"].AsObject(), post.ID, token); else if (create != default) - await _outbox.Publish(author, post, create, token); + await outbox.Publish(author, post, create, token); if (create != default && post.Approval != ApprovalState.Pending && group is { IsCircle: false } && visibility is PostVisibility.Public or PostVisibility.Unlisted) - await _groups.Announce(group, create, post.ObjectURI, isNewPost: true, token); + await groupDistributor.Announce(group, create, post.ObjectURI, isNewPost: true, token); return new StatusOutcome(post); } @@ -333,7 +315,7 @@ namespace PrivaPub.Domain.Statuses post.Revisions.RemoveRange(0, post.Revisions.Count - MaxRevisions); var plain = draft.PlainText || post.ContentFormat == ContentFormat.Plain; - var rendered = plain ? await _content.PlainText(draft.Text ?? string.Empty, token) : await _content.Markdown(draft.Text ?? string.Empty, token); + var rendered = plain ? await content.PlainText(draft.Text ?? string.Empty, token) : await content.Markdown(draft.Text ?? string.Empty, token); // descriptions and focal points changed by the edit, on the media it keeps or those the post already has var described = media ?? (draft.MediaChanges.Count > 0 ? await DB.Default.Find().Match(m => m.PostId == post.ID && m.TrashedAt == null).ExecuteAsync(token) @@ -358,7 +340,7 @@ namespace PrivaPub.Domain.Statuses post.Media = media.Select(ToPostMedia).ToList(); // what the edit left out is no longer held by anything var kept = media.Select(m => m.ID).ToList(); - await _media.Trash(m => m.PostId == post.ID && !kept.Contains(m.ID), "edited out", token); + await mediaService.Trash(m => m.PostId == post.ID && !kept.Contains(m.ID), "edited out", token); } post.Title = draft.Title == default ? post.Title : Clean(draft.Title); // as on Mastodon, an edit sends the whole post: no warning sent is no warning (the language alone falls back) @@ -379,7 +361,7 @@ namespace PrivaPub.Domain.Statuses if (!post.IsLocalOnly) { - var group = string.IsNullOrEmpty(post.GroupId) ? default : await _localActors.FindById(LocalActorKind.Group, post.GroupId, token); + var group = string.IsNullOrEmpty(post.GroupId) ? default : await localActors.FindById(LocalActorKind.Group, post.GroupId, token); var note = post.Visibility == PostVisibility.Direct ? ActivityPubRenderer.DirectNote(post, author, Array.Empty<(string, string)>(), post.ContextURI) : ActivityPubRenderer.Note(post, author, group, post.InReplyToURI); @@ -395,22 +377,22 @@ namespace PrivaPub.Domain.Statuses ["cc"] = note["cc"]!.DeepClone(), ["object"] = note }; - await _outbox.Publish(author, post, update, token); + await outbox.Publish(author, post, update, token); if (group is { IsCircle: false }) - await _groups.Announce(group, update, post.ObjectURI, isNewPost: false, token); + await groupDistributor.Announce(group, update, post.ObjectURI, isNewPost: false, token); } return new StatusOutcome(post); } public async Task Remove(LocalActor author, string postId, CancellationToken token) { - var post = await _dbEntities.Posts.Match(p => p.ID == postId && p.GroupUserId == author.Id && !p.IsFederatedCopy).ExecuteFirstAsync(token); + var post = await dbEntities.Posts.Match(p => p.ID == postId && p.GroupUserId == author.Id && !p.IsFederatedCopy).ExecuteFirstAsync(token); if (post == default || post.DeletedAt.HasValue) return StatusOutcome.Fail(StatusCodes.Status404NotFound, "Record not found"); if (post.ReblogOfPostId != default) return await Reblog(author, post.ReblogOfPostId, false, post.Visibility, token); - var audience = await _outbox.Audience(author, post, token); + var audience = await outbox.Audience(author, post, token); await DB.Default.Update().MatchID(post.ID) .Modify(p => p.DeletedAt, DateTime.UtcNow) .Modify(p => p.Text, null) @@ -421,7 +403,7 @@ namespace PrivaPub.Domain.Statuses .Modify(p => p.Revisions, new List()) .ExecuteAsync(token); await Fanout.Deleting(post, token); - await _media.Trash(m => m.PostId == post.ID, "post deleted", token); + await mediaService.Trash(m => m.PostId == post.ID, "post deleted", token); await DB.Default.DeleteAsync(e => e.PostId == post.ID || e.ReblogOfPostId == post.ID); // boosts of it end with it, as on Mastodon, so no count keeps them await DB.Default.Update().Match(p => p.ReblogOfPostId == post.ID && !p.DeletedAt.HasValue) @@ -433,10 +415,10 @@ namespace PrivaPub.Domain.Statuses { var delete = ActivityPubRenderer.Delete(author, post.ObjectURI, $"delete-{post.ID}", new JsonArray(post.To.Select(t => (JsonNode)t).ToArray()), new JsonArray(post.Cc.Select(c => (JsonNode)c).ToArray())); - await _outbox.Publish(author, post, delete, token);//the post in hand still has its group and mentions - var group = string.IsNullOrEmpty(post.GroupId) ? default : await _localActors.FindById(LocalActorKind.Group, post.GroupId, token); + await outbox.Publish(author, post, delete, token);//the post in hand still has its group and mentions + var group = string.IsNullOrEmpty(post.GroupId) ? default : await localActors.FindById(LocalActorKind.Group, post.GroupId, token); if (group is { IsCircle: false }) - await _groups.Announce(group, delete, post.ObjectURI, isNewPost: false, token); + await groupDistributor.Announce(group, delete, post.ObjectURI, isNewPost: false, token); } return new StatusOutcome(post); } @@ -475,7 +457,7 @@ namespace PrivaPub.Domain.Statuses await DB.Default.Update().MatchID(post.ID).Modify(b => b.Inc(p => p.FavouritesCount, 1)).ExecuteAsync(token); post.FavouritesCount++; if (!post.IsFederatedCopy) - await Notifications.Add(post.GroupUserId, NotificationType.Favourite, me.Id, me.Uri, post.ID, token); + await Notifications.Add(post.GroupUserId, NotificationType.Favourite, me.Id, me.Uri, post.ID, token: token); } else { @@ -497,9 +479,9 @@ namespace PrivaPub.Domain.Statuses ["object"] = post.ObjectURI }; if (on && favourite.Approval == ApprovalState.Pending) - await _approvals.Ask(me, post, InteractionKind.Like, like, favourite.ID, token); + await approvals.Ask(me, post, InteractionKind.Like, like, favourite.ID, token); else - await _delivery.Enqueue(me, inboxes, on ? like : Undo(me, like, $"undo-like-{favourite.ID}"), token); + await deliveryService.Enqueue(me, inboxes, on ? like : Undo(me, like, $"undo-like-{favourite.ID}"), token: token); } return new StatusOutcome(post); } @@ -517,7 +499,7 @@ namespace PrivaPub.Domain.Statuses if (post == default) return StatusOutcome.Fail(StatusCodes.Status404NotFound, "Record not found"); - Downvote downvote; + var downvote = default(Downvote); if (on) { await Forget(f => f.AccountId == me.Id && f.PostId == post.ID, post, p => p.FavouritesCount, token); @@ -553,7 +535,7 @@ namespace PrivaPub.Domain.Statuses ["actor"] = me.Uri, ["object"] = post.ObjectURI }; - await _delivery.Enqueue(me, inboxes, on ? dislike : Undo(me, dislike, $"undo-dislike-{downvote.ID}"), token); + await deliveryService.Enqueue(me, inboxes, on ? dislike : Undo(me, dislike, $"undo-dislike-{downvote.ID}"), token: token); } return new StatusOutcome(post); } @@ -578,11 +560,11 @@ namespace PrivaPub.Domain.Statuses async Task> VoteInboxes(PostEntity post, CancellationToken token) { var inboxes = new List(); - if (await Federation.Inbox.Communities.Of(post, _dbEntities, token) is { } communityUri - && await _dbEntities.ForeignAvatars.Match(f => f.ActorURI == communityUri && f.AvatarType == AvatarType.Group).ExecuteFirstAsync(token) is { } community + if (await Federation.Inbox.Communities.Of(post, dbEntities, token) is { } communityUri + && await dbEntities.ForeignAvatars.Match(f => f.ActorURI == communityUri && f.AvatarType == AvatarType.Group).ExecuteFirstAsync(token) is { } community && !string.IsNullOrEmpty(community.InboxURL)) inboxes.Add(community.InboxURL); - if (await AuthorInbox(post, token) is { } author + if (await AuthorInbox(post, token: token) is { } author && !inboxes.Any(i => string.Equals(new Uri(i).Authority, new Uri(author).Authority, StringComparison.OrdinalIgnoreCase))) inboxes.Add(author); return inboxes; @@ -590,7 +572,7 @@ namespace PrivaPub.Domain.Statuses // how a remote post's interaction policy takes an interaction of ours: at once, once asked, or not at all async Task Permission(PostEntity target, LocalActor actor, InteractionKind kind, CancellationToken token) => - target is { IsFederatedCopy: true } && _approvals != default ? await _approvals.Judge(target, actor, kind, token) : QuotePermission.Granted; + target is { IsFederatedCopy: true } && approvals != default ? await approvals.Judge(target, actor, kind, token) : QuotePermission.Granted; public async Task Reblog(LocalActor me, string postId, bool on, PostVisibility visibility, CancellationToken token) { @@ -605,7 +587,7 @@ namespace PrivaPub.Domain.Statuses if (announcePermission == QuotePermission.Denied) return StatusOutcome.Fail(StatusCodes.Status422UnprocessableEntity, "Validation failed: Its author does not take boosts from you"); - var existing = await _dbEntities.Posts.Match(p => p.ReblogOfPostId == original.ID && p.AuthorAccountId == me.Id && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); + var existing = await dbEntities.Posts.Match(p => p.ReblogOfPostId == original.ID && p.AuthorAccountId == me.Id && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); // each boost is an activity of its own, as Mastodon's are: a boost after an unboost is a new Announce, which no // server (and no delivery queue) takes for the one already undone; an unboost undoes the boost it ends var reblogId = existing?.ID ?? ObjectId.GenerateNewId().ToString(); @@ -647,10 +629,10 @@ namespace PrivaPub.Domain.Statuses } catch (MongoWriteException ex) when (ex.WriteError?.Category == ServerErrorCategory.DuplicateKey) { - return new StatusOutcome(await _dbEntities.Posts.Match(p => p.ObjectURI == announceId).ExecuteFirstAsync(token)); + return new StatusOutcome(await dbEntities.Posts.Match(p => p.ObjectURI == announceId).ExecuteFirstAsync(token)); } // two boosts at once: the first one saved stands, and the other goes - var boosts = await _dbEntities.Posts.Match(p => p.ReblogOfPostId == original.ID && p.AuthorAccountId == me.Id && !p.DeletedAt.HasValue) + var boosts = await dbEntities.Posts.Match(p => p.ReblogOfPostId == original.ID && p.AuthorAccountId == me.Id && !p.DeletedAt.HasValue) .Sort(p => p.ID, Order.Ascending).ExecuteAsync(token); if (boosts.Count > 1 && boosts[0].ID != reblog.ID) { @@ -659,12 +641,12 @@ namespace PrivaPub.Domain.Statuses } await DB.Default.Update().MatchID(original.ID).Modify(b => b.Inc(p => p.ReblogsCount, 1)).ExecuteAsync(token); if (!original.IsFederatedCopy) - await Notifications.Add(original.GroupUserId, NotificationType.Reblog, me.Id, me.Uri, original.ID, token); - await _fanout.Distribute(reblog, token); + await Notifications.Add(original.GroupUserId, NotificationType.Reblog, me.Id, me.Uri, original.ID, token: token); + await fanout.Distribute(reblog, token); if (reblog.Approval == ApprovalState.Pending) - await _approvals.Ask(me, original, InteractionKind.Announce, announce, reblog.ID, token); + await approvals.Ask(me, original, InteractionKind.Announce, announce, reblog.ID, token); else - await _delivery.EnqueueToFollowers(me, announce, token, await AuthorInbox(original, token, shared: true) is { } inbox ? new[] { inbox } : default); + await deliveryService.EnqueueToFollowers(me, announce, await AuthorInbox(original, shared: true, token) is { } inbox ? new[] { inbox } : default, token); return new StatusOutcome(reblog); } @@ -674,8 +656,8 @@ namespace PrivaPub.Domain.Statuses await DB.Default.DeleteAsync(existing.ID); await DB.Default.DeleteAsync(e => e.PostId == existing.ID); await DB.Default.Update().MatchID(original.ID).Modify(b => b.Inc(p => p.ReblogsCount, -1)).ExecuteAsync(token); - await _delivery.EnqueueToFollowers(me, Undo(me, announce, $"undo-announce-{existing.ID}"), token, - await AuthorInbox(original, token, shared: true) is { } authorInbox ? new[] { authorInbox } : default); + await deliveryService.EnqueueToFollowers(me, Undo(me, announce, $"undo-announce-{existing.ID}"), + await AuthorInbox(original, shared: true, token) is { } authorInbox ? new[] { authorInbox } : default, token); return new StatusOutcome(original); } @@ -708,7 +690,7 @@ namespace PrivaPub.Domain.Statuses DmGroup dmGroup = default; if (!string.IsNullOrEmpty(draft.ConversationId)) { - dmGroup = await _dbEntities.DmGroups.MatchID(draft.ConversationId).ExecuteFirstAsync(token); + dmGroup = await dbEntities.DmGroups.MatchID(draft.ConversationId).ExecuteFirstAsync(token); if (dmGroup == default || !dmGroup.Members.Any(m => !m.IsForeign && m.AvatarId == author.Id)) return new(default, default, StatusCodes.Status404NotFound, "Conversation not found"); } @@ -733,7 +715,7 @@ namespace PrivaPub.Domain.Statuses return new(default, default, StatusCodes.Status422UnprocessableEntity, "Validation failed: A direct message needs at least one recipient"); var key = DmGroup.KeyOf(members); - dmGroup = await _dbEntities.DmGroups.Match(g => g.ParticipantsKey == key && !g.DeletionAt.HasValue).ExecuteFirstAsync(token); + dmGroup = await dbEntities.DmGroups.Match(g => g.ParticipantsKey == key && !g.DeletionAt.HasValue).ExecuteFirstAsync(token); if (dmGroup == default) { dmGroup = new DmGroup { Members = members, ParticipantsKey = key }; @@ -748,11 +730,11 @@ namespace PrivaPub.Domain.Statuses { if (member.IsForeign) { - var foreign = await _dbEntities.ForeignAvatars.Match(a => a.ActorURI == member.AvatarId).ExecuteFirstAsync(token); + var foreign = await dbEntities.ForeignAvatars.Match(a => a.ActorURI == member.AvatarId).ExecuteFirstAsync(token); if (foreign != default) recipients.Add(new Recipient(foreign.ActorURI, $"{foreign.UserName}@{foreign.Domain}", default, foreign.ID, foreign.InboxURL)); } - else if (await _localActors.FindById(LocalActorKind.Person, member.AvatarId, token) is { } local) + else if (await localActors.FindById(LocalActorKind.Person, member.AvatarId, token) is { } local) recipients.Add(new Recipient(local.Uri, local.Handle, local.Id, default, default)); } return new(dmGroup, recipients); @@ -761,13 +743,13 @@ namespace PrivaPub.Domain.Statuses async Task ResolveRecipient(string recipient, CancellationToken token) { var handle = recipient.Trim().TrimStart('@'); - if (!handle.Contains('@') || handle.EndsWith("@" + new Uri(_localActors.BaseAddress).Authority, StringComparison.OrdinalIgnoreCase)) + if (!handle.Contains('@') || handle.EndsWith("@" + new Uri(localActors.BaseAddress).Authority, StringComparison.OrdinalIgnoreCase)) { - var local = await _localActors.FindByUserName(handle.Split('@')[0], token); + var local = await localActors.FindByUserName(handle.Split('@')[0], token); return local is { Kind: LocalActorKind.Person } ? new GroupMember { AvatarId = local.Id } : default; } - var actorUri = await _remoteActors.ResolveHandle(handle, token); - var foreign = actorUri == default ? default : await _remoteActors.GetActor(actorUri, refresh: false, token); + var actorUri = await remoteActors.ResolveHandle(handle, token); + var foreign = actorUri == default ? default : await remoteActors.GetActor(actorUri, refresh: false, token); return foreign == default ? default : new GroupMember { AvatarId = foreign.ActorURI, IsForeign = true }; } @@ -776,27 +758,27 @@ namespace PrivaPub.Domain.Statuses if (string.IsNullOrEmpty(reference)) return default; return IsRemoteUri(reference) - ? await _dbEntities.Posts.Match(p => p.ObjectURI == reference && !p.DeletedAt.HasValue).ExecuteFirstAsync(token) - : await _dbEntities.Posts.Match(p => p.ID == reference && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); + ? await dbEntities.Posts.Match(p => p.ObjectURI == reference && !p.DeletedAt.HasValue).ExecuteFirstAsync(token) + : await dbEntities.Posts.Match(p => p.ID == reference && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); } async Task Own(LocalActor author, string postId, CancellationToken token) => - await _dbEntities.Posts.Match(p => p.ID == postId && p.GroupUserId == author.Id && !p.IsFederatedCopy && !p.DeletedAt.HasValue && p.ReblogOfPostId == null) + await dbEntities.Posts.Match(p => p.ID == postId && p.GroupUserId == author.Id && !p.IsFederatedCopy && !p.DeletedAt.HasValue && p.ReblogOfPostId == null) .ExecuteFirstAsync(token); async Task Visible(LocalActor me, string postId, CancellationToken token) { - var post = string.IsNullOrEmpty(postId) ? default : await _dbEntities.Posts.Match(p => p.ID == postId && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); + var post = string.IsNullOrEmpty(postId) ? default : await dbEntities.Posts.Match(p => p.ID == postId && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); return post != default && await VisibilityPolicy.CanSee(post, me.Id, token) ? post : default; } // shared: what goes to the author's followers too (a boost) goes to its server's shared inbox, so the server gets // one copy, as Mastodon sends it; two copies at once race in servers that count as they process (Misskey) - async Task AuthorInbox(PostEntity post, CancellationToken token, bool shared = false) + async Task AuthorInbox(PostEntity post, bool shared = false, CancellationToken token = default) { if (!post.IsFederatedCopy || string.IsNullOrEmpty(post.AuthorAccountId)) return default; - var author = await _dbEntities.ForeignAvatars.MatchID(post.AuthorAccountId).ExecuteFirstAsync(token); + var author = await dbEntities.ForeignAvatars.MatchID(post.AuthorAccountId).ExecuteFirstAsync(token); return shared && !string.IsNullOrEmpty(author?.SharedInboxURL) ? author.SharedInboxURL : author?.InboxURL; } @@ -809,7 +791,7 @@ namespace PrivaPub.Domain.Statuses { PostingPolicy.Anyone => true, PostingPolicy.Moderators => member?.Role is GroupRole.Owner or GroupRole.Moderator, - _ => member != default || await _dbEntities.Followings + _ => member != default || await dbEntities.Followings .Match(f => f.AvatarId == author.Id && f.TargetAccountId == group.ID && f.State == FollowState.Accepted).ExecuteAnyAsync(token) }; } @@ -855,8 +837,8 @@ namespace PrivaPub.Domain.Statuses ContentType = attachment.ContentType, Kind = attachment.Kind, DurationSeconds = attachment.DurationSeconds, - URL = _media.Url(attachment.FilePath), - PreviewURL = _media.Url(attachment.PreviewPath ?? attachment.FilePath), + URL = mediaService.Url(attachment.FilePath), + PreviewURL = mediaService.Url(attachment.PreviewPath ?? attachment.FilePath), Description = attachment.Description, Blurhash = attachment.Blurhash, Width = attachment.Width, diff --git a/PrivaPub/Domain/Timelines/Fanout.cs b/PrivaPub/Domain/Timelines/Fanout.cs index 014d14e..aae7a21 100644 --- a/PrivaPub/Domain/Timelines/Fanout.cs +++ b/PrivaPub/Domain/Timelines/Fanout.cs @@ -16,15 +16,9 @@ namespace PrivaPub.Domain.Timelines Task Distribute(Post post, CancellationToken token); } - public class Fanout : IFanout + public class Fanout( + DbEntities dbEntities) : IFanout { - readonly DbEntities _dbEntities; - - public Fanout(DbEntities dbEntities) - { - _dbEntities = dbEntities; - } - public async Task Distribute(Post post, CancellationToken token) { // a located post is read only through /clientapi/post/nearby: the Mastodon API looks past it everywhere, so in a @@ -42,8 +36,8 @@ namespace PrivaPub.Domain.Timelines { case PostVisibility.Public or PostVisibility.Unlisted or PostVisibility.FollowersOnly: var followers = post.IsFederatedCopy - ? await _dbEntities.Followings.Match(f => f.TargetActorURI == post.ActorURI && f.State == FollowState.Accepted && f.FollowerKind == null).ExecuteAsync(token) - : await _dbEntities.Followings.Match(f => f.TargetAccountId == post.GroupUserId && f.TargetIsLocal && f.State == FollowState.Accepted).ExecuteAsync(token); + ? await dbEntities.Followings.Match(f => f.TargetActorURI == post.ActorURI && f.State == FollowState.Accepted && f.FollowerKind == null).ExecuteAsync(token) + : await dbEntities.Followings.Match(f => f.TargetAccountId == post.GroupUserId && f.TargetIsLocal && f.State == FollowState.Accepted).ExecuteAsync(token); foreach (var following in followers) if (await Shows(following, post, token)) { @@ -53,14 +47,14 @@ namespace PrivaPub.Domain.Timelines } if (!string.IsNullOrEmpty(post.AudienceURI)) // (the server's reader of feeds follows communities for nobody's home) - foreach (var member in await _dbEntities.Followings.Match(f => f.TargetActorURI == post.AudienceURI && f.State == FollowState.Accepted && f.FollowerKind == null).ExecuteAsync(token)) + foreach (var member in await dbEntities.Followings.Match(f => f.TargetActorURI == post.AudienceURI && f.State == FollowState.Accepted && f.FollowerKind == null).ExecuteAsync(token)) recipients.Add(member.AvatarId); // a post on a wall (FEP-400e): its owner, when a persona, and those following the owner if (!string.IsNullOrEmpty(post.WallOwnerURI)) { - if (await _dbEntities.Avatars.MatchID(post.WallOwnerAccountId).ExecuteAnyAsync(token)) + if (await dbEntities.Avatars.MatchID(post.WallOwnerAccountId).ExecuteAnyAsync(token)) recipients.Add(post.WallOwnerAccountId); - foreach (var follower in await _dbEntities.Followings.Match(f => f.TargetActorURI == post.WallOwnerURI && f.State == FollowState.Accepted).ExecuteAsync(token)) + foreach (var follower in await dbEntities.Followings.Match(f => f.TargetActorURI == post.WallOwnerURI && f.State == FollowState.Accepted).ExecuteAsync(token)) recipients.Add(follower.AvatarId); } // a public post (not a boost, not a reply) comes to those following one of its hashtags, as on Mastodon, @@ -74,7 +68,7 @@ namespace PrivaPub.Domain.Timelines } break; case PostVisibility.Direct when !string.IsNullOrEmpty(post.ConversationId): - var conversation = await _dbEntities.DmGroups.MatchID(post.ConversationId).ExecuteFirstAsync(token); + var conversation = await dbEntities.DmGroups.MatchID(post.ConversationId).ExecuteFirstAsync(token); foreach (var member in conversation?.Members.Where(m => !m.IsForeign) ?? Enumerable.Empty()) recipients.Add(member.AvatarId); break; @@ -105,9 +99,9 @@ namespace PrivaPub.Domain.Timelines if (string.IsNullOrEmpty(post.ReblogOfPostId)) foreach (var mention in post.Mentions.Where(m => m.IsLocal && !string.IsNullOrEmpty(m.AccountId))) - await Notifications.Add(mention.AccountId, NotificationType.Mention, post.AuthorAccountId ?? post.GroupUserId, post.ActorURI, post.ID, token); + await Notifications.Add(mention.AccountId, NotificationType.Mention, post.AuthorAccountId ?? post.GroupUserId, post.ActorURI, post.ID, token: token); foreach (var avatarId in notifying.Where(recipients.Contains).Distinct()) - await Notifications.Add(avatarId, NotificationType.Status, post.AuthorAccountId ?? post.GroupUserId, post.ActorURI, post.ID, token); + await Notifications.Add(avatarId, NotificationType.Status, post.AuthorAccountId ?? post.GroupUserId, post.ActorURI, post.ID, token: token); if (Streams.Anyone) await Stream(post, recipients, token); } @@ -230,7 +224,7 @@ namespace PrivaPub.Domain.Timelines return true; if (string.IsNullOrEmpty(repliedTo)) return false; - return await _dbEntities.Followings + return await dbEntities.Followings .Match(f => f.AvatarId == following.AvatarId && f.TargetAccountId == repliedTo && f.State == FollowState.Accepted) .ExecuteAnyAsync(token); } diff --git a/PrivaPub/Domain/Timelines/TimelineService.cs b/PrivaPub/Domain/Timelines/TimelineService.cs index edcf6dc..d065f81 100644 --- a/PrivaPub/Domain/Timelines/TimelineService.cs +++ b/PrivaPub/Domain/Timelines/TimelineService.cs @@ -20,26 +20,20 @@ namespace PrivaPub.Domain.Timelines Task MarkNotificationsRead(string rootUserId, string avatarId, CancellationToken token); } - public class TimelineService : ITimelineService + public class TimelineService( + DbEntities dbEntities, + IStringLocalizer localizer) : ITimelineService { const int MaxLimit = 40; - readonly DbEntities _dbEntities; - readonly IStringLocalizer _localizer; - - public TimelineService(DbEntities dbEntities, IStringLocalizer localizer) - { - _dbEntities = dbEntities; - _localizer = localizer; - } public async Task Home(string rootUserId, string avatarId, string maxId, int limit, CancellationToken token) { var result = new WebResult(); if (!await Owns(rootUserId, avatarId, token)) - return result.Invalidate(_localizer["Avatar not found."], StatusCodes.Status404NotFound); + return result.Invalidate(localizer["Avatar not found."], StatusCodes.Status404NotFound); - var query = _dbEntities.TimelineEntries.Match(e => e.AvatarId == avatarId); + var query = dbEntities.TimelineEntries.Match(e => e.AvatarId == avatarId); if (!string.IsNullOrEmpty(maxId)) query.Match(f => f.Lt(e => e.PostId, maxId)); var entries = await query.Sort(e => e.PostId, Order.Descending).Limit(Math.Clamp(limit, 1, MaxLimit)).ExecuteAsync(token); @@ -47,7 +41,7 @@ namespace PrivaPub.Domain.Timelines var ids = entries.Select(e => e.PostId).Concat(entries.Where(e => e.ReblogOfPostId != default).Select(e => e.ReblogOfPostId)).Distinct().ToList(); var posts = ids.Count == 0 ? new Dictionary() - : (await _dbEntities.Posts.Match(p => ids.Contains(p.ID)).Match(VisibilityPolicy.IsShown).ExecuteAsync(token)).ToDictionary(p => p.ID); + : (await dbEntities.Posts.Match(p => ids.Contains(p.ID)).Match(VisibilityPolicy.IsShown).ExecuteAsync(token)).ToDictionary(p => p.ID); result.Data = entries .Where(e => posts.ContainsKey(e.PostId) && (e.ReblogOfPostId == default || posts.ContainsKey(e.ReblogOfPostId))) @@ -66,9 +60,9 @@ namespace PrivaPub.Domain.Timelines { var result = new WebResult(); if (!await Owns(rootUserId, avatarId, token)) - return result.Invalidate(_localizer["Avatar not found."], StatusCodes.Status404NotFound); + return result.Invalidate(localizer["Avatar not found."], StatusCodes.Status404NotFound); - var query = _dbEntities.Notifications.Match(n => n.AvatarId == avatarId); + var query = dbEntities.Notifications.Match(n => n.AvatarId == avatarId); if (!string.IsNullOrEmpty(maxId)) query.Match(f => f.Lt(n => n.ID, maxId)); result.Data = (await query.Sort(n => n.ID, Order.Descending).Limit(Math.Clamp(limit, 1, MaxLimit)).ExecuteAsync(token)) @@ -90,14 +84,14 @@ namespace PrivaPub.Domain.Timelines { var result = new WebResult(); if (!await Owns(rootUserId, avatarId, token)) - return result.Invalidate(_localizer["Avatar not found."], StatusCodes.Status404NotFound); + return result.Invalidate(localizer["Avatar not found."], StatusCodes.Status404NotFound); await DB.Default.Update().Match(n => n.AvatarId == avatarId && !n.IsRead).Modify(n => n.IsRead, true).ExecuteAsync(token); return result; } async Task Owns(string rootUserId, string avatarId, CancellationToken token) => !string.IsNullOrEmpty(rootUserId) && !string.IsNullOrEmpty(avatarId) - && await _dbEntities.RootToAvatars.Match(ra => ra.RootId == rootUserId && ra.AvatarId == avatarId).ExecuteAnyAsync(token); + && await dbEntities.RootToAvatars.Match(ra => ra.RootId == rootUserId && ra.AvatarId == avatarId).ExecuteAnyAsync(token); static ViewPost ToView(Post post) => new() { diff --git a/PrivaPub/Federation/Actors/AccountCountsJob.cs b/PrivaPub/Federation/Actors/AccountCountsJob.cs index a523e02..87889b4 100644 --- a/PrivaPub/Federation/Actors/AccountCountsJob.cs +++ b/PrivaPub/Federation/Actors/AccountCountsJob.cs @@ -14,28 +14,16 @@ namespace PrivaPub.Federation.Actors // once a day, never when someone looks at it; a hidden or missing collection leaves its count unknown. Mastodon and // GoToSocial do the same. A feed's following is its communities: they are kept, and read in turn, so its list shows. // Its featured hashtags (its featuredTags collection, R8) are read with them. - public class AccountCountsJob : IJobHandler + public class AccountCountsJob( + IRemoteActorService remoteActors, + DbEntities dbEntities, + IFeaturedPosts featured = default, + ILocalActorService localActors = default, + IJobQueue jobs = default, + Domain.Social.IFeaturedTags featuredTags = default) : IJobHandler { - readonly IRemoteActorService _remoteActors; - readonly DbEntities _dbEntities; - readonly IFeaturedPosts _featured; - readonly ILocalActorService _localActors; - readonly IJobQueue _jobs; - readonly Domain.Social.IFeaturedTags _featuredTags; - public const int MaxFeedCommunities = 50; - public AccountCountsJob(IRemoteActorService remoteActors, DbEntities dbEntities, IFeaturedPosts featured = default, - ILocalActorService localActors = default, IJobQueue jobs = default, Domain.Social.IFeaturedTags featuredTags = default) - { - _featuredTags = featuredTags; - _remoteActors = remoteActors; - _dbEntities = dbEntities; - _featured = featured; - _localActors = localActors; - _jobs = jobs; - } - public JobKind Kind => JobKind.CountAccount; public int Concurrency => 2; public int MaxAttempts => 2; @@ -45,7 +33,7 @@ namespace PrivaPub.Federation.Actors public async Task Handle(Job job, CancellationToken token) { - var actor = await _dbEntities.ForeignAvatars.Match(a => a.ActorURI == job.Payload && !a.DeletionAt.HasValue).ExecuteFirstAsync(token); + var actor = await dbEntities.ForeignAvatars.Match(a => a.ActorURI == job.Payload && !a.DeletionAt.HasValue).ExecuteFirstAsync(token); if (actor == default) return JobOutcome.Done; var feed = actor.AvatarType == AvatarType.Feed; @@ -62,15 +50,15 @@ namespace PrivaPub.Federation.Actors if (feed && listed) { foreach (var community in communities) - if (_localActors == default || !community.StartsWith(_localActors.BaseAddress + "/", StringComparison.Ordinal)) - await _remoteActors.GetActor(community, refresh: false, token); - if (_jobs != default && await DB.Default.Find().Match(s => s.FeedActorURI == actor.ActorURI).ExecuteAnyAsync(token)) - await Domain.Social.FeedFollows.Sync(_jobs, token); + if (localActors == default || !community.StartsWith(localActors.BaseAddress + "/", StringComparison.Ordinal)) + await remoteActors.GetActor(community, refresh: false, token); + if (jobs != default && await DB.Default.Find().Match(s => s.FeedActorURI == actor.ActorURI).ExecuteAnyAsync(token)) + await Domain.Social.FeedFollows.Sync(jobs, token); } - if (_featured != default) - await _featured.Sync(actor, token); - if (_featuredTags != default) - await _featuredTags.Sync(actor, token); + if (featured != default) + await featured.Sync(actor, token); + if (featuredTags != default) + await featuredTags.Sync(actor, token); return JobOutcome.Done; } @@ -82,7 +70,7 @@ namespace PrivaPub.Federation.Actors if (string.IsNullOrEmpty(collection) || !Origin.Same(collection, actor.ActorURI)) return (default, listed, false); using var scope = HttpScope.For("collection"); - using var fetched = await _remoteActors.FetchObject(collection, token); + using var fetched = await remoteActors.FetchObject(collection, token); if (fetched == default || fetched.Root.ValueKind != System.Text.Json.JsonValueKind.Object) return (default, listed, false); int? total = fetched.Root.TryGetProperty("totalItems", out var counted) && counted.TryGetInt32(out var count) && count >= 0 ? count : default; @@ -92,7 +80,7 @@ namespace PrivaPub.Federation.Actors var page = document["orderedItems"] ?? document["items"] ?? document["first"]?["orderedItems"] ?? document["first"]?["items"]; if (page == default && ActivityJson.Id(document["first"]) is { } first && Origin.Same(first, actor.ActorURI)) { - using var next = await _remoteActors.FetchObject(first, token); + using var next = await remoteActors.FetchObject(first, token); if (next == default) return (total, listed, false); var nextPage = System.Text.Json.Nodes.JsonNode.Parse(next.Root.GetRawText()); diff --git a/PrivaPub/Federation/Actors/ActorDocument.cs b/PrivaPub/Federation/Actors/ActorDocument.cs index bf5d049..b52f3fb 100644 --- a/PrivaPub/Federation/Actors/ActorDocument.cs +++ b/PrivaPub/Federation/Actors/ActorDocument.cs @@ -39,6 +39,7 @@ namespace PrivaPub.Federation.Actors public string MovedTo { get; init; } public string Moderators { get; init; } public List Flairs { get; init; } = new(); + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0006", Justification = "Null when the document does not state searchableBy (FEP-268d), which is not the same as an empty list.")] public List SearchableBy { get; init; } public List AlsoKnownAs { get; init; } = new();//the accounts it says it also is (a Move's target names the moved one) public DateTime? Published { get; init; } diff --git a/PrivaPub/Federation/Actors/FeaturedPosts.cs b/PrivaPub/Federation/Actors/FeaturedPosts.cs index ead2d6b..3a418c1 100644 --- a/PrivaPub/Federation/Actors/FeaturedPosts.cs +++ b/PrivaPub/Federation/Actors/FeaturedPosts.cs @@ -26,20 +26,13 @@ namespace PrivaPub.Federation.Actors // What an account elsewhere features (pins): its `featured` collection, read with its counts at most once a day, and // the Add and Remove it sends when it pins or unpins. An account features only its own posts; a community (Lemmy's, // inside its announce) features posts made in it. Shown first on its profile here, as Mastodon shows them. - public class FeaturedPosts : IFeaturedPosts + public class FeaturedPosts( + DbEntities dbEntities, + IRemoteActorService remoteActors, + IRemotePosts remotePosts) : IFeaturedPosts { public const int MaxFeatured = 20; - readonly DbEntities _dbEntities; - readonly IRemoteActorService _remoteActors; - readonly IRemotePosts _remotePosts; - - public FeaturedPosts(DbEntities dbEntities, IRemoteActorService remoteActors, IRemotePosts remotePosts) - { - _dbEntities = dbEntities; - _remoteActors = remoteActors; - _remotePosts = remotePosts; - } public async Task Receive(JsonNode activity, ForeignAvatar owner, bool add, CancellationToken token) { @@ -110,8 +103,8 @@ namespace PrivaPub.Federation.Actors var isGroup = owner.AvatarType is AvatarType.Group; if (!isGroup && !Origin.Same(objectUri, owner.ActorURI)) return default; - var post = await _dbEntities.Posts.Match(p => p.ObjectURI == objectUri && !p.DeletedAt.HasValue).ExecuteFirstAsync(token) - ?? await _remotePosts.StoreContext(objectUri, 0, token); + var post = await dbEntities.Posts.Match(p => p.ObjectURI == objectUri && !p.DeletedAt.HasValue).ExecuteFirstAsync(token) + ?? await remotePosts.StoreContext(objectUri, 0, token); return post switch { null => default, @@ -125,7 +118,7 @@ namespace PrivaPub.Federation.Actors async Task> Items(ForeignAvatar owner, CancellationToken token) { using var scope = HttpScope.For("collection"); - using var collection = await _remoteActors.FetchObject(owner.FeaturedURL, token); + using var collection = await remoteActors.FetchObject(owner.FeaturedURL, token); if (collection == default || collection.Root.ValueKind != JsonValueKind.Object) return default; var items = ItemsOf(collection.Root); @@ -136,7 +129,7 @@ namespace PrivaPub.Federation.Actors var page = first.ValueKind == JsonValueKind.String ? first.GetString() : default; if (page == default || !Origin.Same(page, owner.ActorURI)) return items; - using var fetched = await _remoteActors.FetchObject(page, token); + using var fetched = await remoteActors.FetchObject(page, token); return fetched == default || fetched.Root.ValueKind != JsonValueKind.Object ? items : ItemsOf(fetched.Root); } diff --git a/PrivaPub/Federation/Actors/FollowingSynchronization.cs b/PrivaPub/Federation/Actors/FollowingSynchronization.cs index f17d528..922cc0e 100644 --- a/PrivaPub/Federation/Actors/FollowingSynchronization.cs +++ b/PrivaPub/Federation/Actors/FollowingSynchronization.cs @@ -23,25 +23,15 @@ namespace PrivaPub.Federation.Actors // only PrivaPub remembers ends, a request it answered without our knowing is accepted, and a follow only it remembers // is undone by the persona, as Mastodon does, or kept within RestoreRecord.FollowersGrace of a restore, which may have // lost it. A follow ends only when the list is the one the digest describes. - public class FollowingSynchronization : IJobHandler + public class FollowingSynchronization( + DbEntities dbEntities, + ILocalActorService localActors, + IRemoteActorService remoteActors, + IFollowService follows, + IDeliveryService deliveryService) : IJobHandler { const int MaxPages = 10; - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - readonly IRemoteActorService _remoteActors; - readonly IFollowService _follows; - readonly IDeliveryService _delivery; - - public FollowingSynchronization(DbEntities dbEntities, ILocalActorService localActors, IRemoteActorService remoteActors, IFollowService follows, - IDeliveryService delivery) - { - _dbEntities = dbEntities; - _localActors = localActors; - _remoteActors = remoteActors; - _follows = follows; - _delivery = delivery; - } public JobKind Kind => JobKind.SynchronizeFollowing; public int Concurrency => 1; @@ -55,14 +45,14 @@ namespace PrivaPub.Federation.Actors public async Task Handle(Job job, CancellationToken token) { var claim = JsonSerializer.Deserialize(job.Payload); - var actor = claim == default ? default : await _dbEntities.ForeignAvatars.Match(a => a.ActorURI == claim.Actor && !a.DeletionAt.HasValue).ExecuteFirstAsync(token); + var actor = claim == default ? default : await dbEntities.ForeignAvatars.Match(a => a.ActorURI == claim.Actor && !a.DeletionAt.HasValue).ExecuteFirstAsync(token); if (actor == default || string.IsNullOrEmpty(actor.FollowersURL) || claim.CollectionId != actor.FollowersURL || !Origin.Same(claim.Url, actor.ActorURI)) return JobOutcome.Done; - var followings = await _dbEntities.Followings.Match(f => f.TargetActorURI == actor.ActorURI && !f.TargetIsLocal).ExecuteAsync(token); + var followings = await dbEntities.Followings.Match(f => f.TargetActorURI == actor.ActorURI && !f.TargetIsLocal).ExecuteAsync(token); var personas = new Dictionary(StringComparer.Ordinal); foreach (var following in followings) - if (await _localActors.FindById(LocalActorKind.Person, following.AvatarId, token) is { } persona) + if (await localActors.FindById(LocalActorKind.Person, following.AvatarId, token) is { } persona) personas[persona.Uri] = (persona, following); var accepted = personas.Values.Where(p => p.Following.State == FollowState.Accepted).Select(p => p.Persona.Uri).ToList(); if (FollowersSynchronization.Digest(accepted) == claim.Digest) @@ -76,7 +66,7 @@ namespace PrivaPub.Federation.Actors var named = listed.ToHashSet(StringComparer.Ordinal); if (complete) foreach (var uri in accepted.Where(uri => !named.Contains(uri))) - await _follows.UnfollowAs(personas[uri].Persona, actor.ActorURI, token); + await follows.UnfollowAs(personas[uri].Persona, actor.ActorURI, token); foreach (var uri in named) { @@ -86,7 +76,7 @@ namespace PrivaPub.Federation.Actors await DB.Default.Update().MatchID(known.Following.ID).Modify(f => f.State, FollowState.Accepted).ExecuteAsync(token); continue; } - if (await _localActors.FindByUri(uri, token) is not { Kind: LocalActorKind.Person } stranger) + if (await localActors.FindByUri(uri, token) is not { Kind: LocalActorKind.Person } stranger) continue; // a follow the restore lost: kept, not undone if (await Infrastructure.Backup.RestoreRecord.InFollowersGrace(token)) @@ -110,7 +100,7 @@ namespace PrivaPub.Federation.Actors ["actor"] = stranger.Uri, ["object"] = new JsonObject { ["type"] = "Follow", ["actor"] = stranger.Uri, ["object"] = actor.ActorURI } }; - await _delivery.Enqueue(stranger, new[] { string.IsNullOrEmpty(actor.InboxURL) ? actor.SharedInboxURL : actor.InboxURL }, undo, token); + await deliveryService.Enqueue(stranger, new[] { string.IsNullOrEmpty(actor.InboxURL) ? actor.SharedInboxURL : actor.InboxURL }, undo, token: token); } return JobOutcome.Done; } @@ -123,7 +113,7 @@ namespace PrivaPub.Federation.Actors var next = url; for (var page = 0; page < MaxPages && next != default; page++) { - using var fetched = await _remoteActors.FetchObject(next, token); + using var fetched = await remoteActors.FetchObject(next, token); if (fetched == default || fetched.Root.ValueKind != JsonValueKind.Object) return page == 0 ? default : items; var root = fetched.Root; diff --git a/PrivaPub/Federation/Actors/LocalActorService.cs b/PrivaPub/Federation/Actors/LocalActorService.cs index d2c5db2..2e4b328 100644 --- a/PrivaPub/Federation/Actors/LocalActorService.cs +++ b/PrivaPub/Federation/Actors/LocalActorService.cs @@ -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, + 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; - readonly Domain.Instance.IInstanceSettings _settings; InstanceActor _instanceActor; ReporterActor _reporterActor; ReaderActor _readerActor; - public LocalActorService(DbEntities dbEntities, IOptionsMonitor 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 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 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 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 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(); diff --git a/PrivaPub/Federation/Actors/OutboxBackfill.cs b/PrivaPub/Federation/Actors/OutboxBackfill.cs index 6c7bbac..9116a84 100644 --- a/PrivaPub/Federation/Actors/OutboxBackfill.cs +++ b/PrivaPub/Federation/Actors/OutboxBackfill.cs @@ -14,20 +14,13 @@ namespace PrivaPub.Federation.Actors // The latest public posts of an account a persona has just followed, read from the first page of its outbox (at most // twenty, once a day) and kept as any fetched post: its profile shows them and threads find them at once, instead of // only what it posts from then on. Homes still get only what arrives from now on, as on Mastodon. - public class OutboxBackfill : IJobHandler + public class OutboxBackfill( + DbEntities dbEntities, + IRemoteActorService remoteActors, + IRemotePosts remotePosts) : IJobHandler { public const int MaxPosts = 20; - readonly DbEntities _dbEntities; - readonly IRemoteActorService _remoteActors; - readonly IRemotePosts _remotePosts; - - public OutboxBackfill(DbEntities dbEntities, IRemoteActorService remoteActors, IRemotePosts remotePosts) - { - _dbEntities = dbEntities; - _remoteActors = remoteActors; - _remotePosts = remotePosts; - } public JobKind Kind => JobKind.BackfillOutbox; public int Concurrency => 1; @@ -38,11 +31,11 @@ namespace PrivaPub.Federation.Actors public async Task Handle(Job job, CancellationToken token) { - var actor = await _dbEntities.ForeignAvatars.Match(a => a.ActorURI == job.Payload && !a.DeletionAt.HasValue).ExecuteFirstAsync(token); + var actor = await dbEntities.ForeignAvatars.Match(a => a.ActorURI == job.Payload && !a.DeletionAt.HasValue).ExecuteFirstAsync(token); if (actor == default || string.IsNullOrEmpty(actor.OutboxURL) || !Origin.Same(actor.OutboxURL, actor.ActorURI)) return JobOutcome.Done; foreach (var objectUri in (await Items(actor, token)).Take(MaxPosts)) - await _remotePosts.StoreContext(objectUri, 0, token); + await remotePosts.StoreContext(objectUri, 0, token); return JobOutcome.Done; } @@ -51,7 +44,7 @@ namespace PrivaPub.Federation.Actors async Task> Items(Models.User.ForeignAvatar actor, CancellationToken token) { using var scope = HttpScope.For("outbox"); - using var outbox = await _remoteActors.FetchObject(actor.OutboxURL, token); + using var outbox = await remoteActors.FetchObject(actor.OutboxURL, token); if (outbox == default || outbox.Root.ValueKind != JsonValueKind.Object) return new(); var page = ItemsOf(outbox.Root, actor); @@ -62,7 +55,7 @@ namespace PrivaPub.Federation.Actors var pageUri = first.ValueKind == JsonValueKind.String ? first.GetString() : default; if (pageUri == default || !Origin.Same(pageUri, actor.ActorURI)) return page; - using var fetched = await _remoteActors.FetchObject(pageUri, token); + using var fetched = await remoteActors.FetchObject(pageUri, token); return fetched == default || fetched.Root.ValueKind != JsonValueKind.Object ? page : ItemsOf(fetched.Root, actor); } diff --git a/PrivaPub/Federation/Actors/RemoteActorService.cs b/PrivaPub/Federation/Actors/RemoteActorService.cs index 379331d..ce112af 100644 --- a/PrivaPub/Federation/Actors/RemoteActorService.cs +++ b/PrivaPub/Federation/Actors/RemoteActorService.cs @@ -26,41 +26,30 @@ namespace PrivaPub.Federation.Actors Task ResolveHandle(string handle, CancellationToken token); } - public class RemoteActorService : IRemoteActorService + public class RemoteActorService( + IFederationHttp federationHttp, + ILocalActorService localActors, + IMemoryCache cache, + DbEntities dbEntities, + IOptionsMonitor options = default, + Infrastructure.Jobs.IJobQueue jobs = default) : IRemoteActorService { public const string ActivityJson = "application/activity+json"; const string Accept = "application/activity+json, application/ld+json; profile=\"https://www.w3.org/ns/activitystreams\""; static readonly TimeSpan CacheLifetime = TimeSpan.FromDays(1); static readonly TimeSpan RefetchInterval = TimeSpan.FromMinutes(5); - readonly IFederationHttp _http; - readonly ILocalActorService _localActors; - readonly IMemoryCache _cache; - readonly DbEntities _dbEntities; - readonly IOptionsMonitor _options; - readonly Infrastructure.Jobs.IJobQueue _jobs; - - public RemoteActorService(IFederationHttp http, ILocalActorService localActors, IMemoryCache cache, DbEntities dbEntities, - IOptionsMonitor options = default, Infrastructure.Jobs.IJobQueue jobs = default) - { - _jobs = jobs; - _http = http; - _localActors = localActors; - _cache = cache; - _dbEntities = dbEntities; - _options = options; - } public Task FetchObject(string uri, CancellationToken token) => FetchObject(uri, default, token); public async Task FetchObject(string uri, string etag, CancellationToken token) { using var scope = HttpScope.Default("object"); - var signer = await _localActors.GetInstanceActor(token); + var signer = await localActors.GetInstanceActor(token); var fetched = string.IsNullOrEmpty(etag) ? await Get(uri, signer, token) - : await _http.GetJsonIfChanged(uri, Accept, etag, request => HttpSignatures.Sign(request, signer, body: null), token); + : await federationHttp.GetJsonIfChanged(uri, Accept, etag, request => HttpSignatures.Sign(request, signer, body: null), token); if (fetched == default || fetched.NotModified) return fetched; @@ -86,7 +75,7 @@ namespace PrivaPub.Federation.Actors return default; actorUri = StripFragment(actorUri); - var cached = await _dbEntities.ForeignAvatars.Match(a => a.ActorURI == actorUri).ExecuteFirstAsync(token); + var cached = await dbEntities.ForeignAvatars.Match(a => a.ActorURI == actorUri).ExecuteFirstAsync(token); if (cached != default && !refresh && DateTime.UtcNow - cached.UpdatedAt < CacheLifetime) return cached; if (!MayFetch(actorUri)) @@ -105,8 +94,8 @@ namespace PrivaPub.Federation.Actors // its counts are read once a day, after it was fetched (AccountCountsJob) async Task Counted(ForeignAvatar stored, CancellationToken token) { - if (_jobs != default && stored is { DeletionAt: null } && Uri.TryCreate(stored.ActorURI, UriKind.Absolute, out var uri)) - await _jobs.Enqueue(Models.Jobs.JobKind.CountAccount, stored.ActorURI, uri.Host.ToLowerInvariant(), + if (jobs != default && stored is { DeletionAt: null } && Uri.TryCreate(stored.ActorURI, UriKind.Absolute, out var uri)) + await jobs.Enqueue(Models.Jobs.JobKind.CountAccount, stored.ActorURI, uri.Host.ToLowerInvariant(), AccountCountsJob.DedupeKey(stored.ActorURI, DateTime.UtcNow), token); return stored; } @@ -116,7 +105,7 @@ namespace PrivaPub.Federation.Actors if (Origin.Of(keyId) == default) return default; - var cached = await _dbEntities.ForeignAvatars.Match(a => a.PublicKeyId == keyId).ExecuteFirstAsync(token); + var cached = await dbEntities.ForeignAvatars.Match(a => a.PublicKeyId == keyId).ExecuteFirstAsync(token); if (cached != default && !string.IsNullOrEmpty(cached.PublicKey) && !refresh) return cached; if (!MayFetch(keyId)) @@ -143,7 +132,7 @@ namespace PrivaPub.Federation.Actors return await Counted(await Upsert(actor, key, token), token); } - public bool KeyTemporarilyUnavailable(string keyId) => Origin.Of(keyId) != default && _http.FailedTemporarily(StripFragment(keyId)); + public bool KeyTemporarilyUnavailable(string keyId) => Origin.Of(keyId) != default && federationHttp.FailedTemporarily(StripFragment(keyId)); // whether an object's origin says it is gone: 404 or 410 to our instance actor, or a Tombstone in its place public async Task IsGone(string uri, CancellationToken token) @@ -151,8 +140,8 @@ namespace PrivaPub.Federation.Actors if (Origin.Of(uri) == default) return false; using var scope = HttpScope.Default("object"); - var signer = await _localActors.GetInstanceActor(token); - var (status, fetched) = await _http.GetJsonStatus(uri, Accept, request => HttpSignatures.Sign(request, signer, body: null), token); + var signer = await localActors.GetInstanceActor(token); + var (status, fetched) = await federationHttp.GetJsonStatus(uri, Accept, request => HttpSignatures.Sign(request, signer, body: null), token); using (fetched) return status is StatusCodes.Status404NotFound or StatusCodes.Status410Gone || fetched != default && Text(fetched.Root, "type") == "Tombstone"; } @@ -165,9 +154,9 @@ namespace PrivaPub.Federation.Actors using var scope = HttpScope.For("webfinger"); var query = $"/.well-known/webfinger?resource={Uri.EscapeDataString($"acct:{parts[0]}@{parts[1]}")}"; - using var fetched = await _http.GetJson($"https://{parts[1]}{query}", "application/jrd+json, application/json", sign: default, token) - ?? (_options?.CurrentValue.AllowPlainHttp == true - ? await _http.GetJson($"http://{parts[1]}{query}", "application/jrd+json, application/json", sign: default, token) + using var fetched = await federationHttp.GetJson($"https://{parts[1]}{query}", "application/jrd+json, application/json", sign: default, token) + ?? (options?.CurrentValue.AllowPlainHttp == true + ? await federationHttp.GetJson($"http://{parts[1]}{query}", "application/jrd+json, application/json", sign: default, token) : default); if (fetched == default) return default; @@ -185,14 +174,14 @@ namespace PrivaPub.Federation.Actors } async Task Get(string uri, LocalActor signer, CancellationToken token) => - await _http.GetJson(uri, Accept, request => HttpSignatures.Sign(request, signer, body: null), token); + await federationHttp.GetJson(uri, Accept, request => HttpSignatures.Sign(request, signer, body: null), token); bool MayFetch(string uri) { var key = "remote-actor:fetched:" + uri; - if (_cache.TryGetValue(key, out _)) + if (cache.TryGetValue(key, out _)) return false; - _cache.Set(key, true, RefetchInterval); + cache.Set(key, true, RefetchInterval); return true; } @@ -206,7 +195,7 @@ namespace PrivaPub.Federation.Actors if (named is not { Length: 2 } || named[0].Length == 0 || named[1].Length == 0 || named[1].Equals(host, StringComparison.OrdinalIgnoreCase)) return host; var domain = named[1].ToLowerInvariant(); - var stored = await _dbEntities.ForeignAvatars.Match(a => a.ActorURI == actor.Id).ExecuteFirstAsync(token); + var stored = await dbEntities.ForeignAvatars.Match(a => a.ActorURI == actor.Id).ExecuteFirstAsync(token); if (stored?.Domain == domain && stored.UserName == actor.PreferredUsername) return domain; return await ResolveHandle($"{named[0]}@{domain}", token) == actor.Id ? domain : host; diff --git a/PrivaPub/Federation/Actors/Walls.cs b/PrivaPub/Federation/Actors/Walls.cs index 36f1ed8..cd4e394 100644 --- a/PrivaPub/Federation/Actors/Walls.cs +++ b/PrivaPub/Federation/Actors/Walls.cs @@ -32,42 +32,33 @@ namespace PrivaPub.Federation.Actors // the persona and its followers, and told to its followers' servers with Add{Note}. The persona may take it off again // (Remove, which Smithereen takes for a deletion, as it is on its walls). Another server's account that tells its // followers here of a post on its wall (Add) has it shown to them as on its wall. - public class Walls : IWalls + public class Walls( + DbEntities dbEntities, + ILocalActorService localActors, + IRemotePosts remotePosts, + IDeliveryService delivery, + IFanout fanout) : IWalls { public const string Path = "graffiti"; - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - readonly IRemotePosts _remotePosts; - readonly IDeliveryService _delivery; - readonly IFanout _fanout; - - public Walls(DbEntities dbEntities, ILocalActorService localActors, IRemotePosts remotePosts, IDeliveryService delivery, IFanout fanout) - { - _dbEntities = dbEntities; - _localActors = localActors; - _remotePosts = remotePosts; - _delivery = delivery; - _fanout = fanout; - } public async Task OwnerOf(string wallUri, CancellationToken token) { if (string.IsNullOrEmpty(wallUri) || !wallUri.EndsWith("/" + Path, StringComparison.Ordinal)) return default; - var owner = await _localActors.FindByUri(wallUri[..^(Path.Length + 1)], token); + var owner = await localActors.FindByUri(wallUri[..^(Path.Length + 1)], token); return owner is { HasWall: true } && owner.Wall == wallUri ? owner : default; } // its followers, as the actor says to Smithereen (wallPosting), unless the persona hides them public async Task MayWrite(LocalActor owner, ForeignAvatar author, CancellationToken token) => - await _dbEntities.Followers.Match(f => f.LocalActorId == owner.Id && f.LocalActorKind == owner.Kind && f.ActorURI == author.ActorURI && f.IsAccepted) + await dbEntities.Followers.Match(f => f.LocalActorId == owner.Id && f.LocalActorKind == owner.Kind && f.ActorURI == author.ActorURI && f.IsAccepted) .ExecuteAnyAsync(token) && !(await Domain.Relationships.Hidden.RecipientsHiding(new[] { owner.Id }, author.ActorURI, token)).Contains(owner.Id); public async Task Hosted(PostEntity post, LocalActor owner, CancellationToken token) { - await Notifications.Add(owner.Id, NotificationType.Mention, post.AuthorAccountId, post.ActorURI, post.ID, token); + await Notifications.Add(owner.Id, NotificationType.Mention, post.AuthorAccountId, post.ActorURI, post.ID, token: token); var add = new JsonObject { ["@context"] = ActivityPubRenderer.Context(), @@ -78,7 +69,7 @@ namespace PrivaPub.Federation.Actors ["target"] = new JsonObject { ["type"] = "OrderedCollection", ["id"] = owner.Wall, ["attributedTo"] = owner.Uri }, ["to"] = new JsonArray(ActivityPubRenderer.Public, owner.Followers, post.ActorURI) }; - await _delivery.EnqueueToFollowers(owner, add, token, await AuthorInbox(post, token)); + await delivery.EnqueueToFollowers(owner, add, await AuthorInbox(post, token), token); } public async Task Receive(JsonNode activity, ForeignAvatar owner, bool add, CancellationToken token) @@ -91,7 +82,7 @@ namespace PrivaPub.Federation.Actors } if (!add) { - var walled = await _dbEntities.Posts.Match(p => p.ObjectURI == objectUri && p.WallOwnerURI == owner.ActorURI).ExecuteFirstAsync(token); + var walled = await dbEntities.Posts.Match(p => p.ObjectURI == objectUri && p.WallOwnerURI == owner.ActorURI).ExecuteFirstAsync(token); if (walled == default) { Arrival.Drop("unknown-object"); @@ -102,8 +93,8 @@ namespace PrivaPub.Federation.Actors return; } - var post = await _dbEntities.Posts.Match(p => p.ObjectURI == objectUri && !p.DeletedAt.HasValue).ExecuteFirstAsync(token) - ?? await _remotePosts.StoreContext(objectUri, 0, token); + var post = await dbEntities.Posts.Match(p => p.ObjectURI == objectUri && !p.DeletedAt.HasValue).ExecuteFirstAsync(token) + ?? await remotePosts.StoreContext(objectUri, 0, token); if (post is not { IsFederatedCopy: true, ReblogOfPostId: null, Visibility: PostVisibility.Public or PostVisibility.Unlisted } || !string.IsNullOrEmpty(post.InReplyToURI)) { Arrival.Drop("unknown-object"); @@ -123,7 +114,7 @@ namespace PrivaPub.Federation.Actors .Modify(p => p.WallOwnerURI, post.WallOwnerURI) .Modify(p => p.WallOwnerAccountId, post.WallOwnerAccountId) .ExecuteAsync(token); - await _fanout.Distribute(post, token); + await fanout.Distribute(post, token); Arrival.Accept("walled"); } @@ -142,14 +133,14 @@ namespace PrivaPub.Federation.Actors ["target"] = owner.Wall, ["to"] = new JsonArray(ActivityPubRenderer.Public, owner.Followers, post.ActorURI) }; - await _delivery.EnqueueToFollowers(owner, remove, token, await AuthorInbox(post, token)); + await delivery.EnqueueToFollowers(owner, remove, await AuthorInbox(post, token), token); await RemoteDeletes.Remove(post, post.ObjectURI, token); return true; } async Task> AuthorInbox(PostEntity post, CancellationToken token) { - var author = await _dbEntities.ForeignAvatars.Match(a => a.ActorURI == post.ActorURI).ExecuteFirstAsync(token); + var author = await dbEntities.ForeignAvatars.Match(a => a.ActorURI == post.ActorURI).ExecuteFirstAsync(token); var inbox = string.IsNullOrEmpty(author?.SharedInboxURL) ? author?.InboxURL : author.SharedInboxURL; return inbox == default ? Array.Empty() : new[] { inbox }; } diff --git a/PrivaPub/Federation/Controllers/EmojisController.cs b/PrivaPub/Federation/Controllers/EmojisController.cs index 22428db..d8420d6 100644 --- a/PrivaPub/Federation/Controllers/EmojisController.cs +++ b/PrivaPub/Federation/Controllers/EmojisController.cs @@ -17,16 +17,11 @@ namespace PrivaPub.Federation.Controllers // answers 410 with a Tombstone. An emoji tells nothing about anyone, so it is served unsigned under SecureMode too, as the // server's own actors are; a browser is sent to the picture. [ApiController] - public class EmojisController : ControllerBase + public class EmojisController( + ILocalActorService localActors) : ControllerBase { const string ActivityContentType = "application/activity+json; charset=utf-8"; - readonly ILocalActorService _localActors; - - public EmojisController(ILocalActorService localActors) - { - _localActors = localActors; - } [HttpGet, Route("/" + LocalEmojis.Path + "/{shortcode}")] public async Task Get(string shortcode, CancellationToken token) @@ -44,7 +39,7 @@ namespace PrivaPub.Federation.Controllers Content = new JsonObject { ["@context"] = ActivityPubRenderer.ActivityStreams, - ["id"] = LocalEmojis.Uri(_localActors.BaseAddress, emoji.Shortcode), + ["id"] = LocalEmojis.Uri(localActors.BaseAddress, emoji.Shortcode), ["type"] = "Tombstone", ["formerType"] = "Emoji", ["deleted"] = ActivityPubRenderer.Timestamp(deleted) @@ -60,7 +55,7 @@ namespace PrivaPub.Federation.Controllers emoji.ImageUpdatedAt, emoji.Category, emoji.VisibleInPicker); return new ContentResult { - Content = LocalEmojis.Document(live, _localActors.BaseAddress).ToJsonString(), + Content = LocalEmojis.Document(live, localActors.BaseAddress).ToJsonString(), ContentType = ActivityContentType, StatusCode = StatusCodes.Status200OK }; diff --git a/PrivaPub/Federation/Controllers/PeasantsController.cs b/PrivaPub/Federation/Controllers/PeasantsController.cs index 223e2f2..6dbcbc2 100644 --- a/PrivaPub/Federation/Controllers/PeasantsController.cs +++ b/PrivaPub/Federation/Controllers/PeasantsController.cs @@ -26,34 +26,23 @@ using PrivaPub.Infrastructure; namespace PrivaPub.Federation.Controllers { [ApiController, Route("peasants")] - public class PeasantsController : ControllerBase, IAsyncActionFilter + public class PeasantsController( + ILocalActorService localActors, + IInboxReceiver inboxReceiver, + DbEntities dbEntities, + ILogger logger, + ISignedFetchAuthorizer fetches, + IOptionsMonitor federation) : ControllerBase, IAsyncActionFilter { const string ActivityContentType = "application/activity+json; charset=utf-8"; const int OutboxSize = 20; - readonly ILocalActorService _localActors; - readonly IInboxReceiver _inbox; - readonly DbEntities _dbEntities; - readonly ILogger _logger; - readonly ISignedFetchAuthorizer _fetches; - readonly IOptionsMonitor _federation; - - public PeasantsController(ILocalActorService localActors, IInboxReceiver inbox, DbEntities dbEntities, - ILogger logger, ISignedFetchAuthorizer fetches, IOptionsMonitor federation) - { - _fetches = fetches; - _federation = federation; - _localActors = localActors; - _inbox = inbox; - _dbEntities = dbEntities; - _logger = logger; - } [HttpGet, Route("{actor}")] public async Task GetActor(string actor, CancellationToken token) { - var local = await _localActors.FindByUserName(actor, token); - if (local == default && await _localActors.Gone(actor, token) is { } gone) + var local = await localActors.FindByUserName(actor, token); + if (local == default && await localActors.Gone(actor, token) is { } gone) return new ContentResult { Content = new JsonObject @@ -82,14 +71,14 @@ namespace PrivaPub.Federation.Controllers var accept = Request.Headers.Accept.ToString(); if (!accept.Contains("activity+json", StringComparison.OrdinalIgnoreCase) && !accept.Contains("ld+json", StringComparison.OrdinalIgnoreCase)) return NotFound(); - return Activity(ActivityPubRenderer.Actor(await _localActors.GetInstanceActor(token))); + return Activity(ActivityPubRenderer.Actor(await localActors.GetInstanceActor(token))); } [HttpGet, Route("{actor}/anus")] public async Task Outbox(string actor, [FromQuery] bool page, [FromQuery(Name = "max_id")] string maxId, CancellationToken token) { - var local = await _localActors.FindByUserName(actor, token); + var local = await localActors.FindByUserName(actor, token); if (local is not { IsFederated: true }) return NotFound(); @@ -101,8 +90,8 @@ namespace PrivaPub.Federation.Controllers } var query = local.Kind == LocalActorKind.Group - ? _dbEntities.Posts.Match(p => p.GroupId == local.Id).Match(VisibilityPolicy.IsPublic) - : _dbEntities.Posts.Match(p => p.GroupUserId == local.Id && !p.IsFederatedCopy).Match(VisibilityPolicy.IsPublic); + ? dbEntities.Posts.Match(p => p.GroupId == local.Id).Match(VisibilityPolicy.IsPublic) + : dbEntities.Posts.Match(p => p.GroupUserId == local.Id && !p.IsFederatedCopy).Match(VisibilityPolicy.IsPublic); if (!string.IsNullOrEmpty(maxId)) query.Match(f => f.Lt(p => p.ID, maxId)); var latest = await query.Sort(p => p.ID, Order.Descending).Limit(OutboxSize).ExecuteAsync(token); @@ -134,11 +123,11 @@ namespace PrivaPub.Federation.Controllers [HttpGet, Route("{actor}/groupies")] public async Task Followers(string actor, CancellationToken token) { - var local = await _localActors.FindByUserName(actor, token); + var local = await localActors.FindByUserName(actor, token); if (local is not { IsFederated: true }) return NotFound(); - if (local.IsCircle && !SignedFetchAuthorizer.MayReadCircle(await _dbEntities.Groups.MatchID(local.Id).ExecuteFirstAsync(token), - await _fetches.Requester(Request, token))) + if (local.IsCircle && !SignedFetchAuthorizer.MayReadCircle(await dbEntities.Groups.MatchID(local.Id).ExecuteFirstAsync(token), + await fetches.Requester(Request, token))) return NotFound(); var count = await DB.Default.CountAsync( f => f.LocalActorId == local.Id && f.LocalActorKind == local.Kind && f.IsAccepted, token); @@ -150,7 +139,7 @@ namespace PrivaPub.Federation.Controllers [HttpGet, Route("{actor}/" + Walls.Path)] public async Task Wall(string actor, [FromQuery] bool page, [FromQuery(Name = "max_id")] string maxId, CancellationToken token) { - var local = await _localActors.FindByUserName(actor, token); + var local = await localActors.FindByUserName(actor, token); if (local is not { HasWall: true }) return NotFound(); var wall = local.Wall; @@ -161,7 +150,7 @@ namespace PrivaPub.Federation.Controllers || p.GroupUserId == local.Id && !p.IsFederatedCopy && p.ReblogOfPostId == null && p.AnsweringToPostId == null && p.InReplyToURI == null && p.GroupId == null); if (!page) return Activity(ActivityPubRenderer.OrderedCollection(wall, (int)await DB.Default.CountAsync(onWall, token), default, $"{wall}?page=true")); - var query = _dbEntities.Posts.Match(onWall); + var query = dbEntities.Posts.Match(onWall); if (!string.IsNullOrEmpty(maxId)) query.Match(f => f.Lt(p => p.ID, maxId)); var latest = await query.Sort(p => p.ID, Order.Descending).Limit(OutboxSize).ExecuteAsync(token); @@ -174,10 +163,10 @@ namespace PrivaPub.Federation.Controllers [HttpGet, Route("{actor}/groupies/roll-call")] public async Task RollCall(string actor, CancellationToken token) { - var local = await _localActors.FindByUserName(actor, token); + var local = await localActors.FindByUserName(actor, token); if (local is not { IsFederated: true } || !FollowersSynchronization.Synchronizes(local)) return NotFound(); - var requester = await _fetches.Requester(Request, token); + var requester = await fetches.Requester(Request, token); if (requester == default) return StatusCode(StatusCodes.Status401Unauthorized); var there = await FollowersSynchronization.On(local, FollowersSynchronization.Origin(requester.ActorURI), token); @@ -187,7 +176,7 @@ namespace PrivaPub.Federation.Controllers [HttpGet, Route("{actor}/stalking")] public async Task Following(string actor, CancellationToken token) { - var local = await _localActors.FindByUserName(actor, token); + var local = await localActors.FindByUserName(actor, token); if (local is not { IsFederated: true }) return NotFound(); // the count, as following_count says it; who is followed is never listed (FEDERATION.md) @@ -200,11 +189,11 @@ namespace PrivaPub.Federation.Controllers [HttpGet, Route("{actor}/flock")] public async Task Members(string actor, CancellationToken token) { - var local = await _localActors.FindByUserName(actor, token); + var local = await localActors.FindByUserName(actor, token); if (local is not { IsFederated: true, Kind: LocalActorKind.Group }) return NotFound(); - var group = await _dbEntities.Groups.MatchID(local.Id).ExecuteFirstAsync(token); - if (local.IsCircle && !SignedFetchAuthorizer.MayReadCircle(group, await _fetches.Requester(Request, token))) + var group = await dbEntities.Groups.MatchID(local.Id).ExecuteFirstAsync(token); + if (local.IsCircle && !SignedFetchAuthorizer.MayReadCircle(group, await fetches.Requester(Request, token))) return NotFound(); return Activity(ActivityPubRenderer.OrderedCollection(local.Flock, group.Members.Count, default)); } @@ -212,15 +201,15 @@ namespace PrivaPub.Federation.Controllers [HttpGet, Route("{actor}/wardens")] public async Task Moderators(string actor, CancellationToken token) { - var local = await _localActors.FindByUserName(actor, token); + var local = await localActors.FindByUserName(actor, token); if (local is not { IsFederated: true, Kind: LocalActorKind.Group }) return NotFound(); - var group = await _dbEntities.Groups.MatchID(local.Id).ExecuteFirstAsync(token); - if (local.IsCircle && !SignedFetchAuthorizer.MayReadCircle(group, await _fetches.Requester(Request, token))) + var group = await dbEntities.Groups.MatchID(local.Id).ExecuteFirstAsync(token); + if (local.IsCircle && !SignedFetchAuthorizer.MayReadCircle(group, await fetches.Requester(Request, token))) return NotFound(); var moderators = new List(); foreach (var member in group.Members.Where(m => !m.IsForeign && m.Role is GroupRole.Owner or GroupRole.Moderator)) - if (await _localActors.FindById(LocalActorKind.Person, member.AvatarId, token) is { } moderator) + if (await localActors.FindById(LocalActorKind.Person, member.AvatarId, token) is { } moderator) moderators.Add(moderator.Uri); return Activity(ActivityPubRenderer.OrderedCollection(local.Wardens, moderators.Count, moderators)); } @@ -228,14 +217,14 @@ namespace PrivaPub.Federation.Controllers [HttpGet, Route("{actor}/trophies")] public async Task Featured(string actor, CancellationToken token) { - var local = await _localActors.FindByUserName(actor, token); + var local = await localActors.FindByUserName(actor, token); if (local is not { IsFederated: true }) return NotFound(); var pinIds = (await DB.Default.Find().Match(p => p.AvatarId == local.Id).Sort(p => p.ID, Order.Descending).ExecuteAsync(token)) .Select(p => p.PostId).ToList(); var posts = pinIds.Count == 0 ? new List() - : await _dbEntities.Posts.Match(p => pinIds.Contains(p.ID) && p.GroupUserId == local.Id && p.ReblogOfPostId == null) + : await dbEntities.Posts.Match(p => pinIds.Contains(p.ID) && p.GroupUserId == local.Id && p.ReblogOfPostId == null) .Match(VisibilityPolicy.IsPublic).ExecuteAsync(token); var notes = new List(); foreach (var id in pinIds) @@ -249,7 +238,7 @@ namespace PrivaPub.Federation.Controllers [HttpGet, Route("{actor}/tattoos")] public async Task FeaturedTags(string actor, CancellationToken token) { - var local = await _localActors.FindByUserName(actor, token); + var local = await localActors.FindByUserName(actor, token); if (local is not { IsFederated: true }) return NotFound(); var tags = local.Kind == LocalActorKind.Person @@ -278,7 +267,7 @@ namespace PrivaPub.Federation.Controllers if (WantsHtml()) return Redirect(local.PostHtmlUrl(post.ID)); - var group = string.IsNullOrEmpty(post.GroupId) ? default : await _localActors.FindById(LocalActorKind.Group, post.GroupId, token); + var group = string.IsNullOrEmpty(post.GroupId) ? default : await localActors.FindById(LocalActorKind.Group, post.GroupId, token); var note = ActivityPubRenderer.Note(post, local, group, post.InReplyToURI); note["@context"] = ActivityPubRenderer.Context(); return Activity(note); @@ -291,7 +280,7 @@ namespace PrivaPub.Federation.Controllers var (local, post) = await PublicPost(actor, postId, token); if (post == default || post.IsLocalOnly || !string.IsNullOrEmpty(post.GroupId)) return NotFound(); - var replies = await _dbEntities.Posts.Match(p => p.AnsweringToPostId == post.ID && !p.IsLocalOnly && p.ReblogOfPostId == null) + var replies = await dbEntities.Posts.Match(p => p.AnsweringToPostId == post.ID && !p.IsLocalOnly && p.ReblogOfPostId == null) .Match(VisibilityPolicy.IsPublic).Sort(p => p.CreationDate, Order.Ascending).Limit(MaxThread).ExecuteAsync(token); replies.RemoveAll(VisibilityPolicy.Barred); return Activity(ActivityPubRenderer.OrderedCollection(local.PostUri(post.ID) + "/replies", replies.Count, @@ -309,7 +298,7 @@ namespace PrivaPub.Federation.Controllers var level = new List { root.ID }; for (var depth = 0; depth < PrivaPub.Federation.Inbox.RemotePosts.MaxDepth && level.Count > 0 && thread.Count < MaxThread; depth++) { - var next = await _dbEntities.Posts.Match(p => level.Contains(p.AnsweringToPostId) && !p.IsLocalOnly && p.ReblogOfPostId == null) + var next = await dbEntities.Posts.Match(p => level.Contains(p.AnsweringToPostId) && !p.IsLocalOnly && p.ReblogOfPostId == null) .Match(VisibilityPolicy.IsPublic).Sort(p => p.CreationDate, Order.Ascending).Limit(MaxThread - thread.Count).ExecuteAsync(token); thread.AddRange(next.Where(p => !VisibilityPolicy.Barred(p))); level = next.Select(p => p.ID).ToList(); @@ -324,9 +313,9 @@ namespace PrivaPub.Federation.Controllers [HttpGet, Route("{actor}/parrot-licences/{licenceId}")] public async Task ParrotLicence(string actor, string licenceId, CancellationToken token) { - var author = await _localActors.FindByUserName(actor, token); + var author = await localActors.FindByUserName(actor, token); var licence = author == default ? default : await DB.Default.Find().Match(l => l.ID == licenceId && l.AuthorAvatarId == author.Id).ExecuteFirstAsync(token); - var quoted = licence == default ? default : await _dbEntities.Posts.MatchID(licence.PostId).ExecuteFirstAsync(token); + var quoted = licence == default ? default : await dbEntities.Posts.MatchID(licence.PostId).ExecuteFirstAsync(token); if (quoted == default) return NotFound(); var uri = Domain.Statuses.QuoteService.LicenceUri(author, licence.ID); @@ -353,13 +342,13 @@ namespace PrivaPub.Federation.Controllers { if (activityId.StartsWith("announce-", StringComparison.Ordinal)) { - var booster = await _localActors.FindByUserName(actor, token); + var booster = await localActors.FindByUserName(actor, token); var uri = booster?.ActivityUri(activityId); if (booster is { Kind: LocalActorKind.Group, IsCircle: false }) return await GroupAnnounce(booster, activityId, uri, token); - var reblog = uri == default ? default : await _dbEntities.Posts.Match(p => p.ObjectURI == uri && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); + var reblog = uri == default ? default : await dbEntities.Posts.Match(p => p.ObjectURI == uri && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); var rendered = reblog == default ? default : await AnnounceFor(reblog, token); - if (rendered != default && WantsHtml() && await _dbEntities.Posts.MatchID(reblog.ReblogOfPostId).ExecuteFirstAsync(token) is { } boosted) + if (rendered != default && WantsHtml() && await dbEntities.Posts.MatchID(reblog.ReblogOfPostId).ExecuteFirstAsync(token) is { } boosted) return Redirect(boosted.Url ?? boosted.ObjectURI);//a boost has no page of its own: the boosted post's return rendered == default ? NotFound() : Activity(rendered); } @@ -377,14 +366,14 @@ namespace PrivaPub.Federation.Controllers [HttpGet, Route("{actor}/whispers/{conversationId}")] public async Task Whispers(string actor, string conversationId, CancellationToken token) { - var local = await _localActors.FindByUserName(actor, token); + var local = await localActors.FindByUserName(actor, token); if (local is not { IsFederated: true, Kind: LocalActorKind.Person }) return NotFound(); var uri = local.ConversationUri(conversationId); - var conversation = await _dbEntities.DmGroups.Match(g => g.ID == conversationId && g.ConversationURI == uri && !g.DeletionAt.HasValue).ExecuteFirstAsync(token); - if (conversation == default || !SignedFetchAuthorizer.MayReadConversation(conversation, await _fetches.Requester(Request, token))) + var conversation = await dbEntities.DmGroups.Match(g => g.ID == conversationId && g.ConversationURI == uri && !g.DeletionAt.HasValue).ExecuteFirstAsync(token); + if (conversation == default || !SignedFetchAuthorizer.MayReadConversation(conversation, await fetches.Requester(Request, token))) return NotFound(); - var posts = await _dbEntities.Posts + var posts = await dbEntities.Posts .Match(p => p.ConversationId == conversationId && p.Visibility == PostVisibility.Direct && !p.DeletedAt.HasValue) .Sort(p => p.CreationDate, Order.Ascending) .ExecuteAsync(token); @@ -401,28 +390,28 @@ namespace PrivaPub.Federation.Controllers [HttpPost, Route("{actor}/mouth"), EnableRateLimiting(RateLimiting.Inbox)] public async Task Inbox(string actor, CancellationToken token) { - var local = await _localActors.FindByUserName(actor, token); - if (local == default && await _localActors.Gone(actor, token) != default) + var local = await localActors.FindByUserName(actor, token); + if (local == default && await localActors.Gone(actor, token) != default) return StatusCode(StatusCodes.Status410Gone); if (local is not { IsFederated: true }) - return Answer(_inbox.NoSuchRecipient(Request)); - return Answer(await _inbox.Receive(Request, local, token)); + return Answer(inboxReceiver.NoSuchRecipient(Request)); + return Answer(await inboxReceiver.Receive(Request, local, token)); } [HttpPost, Route("{actor}/human-centipede"), EnableRateLimiting(RateLimiting.Inbox)] public async Task ActorSharedInbox(string actor, CancellationToken token) => - Answer(await _inbox.Receive(Request, default, token)); + Answer(await inboxReceiver.Receive(Request, default, token)); [HttpPost, Route("/human-centipede"), EnableRateLimiting(RateLimiting.Inbox)] public async Task SharedInbox(CancellationToken token) => - Answer(await _inbox.Receive(Request, default, token)); + Answer(await inboxReceiver.Receive(Request, default, token)); async Task<(LocalActor Actor, PostEntity Post)> PublicPost(string actor, string postId, CancellationToken token) { - var local = await _localActors.FindByUserName(actor, token); + var local = await localActors.FindByUserName(actor, token); if (local is not { IsFederated: true, Kind: LocalActorKind.Person }) return default; - var post = await _dbEntities.Posts + var post = await dbEntities.Posts .Match(p => p.ID == postId && p.GroupUserId == local.Id && !p.IsFederatedCopy && p.ReblogOfPostId == null) .Match(VisibilityPolicy.IsPublic) .ExecuteFirstAsync(token); @@ -434,24 +423,24 @@ namespace PrivaPub.Federation.Controllers // member, or the members on the requesting instance actor's server. async Task<(LocalActor Author, PostEntity Post, JsonObject Note)?> SignedPost(string actor, string postId, CancellationToken token) { - var local = await _localActors.FindByUserName(actor, token); + var local = await localActors.FindByUserName(actor, token); if (local is not { IsFederated: true, Kind: LocalActorKind.Person }) return default; - var post = await _dbEntities.Posts + var post = await dbEntities.Posts .Match(p => p.ID == postId && p.GroupUserId == local.Id && !p.IsFederatedCopy && p.ReblogOfPostId == null && (p.Visibility == PostVisibility.FollowersOnly || p.Visibility == PostVisibility.Direct || p.Visibility == PostVisibility.Circle)) .ExecuteFirstAsync(token); if (post == default) return default; - var requester = await _fetches.Requester(Request, token); - if (!await _fetches.MayRead(post, requester, token)) + var requester = await fetches.Requester(Request, token); + if (!await fetches.MayRead(post, requester, token)) return default; if (post.Visibility == PostVisibility.Circle) { - var circle = await _dbEntities.Groups.MatchID(post.GroupId).ExecuteFirstAsync(token); - var note = ActivityPubRenderer.Note(post, local, _localActors.FromGroup(circle), post.InReplyToURI); + var circle = await dbEntities.Groups.MatchID(post.GroupId).ExecuteFirstAsync(token); + var note = ActivityPubRenderer.Note(post, local, localActors.FromGroup(circle), post.InReplyToURI); var readers = SignedFetchAuthorizer.CircleReaders(circle, requester); - var named = readers.Count == 0 ? new List() : await _dbEntities.ForeignAvatars.Match(a => readers.Contains(a.ActorURI)).ExecuteAsync(token); + var named = readers.Count == 0 ? new List() : await dbEntities.ForeignAvatars.Match(a => readers.Contains(a.ActorURI)).ExecuteAsync(token); return (local, post, OutboxPublisher.Naming(note, named)); } var rendered = post.Visibility == PostVisibility.Direct @@ -464,10 +453,10 @@ namespace PrivaPub.Federation.Controllers async Task Tombstone(string actor, string postId, CancellationToken token) { - var local = await _localActors.FindByUserName(actor, token); + var local = await localActors.FindByUserName(actor, token); if (local is not { IsFederated: true, Kind: LocalActorKind.Person }) return default; - var deleted = await _dbEntities.Posts + var deleted = await dbEntities.Posts .Match(p => p.ID == postId && p.GroupUserId == local.Id && !p.IsFederatedCopy && p.DeletedAt.HasValue && (p.Visibility == PostVisibility.Public || p.Visibility == PostVisibility.Unlisted)) .ExecuteFirstAsync(token); @@ -493,7 +482,7 @@ namespace PrivaPub.Federation.Controllers { if (await DB.Default.Find().Match(a => a.ActivityURI == uri && a.GroupId == group.Id).ExecuteFirstAsync(token) is { } kept) { - var about = await _dbEntities.Posts.Match(p => p.ObjectURI == kept.ObjectURI).ExecuteFirstAsync(token); + var about = await dbEntities.Posts.Match(p => p.ObjectURI == kept.ObjectURI).ExecuteFirstAsync(token); if (!VisibilityPolicy.Shown(about) || about.Visibility is not (PostVisibility.Public or PostVisibility.Unlisted)) return StatusCode(StatusCodes.Status410Gone); var body = JsonNode.Parse(kept.Body)!.AsObject(); @@ -501,13 +490,13 @@ namespace PrivaPub.Federation.Controllers return Activity(body); } var postId = activityId["announce-".Length..]; - var post = await _dbEntities.Posts.Match(p => p.ID == postId && p.GroupId == group.Id).Match(VisibilityPolicy.IsPublic).ExecuteFirstAsync(token); + var post = await dbEntities.Posts.Match(p => p.ID == postId && p.GroupId == group.Id).Match(VisibilityPolicy.IsPublic).ExecuteFirstAsync(token); return post == default ? NotFound() : Activity(ActivityPubRenderer.Announce(group, post.ObjectURI, activityId, post.CreationDate)); } async Task AnnounceFor(PostEntity reblog, CancellationToken token) { - var original = await _dbEntities.Posts.MatchID(reblog.ReblogOfPostId).ExecuteFirstAsync(token); + var original = await dbEntities.Posts.MatchID(reblog.ReblogOfPostId).ExecuteFirstAsync(token); if (!VisibilityPolicy.Shown(original)) return default; return new JsonObject @@ -525,7 +514,7 @@ namespace PrivaPub.Federation.Controllers async Task CreateFor(PostEntity post, LocalActor author, CancellationToken token) { - var group = string.IsNullOrEmpty(post.GroupId) ? default : await _localActors.FindById(LocalActorKind.Group, post.GroupId, token); + var group = string.IsNullOrEmpty(post.GroupId) ? default : await localActors.FindById(LocalActorKind.Group, post.GroupId, token); var note = ActivityPubRenderer.Note(post, author, group, post.InReplyToURI); return ActivityPubRenderer.Create(author, note, $"create-{post.ID}"); } @@ -546,9 +535,9 @@ namespace PrivaPub.Federation.Controllers // SecureMode asks every reader of ActivityPub documents for a signature, except for the server's own actors (the // instance actor, the reporter, the reader of feeds), whose keys peers need first, and except for browsers, which // only get redirected to the public pages - if (_federation.CurrentValue.SecureMode && HttpMethods.IsGet(Request.Method) && !WantsHtml() && Request.Path.Value != "/" + if (federation.CurrentValue.SecureMode && HttpMethods.IsGet(Request.Method) && !WantsHtml() && Request.Path.Value != "/" && !LocalActorService.IsServerActorName(context.RouteData.Values["actor"] as string) - && await _fetches.Requester(Request, HttpContext.RequestAborted) == default) + && await fetches.Requester(Request, HttpContext.RequestAborted) == default) { context.Result = StatusCode(StatusCodes.Status401Unauthorized); return; @@ -557,7 +546,7 @@ namespace PrivaPub.Federation.Controllers // nothing new is told of it, and lifting the suspension serves it all again (owner decision 2026-10-17) if (HttpMethods.IsGet(Request.Method) && context.RouteData.Values["actor"] is string name && context.ActionDescriptor is Microsoft.AspNetCore.Mvc.Controllers.ControllerActionDescriptor { ActionName: not nameof(GetActor) } - && await _localActors.FindByUserName(name, HttpContext.RequestAborted) is { Kind: LocalActorKind.Person, Suspended: true }) + && await localActors.FindByUserName(name, HttpContext.RequestAborted) is { Kind: LocalActorKind.Person, Suspended: true }) { context.Result = NotFound(); return; @@ -568,7 +557,7 @@ namespace PrivaPub.Federation.Controllers IActionResult Answer(InboxResult result) { if (result.Error != default) - _logger.LogInformation("Inbox refused with {Status} ({Reason}): {Error}", result.StatusCode, result.Reason, result.Error); + logger.LogInformation("Inbox refused with {Status} ({Reason}): {Error}", result.StatusCode, result.Reason, result.Error); if (result.RetryAfterSeconds is { } seconds) Response.Headers.RetryAfter = seconds.ToString(System.Globalization.CultureInfo.InvariantCulture); return result.Error == default ? StatusCode(result.StatusCode) : StatusCode(result.StatusCode, result.Error); diff --git a/PrivaPub/Federation/Controllers/WellKnownController.cs b/PrivaPub/Federation/Controllers/WellKnownController.cs index 4cb410f..6143886 100644 --- a/PrivaPub/Federation/Controllers/WellKnownController.cs +++ b/PrivaPub/Federation/Controllers/WellKnownController.cs @@ -18,31 +18,20 @@ using PrivaPub.Infrastructure; namespace PrivaPub.Federation.Controllers { [ApiController] - public class WellKnownController : ControllerBase + public class WellKnownController( + ILocalActorService localActors, + IOptionsMonitor registrations, + Domain.Instance.IInstanceSettings settings) : ControllerBase { - readonly ILocalActorService _localActors; - readonly DbEntities _dbEntities; - readonly IOptionsMonitor _registrations; - readonly Domain.Instance.IInstanceSettings _settings; - - public WellKnownController(ILocalActorService localActors, DbEntities dbEntities, IOptionsMonitor registrations, - Domain.Instance.IInstanceSettings settings) - { - _registrations = registrations; - _settings = settings; - _localActors = localActors; - _dbEntities = dbEntities; - } - [HttpGet, Route("/.well-known/webfinger")] public async Task WebFinger([FromQuery] string resource, CancellationToken token) { if (string.IsNullOrEmpty(resource)) return BadRequest(); // the server itself (FEP-d556): its instance actor - if (resource.TrimEnd('/') == _localActors.BaseAddress) + if (resource.TrimEnd('/') == localActors.BaseAddress) { - var instance = await _localActors.GetInstanceActor(token); + var instance = await localActors.GetInstanceActor(token); return Content(new JsonObject { ["subject"] = resource, @@ -53,7 +42,7 @@ namespace PrivaPub.Federation.Controllers }.ToJsonString(), "application/jrd+json; charset=utf-8"); } - LocalActor actor; + var actor = default(LocalActor); // Mastodon, GoToSocial and Pleroma also take a bare user@domain or @user@domain, so we do too. var acct = resource.StartsWith("acct:", StringComparison.OrdinalIgnoreCase) ? resource[5..] : !resource.Contains("://", StringComparison.Ordinal) && resource.Contains('@') ? resource @@ -61,15 +50,15 @@ namespace PrivaPub.Federation.Controllers if (acct != default) { var parts = acct.TrimStart('@').Split('@'); - var domain = new Uri(_localActors.BaseAddress).Authority; + var domain = new Uri(localActors.BaseAddress).Authority; if (parts.Length != 2 || !parts[1].Equals(domain, StringComparison.OrdinalIgnoreCase)) return NotFound(); - actor = await _localActors.FindByUserName(parts[0], token); - if (actor == default && await _localActors.Gone(parts[0], token) != default) + actor = await localActors.FindByUserName(parts[0], token); + if (actor == default && await localActors.Gone(parts[0], token) != default) return StatusCode(StatusCodes.Status410Gone); } else - actor = await _localActors.FindByUri(resource, token); + actor = await localActors.FindByUri(resource, token); if (actor is not { IsFederated: true }) return NotFound(); @@ -96,18 +85,18 @@ namespace PrivaPub.Federation.Controllers new JsonObject { ["rel"] = "http://nodeinfo.diaspora.software/ns/schema/2.1", - ["href"] = $"{_localActors.BaseAddress}/nodeinfo/2.1" + ["href"] = $"{localActors.BaseAddress}/nodeinfo/2.1" }, new JsonObject { ["rel"] = "http://nodeinfo.diaspora.software/ns/schema/2.0", - ["href"] = $"{_localActors.BaseAddress}/nodeinfo/2.0" + ["href"] = $"{localActors.BaseAddress}/nodeinfo/2.0" }, // the application actor (FEP-2677) new JsonObject { ["rel"] = "https://www.w3.org/ns/activitystreams#Application", - ["href"] = (await _localActors.GetInstanceActor(token)).Uri + ["href"] = (await localActors.GetInstanceActor(token)).Uri }) }; return Content(document.ToJsonString(), "application/json; charset=utf-8"); @@ -130,7 +119,7 @@ namespace PrivaPub.Federation.Controllers ["software"] = software, ["protocols"] = new JsonArray("activitypub"), ["services"] = new JsonObject { ["inbound"] = new JsonArray(), ["outbound"] = new JsonArray() }, - ["openRegistrations"] = _registrations.CurrentValue.IsOpen, + ["openRegistrations"] = registrations.CurrentValue.IsOpen, ["usage"] = new JsonObject { ["users"] = new JsonObject @@ -144,8 +133,8 @@ namespace PrivaPub.Federation.Controllers ["metadata"] = new JsonObject { // the server's name and short description, as its administrator set them (IInstanceSettings) - ["nodeName"] = _settings.Current.Title, - ["nodeDescription"] = _settings.Current.ShortDescription ?? string.Empty, + ["nodeName"] = settings.Current.Title, + ["nodeDescription"] = settings.Current.ShortDescription ?? string.Empty, ["federation"] = new JsonObject { ["document"] = "https://git.thepra.dev/thepra/SocialPub/src/branch/master/FEDERATION.md" } } }; diff --git a/PrivaPub/Federation/Crawler/Crawler.cs b/PrivaPub/Federation/Crawler/Crawler.cs index daeea9c..a0d85c4 100644 --- a/PrivaPub/Federation/Crawler/Crawler.cs +++ b/PrivaPub/Federation/Crawler/Crawler.cs @@ -23,21 +23,12 @@ namespace PrivaPub.Federation.Crawler } //each hour, the servers due for a visit, spread across the hour so the crawler reaches one at a time - public class CrawlPlanner : IJobHandler + public class CrawlPlanner( + IJobQueue queue, + IDomainBlocks blocks, + IOptionsMonitor options, + IOptionsMonitor federation = default) : IJobHandler { - readonly IJobQueue _queue; - readonly IDomainBlocks _blocks; - readonly IOptionsMonitor _options; - readonly IOptionsMonitor _federation; - - public CrawlPlanner(IJobQueue queue, IDomainBlocks blocks, IOptionsMonitor options, IOptionsMonitor federation = default) - { - _queue = queue; - _blocks = blocks; - _options = options; - _federation = federation; - } - public JobKind Kind => JobKind.CrawlPlan; public int Concurrency => 1; public int MaxAttempts => 1; @@ -53,11 +44,11 @@ namespace PrivaPub.Federation.Crawler public async Task Handle(Job job, CancellationToken token) { - var crawler = _options.CurrentValue.Crawler; + var crawler = options.CurrentValue.Crawler; if (!crawler.Enabled) return JobOutcome.Done; var now = DateTime.UtcNow; - foreach (var seed in PeerHosts.Filter(crawler.Seeds ?? new(), host => !_blocks.IsSuspended(host), _federation?.CurrentValue.AllowPrivateNetworks == true)) + foreach (var seed in PeerHosts.Filter(crawler.Seeds ?? new(), host => !blocks.IsSuspended(host), federation?.CurrentValue.AllowPrivateNetworks == true)) await DB.Default.Update() .Match(i => i.Host == seed) .Modify(b => b.SetOnInsert(i => i.Seen, "crawled")) @@ -73,7 +64,7 @@ namespace PrivaPub.Federation.Crawler .Limit(perHour * 3) .ExecuteAsync(token); var week = InstanceDescriber.Week(now); - var jobs = candidates.Where(i => _blocks.Find(i.Host) == default && PeerHosts.Normalise(i.Host) != default) + var jobs = candidates.Where(i => blocks.Find(i.Host) == default && PeerHosts.Normalise(i.Host) != default) .Take(perHour) .Select((instance, index) => new Job { @@ -83,36 +74,24 @@ namespace PrivaPub.Federation.Crawler DedupeKey = $"crawl|{instance.Host}|{week}", RunAt = now.AddSeconds(index * 3600.0 / perHour) }); - await _queue.EnqueueMany(jobs, token); + await queue.EnqueueMany(jobs, token); return JobOutcome.Done; } } //one server: its robots.txt, a description if only crawling ever found it, then the servers its peers list names - public class InstanceCrawler : IJobHandler + public class InstanceCrawler( + IFederationHttp http, + InstanceDescriber describer, + IDomainBlocks blocks, + IOptionsMonitor options, + IOptionsMonitor app, + IOptionsMonitor federation, + IInteractionLedger ledger = default) : IJobHandler { const int MaxPeers = 20_000; const int MaxRobotsBytes = 64 * 1024; - readonly IFederationHttp _http; - readonly InstanceDescriber _describer; - readonly IDomainBlocks _blocks; - readonly IOptionsMonitor _options; - readonly IOptionsMonitor _app; - readonly IOptionsMonitor _federation; - readonly IInteractionLedger _ledger; - - public InstanceCrawler(IFederationHttp http, InstanceDescriber describer, IDomainBlocks blocks, IOptionsMonitor options, - IOptionsMonitor app, IOptionsMonitor federation, IInteractionLedger ledger = default) - { - _http = http; - _describer = describer; - _blocks = blocks; - _options = options; - _app = app; - _federation = federation; - _ledger = ledger; - } public JobKind Kind => JobKind.CrawlInstance; public int Concurrency => 1; @@ -123,16 +102,16 @@ namespace PrivaPub.Federation.Crawler public async Task Handle(Job job, CancellationToken token) { - var crawler = _options.CurrentValue.Crawler; + var crawler = options.CurrentValue.Crawler; var host = job.Payload; - if (!crawler.Enabled || _blocks.Find(host) != default) + if (!crawler.Enabled || blocks.Find(host) != default) return JobOutcome.Done; - using var crawl = HttpScope.Crawl(Stargazer.UserAgent(_app.CurrentValue.BackendBaseAddress)); + using var crawl = HttpScope.Crawl(Stargazer.UserAgent(app.CurrentValue.BackendBaseAddress)); - RobotsTxt robots; + var robots = default(RobotsTxt); using (HttpScope.For("robots")) { - var (status, text) = await _http.GetText(Address($"https://{host}/robots.txt"), MaxRobotsBytes, token); + var (status, text) = await http.GetText(Address($"https://{host}/robots.txt"), MaxRobotsBytes, token); robots = RobotsTxt.From(status, text, Stargazer.Token, "PrivaPub"); } var instance = await DB.Default.Find().Match(i => i.Host == host).ExecuteFirstAsync(token); @@ -146,14 +125,14 @@ namespace PrivaPub.Federation.Crawler var reachable = true; if (instance?.Seen != "touched") - reachable = await _describer.Describe(host, crawled: true, robots.Allows, token); + reachable = await describer.Describe(host, crawled: true, robots.Allows, token); int? peersCount = default; if (robots.Allows("/api/v1/instance/peers")) { - IReadOnlyList peers; + var peers = default(IReadOnlyList); using (HttpScope.For("peers")) - peers = await _http.GetStringArray(Address($"https://{host}/api/v1/instance/peers"), MaxPeers, token); + peers = await http.GetStringArray(Address($"https://{host}/api/v1/instance/peers"), MaxPeers, token); peersCount = peers.Count; await Discover(peers, crawler, token); } @@ -167,8 +146,8 @@ namespace PrivaPub.Federation.Crawler var room = Math.Min(crawler.MaxNewHostsPerCrawl, crawler.MaxHosts - (int)await DB.Default.CountAsync(i => i.Seen == "crawled", token)); if (room <= 0) return; - var candidates = PeerHosts.Filter(peers, host => _http.IsAllowed(new Uri($"https://{host}/")) && _blocks.Find(host) == default, - _federation.CurrentValue.AllowPrivateNetworks).ToList(); + var candidates = PeerHosts.Filter(peers, host => http.IsAllowed(new Uri($"https://{host}/")) && blocks.Find(host) == default, + federation.CurrentValue.AllowPrivateNetworks).ToList(); var now = DateTime.UtcNow; foreach (var batch in candidates.Chunk(500)) { @@ -203,6 +182,6 @@ namespace PrivaPub.Federation.Crawler } void Record(string host, string outcome, string reason) => - _ledger?.Record(new InteractionEvent { Channel = Interactions.Crawl, Host = host, Outcome = outcome, Reason = reason, Crawl = true }); + ledger?.Record(new InteractionEvent { Channel = Interactions.Crawl, Host = host, Outcome = outcome, Reason = reason, Crawl = true }); } } diff --git a/PrivaPub/Federation/Inbox/Handlers/AcceptHandler.cs b/PrivaPub/Federation/Inbox/Handlers/AcceptHandler.cs index 7ead988..5765949 100644 --- a/PrivaPub/Federation/Inbox/Handlers/AcceptHandler.cs +++ b/PrivaPub/Federation/Inbox/Handlers/AcceptHandler.cs @@ -12,53 +12,40 @@ using static PrivaPub.Federation.Objects.ActivityJson; namespace PrivaPub.Federation.Inbox.Handlers { - public class AcceptHandler : IActivityHandler + public class AcceptHandler( + DbEntities db, + ILocalActorService localActorService, + IQuoteService quotes, + IInteractionApprovals approvals = default, + IParticipations participations = default, + Relays.IRelays relays = default, + Infrastructure.Jobs.IJobQueue queue = default) : IActivityHandler { - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - readonly IQuoteService _quotes; - readonly IInteractionApprovals _approvals; - readonly IParticipations _participations; - readonly Relays.IRelays _relays; - readonly Infrastructure.Jobs.IJobQueue _queue; - - public AcceptHandler(DbEntities dbEntities, ILocalActorService localActors, IQuoteService quotes, IInteractionApprovals approvals = default, - IParticipations participations = default, Relays.IRelays relays = default, Infrastructure.Jobs.IJobQueue queue = default) - { - _queue = queue; - _relays = relays; - _participations = participations; - _dbEntities = dbEntities; - _localActors = localActors; - _quotes = quotes; - _approvals = approvals; - } - public virtual string Type => "Accept"; public async Task Handle(JsonNode activity, ForeignAvatar actor, CancellationToken token) { - if (await _quotes.Answered(activity, actor, accepted: Type == "Accept", token)) + if (await quotes.Answered(activity, actor, accepted: Type == "Accept", token)) { Arrival.Accept("quote-answer"); return; } - if (_approvals != default && await _approvals.Answered(activity, actor, accepted: Type == "Accept", token)) + if (approvals != default && await approvals.Answered(activity, actor, accepted: Type == "Accept", token)) { Arrival.Accept("interaction-answer"); return; } - if (_participations != default && await _participations.Answered(activity, actor, accepted: Type == "Accept", token)) + if (participations != default && await participations.Answered(activity, actor, accepted: Type == "Accept", token)) { Arrival.Accept("participation-answer"); return; } - if (_relays != default && await _relays.Answered(activity, actor, accepted: Type == "Accept", token)) + if (relays != default && await relays.Answered(activity, actor, accepted: Type == "Accept", token)) { Arrival.Accept("relay-answer"); return; } - var following = await FindFollowing(activity["object"], actor, _dbEntities, _localActors, token); + var following = await FindFollowing(activity["object"], actor, db, localActorService, token); if (following == default) { Arrival.Drop("unknown-object"); @@ -73,8 +60,8 @@ namespace PrivaPub.Federation.Inbox.Handlers protected virtual async Task Apply(Following following, CancellationToken token) { await DB.Default.Update().MatchID(following.ID).Modify(f => f.State, FollowState.Accepted).ExecuteAsync(token); - if (_queue != default) - await _queue.Enqueue(Models.Jobs.JobKind.BackfillOutbox, following.TargetActorURI, new Uri(following.TargetActorURI).Host, + if (queue != default) + await queue.Enqueue(Models.Jobs.JobKind.BackfillOutbox, following.TargetActorURI, new Uri(following.TargetActorURI).Host, Actors.OutboxBackfill.DedupeKey(following.TargetActorURI, DateTime.UtcNow), token); } diff --git a/PrivaPub/Federation/Inbox/Handlers/AnnounceHandler.cs b/PrivaPub/Federation/Inbox/Handlers/AnnounceHandler.cs index 46573be..6cf879d 100644 --- a/PrivaPub/Federation/Inbox/Handlers/AnnounceHandler.cs +++ b/PrivaPub/Federation/Inbox/Handlers/AnnounceHandler.cs @@ -22,40 +22,23 @@ using PostEntity = PrivaPub.Models.Post.Post; namespace PrivaPub.Federation.Inbox.Handlers { - public class AnnounceHandler : IActivityHandler + public class AnnounceHandler( + DbEntities dbEntities, + ILocalActorService localActors, + IRemotePosts remotePosts, + IFanout fanout, + IRemoteActorService remoteActors, + IObjectRecords records, + IQuoteService quotes, + IServiceProvider services = default, + PrivaPub.Federation.Relays.IRelays relays = default, + PrivaPub.Federation.Moderation.IDomainBlocks domainBlocks = default) : IActivityHandler { - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - readonly IRemotePosts _remotePosts; - readonly IFanout _fanout; - readonly IRemoteActorService _remoteActors; - - readonly IObjectRecords _records; - readonly IQuoteService _quotes; - readonly IServiceProvider _services; - // the handlers a community's relayed votes go to (Like, Dislike, Undo); resolved when first needed, since this // handler is one of them; tests set it + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0006", Justification = "Null until first needed: this handler is one of the relayed-vote handlers, so they cannot be injected into it.")] public IEnumerable Relays { get; set; } - readonly PrivaPub.Federation.Relays.IRelays _relayService; - readonly PrivaPub.Federation.Moderation.IDomainBlocks _domainBlocks; - - public AnnounceHandler(DbEntities dbEntities, ILocalActorService localActors, IRemotePosts remotePosts, IFanout fanout, IRemoteActorService remoteActors, - IObjectRecords records, IQuoteService quotes, IServiceProvider services = default, PrivaPub.Federation.Relays.IRelays relays = default, - PrivaPub.Federation.Moderation.IDomainBlocks domainBlocks = default) - { - _domainBlocks = domainBlocks; - _relayService = relays; - _services = services; - _records = records; - _quotes = quotes; - _remoteActors = remoteActors; - _dbEntities = dbEntities; - _localActors = localActors; - _remotePosts = remotePosts; - _fanout = fanout; - } public string Type => "Announce"; @@ -74,27 +57,27 @@ namespace PrivaPub.Federation.Inbox.Handlers Arrival.Drop("unparseable"); return; } - if (await _dbEntities.Posts.Match(p => p.ObjectURI == announceId).ExecuteAnyAsync(token)) + if (await dbEntities.Posts.Match(p => p.ObjectURI == announceId).ExecuteAnyAsync(token)) { Arrival.Drop("duplicate"); return; } - if (_relayService != default && await _relayService.Passes(actor.ActorURI, token)) + if (relays != default && await relays.Passes(actor.ActorURI, token)) { await FromRelay(objectUri, token); return; } - var isLocal = objectUri.StartsWith(_localActors.BaseAddress + "/", StringComparison.OrdinalIgnoreCase); - var original = await _dbEntities.Posts.Match(p => p.ObjectURI == objectUri && !p.DeletedAt.HasValue && p.ReblogOfPostId == null).ExecuteFirstAsync(token); - var followed = await _dbEntities.Followings.Match(f => f.TargetActorURI == actor.ActorURI && f.State == FollowState.Accepted).ExecuteAnyAsync(token); + var isLocal = objectUri.StartsWith(localActors.BaseAddress + "/", StringComparison.OrdinalIgnoreCase); + var original = await dbEntities.Posts.Match(p => p.ObjectURI == objectUri && !p.DeletedAt.HasValue && p.ReblogOfPostId == null).ExecuteFirstAsync(token); + var followed = await dbEntities.Followings.Match(f => f.TargetActorURI == actor.ActorURI && f.State == FollowState.Accepted).ExecuteAnyAsync(token); if (original is not { IsFederatedCopy: false } && !followed) { Arrival.Drop("not-followed"); return; } if (original == default && !isLocal) - original = await _remotePosts.StoreContext(objectUri, 0, token); + original = await remotePosts.StoreContext(objectUri, 0, token); if (original == default) { Arrival.Drop("fetch-failed"); @@ -125,7 +108,7 @@ namespace PrivaPub.Federation.Inbox.Handlers Cc = cc, IsFederatedCopy = true, AuthorSuspended = actor.SuspendedAt.HasValue, - AuthorLimited = RemotePosts.Limited(actor, _domainBlocks), + AuthorLimited = RemotePosts.Limited(actor, domainBlocks), CreationDate = published, UpdateDate = published }; @@ -144,20 +127,20 @@ namespace PrivaPub.Federation.Inbox.Handlers return; } Arrival.Accept("stored"); - Arrival.About(local: original.IsFederatedCopy ? default : await _localActors.FindById(Models.Federation.LocalActorKind.Person, original.GroupUserId, token)); + Arrival.About(local: original.IsFederatedCopy ? default : await localActors.FindById(Models.Federation.LocalActorKind.Person, original.GroupUserId, token)); await DB.Default.Update().MatchID(original.ID).Modify(b => b.Inc(p => p.ReblogsCount, 1)).ExecuteAsync(token); if (!original.IsFederatedCopy) - await Notifications.Add(original.GroupUserId, NotificationType.Reblog, actor.ID, actor.ActorURI, original.ID, token); - await _fanout.Distribute(reblog, token); + await Notifications.Add(original.GroupUserId, NotificationType.Reblog, actor.ID, actor.ActorURI, original.ID, token: token); + await fanout.Distribute(reblog, token); } // a post a relay we subscribe to announces: kept as its author's, for the federated timeline, never as the relay's // boost (Mastodon unwraps them the same way) async Task FromRelay(string objectUri, CancellationToken token) { - var held = await _dbEntities.Posts.Match(p => p.ObjectURI == objectUri).ExecuteFirstAsync(token); - var post = held ?? await _remotePosts.StoreContext(objectUri, 0, token); + var held = await dbEntities.Posts.Match(p => p.ObjectURI == objectUri).ExecuteFirstAsync(token); + var post = held ?? await remotePosts.StoreContext(objectUri, 0, token); if (post == default) { Arrival.Drop("fetch-failed"); @@ -170,14 +153,14 @@ namespace PrivaPub.Federation.Inbox.Handlers return; } Arrival.Accept("relayed"); - await _fanout.Distribute(post, token); + await fanout.Distribute(post, token); } async Task GroupActivity(JsonNode inner, ForeignAvatar group, CancellationToken token) { Arrival.About(Value(inner, "type")); if (group.AvatarType != AvatarType.Group - || !await _dbEntities.Followings.Match(f => f.TargetActorURI == group.ActorURI && f.State == FollowState.Accepted).ExecuteAnyAsync(token) + || !await dbEntities.Followings.Match(f => f.TargetActorURI == group.ActorURI && f.State == FollowState.Accepted).ExecuteAnyAsync(token) && !await OurPostInItsThread(inner, group, token)) { Arrival.Drop("not-followed"); @@ -187,12 +170,12 @@ namespace PrivaPub.Federation.Inbox.Handlers switch (Value(inner, "type")) { case "Create" when objectUri != default: - if (await _dbEntities.Posts.Match(p => p.ObjectURI == objectUri).ExecuteAnyAsync(token)) + if (await dbEntities.Posts.Match(p => p.ObjectURI == objectUri).ExecuteAnyAsync(token)) { Arrival.Drop("duplicate"); return; } - var post = await _remotePosts.StoreContext(objectUri, 0, token); + var post = await remotePosts.StoreContext(objectUri, 0, token); if (post == default) { Arrival.Drop("fetch-failed"); @@ -202,10 +185,10 @@ namespace PrivaPub.Federation.Inbox.Handlers Arrival.About(visibility: post.Visibility); await DB.Default.Update().MatchID(post.ID).Modify(p => p.AudienceURI, group.ActorURI).ExecuteAsync(token); post.AudienceURI = group.ActorURI; - await _fanout.Distribute(post, token); + await fanout.Distribute(post, token); break; case "Update" when objectUri != default: - var stored = await _dbEntities.Posts.Match(p => p.ObjectURI == objectUri && p.AudienceURI == group.ActorURI && !p.DeletedAt.HasValue) + var stored = await dbEntities.Posts.Match(p => p.ObjectURI == objectUri && p.AudienceURI == group.ActorURI && !p.DeletedAt.HasValue) .ExecuteFirstAsync(token); if (stored == default) { @@ -213,7 +196,7 @@ namespace PrivaPub.Federation.Inbox.Handlers return; } Arrival.About(visibility: stored.Visibility, created: stored.CreationDate); - using (var fetched = await _remoteActors.FetchObject(objectUri, token)) + using (var fetched = await remoteActors.FetchObject(objectUri, token)) { var note = fetched == default ? default : NoteParser.Parse(System.Text.Json.Nodes.JsonNode.Parse(fetched.Root.GetRawText())); if (note == default || note.AttributedTo != stored.ActorURI) @@ -221,11 +204,11 @@ namespace PrivaPub.Federation.Inbox.Handlers Arrival.Drop(note == default ? "fetch-failed" : "misattributed"); return; } - Arrival.Accept(await RemoteEdits.Apply(stored, note, Id(inner), _localActors, _records, _quotes, token) ? "edit" : "refresh"); + Arrival.Accept(await RemoteEdits.Apply(stored, note, Id(inner), localActors, records, quotes, token) ? "edit" : "refresh"); } break; case "Delete" when objectUri != default: - var deleted = await _dbEntities.Posts.Match(p => p.ObjectURI == objectUri && p.AudienceURI == group.ActorURI).ExecuteFirstAsync(token); + var deleted = await dbEntities.Posts.Match(p => p.ObjectURI == objectUri && p.AudienceURI == group.ActorURI).ExecuteFirstAsync(token); if (deleted == default) { Arrival.Drop("unknown-object"); @@ -235,7 +218,7 @@ namespace PrivaPub.Federation.Inbox.Handlers // a community on the post's own server speaks for it: PieFed keeps serving a thread its moderator removed. // One elsewhere is believed once the post's server says it is gone if (!Origin.Same(objectUri, group.ActorURI)) - using (var check = await _remoteActors.FetchObject(objectUri, token)) + using (var check = await remoteActors.FetchObject(objectUri, token)) if (check != default && Value(System.Text.Json.Nodes.JsonNode.Parse(check.Root.GetRawText()), "type") != "Tombstone") { Arrival.Drop("not-deleted"); @@ -257,7 +240,7 @@ namespace PrivaPub.Federation.Inbox.Handlers await Ban(inner, group, token); break; case "Undo" when Value(inner["object"], "type") == "Block" && Id(inner["object"]?["target"]) == group.ActorURI: - if (await BlockHandler.Undo(inner["object"], Id(inner["object"]), group, _localActors, token)) + if (await BlockHandler.Undo(inner["object"], Id(inner["object"]), group, localActors, token)) Arrival.Accept("unbanned"); else Arrival.Drop("unknown-object"); @@ -267,7 +250,7 @@ namespace PrivaPub.Federation.Inbox.Handlers break; // a moderator features a post in the community, or no longer: the community's own pins case "Add" or "Remove" when Id(inner["target"]) is { } target && target == group.FeaturedURL: - var featured = (Relays ?? _services?.GetService(typeof(IEnumerable)) as IEnumerable) + var featured = (Relays ?? services?.GetService(typeof(IEnumerable)) as IEnumerable) ?.FirstOrDefault(h => h.Type == Value(inner, "type")); if (featured == default) Arrival.Drop("unsupported"); @@ -292,8 +275,8 @@ namespace PrivaPub.Federation.Inbox.Handlers }; var post = target == default ? default - : await _dbEntities.Posts.Match(p => p.ObjectURI == target && !p.IsFederatedCopy && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); - return post != default && await Communities.Of(post, _dbEntities, token) == group.ActorURI; + : await dbEntities.Posts.Match(p => p.ObjectURI == target && !p.IsFederatedCopy && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); + return post != default && await Communities.Of(post, dbEntities, token) == group.ActorURI; } // A community's moderators lock one of its posts, or unlock it: no more replies, ours included. The community vouches @@ -302,7 +285,7 @@ namespace PrivaPub.Federation.Inbox.Handlers { var post = objectUri == default ? default - : await _dbEntities.Posts.Match(p => p.ObjectURI == objectUri && p.AudienceURI == group.ActorURI).ExecuteFirstAsync(token); + : await dbEntities.Posts.Match(p => p.ObjectURI == objectUri && p.AudienceURI == group.ActorURI).ExecuteFirstAsync(token); if (post == default) { Arrival.Drop("unknown-object"); @@ -318,7 +301,7 @@ namespace PrivaPub.Federation.Inbox.Handlers // host is not taken: it would be ours to announce. async Task Move(string objectUri, string targetUri, ForeignAvatar group, CancellationToken token) { - var post = await _dbEntities.Posts.Match(p => p.ObjectURI == objectUri && p.AudienceURI == group.ActorURI && !p.DeletedAt.HasValue) + var post = await dbEntities.Posts.Match(p => p.ObjectURI == objectUri && p.AudienceURI == group.ActorURI && !p.DeletedAt.HasValue) .ExecuteFirstAsync(token); if (post == default) { @@ -326,9 +309,9 @@ namespace PrivaPub.Federation.Inbox.Handlers return; } Arrival.About(visibility: post.Visibility, created: post.CreationDate); - var target = targetUri == default || targetUri == group.ActorURI || await _localActors.FindByUri(targetUri, token) != default + var target = targetUri == default || targetUri == group.ActorURI || await localActors.FindByUri(targetUri, token) != default ? default - : await _remoteActors.GetActor(targetUri, refresh: false, token); + : await remoteActors.GetActor(targetUri, refresh: false, token); if (target is not { AvatarType: AvatarType.Group }) { Arrival.Drop("unknown-target"); @@ -339,7 +322,7 @@ namespace PrivaPub.Federation.Inbox.Handlers while (level.Count > 0 && thread.Count < MaxMoved) { var parents = level; - level = (await _dbEntities.Posts.Match(p => parents.Contains(p.AnsweringToPostId) && p.AudienceURI == group.ActorURI) + level = (await dbEntities.Posts.Match(p => parents.Contains(p.AnsweringToPostId) && p.AudienceURI == group.ActorURI) .Project(p => new PostEntity { ID = p.ID }).ExecuteAsync(token)).Select(p => p.ID).ToList(); thread.AddRange(level); } @@ -354,7 +337,7 @@ namespace PrivaPub.Federation.Inbox.Handlers // Undo. A ban of someone from another server is no business of ours. async Task Ban(JsonNode inner, ForeignAvatar group, CancellationToken token) { - if (Id(inner["object"]) is not { } uri || await _localActors.FindByUri(uri, token) is not { Kind: LocalActorKind.Person } persona) + if (Id(inner["object"]) is not { } uri || await localActors.FindByUri(uri, token) is not { Kind: LocalActorKind.Person } persona) { Arrival.Drop("not-ours"); return; @@ -378,7 +361,7 @@ namespace PrivaPub.Federation.Inbox.Handlers { var actorUri = Id(inner["actor"]); var type = Value(inner, "type"); - var handlers = Relays ?? _services?.GetService(typeof(IEnumerable)) as IEnumerable; + var handlers = Relays ?? services?.GetService(typeof(IEnumerable)) as IEnumerable; var handler = handlers?.FirstOrDefault(h => h.Type == type); if (actorUri == default || handler == default) { @@ -388,7 +371,7 @@ namespace PrivaPub.Federation.Inbox.Handlers var activity = inner; var target = Id(Value(inner, "type") == "Undo" ? (inner["object"] as JsonObject)?["object"] : inner["object"]); var ownPost = target != default - && await _dbEntities.Posts.Match(p => p.ObjectURI == target && p.AudienceURI == group.ActorURI).ExecuteAnyAsync(token); + && await dbEntities.Posts.Match(p => p.ObjectURI == target && p.AudienceURI == group.ActorURI).ExecuteAnyAsync(token); if (!Origin.Same(actorUri, group.ActorURI) && !ownPost) { var id = Id(inner); @@ -397,7 +380,7 @@ namespace PrivaPub.Federation.Inbox.Handlers Arrival.Drop("misattributed"); return; } - using var fetched = await _remoteActors.FetchObject(id, token); + using var fetched = await remoteActors.FetchObject(id, token); activity = fetched == default ? default : JsonNode.Parse(fetched.Root.GetRawText()); if (activity == default || Value(activity, "type") != type || Id(activity["actor"]) != actorUri) { @@ -405,7 +388,7 @@ namespace PrivaPub.Federation.Inbox.Handlers return; } } - var actor = await _remoteActors.GetActor(actorUri, refresh: false, token); + var actor = await remoteActors.GetActor(actorUri, refresh: false, token); if (actor == default) { Arrival.Drop("unknown-actor"); diff --git a/PrivaPub/Federation/Inbox/Handlers/BlockHandler.cs b/PrivaPub/Federation/Inbox/Handlers/BlockHandler.cs index 5915960..2434018 100644 --- a/PrivaPub/Federation/Inbox/Handlers/BlockHandler.cs +++ b/PrivaPub/Federation/Inbox/Handlers/BlockHandler.cs @@ -17,22 +17,15 @@ namespace PrivaPub.Federation.Inbox.Handlers // A remote account blocks one of our personas, as Mastodon does it: the follows between them end here too (the blocker // already ended its side, so nothing is sent back), the persona stops seeing the blocker's posts and notifications, the // relationship says blocked_by, and nothing of the persona's is addressed to the blocker any more. Undo{Block} lifts it. - public class BlockHandler : IActivityHandler + public class BlockHandler( + DbEntities dbEntities, + ILocalActorService localActorService) : IActivityHandler { - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - - public BlockHandler(DbEntities dbEntities, ILocalActorService localActors) - { - _dbEntities = dbEntities; - _localActors = localActors; - } - public string Type => "Block"; public async Task Handle(JsonNode activity, ForeignAvatar actor, CancellationToken token) { - var target = Id(activity["object"]) is { } uri ? await _localActors.FindByUri(uri, token) : default; + var target = Id(activity["object"]) is { } uri ? await localActorService.FindByUri(uri, token) : default; if (target is not { Kind: LocalActorKind.Person }) { Arrival.Drop("unknown-object"); @@ -70,7 +63,7 @@ namespace PrivaPub.Federation.Inbox.Handlers async Task Ban(JsonNode activity, LocalActor persona, string communityUri, CancellationToken token) { - var community = await _dbEntities.ForeignAvatars.Match(f => f.ActorURI == communityUri && f.AvatarType == AvatarType.Group).ExecuteFirstAsync(token); + var community = await dbEntities.ForeignAvatars.Match(f => f.ActorURI == communityUri && f.AvatarType == AvatarType.Group).ExecuteFirstAsync(token); if (community == default) { Arrival.Drop("unknown-community"); diff --git a/PrivaPub/Federation/Inbox/Handlers/CreateHandler.cs b/PrivaPub/Federation/Inbox/Handlers/CreateHandler.cs index 50d0512..8b9d376 100644 --- a/PrivaPub/Federation/Inbox/Handlers/CreateHandler.cs +++ b/PrivaPub/Federation/Inbox/Handlers/CreateHandler.cs @@ -26,45 +26,22 @@ using PostEntity = PrivaPub.Models.Post.Post; namespace PrivaPub.Federation.Inbox.Handlers { - public class CreateHandler : IActivityHandler + public class CreateHandler( + DbEntities dbEntities, + ILocalActorService localActors, + IRemoteActorService remoteActors, + IDeliveryService delivery, + IFanout fanout, + IRemotePosts remotePosts, + IGroupDistributor groups, + IObjectRecords records, + IPollService polls, + ILinkPreviews previews, + IQuoteService quotes, + IInteractionApprovals approvals = default, + Relays.IRelays relays = default, + IWalls walls = default) : IActivityHandler { - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - readonly IRemoteActorService _remoteActors; - readonly IDeliveryService _delivery; - readonly IDomainBlocks _domainBlocks; - readonly IFanout _fanout; - readonly IRemotePosts _remotePosts; - readonly IGroupDistributor _groups; - readonly IObjectRecords _records; - readonly IPollService _polls; - readonly ILinkPreviews _previews; - readonly IQuoteService _quotes; - readonly IInteractionApprovals _approvals; - readonly Relays.IRelays _relays; - readonly IWalls _walls; - - public CreateHandler(DbEntities dbEntities, ILocalActorService localActors, IRemoteActorService remoteActors, IDeliveryService delivery, - IDomainBlocks domainBlocks, IFanout fanout, IRemotePosts remotePosts, IGroupDistributor groups, IObjectRecords records, IPollService polls, ILinkPreviews previews, IQuoteService quotes, - IInteractionApprovals approvals = default, Relays.IRelays relays = default, IWalls walls = default) - { - _walls = walls; - _relays = relays; - _approvals = approvals; - _quotes = quotes; - _previews = previews; - _records = records; - _polls = polls; - _groups = groups; - _fanout = fanout; - _remotePosts = remotePosts; - _dbEntities = dbEntities; - _localActors = localActors; - _remoteActors = remoteActors; - _delivery = delivery; - _domainBlocks = domainBlocks; - } - public string Type => "Create"; public async Task Handle(JsonNode activity, ForeignAvatar author, CancellationToken token) @@ -73,7 +50,7 @@ namespace PrivaPub.Federation.Inbox.Handlers var refetched = node is not JsonObject || !Origin.Same(Id(node), author.ActorURI); if (refetched) { - using var fetched = await _remoteActors.FetchObject(Id(node), token); + using var fetched = await remoteActors.FetchObject(Id(node), token); node = fetched == default ? default : JsonNode.Parse(fetched.Root.GetRawText()); if (node == default) Arrival.Drop("fetch-failed"); @@ -85,11 +62,11 @@ namespace PrivaPub.Federation.Inbox.Handlers { if (!refetched) { - using var fetched = await _remoteActors.FetchObject(note.Id, token); + using var fetched = await remoteActors.FetchObject(note.Id, token); note = fetched == default ? default : NoteParser.Parse(JsonNode.Parse(fetched.Root.GetRawText())); refetched = true; } - author = note == default ? default : await _remoteActors.GetActor(note.AttributedTo, refresh: false, token); + author = note == default ? default : await remoteActors.GetActor(note.AttributedTo, refresh: false, token); if (author == default) { Arrival.Drop(note == default ? "fetch-failed" : "author-unavailable"); @@ -104,16 +81,16 @@ namespace PrivaPub.Federation.Inbox.Handlers Arrival.About(note.Type); if (note.Title != default && note.InReplyTo != default && ObjectShapes.Text(note.ContentHtml, 1) == default) { - var question = await _dbEntities.Posts.Match(p => p.ObjectURI == note.InReplyTo && p.Poll != null).ExecuteFirstAsync(token); + var question = await dbEntities.Posts.Match(p => p.ObjectURI == note.InReplyTo && p.Poll != null).ExecuteFirstAsync(token); if (question != default) { - await _polls.Receive(question, author, note.Title, Id(activity), token); + await polls.Receive(question, author, note.Title, Id(activity), token); Arrival.Accept("poll-vote"); Arrival.About(visibility: question.Visibility); return; } } - if (await _dbEntities.Posts.Match(p => p.ObjectURI == note.Id).ExecuteAnyAsync(token)) + if (await dbEntities.Posts.Match(p => p.ObjectURI == note.Id).ExecuteAnyAsync(token)) { Arrival.Drop("duplicate"); return; @@ -146,7 +123,7 @@ namespace PrivaPub.Federation.Inbox.Handlers var localTargets = new List(); for (var i = 0; i < addressed.Count; i++) { - var local = await _localActors.FindByAddress(addressed[i], token); + var local = await localActors.FindByAddress(addressed[i], token); if (local == default) continue; addressed[i] = local.Uri; @@ -158,9 +135,9 @@ namespace PrivaPub.Federation.Inbox.Handlers var parent = string.IsNullOrEmpty(note.InReplyTo) ? default - : await _dbEntities.Posts.Match(p => p.ObjectURI == note.InReplyTo && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); + : await dbEntities.Posts.Match(p => p.ObjectURI == note.InReplyTo && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); // a reply its parent's author has not let in (GoToSocial's canReply), which a third party must not show - if (_approvals != default && parent != default && !await _approvals.MayReply(note, author, parent, token)) + if (approvals != default && parent != default && !await approvals.MayReply(note, author, parent, token)) { Arrival.Drop("reply-not-authorized"); return; @@ -183,26 +160,26 @@ namespace PrivaPub.Federation.Inbox.Handlers group = default; var repliesToLocal = parent is { IsFederatedCopy: false } && visibility != PostVisibility.Direct; - var followed = visibility != PostVisibility.Direct && await _dbEntities.Followings + var followed = visibility != PostVisibility.Direct && await dbEntities.Followings .Match(f => f.TargetActorURI == author.ActorURI && f.State == FollowState.Accepted) .ExecuteAnyAsync(token); // a reply in the thread of someone followed here, as Mastodon keeps them: what the thread's server forwards var repliesToFollowed = !followed && parent is { IsFederatedCopy: true } && visibility is PostVisibility.Public or PostVisibility.Unlisted - && await _dbEntities.Followings.Match(f => f.TargetActorURI == parent.ActorURI && f.State == FollowState.Accepted).ExecuteAnyAsync(token); + && await dbEntities.Followings.Match(f => f.TargetActorURI == parent.ActorURI && f.State == FollowState.Accepted).ExecuteAnyAsync(token); // a post in a remote group followed here that the group's own server sends itself rather than announcing it (Mbin // delivers a magazine's threads to its subscribers as their author's Create): the group's server speaks for it var inFollowedGroup = !followed && visibility is PostVisibility.Public or PostVisibility.Unlisted && note.Audience != default && Origin.Same(note.Audience, author.ActorURI) && Origin.Same(note.Id, note.Audience) - && await _dbEntities.Followings.Match(f => f.TargetActorURI == note.Audience && f.State == FollowState.Accepted).ExecuteAnyAsync(token); + && await dbEntities.Followings.Match(f => f.TargetActorURI == note.Audience && f.State == FollowState.Accepted).ExecuteAnyAsync(token); // a public post a relay we subscribe to passes on, for the federated timeline (read again from its origin, as any // forwarded post) - var relayed = !followed && visibility == PostVisibility.Public && _relays != default - && await _relays.Passes(Arrival.Current?.ForwardedBy, token); + var relayed = !followed && visibility == PostVisibility.Public && relays != default + && await relays.Passes(Arrival.Current?.ForwardedBy, token); // written on a persona's wall (FEP-400e): public, not a reply, by an account following the persona, as its actor // tells Smithereen - var wall = _walls == default || note.Wall == default ? default : await _walls.OwnerOf(note.Wall, token); + var wall = walls == default || note.Wall == default ? default : await walls.OwnerOf(note.Wall, token); if (wall != default && (visibility is not (PostVisibility.Public or PostVisibility.Unlisted) || !string.IsNullOrEmpty(note.InReplyTo) - || note.WallOwner != default && note.WallOwner != wall.Uri || !await _walls.MayWrite(wall, author, token))) + || note.WallOwner != default && note.WallOwner != wall.Uri || !await walls.MayWrite(wall, author, token))) { Arrival.Drop("wall-refused"); return; @@ -214,7 +191,7 @@ namespace PrivaPub.Federation.Inbox.Handlers return; } if (parent == default && visibility != PostVisibility.Direct) - parent = await _remotePosts.Parent(note.InReplyTo, 1, token); + parent = await remotePosts.Parent(note.InReplyTo, 1, token); DmGroup conversation = default; if (visibility == PostVisibility.Direct) @@ -226,7 +203,7 @@ namespace PrivaPub.Federation.Inbox.Handlers conversation = await FindOrCreateConversation(participants, Origin.Same(note.Context, author.ActorURI) ? note.Context : default, token); } - var post = await _remotePosts.Build(note, author, visibility, to, cc, parent, token); + var post = await remotePosts.Build(note, author, visibility, to, cc, parent, token); post.ActivityURI = Id(activity); post.GroupId = group?.Id; post.ConversationId = conversation?.ID; @@ -247,31 +224,31 @@ namespace PrivaPub.Federation.Inbox.Handlers } Arrival.Accept("stored"); Arrival.About(local: group ?? persons.FirstOrDefault()); - await _records.Record(note, post, ObjectPath.Delivered, refetched, token); - await _previews.Wanted(post, token); - await _quotes.Resolve(post, note, token); + await records.Record(note, post, ObjectPath.Delivered, refetched, token); + await previews.Wanted(post, token); + await quotes.Resolve(post, note, token); if (parent != default && Domain.Privacy.Counted.Reply(post)) await DB.Default.Update().MatchID(parent.ID).Modify(b => b.Inc(p => p.RepliesCount, 1)).ExecuteAsync(token); - await _fanout.Distribute(post, token); - await ReplyRelay.Pass(post, _dbEntities, _localActors, _delivery, token); + await fanout.Distribute(post, token); + await ReplyRelay.Pass(post, dbEntities, localActors, delivery, token); if (conversation != default) { await Domain.Statuses.ConversationStates.Posted(conversation.ID, post.ID, default, token); await Domain.Timelines.Fanout.Conversation(conversation.ID, token);//the `direct` streams (R8), once it is the newest } if (group is { IsCircle: false }) - await _groups.Announce(group, activity.AsObject(), note.Id, isNewPost: true, token); + await groups.Announce(group, activity.AsObject(), note.Id, isNewPost: true, token); if (wall != default) - await _walls.Hosted(post, wall, token); + await walls.Hosted(post, wall, token); } async Task IsCircleMember(LocalActor circle, string actorUri, CancellationToken token) => - await _dbEntities.Groups.Match(g => g.ID == circle.Id && g.Members.Any(m => m.IsForeign && m.AvatarId == actorUri)).ExecuteAnyAsync(token); + await dbEntities.Groups.Match(g => g.ID == circle.Id && g.Members.Any(m => m.IsForeign && m.AvatarId == actorUri)).ExecuteAnyAsync(token); async Task MayPost(LocalActor community, string actorUri, CancellationToken token) { - var entity = await _dbEntities.Groups.MatchID(community.Id).ExecuteFirstAsync(token); + var entity = await dbEntities.Groups.MatchID(community.Id).ExecuteFirstAsync(token); return entity?.PostingPolicy switch { PostingPolicy.Anyone => true, @@ -285,7 +262,7 @@ namespace PrivaPub.Federation.Inbox.Handlers var members = new List(); foreach (var uri in participantUris.Distinct(StringComparer.Ordinal)) { - var local = await _localActors.FindByUri(uri, token); + var local = await localActors.FindByUri(uri, token); var member = local != default && local.Kind == LocalActorKind.Person ? new GroupMember { AvatarId = local.Id } : new GroupMember { AvatarId = uri, IsForeign = true }; @@ -294,7 +271,7 @@ namespace PrivaPub.Federation.Inbox.Handlers } var key = DmGroup.KeyOf(members); - var match = await _dbEntities.DmGroups.Match(g => g.ParticipantsKey == key && !g.DeletionAt.HasValue).ExecuteFirstAsync(token); + var match = await dbEntities.DmGroups.Match(g => g.ParticipantsKey == key && !g.DeletionAt.HasValue).ExecuteFirstAsync(token); if (match != default) return match; diff --git a/PrivaPub/Federation/Inbox/Handlers/DeleteHandler.cs b/PrivaPub/Federation/Inbox/Handlers/DeleteHandler.cs index fc1e0c0..22a5e0f 100644 --- a/PrivaPub/Federation/Inbox/Handlers/DeleteHandler.cs +++ b/PrivaPub/Federation/Inbox/Handlers/DeleteHandler.cs @@ -21,26 +21,14 @@ using PostEntity = PrivaPub.Models.Post.Post; namespace PrivaPub.Federation.Inbox.Handlers { - public class DeleteHandler : IActivityHandler + public class DeleteHandler( + DbEntities dbEntities, + ILocalActorService localActors, + IRemoteActorService remoteActors, + IDeliveryService delivery, + IGroupDistributor groups, + IQuoteService quotes) : IActivityHandler { - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - readonly IRemoteActorService _remoteActors; - readonly IDeliveryService _delivery; - readonly IGroupDistributor _groups; - readonly IQuoteService _quotes; - - public DeleteHandler(DbEntities dbEntities, ILocalActorService localActors, IRemoteActorService remoteActors, IDeliveryService delivery, - IGroupDistributor groups, IQuoteService quotes) - { - _quotes = quotes; - _groups = groups; - _dbEntities = dbEntities; - _localActors = localActors; - _remoteActors = remoteActors; - _delivery = delivery; - } - public string Type => "Delete"; const int MaxObjects = 50; @@ -70,7 +58,7 @@ namespace PrivaPub.Federation.Inbox.Handlers actor.DeletionAt = DateTime.UtcNow; actor.AccountState = AvatarAccountState.Deleted; await DB.Default.SaveAsync(actor, token); - var followers = await _dbEntities.Followers.Match(f => f.ActorURI == actor.ActorURI).ExecuteAsync(token); + var followers = await dbEntities.Followers.Match(f => f.ActorURI == actor.ActorURI).ExecuteAsync(token); foreach (var follower in followers) { await DB.Default.DeleteAsync(follower.ID); @@ -85,24 +73,24 @@ namespace PrivaPub.Federation.Inbox.Handlers } await RemoteDeletes.Tombstone(objectUri, token); - var post = await _dbEntities.Posts.Match(p => p.ObjectURI == objectUri && p.ActorURI == actor.ActorURI).ExecuteFirstAsync(token); + var post = await dbEntities.Posts.Match(p => p.ObjectURI == objectUri && p.ActorURI == actor.ActorURI).ExecuteFirstAsync(token); // deleted by another account of its author's server (Mobilizon's organiser deletes the group's event): once // that server says it is gone - if (post == default && await _dbEntities.Posts.Match(p => p.ObjectURI == objectUri).ExecuteFirstAsync(token) is { } held - && held.ActorURI != actor.ActorURI && Origin.Same(held.ActorURI, actor.ActorURI) && await _remoteActors.IsGone(objectUri, token)) + if (post == default && await dbEntities.Posts.Match(p => p.ObjectURI == objectUri).ExecuteFirstAsync(token) is { } held + && held.ActorURI != actor.ActorURI && Origin.Same(held.ActorURI, actor.ActorURI) && await remoteActors.IsGone(objectUri, token)) post = held; if (post == default) { Arrival.Accept("tombstone-only"); - await _quotes.Revoke(objectUri, token); + await quotes.Revoke(objectUri, token); return; } Arrival.Accept("removed"); Arrival.About(post.ObjectType, post.Visibility, post.CreationDate); - await ReplyRelay.Pass(post, _dbEntities, _localActors, _delivery, token); + await ReplyRelay.Pass(post, dbEntities, localActors, delivery, token); await RemoteDeletes.Remove(post, objectUri, token); - if (!string.IsNullOrEmpty(post.GroupId) && await _localActors.FindById(LocalActorKind.Group, post.GroupId, token) is { IsCircle: false } community) - await _groups.Announce(community, activity.AsObject(), post.ObjectURI, isNewPost: false, token); + if (!string.IsNullOrEmpty(post.GroupId) && await localActors.FindById(LocalActorKind.Group, post.GroupId, token) is { IsCircle: false } community) + await groups.Announce(community, activity.AsObject(), post.ObjectURI, isNewPost: false, token); } } } diff --git a/PrivaPub/Federation/Inbox/Handlers/DislikeHandler.cs b/PrivaPub/Federation/Inbox/Handlers/DislikeHandler.cs index 5dd42ae..955021c 100644 --- a/PrivaPub/Federation/Inbox/Handlers/DislikeHandler.cs +++ b/PrivaPub/Federation/Inbox/Handlers/DislikeHandler.cs @@ -14,15 +14,9 @@ using PostEntity = PrivaPub.Models.Post.Post; namespace PrivaPub.Federation.Inbox.Handlers { - public class DislikeHandler : IActivityHandler + public class DislikeHandler( + DbEntities dbEntities) : IActivityHandler { - readonly DbEntities _dbEntities; - - public DislikeHandler(DbEntities dbEntities) - { - _dbEntities = dbEntities; - } - public string Type => "Dislike"; public async Task Handle(JsonNode activity, ForeignAvatar actor, CancellationToken token) @@ -30,7 +24,7 @@ namespace PrivaPub.Federation.Inbox.Handlers var objectUri = Id(activity["object"]); var post = objectUri == default ? default - : await _dbEntities.Posts.Match(p => p.ObjectURI == objectUri && !p.DeletedAt.HasValue && p.ReblogOfPostId == null).ExecuteFirstAsync(token); + : await dbEntities.Posts.Match(p => p.ObjectURI == objectUri && !p.DeletedAt.HasValue && p.ReblogOfPostId == null).ExecuteFirstAsync(token); if (post == default || !await VisibilityPolicy.RemoteCanSee(post, actor, token)) { Arrival.Drop(post == default ? "unknown-object" : "not-visible"); diff --git a/PrivaPub/Federation/Inbox/Handlers/EmojiReactHandler.cs b/PrivaPub/Federation/Inbox/Handlers/EmojiReactHandler.cs index 852ed09..9acf6fc 100644 --- a/PrivaPub/Federation/Inbox/Handlers/EmojiReactHandler.cs +++ b/PrivaPub/Federation/Inbox/Handlers/EmojiReactHandler.cs @@ -8,17 +8,10 @@ using static PrivaPub.Federation.Objects.ActivityJson; namespace PrivaPub.Federation.Inbox.Handlers { - public class EmojiReactHandler : IActivityHandler + public class EmojiReactHandler( + DbEntities dbEntities, + IReactions reactions) : IActivityHandler { - readonly DbEntities _dbEntities; - readonly IReactions _reactions; - - public EmojiReactHandler(DbEntities dbEntities, IReactions reactions) - { - _dbEntities = dbEntities; - _reactions = reactions; - } - public string Type => "EmojiReact"; public async Task Handle(JsonNode activity, ForeignAvatar actor, CancellationToken token) @@ -26,14 +19,14 @@ namespace PrivaPub.Federation.Inbox.Handlers var objectUri = Id(activity["object"]); var post = objectUri == default ? default - : await _dbEntities.Posts.Match(p => p.ObjectURI == objectUri && !p.DeletedAt.HasValue && p.ReblogOfPostId == null).ExecuteFirstAsync(token); + : await dbEntities.Posts.Match(p => p.ObjectURI == objectUri && !p.DeletedAt.HasValue && p.ReblogOfPostId == null).ExecuteFirstAsync(token); if (post == default) { Arrival.Drop("unknown-object"); return; } Arrival.About(post.ObjectType ?? "Note", post.Visibility, post.CreationDate); - await _reactions.Receive(post, actor, Value(activity, "content"), activity["tag"], Id(activity), token); + await reactions.Receive(post, actor, Value(activity, "content"), activity["tag"], Id(activity), token); } } } diff --git a/PrivaPub/Federation/Inbox/Handlers/FeaturedHandler.cs b/PrivaPub/Federation/Inbox/Handlers/FeaturedHandler.cs index 70e80d5..e3e0d03 100644 --- a/PrivaPub/Federation/Inbox/Handlers/FeaturedHandler.cs +++ b/PrivaPub/Federation/Inbox/Handlers/FeaturedHandler.cs @@ -10,51 +10,39 @@ namespace PrivaPub.Federation.Inbox.Handlers // its `featured` collection (as Mastodon sends it) or its `featuredTags` is a featured tag (R8). On its wall // (Smithereen's, FEP-400e) it tells of a post someone wrote there, or takes it off. Any other target (a community's // moderators) is not ours to keep. - public class FeaturedHandler : IActivityHandler + public class FeaturedHandler( + IFeaturedPosts featuredPosts, + bool add, + IWalls walls = default, + IRemoteActorService remoteActors = default, + Infrastructure.Jobs.IJobQueue queue = default, + Domain.Social.IFeaturedTags tags = default) : IActivityHandler { - readonly IFeaturedPosts _featured; - readonly IWalls _walls; - readonly IRemoteActorService _remoteActors; - readonly Infrastructure.Jobs.IJobQueue _queue; - readonly Domain.Social.IFeaturedTags _tags; - readonly bool _add; - - public FeaturedHandler(IFeaturedPosts featured, bool add, IWalls walls = default, IRemoteActorService remoteActors = default, - Infrastructure.Jobs.IJobQueue queue = default, Domain.Social.IFeaturedTags tags = default) - { - _tags = tags; - _featured = featured; - _walls = walls; - _remoteActors = remoteActors; - _queue = queue; - _add = add; - } - - public string Type => _add ? "Add" : "Remove"; + public string Type => add ? "Add" : "Remove"; public async Task Handle(JsonNode activity, ForeignAvatar actor, CancellationToken token) { - if (_add && _queue != default && await ConversationContainers.Unwrap(activity, actor, _queue, token)) + if (add && queue != default && await ConversationContainers.Unwrap(activity, actor, queue, token)) return; var target = Objects.ActivityJson.Id(activity["target"]); // a collection of its own we do not know of: its document read again, at most hourly, in case it was kept before // we read that collection (a wall) - if (_remoteActors != default && target != default && target != actor.FeaturedURL && target != actor.WallURL && target != actor.FeaturedTagsURL + if (remoteActors != default && target != default && target != actor.FeaturedURL && target != actor.WallURL && target != actor.FeaturedTagsURL && Objects.Origin.Same(target, actor.ActorURI) && actor.UpdatedAt < DateTime.UtcNow.AddHours(-1)) - actor = await _remoteActors.GetActor(actor.ActorURI, refresh: true, token) ?? actor; + actor = await remoteActors.GetActor(actor.ActorURI, refresh: true, token) ?? actor; // a featured hashtag: an object of its own, with no id (its href is no post), so before anything reads it as one if (Objects.ActivityJson.Value(activity["object"], "type") == "Hashtag") { - if (_tags != default && target != default && (target == actor.FeaturedURL || target == actor.FeaturedTagsURL)) - await _tags.Receive(activity, actor, _add, token); + if (tags != default && target != default && (target == actor.FeaturedURL || target == actor.FeaturedTagsURL)) + await tags.Receive(activity, actor, add, token); else Arrival.Drop("unknown-target"); return; } - if (_walls != default && !string.IsNullOrEmpty(actor.WallURL) && target == actor.WallURL) - await _walls.Receive(activity, actor, _add, token); + if (walls != default && !string.IsNullOrEmpty(actor.WallURL) && target == actor.WallURL) + await walls.Receive(activity, actor, add, token); else - await _featured.Receive(activity, actor, _add, token); + await featuredPosts.Receive(activity, actor, add, token); } } } diff --git a/PrivaPub/Federation/Inbox/Handlers/FlagHandler.cs b/PrivaPub/Federation/Inbox/Handlers/FlagHandler.cs index 831ee46..0377cc0 100644 --- a/PrivaPub/Federation/Inbox/Handlers/FlagHandler.cs +++ b/PrivaPub/Federation/Inbox/Handlers/FlagHandler.cs @@ -12,17 +12,10 @@ using static PrivaPub.Federation.Objects.ActivityJson; namespace PrivaPub.Federation.Inbox.Handlers { - public class FlagHandler : IActivityHandler + public class FlagHandler( + DbEntities dbEntities, + ILocalActorService localActors) : IActivityHandler { - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - - public FlagHandler(DbEntities dbEntities, ILocalActorService localActors) - { - _dbEntities = dbEntities; - _localActors = localActors; - } - public string Type => "Flag"; public async Task Handle(JsonNode activity, ForeignAvatar actor, CancellationToken token) @@ -38,7 +31,7 @@ namespace PrivaPub.Federation.Inbox.Handlers var postUris = new List(); foreach (var uri in objects.Take(50)) { - var local = await _localActors.FindByUri(uri, token); + var local = await localActors.FindByUri(uri, token); if (local is { Kind: LocalActorKind.Person } && uri.TrimEnd('/') == local.Uri) target ??= local; else @@ -46,9 +39,9 @@ namespace PrivaPub.Federation.Inbox.Handlers } var posts = postUris.Count == 0 ? new List() - : await _dbEntities.Posts.Match(p => postUris.Contains(p.ObjectURI) && !p.IsFederatedCopy).ExecuteAsync(token); + : await dbEntities.Posts.Match(p => postUris.Contains(p.ObjectURI) && !p.IsFederatedCopy).ExecuteAsync(token); if (target == default && posts.Count > 0) - target = await _localActors.FindById(LocalActorKind.Person, posts[0].GroupUserId, token); + target = await localActors.FindById(LocalActorKind.Person, posts[0].GroupUserId, token); if (target == default) { Arrival.Drop("unknown-object"); diff --git a/PrivaPub/Federation/Inbox/Handlers/FollowHandler.cs b/PrivaPub/Federation/Inbox/Handlers/FollowHandler.cs index 67ad185..c0b4b12 100644 --- a/PrivaPub/Federation/Inbox/Handlers/FollowHandler.cs +++ b/PrivaPub/Federation/Inbox/Handlers/FollowHandler.cs @@ -21,21 +21,11 @@ using PostEntity = PrivaPub.Models.Post.Post; namespace PrivaPub.Federation.Inbox.Handlers { - public class FollowHandler : IActivityHandler + public class FollowHandler( + DbEntities dbEntities, + ILocalActorService localActors, + IDeliveryService delivery) : IActivityHandler { - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - readonly IRemoteActorService _remoteActors; - readonly IDeliveryService _delivery; - - public FollowHandler(DbEntities dbEntities, ILocalActorService localActors, IRemoteActorService remoteActors, IDeliveryService delivery) - { - _dbEntities = dbEntities; - _localActors = localActors; - _remoteActors = remoteActors; - _delivery = delivery; - } - public string Type => "Follow"; public async Task Handle(JsonNode activity, ForeignAvatar actor, CancellationToken token) @@ -43,7 +33,7 @@ namespace PrivaPub.Federation.Inbox.Handlers var follow = activity; var follower = actor; - var target = await _localActors.FindByAddress(Id(follow["object"]), token); + var target = await localActors.FindByAddress(Id(follow["object"]), token); if (target is not { IsFederated: true } || target.IsServerActor) { Arrival.Drop("unknown-recipient"); @@ -67,12 +57,12 @@ namespace PrivaPub.Federation.Inbox.Handlers ["actor"] = target.Uri, ["object"] = follow.DeepClone() }; - await _delivery.Enqueue(target, new[] { follower.InboxURL }, reject, token); + await delivery.Enqueue(target, new[] { follower.InboxURL }, reject, token: token); Arrival.Reject("blocked"); return; } - var existing = await _dbEntities.Followers + var existing = await dbEntities.Followers .Match(f => f.LocalActorId == target.Id && f.LocalActorKind == target.Kind && f.ActorURI == follower.ActorURI) .ExecuteFirstAsync(token); var record = existing ?? new Follower @@ -90,7 +80,7 @@ namespace PrivaPub.Federation.Inbox.Handlers if (target.Kind == LocalActorKind.Person) await Notifications.Add(target.Id, record.IsAccepted ? NotificationType.Follow : NotificationType.FollowRequest, - follower.ID, follower.ActorURI, default, token); + follower.ID, follower.ActorURI, default, token: token); if (!record.IsAccepted) return; @@ -98,7 +88,7 @@ namespace PrivaPub.Federation.Inbox.Handlers await AddForeignMember(target.Id, follower.ActorURI, token); var accept = ActivityPubRenderer.Accept(target, follow, $"accept-{record.ID}-{DateTime.UtcNow.Ticks}"); - await _delivery.Enqueue(target, new[] { follower.InboxURL }, accept, token); + await delivery.Enqueue(target, new[] { follower.InboxURL }, accept, token: token); return; } } diff --git a/PrivaPub/Federation/Inbox/Handlers/JoinHandler.cs b/PrivaPub/Federation/Inbox/Handlers/JoinHandler.cs index 9414284..921631d 100644 --- a/PrivaPub/Federation/Inbox/Handlers/JoinHandler.cs +++ b/PrivaPub/Federation/Inbox/Handlers/JoinHandler.cs @@ -11,31 +11,23 @@ using static PrivaPub.Federation.Objects.ActivityJson; namespace PrivaPub.Federation.Inbox.Handlers { - public class JoinHandler : IActivityHandler + public class JoinHandler( + DbEntities dbEntities, + ILocalActorService localActors, + IDeliveryService delivery) : IActivityHandler { - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - readonly IDeliveryService _delivery; - - public JoinHandler(DbEntities dbEntities, ILocalActorService localActors, IDeliveryService delivery) - { - _dbEntities = dbEntities; - _localActors = localActors; - _delivery = delivery; - } - public string Type => "Join"; public async Task Handle(JsonNode activity, ForeignAvatar actor, CancellationToken token) { var objectUri = Id(activity["object"]); - if (objectUri == default || !objectUri.StartsWith(_localActors.BaseAddress + "/", StringComparison.OrdinalIgnoreCase)) + if (objectUri == default || !objectUri.StartsWith(localActors.BaseAddress + "/", StringComparison.OrdinalIgnoreCase)) { Arrival.Drop("unknown-object"); return; } - var post = await _dbEntities.Posts.Match(p => p.ObjectURI == objectUri && !p.IsFederatedCopy && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); - var owner = post == default ? default : await _localActors.FindById(LocalActorKind.Person, post.GroupUserId, token); + var post = await dbEntities.Posts.Match(p => p.ObjectURI == objectUri && !p.IsFederatedCopy && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); + var owner = post == default ? default : await localActors.FindById(LocalActorKind.Person, post.GroupUserId, token); if (owner == default || string.IsNullOrEmpty(actor.InboxURL)) { Arrival.Drop("unknown-object"); @@ -43,14 +35,14 @@ namespace PrivaPub.Federation.Inbox.Handlers } Arrival.About(post.ObjectType ?? "Note", post.Visibility, post.CreationDate); Arrival.Reject("ignored"); - await _delivery.Enqueue(owner, new[] { actor.InboxURL }, new JsonObject + await delivery.Enqueue(owner, new[] { actor.InboxURL }, new JsonObject { ["@context"] = ActivityPubRenderer.ActivityStreams, ["id"] = owner.ActivityUri($"ignore-{Guid.NewGuid():N}"), ["type"] = "Ignore", ["actor"] = owner.Uri, ["object"] = activity.DeepClone() - }, token); + }, token: token); } } } diff --git a/PrivaPub/Federation/Inbox/Handlers/LikeHandler.cs b/PrivaPub/Federation/Inbox/Handlers/LikeHandler.cs index 4ac79d0..12dd337 100644 --- a/PrivaPub/Federation/Inbox/Handlers/LikeHandler.cs +++ b/PrivaPub/Federation/Inbox/Handlers/LikeHandler.cs @@ -16,17 +16,10 @@ using PostEntity = PrivaPub.Models.Post.Post; namespace PrivaPub.Federation.Inbox.Handlers { - public class LikeHandler : IActivityHandler + public class LikeHandler( + DbEntities dbEntities, + IReactions reactions) : IActivityHandler { - readonly DbEntities _dbEntities; - readonly IReactions _reactions; - - public LikeHandler(DbEntities dbEntities, IReactions reactions) - { - _dbEntities = dbEntities; - _reactions = reactions; - } - public string Type => "Like"; public async Task Handle(JsonNode activity, ForeignAvatar actor, CancellationToken token) @@ -34,7 +27,7 @@ namespace PrivaPub.Federation.Inbox.Handlers var objectUri = Id(activity["object"]); var post = objectUri == default ? default - : await _dbEntities.Posts.Match(p => p.ObjectURI == objectUri && !p.DeletedAt.HasValue && p.ReblogOfPostId == null).ExecuteFirstAsync(token); + : await dbEntities.Posts.Match(p => p.ObjectURI == objectUri && !p.DeletedAt.HasValue && p.ReblogOfPostId == null).ExecuteFirstAsync(token); if (post == default || !await VisibilityPolicy.RemoteCanSee(post, actor, token)) { Arrival.Drop(post == default ? "unknown-object" : "not-visible"); @@ -44,7 +37,7 @@ namespace PrivaPub.Federation.Inbox.Handlers var content = Value(activity, "_misskey_reaction") ?? Value(activity, "content"); if (!Reactions.IsHeart(content)) { - await _reactions.Receive(post, actor, content, activity["tag"], Id(activity), token); + await reactions.Receive(post, actor, content, activity["tag"], Id(activity), token); return; } @@ -64,7 +57,7 @@ namespace PrivaPub.Federation.Inbox.Handlers && (await DB.Default.DeleteAsync(downvoted.ID)).DeletedCount > 0) await DB.Default.Update().MatchID(post.ID).Modify(b => b.Inc(p => p.DownvotesCount, -1)).ExecuteAsync(token); if (!post.IsFederatedCopy) - await Notifications.Add(post.GroupUserId, NotificationType.Favourite, actor.ID, actor.ActorURI, post.ID, token); + await Notifications.Add(post.GroupUserId, NotificationType.Favourite, actor.ID, actor.ActorURI, post.ID, token: token); } } } diff --git a/PrivaPub/Federation/Inbox/Handlers/LockHandler.cs b/PrivaPub/Federation/Inbox/Handlers/LockHandler.cs index aee82a5..1a45054 100644 --- a/PrivaPub/Federation/Inbox/Handlers/LockHandler.cs +++ b/PrivaPub/Federation/Inbox/Handlers/LockHandler.cs @@ -15,20 +15,14 @@ namespace PrivaPub.Federation.Inbox.Handlers // A moderator's lock of a thread sent as it is, not inside its community's announce (Mbin sends it to the magazine's // subscribers itself): taken only from the post's own server, which speaks for it. Replies are refused until the // Undo{Lock}, as for a lock a community announces. - public class LockHandler : IActivityHandler + public class LockHandler( + DbEntities db) : IActivityHandler { - readonly DbEntities _dbEntities; - - public LockHandler(DbEntities dbEntities) - { - _dbEntities = dbEntities; - } - public string Type => "Lock"; public async Task Handle(JsonNode activity, ForeignAvatar actor, CancellationToken token) { - if (await Set(_dbEntities, Id(activity["object"]), actor, locked: true, token)) + if (await Set(db, Id(activity["object"]), actor, locked: true, token)) Arrival.Accept("locked"); else Arrival.Drop("unknown-object"); diff --git a/PrivaPub/Federation/Inbox/Handlers/MoveHandler.cs b/PrivaPub/Federation/Inbox/Handlers/MoveHandler.cs index d0c099e..060cc29 100644 --- a/PrivaPub/Federation/Inbox/Handlers/MoveHandler.cs +++ b/PrivaPub/Federation/Inbox/Handlers/MoveHandler.cs @@ -20,24 +20,13 @@ namespace PrivaPub.Federation.Inbox.Handlers // it among its alsoKnownAs. The old account then shows where it went (`moved`), and, as Mastodon does it (owner // decision 2026-10-05), the personas following it follow the new one instead, in the same lists, and those that // muted or blocked it mute or block the new one too. - public class MoveHandler : IActivityHandler + public class MoveHandler( + IRemoteActorService remoteActors, + DbEntities dbEntities, + ILocalActorService localActors, + IFollowService follows, + IRelationshipService relationships) : IActivityHandler { - readonly IRemoteActorService _remoteActors; - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - readonly IFollowService _follows; - readonly IRelationshipService _relationships; - - public MoveHandler(IRemoteActorService remoteActors, DbEntities dbEntities, ILocalActorService localActors, IFollowService follows, - IRelationshipService relationships) - { - _remoteActors = remoteActors; - _dbEntities = dbEntities; - _localActors = localActors; - _follows = follows; - _relationships = relationships; - } - public string Type => "Move"; public async Task Handle(JsonNode activity, ForeignAvatar actor, CancellationToken token) @@ -48,7 +37,7 @@ namespace PrivaPub.Federation.Inbox.Handlers Arrival.Drop("not-self"); return; } - var moved = await _remoteActors.GetActor(target, refresh: true, token); + var moved = await remoteActors.GetActor(target, refresh: true, token); if (moved == default) { Arrival.Drop("target-unavailable"); @@ -67,15 +56,15 @@ namespace PrivaPub.Federation.Inbox.Handlers async Task MoveFollows(ForeignAvatar old, ForeignAvatar moved, CancellationToken token) { - foreach (var following in await _dbEntities.Followings.Match(f => f.TargetActorURI == old.ActorURI).ExecuteAsync(token)) + foreach (var following in await dbEntities.Followings.Match(f => f.TargetActorURI == old.ActorURI).ExecuteAsync(token)) { - var persona = await _localActors.FindById(LocalActorKind.Person, following.AvatarId, token); + var persona = await localActors.FindById(LocalActorKind.Person, following.AvatarId, token); if (persona == default) continue; var lists = await DB.Default.Find().Match(m => m.AvatarId == persona.Id && m.AccountId == old.ID).ExecuteAsync(token); var endorsed = await DB.Default.Find().Match(e => e.AvatarId == persona.Id && e.TargetActorURI == old.ActorURI).ExecuteAnyAsync(token); - var followed = await _follows.FollowAs(persona, moved.ActorURI, following.ShowReblogs, token, following.Notify, following.Languages ?? new List()); - await _follows.UnfollowAs(persona, old.ActorURI, token); + var followed = await follows.FollowAs(persona, moved.ActorURI, following.ShowReblogs, following.Notify, following.Languages ?? new List(), token); + await follows.UnfollowAs(persona, old.ActorURI, token); if (followed == default) continue; // the persona's endorsement and private note go with the follow, as Mastodon carries them over (R8) @@ -100,14 +89,14 @@ namespace PrivaPub.Federation.Inbox.Handlers async Task CarryOver(ForeignAvatar old, ForeignAvatar moved, CancellationToken token) { foreach (var mute in await DB.Default.Find().Match(m => m.TargetActorURI == old.ActorURI).ExecuteAsync(token)) - if (await _localActors.FindById(LocalActorKind.Person, mute.AvatarId, token) is { } persona + if (await localActors.FindById(LocalActorKind.Person, mute.AvatarId, token) is { } persona && !await DB.Default.Find().Match(m => m.AvatarId == persona.Id && m.TargetActorURI == moved.ActorURI).ExecuteAnyAsync(token)) - await _relationships.Mute(persona, moved.ActorURI, moved.ID, mute.HideNotifications, + await relationships.Mute(persona, moved.ActorURI, moved.ID, mute.HideNotifications, mute.ExpiresAt is { } expires ? expires - DateTime.UtcNow : default(TimeSpan?), token); foreach (var block in await DB.Default.Find().Match(b => b.TargetActorURI == old.ActorURI).ExecuteAsync(token)) - if (await _localActors.FindById(LocalActorKind.Person, block.AvatarId, token) is { } persona + if (await localActors.FindById(LocalActorKind.Person, block.AvatarId, token) is { } persona && !await DB.Default.Find().Match(b => b.AvatarId == persona.Id && b.TargetActorURI == moved.ActorURI).ExecuteAnyAsync(token)) - await _relationships.Block(persona, moved.ActorURI, moved.ID, token); + await relationships.Block(persona, moved.ActorURI, moved.ID, token); } } } diff --git a/PrivaPub/Federation/Inbox/Handlers/QuoteRequestHandler.cs b/PrivaPub/Federation/Inbox/Handlers/QuoteRequestHandler.cs index 4ec0c96..4341a78 100644 --- a/PrivaPub/Federation/Inbox/Handlers/QuoteRequestHandler.cs +++ b/PrivaPub/Federation/Inbox/Handlers/QuoteRequestHandler.cs @@ -5,17 +5,11 @@ using System.Text.Json.Nodes; namespace PrivaPub.Federation.Inbox.Handlers { - public class QuoteRequestHandler : IActivityHandler + public class QuoteRequestHandler( + IQuoteService quotes) : IActivityHandler { - readonly IQuoteService _quotes; - - public QuoteRequestHandler(IQuoteService quotes) - { - _quotes = quotes; - } - public string Type => "QuoteRequest"; - public Task Handle(JsonNode activity, ForeignAvatar actor, CancellationToken token) => _quotes.ReceiveRequest(activity, actor, token); + public Task Handle(JsonNode activity, ForeignAvatar actor, CancellationToken token) => quotes.ReceiveRequest(activity, actor, token); } } diff --git a/PrivaPub/Federation/Inbox/Handlers/ReplyApprovalHandler.cs b/PrivaPub/Federation/Inbox/Handlers/ReplyApprovalHandler.cs index 052cf05..efdad70 100644 --- a/PrivaPub/Federation/Inbox/Handlers/ReplyApprovalHandler.cs +++ b/PrivaPub/Federation/Inbox/Handlers/ReplyApprovalHandler.cs @@ -7,18 +7,15 @@ namespace PrivaPub.Federation.Inbox.Handlers { // FEP-5624 (PeerTube): the author of a post whose canReply asks it to approve each reply lets one of ours in, which then // goes to its audience carrying the approval (replyApproval) - public class ReplyApprovalHandler : IActivityHandler + public class ReplyApprovalHandler( + IInteractionApprovals approvals) : IActivityHandler { - readonly IInteractionApprovals _approvals; - - public ReplyApprovalHandler(IInteractionApprovals approvals) => _approvals = approvals; - public virtual string Type => "ApproveReply"; protected virtual bool Approves => true; public async Task Handle(JsonNode activity, ForeignAvatar actor, CancellationToken token) => - await _approvals.Answered(activity, actor, Approves, token); + await approvals.Answered(activity, actor, Approves, token); } // and refuses one, which stays ours alone diff --git a/PrivaPub/Federation/Inbox/Handlers/ResolveHandler.cs b/PrivaPub/Federation/Inbox/Handlers/ResolveHandler.cs index b8fde16..eefcbb5 100644 --- a/PrivaPub/Federation/Inbox/Handlers/ResolveHandler.cs +++ b/PrivaPub/Federation/Inbox/Handlers/ResolveHandler.cs @@ -15,18 +15,12 @@ namespace PrivaPub.Federation.Inbox.Handlers // Lemmy 1.0 tells a report's sender that it was dealt with: Resolve{Flag}, the Flag being one we sent // (`/grunts/flag-`). It is believed from the server holding what was reported, or the community it was // reported to, and kept on the report beside our own moderators' resolution, which it never replaces. - public class ResolveHandler : IActivityHandler + public class ResolveHandler( + DbEntities dbEntities, + ILocalActorService localActors) : IActivityHandler { const string FlagMarker = "/grunts/flag-"; - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - - public ResolveHandler(DbEntities dbEntities, ILocalActorService localActors) - { - _dbEntities = dbEntities; - _localActors = localActors; - } public string Type => "Resolve"; @@ -36,7 +30,7 @@ namespace PrivaPub.Federation.Inbox.Handlers var flagId = Id(flag); var marker = flagId?.IndexOf(FlagMarker, StringComparison.Ordinal) ?? -1; if (flag is JsonObject && Value(flag, "type") != "Flag" || marker < 0 - || !flagId.StartsWith(_localActors.BaseAddress + "/", StringComparison.OrdinalIgnoreCase)) + || !flagId.StartsWith(localActors.BaseAddress + "/", StringComparison.OrdinalIgnoreCase)) { Arrival.Drop("not-ours"); return; @@ -49,8 +43,8 @@ namespace PrivaPub.Federation.Inbox.Handlers return; } var concerned = new List(report.ObjectURIs) { report.TargetActorURI }; - foreach (var post in report.PostIds.Count == 0 ? new List() : await _dbEntities.Posts.Match(p => report.PostIds.Contains(p.ID)).ExecuteAsync(token)) - concerned.Add(await Communities.Of(post, _dbEntities, token)); + foreach (var post in report.PostIds.Count == 0 ? new List() : await dbEntities.Posts.Match(p => report.PostIds.Contains(p.ID)).ExecuteAsync(token)) + concerned.Add(await Communities.Of(post, dbEntities, token)); if (!concerned.Any(uri => Origin.Same(uri, actor.ActorURI))) { Arrival.Drop("misattributed"); diff --git a/PrivaPub/Federation/Inbox/Handlers/UndoHandler.cs b/PrivaPub/Federation/Inbox/Handlers/UndoHandler.cs index 7efa13b..6fb34c9 100644 --- a/PrivaPub/Federation/Inbox/Handlers/UndoHandler.cs +++ b/PrivaPub/Federation/Inbox/Handlers/UndoHandler.cs @@ -16,19 +16,11 @@ using PostEntity = PrivaPub.Models.Post.Post; namespace PrivaPub.Federation.Inbox.Handlers { - public class UndoHandler : IActivityHandler + public class UndoHandler( + DbEntities dbEntities, + ILocalActorService localActors, + IReactions reactions) : IActivityHandler { - readonly IReactions _reactions; - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - - public UndoHandler(DbEntities dbEntities, ILocalActorService localActors, IReactions reactions) - { - _reactions = reactions; - _dbEntities = dbEntities; - _localActors = localActors; - } - public string Type => "Undo"; public async Task Handle(JsonNode activity, ForeignAvatar actor, CancellationToken token) @@ -48,11 +40,11 @@ namespace PrivaPub.Federation.Inbox.Handlers if (innerType is null or "Dislike") undone |= await UndoDislike(inner, innerId, actor, token); if (innerType is null or "Block") - undone |= await BlockHandler.Undo(inner, innerId, actor, _localActors, token); + undone |= await BlockHandler.Undo(inner, innerId, actor, localActors, token); if (innerType == "Lock") - undone |= await LockHandler.Set(_dbEntities, Id(inner["object"]), actor, locked: false, token); + undone |= await LockHandler.Set(dbEntities, Id(inner["object"]), actor, locked: false, token); if (innerType is null or "Like" or "EmojiReact") - undone |= await _reactions.Withdraw(actor, innerId, inner is JsonObject ? Id(inner["object"]) : default, + undone |= await reactions.Withdraw(actor, innerId, inner is JsonObject ? Id(inner["object"]) : default, inner is JsonObject ? Value(inner, "_misskey_reaction") ?? Value(inner, "content") : default, token); if (undone) Arrival.Accept("undone"); @@ -67,7 +59,7 @@ namespace PrivaPub.Federation.Inbox.Handlers : await DB.Default.Find().Match(d => d.ActivityURI == innerId && d.ActorURI == actor.ActorURI).ExecuteFirstAsync(token); if (downvote == default && inner is JsonObject && Id(inner["object"]) is { } objectUri) { - var post = await _dbEntities.Posts.Match(p => p.ObjectURI == objectUri).ExecuteFirstAsync(token); + var post = await dbEntities.Posts.Match(p => p.ObjectURI == objectUri).ExecuteFirstAsync(token); downvote = post == default ? default : await DB.Default.Find().Match(d => d.PostId == post.ID && d.ActorURI == actor.ActorURI).ExecuteFirstAsync(token); @@ -81,9 +73,9 @@ namespace PrivaPub.Federation.Inbox.Handlers async Task UndoFollow(JsonNode inner, string innerId, ForeignAvatar actor, CancellationToken token) { - var followers = await _dbEntities.Followers.Match(f => f.ActorURI == actor.ActorURI).ExecuteAsync(token); + var followers = await dbEntities.Followers.Match(f => f.ActorURI == actor.ActorURI).ExecuteAsync(token); var targetUri = inner is JsonObject ? Id(inner["object"]) : default; - var target = targetUri == default ? default : await _localActors.FindByAddress(targetUri, token); + var target = targetUri == default ? default : await localActors.FindByAddress(targetUri, token); var undone = false; foreach (var follower in followers) { @@ -104,13 +96,13 @@ namespace PrivaPub.Federation.Inbox.Handlers { var favourite = innerId == default ? default - : await _dbEntities.Favourites.Match(f => f.ActivityURI == innerId && f.ActorURI == actor.ActorURI).ExecuteFirstAsync(token); + : await dbEntities.Favourites.Match(f => f.ActivityURI == innerId && f.ActorURI == actor.ActorURI).ExecuteFirstAsync(token); if (favourite == default && inner is JsonObject && Id(inner["object"]) is { } objectUri) { - var post = await _dbEntities.Posts.Match(p => p.ObjectURI == objectUri).ExecuteFirstAsync(token); + var post = await dbEntities.Posts.Match(p => p.ObjectURI == objectUri).ExecuteFirstAsync(token); favourite = post == default ? default - : await _dbEntities.Favourites.Match(f => f.PostId == post.ID && f.ActorURI == actor.ActorURI).ExecuteFirstAsync(token); + : await dbEntities.Favourites.Match(f => f.PostId == post.ID && f.ActorURI == actor.ActorURI).ExecuteFirstAsync(token); } if (favourite == default) return false; @@ -123,7 +115,7 @@ namespace PrivaPub.Federation.Inbox.Handlers { if (innerId == default) return false; - var reblog = await _dbEntities.Posts + var reblog = await dbEntities.Posts .Match(p => p.ObjectURI == innerId && p.ActorURI == actor.ActorURI && p.ReblogOfPostId != null) .ExecuteFirstAsync(token); if (reblog == default) diff --git a/PrivaPub/Federation/Inbox/Handlers/UpdateHandler.cs b/PrivaPub/Federation/Inbox/Handlers/UpdateHandler.cs index 6ce7a6c..3006d06 100644 --- a/PrivaPub/Federation/Inbox/Handlers/UpdateHandler.cs +++ b/PrivaPub/Federation/Inbox/Handlers/UpdateHandler.cs @@ -16,29 +16,15 @@ using PostEntity = PrivaPub.Models.Post.Post; namespace PrivaPub.Federation.Inbox.Handlers { - public class UpdateHandler : IActivityHandler + public class UpdateHandler( + DbEntities dbEntities, + ILocalActorService localActors, + IRemoteActorService remoteActors, + IGroupDistributor groups, + IObjectRecords records, + IQuoteService quotes, + IDeliveryService delivery = default) : IActivityHandler { - - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - readonly IRemoteActorService _remoteActors; - readonly IGroupDistributor _groups; - readonly IObjectRecords _records; - readonly IQuoteService _quotes; - readonly IDeliveryService _delivery; - - public UpdateHandler(DbEntities dbEntities, ILocalActorService localActors, IRemoteActorService remoteActors, IGroupDistributor groups, - IObjectRecords records, IQuoteService quotes, IDeliveryService delivery = default) - { - _delivery = delivery; - _quotes = quotes; - _records = records; - _groups = groups; - _dbEntities = dbEntities; - _localActors = localActors; - _remoteActors = remoteActors; - } - public string Type => "Update"; public async Task Handle(JsonNode activity, ForeignAvatar actor, CancellationToken token) @@ -46,7 +32,7 @@ namespace PrivaPub.Federation.Inbox.Handlers var inner = activity["object"]; if (Id(inner) == actor.ActorURI) { - await _remoteActors.GetActor(actor.ActorURI, refresh: true, token); + await remoteActors.GetActor(actor.ActorURI, refresh: true, token); Arrival.Accept("actor-refresh"); Arrival.About(actor.AvatarType.ToString()); return; @@ -61,7 +47,7 @@ namespace PrivaPub.Federation.Inbox.Handlers // as that server has it now if (note != default && note.AttributedTo != actor.ActorURI && Origin.Same(note.AttributedTo, actor.ActorURI)) { - using var fetched = await _remoteActors.FetchObject(note.Id, token); + using var fetched = await remoteActors.FetchObject(note.Id, token); var current = fetched == default ? default : NoteParser.Parse(JsonNode.Parse(fetched.Root.GetRawText())); if (current == default || current.Id != note.Id || current.AttributedTo != note.AttributedTo) { @@ -69,7 +55,7 @@ namespace PrivaPub.Federation.Inbox.Handlers return; } note = current; - actor = await _remoteActors.GetActor(note.AttributedTo, refresh: false, token); + actor = await remoteActors.GetActor(note.AttributedTo, refresh: false, token); if (actor == default) { Arrival.Drop("author-unavailable"); @@ -82,7 +68,7 @@ namespace PrivaPub.Federation.Inbox.Handlers return; } - var post = await _dbEntities.Posts.Match(p => p.ObjectURI == note.Id && p.ActorURI == actor.ActorURI).ExecuteFirstAsync(token); + var post = await dbEntities.Posts.Match(p => p.ObjectURI == note.Id && p.ActorURI == actor.ActorURI).ExecuteFirstAsync(token); if (post == default || post.DeletedAt.HasValue) { Arrival.Drop("unknown-object"); @@ -90,12 +76,12 @@ namespace PrivaPub.Federation.Inbox.Handlers } Arrival.About(note.Type, post.Visibility, post.CreationDate); - var edited = await RemoteEdits.Apply(post, note, Id(activity), _localActors, _records, _quotes, token); + var edited = await RemoteEdits.Apply(post, note, Id(activity), localActors, records, quotes, token); Arrival.Accept(edited ? "edit" : "refresh"); if (edited) - await ReplyRelay.Pass(post, _dbEntities, _localActors, _delivery, token); - if (edited && !string.IsNullOrEmpty(post.GroupId) && await _localActors.FindById(Models.Federation.LocalActorKind.Group, post.GroupId, token) is { IsCircle: false } community) - await _groups.Announce(community, activity.AsObject(), post.ObjectURI, isNewPost: false, token); + await ReplyRelay.Pass(post, dbEntities, localActors, delivery, token); + if (edited && !string.IsNullOrEmpty(post.GroupId) && await localActors.FindById(Models.Federation.LocalActorKind.Group, post.GroupId, token) is { IsCircle: false } community) + await groups.Announce(community, activity.AsObject(), post.ObjectURI, isNewPost: false, token); } } } diff --git a/PrivaPub/Federation/Inbox/Handlers/WarnHandler.cs b/PrivaPub/Federation/Inbox/Handlers/WarnHandler.cs index 10878df..8e89083 100644 --- a/PrivaPub/Federation/Inbox/Handlers/WarnHandler.cs +++ b/PrivaPub/Federation/Inbox/Handlers/WarnHandler.cs @@ -17,20 +17,13 @@ namespace PrivaPub.Federation.Inbox.Handlers // [persona], object: post, summary: reason, audience: community}), sent to the persona's inbox alone. It becomes the // persona's moderation_warning notification, once the sender is shown to moderate that community and the post is the // persona's own, in it. - public class WarnHandler : IActivityHandler + public class WarnHandler( + DbEntities dbEntities, + ILocalActorService localActors, + IRemoteActorService remoteActors) : IActivityHandler { const int MaxReason = 1000; - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - readonly IRemoteActorService _remoteActors; - - public WarnHandler(DbEntities dbEntities, ILocalActorService localActors, IRemoteActorService remoteActors) - { - _dbEntities = dbEntities; - _localActors = localActors; - _remoteActors = remoteActors; - } public string Type => "Warn"; @@ -38,7 +31,7 @@ namespace PrivaPub.Federation.Inbox.Handlers { LocalActor persona = default; foreach (var uri in Recipients(activity["to"])) - if (await _localActors.FindByUri(uri, token) is { Kind: LocalActorKind.Person } found) + if (await localActors.FindByUri(uri, token) is { Kind: LocalActorKind.Person } found) { persona = found; break; @@ -49,7 +42,7 @@ namespace PrivaPub.Federation.Inbox.Handlers return; } var communityUri = Id(activity["audience"]); - var community = communityUri == default ? default : await _remoteActors.GetActor(communityUri, refresh: false, token); + var community = communityUri == default ? default : await remoteActors.GetActor(communityUri, refresh: false, token); if (community is not { AvatarType: AvatarType.Group }) { Arrival.Drop("unknown-community"); @@ -58,21 +51,21 @@ namespace PrivaPub.Federation.Inbox.Handlers var objectUri = Id(activity["object"]); var post = objectUri == default ? default - : await _dbEntities.Posts.Match(p => p.ObjectURI == objectUri && p.GroupUserId == persona.Id && !p.IsFederatedCopy).ExecuteFirstAsync(token); - if (post == default || await Communities.Of(post, _dbEntities, token) != community.ActorURI) + : await dbEntities.Posts.Match(p => p.ObjectURI == objectUri && p.GroupUserId == persona.Id && !p.IsFederatedCopy).ExecuteFirstAsync(token); + if (post == default || await Communities.Of(post, dbEntities, token) != community.ActorURI) { Arrival.Drop("unknown-object"); return; } Arrival.About(visibility: post.Visibility, created: post.CreationDate, local: persona); - if (!await Communities.Moderates(community, actor.ActorURI, _remoteActors, token)) + if (!await Communities.Moderates(community, actor.ActorURI, remoteActors, token)) { Arrival.Drop("not-moderator"); return; } var reason = Value(activity, "summary") ?? Value(activity, "content"); - await Notifications.Add(persona.Id, NotificationType.ModerationWarning, community.ID, community.ActorURI, post.ID, token, - text: string.IsNullOrWhiteSpace(reason) ? default : reason.Trim().Length <= MaxReason ? reason.Trim() : reason.Trim()[..MaxReason]); + await Notifications.Add(persona.Id, NotificationType.ModerationWarning, community.ID, community.ActorURI, post.ID, + text: string.IsNullOrWhiteSpace(reason) ? default : reason.Trim().Length <= MaxReason ? reason.Trim() : reason.Trim()[..MaxReason], token: token); Arrival.Accept("warned"); } diff --git a/PrivaPub/Federation/Inbox/InboxProcessor.cs b/PrivaPub/Federation/Inbox/InboxProcessor.cs index 6f66c33..d294e52 100644 --- a/PrivaPub/Federation/Inbox/InboxProcessor.cs +++ b/PrivaPub/Federation/Inbox/InboxProcessor.cs @@ -20,27 +20,17 @@ namespace PrivaPub.Federation.Inbox Task Handle(JsonNode activity, ForeignAvatar actor, CancellationToken token); } - public class InboxProcessor : IJobHandler + public class InboxProcessor( + IRemoteActorService remoteActors, + IEnumerable handlers, + ILogger logger, + IInteractionLedger ledger = default, + ILocalActorService localActors = default, + Microsoft.Extensions.Options.IOptionsMonitor federation = default) : IJobHandler { - readonly IRemoteActorService _remoteActors; - readonly IReadOnlyDictionary _handlers; - readonly ILogger _logger; - readonly IInteractionLedger _ledger; - readonly ILocalActorService _localActors; + readonly IReadOnlyDictionary _handlers = handlers.ToDictionary(h => h.Type, StringComparer.Ordinal); + readonly int _concurrency = Math.Max(1, federation?.CurrentValue.InboxConcurrency ?? 8); - readonly int _concurrency; - - public InboxProcessor(IRemoteActorService remoteActors, IEnumerable handlers, ILogger logger, - IInteractionLedger ledger = default, ILocalActorService localActors = default, - Microsoft.Extensions.Options.IOptions federation = default) - { - _concurrency = Math.Max(1, federation?.Value.InboxConcurrency ?? 8); - _localActors = localActors; - _remoteActors = remoteActors; - _handlers = handlers.ToDictionary(h => h.Type, StringComparer.Ordinal); - _logger = logger; - _ledger = ledger; - } public JobKind Kind => JobKind.ProcessInbox; public int Concurrency => _concurrency; @@ -59,7 +49,7 @@ namespace PrivaPub.Federation.Inbox return JobOutcome.Done; } - var actor = await _remoteActors.GetActor(payload.ActorURI, refresh: false, token); + var actor = await remoteActors.GetActor(payload.ActorURI, refresh: false, token); if (actor == default) { Record(job, payload, activity, type, started, new ArrivalVerdict(), Interactions.Deferred, "actor-unavailable"); @@ -73,10 +63,10 @@ namespace PrivaPub.Federation.Inbox return JobOutcome.Done; } if (payload.ForwardedBy != default && Forwarded.NamesUnknownKey(activity, actor)) - actor = await _remoteActors.GetActor(actor.ActorURI, refresh: true, token) ?? actor; + actor = await remoteActors.GetActor(actor.ActorURI, refresh: true, token) ?? actor; if (payload.ForwardedBy != default && !Forwarded.Proven(activity, actor)) { - var (confirmed, drop) = await Forwarded.Confirm(activity, type, actor.ActorURI, _remoteActors, token); + var (confirmed, drop) = await Forwarded.Confirm(activity, type, actor.ActorURI, remoteActors, token); if (drop != default) { Record(job, payload, activity, type, started, new ArrivalVerdict(), Interactions.Dropped, drop); @@ -91,7 +81,7 @@ namespace PrivaPub.Federation.Inbox Arrival.Current = arrival; try { - await LocalReferences.Canonicalise(activity, _localActors?.BaseAddress, token); + await LocalReferences.Canonicalise(activity, localActors?.BaseAddress, token); await handler.Handle(activity, actor, token); } catch (Exception ex) when (ex is not OperationCanceledException) @@ -104,16 +94,16 @@ namespace PrivaPub.Federation.Inbox Arrival.Current = default; } Record(job, payload, activity, type, started, arrival.Verdict, default, default); - _logger.LogInformation("Processed {Type} {Id} from {Actor}", type, Id(activity), actor.ActorURI); + logger.LogInformation("Processed {Type} {Id} from {Actor}", type, Id(activity), actor.ActorURI); return JobOutcome.Done; } void Record(Job job, InboxPayload payload, JsonNode activity, string type, long started, ArrivalVerdict verdict, string outcome, string reason) { - if (_ledger == default || payload == default) + if (ledger == default || payload == default) return; var embedded = activity?["object"] as JsonObject; - _ledger.Record(new InteractionEvent + ledger.Record(new InteractionEvent { Channel = Interactions.In, Host = Interactions.HostOf(payload.ActorURI), diff --git a/PrivaPub/Federation/Inbox/InboxReceiver.cs b/PrivaPub/Federation/Inbox/InboxReceiver.cs index db9626b..56e16ba 100644 --- a/PrivaPub/Federation/Inbox/InboxReceiver.cs +++ b/PrivaPub/Federation/Inbox/InboxReceiver.cs @@ -28,29 +28,18 @@ namespace PrivaPub.Federation.Inbox InboxResult NoSuchRecipient(HttpRequest request); } - public class InboxReceiver : IInboxReceiver + public class InboxReceiver( + ILocalActorService localActors, + IRemoteActorService remoteActors, + IJobQueue queue, + IDomainBlocks domainBlocks, + ILogger logger, + IInteractionLedger ledger = default) : IInboxReceiver { const int KeyRetrySeconds = 300; const int MaxBodyBytes = 1024 * 1024; - readonly ILocalActorService _localActors; - readonly IRemoteActorService _remoteActors; - readonly IJobQueue _queue; - readonly IDomainBlocks _domainBlocks; - readonly ILogger _logger; - readonly IInteractionLedger _ledger; - - public InboxReceiver(ILocalActorService localActors, IRemoteActorService remoteActors, IJobQueue queue, IDomainBlocks domainBlocks, - ILogger logger, IInteractionLedger ledger = default) - { - _localActors = localActors; - _remoteActors = remoteActors; - _queue = queue; - _domainBlocks = domainBlocks; - _logger = logger; - _ledger = ledger; - } sealed class Receipt { @@ -91,10 +80,10 @@ namespace PrivaPub.Federation.Inbox void Record(Receipt receipt, InboxResult result, int latencyMs) { - if (_ledger == default || result == default) + if (ledger == default || result == default) return; var verified = receipt.VerifiedActor != default; - _ledger.Record(new InteractionEvent + ledger.Record(new InteractionEvent { Channel = Interactions.Receive, Host = verified ? Interactions.HostOf(receipt.VerifiedActor) : receipt.ClaimedHost, @@ -111,6 +100,7 @@ namespace PrivaPub.Federation.Inbox }, verified ? receipt.VerifiedActor : default, hostClaimed: !verified && !receipt.Blocked); } + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0007", Justification = "ActivityPub servers retry a 503 with Retry-After when the signing key cannot be fetched yet; a 4XX would make them drop the activity.")] async Task Receive(HttpRequest request, LocalActor recipient, Receipt receipt, CancellationToken token) { if (request.ContentLength > MaxBodyBytes) @@ -123,7 +113,7 @@ namespace PrivaPub.Federation.Inbox var body = buffer.ToArray(); receipt.Bytes = body.Length; - JsonNode activity; + var activity = default(JsonNode); try { activity = JsonNode.Parse(body); @@ -149,10 +139,10 @@ namespace PrivaPub.Federation.Inbox return new(StatusCodes.Status401Unauthorized, "missing or unreadable Signature header", Reason: "no-signature"); receipt.Signature = signature.Scheme; receipt.ClaimedHost ??= HostOf(signature.KeyId); - if (_domainBlocks.IsSuspended(HostOf(signature.KeyId)) || _domainBlocks.IsSuspended(HostOf(actorUri))) + if (domainBlocks.IsSuspended(HostOf(signature.KeyId)) || domainBlocks.IsSuspended(HostOf(actorUri))) { receipt.Blocked = true; - receipt.ClaimedHost = _domainBlocks.IsSuspended(HostOf(actorUri)) ? HostOf(actorUri) : HostOf(signature.KeyId); + receipt.ClaimedHost = domainBlocks.IsSuspended(HostOf(actorUri)) ? HostOf(actorUri) : HostOf(signature.KeyId); return new(StatusCodes.Status202Accepted, Reason: "suspended"); } @@ -160,14 +150,14 @@ namespace PrivaPub.Federation.Inbox if (requestProblem != default) return new(StatusCodes.Status401Unauthorized, requestProblem, Reason: HttpSignatures.ProblemCode(requestProblem)); - var signed = signature.Signed(request, _localActors.BaseAddress); - var keyOwner = await _remoteActors.GetActorByKeyId(signature.KeyId, refresh: false, token); + var signed = signature.Signed(request, localActors.BaseAddress); + var keyOwner = await remoteActors.GetActorByKeyId(signature.KeyId, refresh: false, token); if (keyOwner == default && type == "Delete" && Id(activity["object"]) == actorUri) return new(StatusCodes.Status202Accepted, Reason: "self-delete-unknown-key"); if (keyOwner == default || !signature.VerifiedBy(keyOwner.PublicKey, signed)) { - keyOwner = await _remoteActors.GetActorByKeyId(signature.KeyId, refresh: true, token); - if (keyOwner == default && _remoteActors.KeyTemporarilyUnavailable(signature.KeyId)) + keyOwner = await remoteActors.GetActorByKeyId(signature.KeyId, refresh: true, token); + if (keyOwner == default && remoteActors.KeyTemporarilyUnavailable(signature.KeyId)) return new(StatusCodes.Status503ServiceUnavailable, "the signing key could not be fetched; try again later", KeyRetrySeconds, "key-unavailable"); if (keyOwner == default || !signature.VerifiedBy(keyOwner.PublicKey, signed)) return new(StatusCodes.Status401Unauthorized, "the signature does not verify", Reason: "signature-invalid"); @@ -178,7 +168,7 @@ namespace PrivaPub.Federation.Inbox receipt.VerifiedActor = keyOwner.ActorURI; var forwardedBy = string.Equals(keyOwner.ActorURI, actorUri, StringComparison.Ordinal) ? default : keyOwner.ActorURI; // (ours come back too, Friendica forwarding our comments in its threads: we know them already) - if (forwardedBy != default && (!Forwarded.Takeable(type, activity, actorUri) || Origin.Same(actorUri, _localActors.BaseAddress))) + if (forwardedBy != default && (!Forwarded.Takeable(type, activity, actorUri) || Origin.Same(actorUri, localActors.BaseAddress))) return new(StatusCodes.Status202Accepted, Reason: "forwarded-ignored"); var shapeProblem = await ShapeProblem(type, activity, actorUri, token); @@ -193,21 +183,21 @@ namespace PrivaPub.Federation.Inbox var dedupe = activityId == default ? default : (forwardedBy == default ? "inbox|" : "inbox|forwarded|") + activityId; var queuedPayload = JsonSerializer.Serialize(payload); var host = new Uri(actorUri).Host.ToLowerInvariant(); - var queued = await _queue.Enqueue(JobKind.ProcessInbox, queuedPayload, host, dedupe, token); + var queued = await queue.Enqueue(JobKind.ProcessInbox, queuedPayload, host, dedupe, token); // one id its sender gave two activities is no duplicate (Friendica's ids are uniqid(), a prefix and the // microsecond, which two of its processes answering at once share): what each carries tells them apart, and a // true copy carries the same - if (!queued && dedupe != default && CarriesOther(await _queue.Payload(dedupe, token), activity)) - queued = await _queue.Enqueue(JobKind.ProcessInbox, queuedPayload, host, $"{dedupe}|{Digest(activity)}", token); + if (!queued && dedupe != default && CarriesOther(await queue.Payload(dedupe, token), activity)) + queued = await queue.Enqueue(JobKind.ProcessInbox, queuedPayload, host, $"{dedupe}|{Digest(activity)}", token); // an Undo of a Follow that comes again while the follow it ends exists again is meant for that follow: Mastodon // gives every Undo it sends after reading a roll-call (FEP-8fcf) one id, `{actor}#follows//undo`. It is kept // once per follow, so a retry still counts as a copy if (!queued && dedupe != default && type == "Undo" && await FollowAgain(activity, actorUri, token) is { } follow) - queued = await _queue.Enqueue(JobKind.ProcessInbox, queuedPayload, host, $"{dedupe}|{Digest(activity)}|{follow}", token); + queued = await queue.Enqueue(JobKind.ProcessInbox, queuedPayload, host, $"{dedupe}|{Digest(activity)}|{follow}", token); // FEP-8fcf: what the sender says of its followers here (FollowingSynchronization) if (queued && forwardedBy == default && FollowersSynchronization.Claim(actorUri, request.Headers[FollowersSynchronization.Header].ToString()) is { } claim) - await _queue.Enqueue(JobKind.SynchronizeFollowing, JsonSerializer.Serialize(claim), host, FollowingSynchronization.DedupeKey(claim, activityId), token); - _logger.LogInformation("Inbox {Recipient}: {Type} from {Actor} queued", recipient?.Handle ?? "shared", type, actorUri); + await queue.Enqueue(JobKind.SynchronizeFollowing, JsonSerializer.Serialize(claim), host, FollowingSynchronization.DedupeKey(claim, activityId), token); + logger.LogInformation("Inbox {Recipient}: {Type} from {Actor} queued", recipient?.Handle ?? "shared", type, actorUri); return new(StatusCodes.Status202Accepted, Reason: !queued ? "duplicate" : forwardedBy != default ? "forwarded" : "queued"); } @@ -215,7 +205,7 @@ namespace PrivaPub.Federation.Inbox async Task FollowAgain(JsonNode activity, string actorUri, CancellationToken token) { if (activity["object"] is not JsonObject inner || Value(inner, "type") != "Follow" || Id(inner["object"]) is not { } targetUri - || await _localActors.FindByUri(targetUri, token) is not { } target) + || await localActors.FindByUri(targetUri, token) is not { } target) return default; var follower = await MongoDB.Entities.DB.Default.Find() .Match(f => f.ActorURI == actorUri && f.LocalActorId == target.Id && f.LocalActorKind == target.Kind) @@ -244,7 +234,7 @@ namespace PrivaPub.Federation.Inbox var activityId = Id(activity); // (Funkwhale names its answer after the activity it answers: `/accept`) if (activityId != default && !Origin.Same(activityId, actorUri) - && !(type is "Accept" or "Reject" && Id(activity["object"]) is { } answered && Origin.Same(answered, _localActors.BaseAddress) + && !(type is "Accept" or "Reject" && Id(activity["object"]) is { } answered && Origin.Same(answered, localActors.BaseAddress) && activityId.StartsWith(answered + "/", StringComparison.Ordinal))) return new(StatusCodes.Status400BadRequest, "the activity's id is not on its actor's origin", Reason: "id-cross-origin"); @@ -253,7 +243,7 @@ namespace PrivaPub.Federation.Inbox { case "Follow": // (by its actor's id, or the profile page Forte names instead) - var target = await _localActors.FindByAddress(Id(inner), token); + var target = await localActors.FindByAddress(Id(inner), token); if (target is not { IsFederated: true } || target.IsServerActor) return new(StatusCodes.Status404NotFound, "no such local actor", Reason: "unknown-recipient"); break; diff --git a/PrivaPub/Federation/Inbox/RemotePosts.cs b/PrivaPub/Federation/Inbox/RemotePosts.cs index dfb104e..60938a3 100644 --- a/PrivaPub/Federation/Inbox/RemotePosts.cs +++ b/PrivaPub/Federation/Inbox/RemotePosts.cs @@ -31,29 +31,17 @@ namespace PrivaPub.Federation.Inbox Task StoreContext(string objectUri, int depth, CancellationToken token); } - public class RemotePosts : IRemotePosts + public class RemotePosts( + DbEntities dbEntities, + ILocalActorService localActorService, + IRemoteActorService remoteActors, + IDomainBlocks domainBlockList, + IJobQueue queue, + IObjectRecords records, + ILinkPreviews previews) : IRemotePosts { public const int MaxDepth = 10; - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - readonly IRemoteActorService _remoteActors; - readonly IDomainBlocks _domainBlocks; - readonly IJobQueue _queue; - readonly IObjectRecords _records; - readonly ILinkPreviews _previews; - - public RemotePosts(DbEntities dbEntities, ILocalActorService localActors, IRemoteActorService remoteActors, IDomainBlocks domainBlocks, - IJobQueue queue, IObjectRecords records, ILinkPreviews previews) - { - _previews = previews; - _records = records; - _dbEntities = dbEntities; - _localActors = localActors; - _remoteActors = remoteActors; - _domainBlocks = domainBlocks; - _queue = queue; - } // The accounts a remote post names (its Mention tags), plus our personas it is addressed to without naming them: Mastodon // keeps those as silent mentions, and Akkoma's to[], or an edit that dropped the @name, address someone that way. A @@ -81,7 +69,7 @@ namespace PrivaPub.Federation.Inbox public async Task Build(NoteDocument note, ForeignAvatar author, PostVisibility visibility, IReadOnlyList to, IReadOnlyList cc, PostEntity parent, CancellationToken token) { - var mentions = await Mentions(note, to.Concat(cc), _localActors, token); + var mentions = await Mentions(note, to.Concat(cc), localActorService, token); var post = new PostEntity { @@ -127,7 +115,7 @@ namespace PrivaPub.Federation.Inbox Language = note.Language, Mentions = mentions, Tags = note.Tags.ToList(), - Media = _domainBlocks.Find(new Uri(author.ActorURI).Host)?.RejectMedia == true ? new() : note.Attachments.ToList(), + Media = domainBlockList.Find(new Uri(author.ActorURI).Host)?.RejectMedia == true ? new() : note.Attachments.ToList(), InReplyToURI = note.InReplyTo, AnsweringToPostId = parent?.ID, InReplyToAccountId = parent?.AuthorAccountId ?? parent?.GroupUserId, @@ -135,7 +123,7 @@ namespace PrivaPub.Federation.Inbox AuthorGone = author.AccountState == AvatarAccountState.Deleted, // the staff's moderation of its author or its server (R6), as AccountModeration sets it on what came before AuthorSuspended = author.SuspendedAt.HasValue, - AuthorLimited = Limited(author, _domainBlocks), + AuthorLimited = Limited(author, domainBlockList), CreationDate = note.Published, UpdateDate = note.Updated ?? note.Published, EditedAt = note.Updated, @@ -172,7 +160,7 @@ namespace PrivaPub.Federation.Inbox if (links.Count != 1 || links[0] == note.Id || !Origin.Same(links[0], author.ActorURI)) return; using var scope = HttpScope.For("object"); - using var fetched = await _remoteActors.FetchObject(links[0], token); + using var fetched = await remoteActors.FetchObject(links[0], token); var episode = fetched == default ? default : NoteParser.Parse(JsonNode.Parse(fetched.Root.GetRawText())); if (episode is not { Type: "PodcastEpisode" } || episode.AttributedTo != author.ActorURI) return; @@ -187,33 +175,33 @@ namespace PrivaPub.Federation.Inbox { if (string.IsNullOrEmpty(inReplyTo)) return default; - var known = await _dbEntities.Posts.Match(p => p.ObjectURI == inReplyTo && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); - if (known != default || inReplyTo.StartsWith(_localActors.BaseAddress + "/", StringComparison.OrdinalIgnoreCase)) + var known = await dbEntities.Posts.Match(p => p.ObjectURI == inReplyTo && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); + if (known != default || inReplyTo.StartsWith(localActorService.BaseAddress + "/", StringComparison.OrdinalIgnoreCase)) return known; return await StoreContext(inReplyTo, depth, token); } public async Task StoreContext(string objectUri, int depth, CancellationToken token) { - var existing = await _dbEntities.Posts.Match(p => p.ObjectURI == objectUri).ExecuteFirstAsync(token); + var existing = await dbEntities.Posts.Match(p => p.ObjectURI == objectUri).ExecuteFirstAsync(token); if (existing != default || depth > MaxDepth || await DB.Default.Find().Match(d => d.ObjectURI == objectUri).ExecuteAnyAsync(token)) return existing; using var scope = HttpScope.For("context"); - using var fetched = await _remoteActors.FetchObject(objectUri, token); + using var fetched = await remoteActors.FetchObject(objectUri, token); var note = fetched == default ? default : NoteParser.Parse(JsonNode.Parse(fetched.Root.GetRawText())); if (note == default || !Origin.Same(note.Id, note.AttributedTo)) return default; var visibility = Addressing.Classify(note.To, note.Cc, default); if (visibility is not (PostVisibility.Public or PostVisibility.Unlisted)) return default; - var author = await _remoteActors.GetActor(note.AttributedTo, refresh: false, token); + var author = await remoteActors.GetActor(note.AttributedTo, refresh: false, token); if (author == default) return default; var grandparent = string.IsNullOrEmpty(note.InReplyTo) ? default - : await _dbEntities.Posts.Match(p => p.ObjectURI == note.InReplyTo && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); + : await dbEntities.Posts.Match(p => p.ObjectURI == note.InReplyTo && !p.DeletedAt.HasValue).ExecuteFirstAsync(token); var post = await Build(note, author, visibility, note.To, note.Cc, grandparent, token); try { @@ -221,29 +209,22 @@ namespace PrivaPub.Federation.Inbox } catch (MongoWriteException ex) when (ex.WriteError?.Category == ServerErrorCategory.DuplicateKey) { - return await _dbEntities.Posts.Match(p => p.ObjectURI == objectUri).ExecuteFirstAsync(token); + return await dbEntities.Posts.Match(p => p.ObjectURI == objectUri).ExecuteFirstAsync(token); } - await _records.Record(note, post, ObjectPath.Fetched, refetched: false, token); - await _previews.Wanted(post, token); + await records.Record(note, post, ObjectPath.Fetched, refetched: false, token); + await previews.Wanted(post, token); if (grandparent == default && !string.IsNullOrEmpty(note.InReplyTo) && depth < MaxDepth) - await _queue.Enqueue(JobKind.FetchAncestors, JsonSerializer.Serialize(new AncestorsPayload(post.ID, depth + 1)), new Uri(note.InReplyTo).Host, + await queue.Enqueue(JobKind.FetchAncestors, JsonSerializer.Serialize(new AncestorsPayload(post.ID, depth + 1)), new Uri(note.InReplyTo).Host, "ancestors|" + post.ID, token); return post; } } - public class AncestorsJobHandler : IJobHandler + public class AncestorsJobHandler( + DbEntities dbEntities, + IRemotePosts remotePosts) : IJobHandler { - readonly DbEntities _dbEntities; - readonly IRemotePosts _remotePosts; - - public AncestorsJobHandler(DbEntities dbEntities, IRemotePosts remotePosts) - { - _dbEntities = dbEntities; - _remotePosts = remotePosts; - } - public JobKind Kind => JobKind.FetchAncestors; public int Concurrency => 1; public int MaxAttempts => 3; @@ -252,11 +233,11 @@ namespace PrivaPub.Federation.Inbox public async Task Handle(Job job, CancellationToken token) { var payload = JsonSerializer.Deserialize(job.Payload); - var child = await _dbEntities.Posts.MatchID(payload.PostId).ExecuteFirstAsync(token); + var child = await dbEntities.Posts.MatchID(payload.PostId).ExecuteFirstAsync(token); if (child == default || string.IsNullOrEmpty(child.InReplyToURI) || !string.IsNullOrEmpty(child.AnsweringToPostId)) return JobOutcome.Done; - var parent = await _remotePosts.Parent(child.InReplyToURI, payload.Depth, token); + var parent = await remotePosts.Parent(child.InReplyToURI, payload.Depth, token); if (parent == default) return JobOutcome.Done; await DB.Default.Update().MatchID(child.ID) diff --git a/PrivaPub/Federation/Inbox/RemoteReplies.cs b/PrivaPub/Federation/Inbox/RemoteReplies.cs index 9abf5dd..b1ae58f 100644 --- a/PrivaPub/Federation/Inbox/RemoteReplies.cs +++ b/PrivaPub/Federation/Inbox/RemoteReplies.cs @@ -27,7 +27,11 @@ namespace PrivaPub.Federation.Inbox // replies' own, two levels down. Read with the instance actor's signature, never a persona's, a few pages and at most // MaxItems posts a job; each one is fetched from its own server and stored like any post fetched for a thread // (RemotePosts.StoreContext: public and unlisted only, its author checked against its origin). - public class RepliesJobHandler : IJobHandler + public class RepliesJobHandler( + DbEntities dbEntities, + IRemoteActorService remoteActors, + IRemotePosts remotePosts, + IJobQueue queue) : IJobHandler { public const int MaxPages = 5; public const int MaxItems = 100; @@ -39,18 +43,6 @@ namespace PrivaPub.Federation.Inbox "Collection", "OrderedCollection", "CollectionPage", "OrderedCollectionPage" }; - readonly DbEntities _dbEntities; - readonly IRemoteActorService _remoteActors; - readonly IRemotePosts _remotePosts; - readonly IJobQueue _queue; - - public RepliesJobHandler(DbEntities dbEntities, IRemoteActorService remoteActors, IRemotePosts remotePosts, IJobQueue queue) - { - _dbEntities = dbEntities; - _remoteActors = remoteActors; - _remotePosts = remotePosts; - _queue = queue; - } public JobKind Kind => JobKind.FetchReplies; public int Concurrency => 2; @@ -69,7 +61,7 @@ namespace PrivaPub.Federation.Inbox public async Task Handle(Job job, CancellationToken token) { var payload = JsonSerializer.Deserialize(job.Payload); - var post = await _dbEntities.Posts.MatchID(payload.PostId).ExecuteFirstAsync(token); + var post = await dbEntities.Posts.MatchID(payload.PostId).ExecuteFirstAsync(token); if (post is not { IsFederatedCopy: true, Visibility: PostVisibility.Public or PostVisibility.Unlisted } || post.DeletedAt.HasValue || string.IsNullOrEmpty(post.ObjectURI)) return JobOutcome.Done; @@ -80,7 +72,7 @@ namespace PrivaPub.Federation.Inbox { var uri = Id(document[name]); // Forte's `context` is the thread's first post - if (uri != default && await _dbEntities.Posts.Match(p => p.ObjectURI == uri).ExecuteAnyAsync(token)) + if (uri != default && await dbEntities.Posts.Match(p => p.ObjectURI == uri).ExecuteAnyAsync(token)) continue; var known = uri == default ? default : await DB.Default.Find().Match(c => c.URI == uri).ExecuteFirstAsync(token); var (thread, etag, unchanged) = await Collection(document[name], known?.ETag, token); @@ -106,7 +98,7 @@ namespace PrivaPub.Federation.Inbox return JobOutcome.Done; var (answers, _) = await StoreAll(replies, false, token); if (payload.Depth < MaxDepth) - await _queue.EnqueueMany(answers.Where(a => a.IsFederatedCopy && a.AnsweringToPostId == post.ID).Take(MaxBranches) + await queue.EnqueueMany(answers.Where(a => a.IsFederatedCopy && a.AnsweringToPostId == post.ID).Take(MaxBranches) .Select(a => For(a, payload.Depth + 1)), token); return JobOutcome.Done; } @@ -119,7 +111,7 @@ namespace PrivaPub.Federation.Inbox if (record != default) return JsonNode.Parse(record.Raw) as JsonObject; using var scope = HttpScope.For("replies"); - using var fetched = await _remoteActors.FetchObject(post.ObjectURI, token); + using var fetched = await remoteActors.FetchObject(post.ObjectURI, token); return fetched == default ? default : JsonNode.Parse(fetched.Root.GetRawText()) as JsonObject; } @@ -133,7 +125,7 @@ namespace PrivaPub.Federation.Inbox if (uri != default && Uri.TryCreate(uri, UriKind.Absolute, out var parsed) && (parsed.Scheme == Uri.UriSchemeHttps || parsed.Scheme == Uri.UriSchemeHttp)) { using var scope = HttpScope.For("replies"); - using var fetched = await _remoteActors.FetchObject(uri, etag, token); + using var fetched = await remoteActors.FetchObject(uri, etag, token); if (fetched?.NotModified == true) return (default, etag, true); node = fetched == default ? default : JsonNode.Parse(fetched.Root.GetRawText()); @@ -160,8 +152,8 @@ namespace PrivaPub.Federation.Inbox var id = activities ? await Added(item, token) : PostId(item); if (id == default) continue; - var post = await _dbEntities.Posts.Match(p => p.ObjectURI == id && !p.DeletedAt.HasValue).ExecuteFirstAsync(token) - ?? await _remotePosts.StoreContext(id, 0, token); + var post = await dbEntities.Posts.Match(p => p.ObjectURI == id && !p.DeletedAt.HasValue).ExecuteFirstAsync(token) + ?? await remotePosts.StoreContext(id, 0, token); if (post != default) posts.Add(post); } @@ -200,7 +192,7 @@ namespace PrivaPub.Federation.Inbox if (node is JsonValue && Id(node) is { } uri) { using var scope = HttpScope.For("replies"); - using var fetched = await _remoteActors.FetchObject(uri, token); + using var fetched = await remoteActors.FetchObject(uri, token); node = fetched == default ? default : JsonNode.Parse(fetched.Root.GetRawText()); } return node as JsonObject; diff --git a/PrivaPub/Federation/Inbox/ReplyRelay.cs b/PrivaPub/Federation/Inbox/ReplyRelay.cs index 189c069..5ab3f13 100644 --- a/PrivaPub/Federation/Inbox/ReplyRelay.cs +++ b/PrivaPub/Federation/Inbox/ReplyRelay.cs @@ -37,7 +37,7 @@ namespace PrivaPub.Federation.Inbox var replier = Interactions.HostOf(reply.ActorURI); var inboxes = (await delivery.FollowerInboxes(owner, token)).Where(i => Interactions.HostOf(i) != replier).ToList(); if (inboxes.Count > 0) - await delivery.Enqueue(owner, inboxes, activity, token); + await delivery.Enqueue(owner, inboxes, activity, token: token); } } } diff --git a/PrivaPub/Federation/Moderation/DomainBlocks.cs b/PrivaPub/Federation/Moderation/DomainBlocks.cs index 9c5276f..1c00693 100644 --- a/PrivaPub/Federation/Moderation/DomainBlocks.cs +++ b/PrivaPub/Federation/Moderation/DomainBlocks.cs @@ -11,20 +11,15 @@ namespace PrivaPub.Federation.Moderation Task Reload(CancellationToken token); } - public class DomainBlocks : IDomainBlocks + public class DomainBlocks( + ILogger logger) : IDomainBlocks { static readonly TimeSpan Staleness = TimeSpan.FromMinutes(5); - readonly ILogger _logger; IReadOnlyDictionary _blocks = new Dictionary(); DateTime _loadedAt = DateTime.MinValue; int _reloading; - public DomainBlocks(ILogger logger) - { - _logger = logger; - } - public static string Normalise(string domain) => domain?.Trim().Trim('.').ToLowerInvariant(); public DomainBlock Find(string host) @@ -67,7 +62,7 @@ namespace PrivaPub.Federation.Moderation } catch (Exception ex) { - _logger.LogWarning(ex, "Domain blocks could not be reloaded"); + logger.LogWarning(ex, "Domain blocks could not be reloaded"); } finally { diff --git a/PrivaPub/Federation/Objects/InstanceDescriber.cs b/PrivaPub/Federation/Objects/InstanceDescriber.cs index 9736d57..4dcfc85 100644 --- a/PrivaPub/Federation/Objects/InstanceDescriber.cs +++ b/PrivaPub/Federation/Objects/InstanceDescriber.cs @@ -11,31 +11,22 @@ using System.Text.Json; namespace PrivaPub.Federation.Objects { - public class InstanceDescriber : IJobHandler + public class InstanceDescriber( + IFederationHttp federationHttp, + IGeoLocator geoLocator = default, + IConnectedAddresses addresses = default, + ICdnRanges cdnRanges = default, + IEdgeHints edgeHints = default) : IJobHandler { const int MaxRawChars = 64 * 1024; - readonly IFederationHttp _http; - readonly IGeoLocator _geo; - readonly IConnectedAddresses _addresses; - readonly ICdnRanges _cdnRanges; - readonly IEdgeHints _edges; - - public InstanceDescriber(IFederationHttp http, IGeoLocator geo = default, IConnectedAddresses addresses = default, ICdnRanges cdnRanges = default, - IEdgeHints edges = default) - { - _http = http; - _geo = geo; - _addresses = addresses; - _cdnRanges = cdnRanges; - _edges = edges; - } public JobKind Kind => JobKind.DescribeInstance; public int Concurrency => 1; public int MaxAttempts => 2; public int PerHostLimit => 1; + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0011", Justification = "An ISO week key such as 2026-W05, not a number shown to a reader.")] public static string Week(DateTime at) => $"{ISOWeek.GetYear(at)}-W{ISOWeek.GetWeekOfYear(at):00}"; public static string DedupeKey(string host, DateTime at) => $"describe|{host}|{ISOWeek.GetYear(at)}-{ISOWeek.GetWeekOfYear(at)}"; @@ -54,18 +45,19 @@ namespace PrivaPub.Federation.Objects public async Task Describe(string host, bool crawled, Func allowed, CancellationToken token) { allowed ??= _ => true; - NodeInfoFacts facts = default; - string rawNodeInfo = default, error; + var facts = default(NodeInfoFacts); + var rawNodeInfo = default(string); + var error = default(string); using (HttpScope.For("nodeinfo")) { error = allowed("/.well-known/nodeinfo") ? "no NodeInfo" : "robots.txt disallows NodeInfo"; using var links = allowed("/.well-known/nodeinfo") - ? await _http.GetJson(Address($"https://{host}/.well-known/nodeinfo"), "application/json", sign: default, token) + ? await federationHttp.GetJson(Address($"https://{host}/.well-known/nodeinfo"), "application/json", sign: default, token) : default; var (href, version) = links == default ? default : InstanceDocuments.NodeInfoLink(links.Root); if (href != default && allowed(new Uri(href).AbsolutePath)) { - using var nodeInfo = await _http.GetJson(Address(href), "application/json", sign: default, token); + using var nodeInfo = await federationHttp.GetJson(Address(href), "application/json", sign: default, token); if (nodeInfo != default) { facts = InstanceDocuments.NodeInfo(nodeInfo.Root, version); @@ -78,7 +70,7 @@ namespace PrivaPub.Federation.Objects // no NodeInfo: NodeInfo2, Castopod's if (facts == default && allowed("/.well-known/x-nodeinfo2")) { - using var nodeInfo2 = await _http.GetJson(Address($"https://{host}/.well-known/x-nodeinfo2"), "application/json", sign: default, token); + using var nodeInfo2 = await federationHttp.GetJson(Address($"https://{host}/.well-known/x-nodeinfo2"), "application/json", sign: default, token); if (nodeInfo2 != default && InstanceDocuments.NodeInfo2(nodeInfo2.Root) is { } second) { facts = second; @@ -96,7 +88,7 @@ namespace PrivaPub.Federation.Objects { if (!allowed(path)) continue; - using var document = await _http.GetJson(Address($"https://{host}{path}"), "application/json", sign: default, token); + using var document = await federationHttp.GetJson(Address($"https://{host}{path}"), "application/json", sign: default, token); if (document == default || document.Root.ValueKind != JsonValueKind.Object) continue; api = InstanceDocuments.InstanceApi(document.Root); @@ -182,9 +174,9 @@ namespace PrivaPub.Federation.Objects InstanceGeo Locate(string host) { var reachedHost = new Uri(Address($"https://{host}/")).Host; - var reached = _addresses?.Of(reachedHost); - var fix = reached == default ? default : _geo?.Locate(reached); - var (cdn, cdnSource) = Cdn(reached, reachedHost, fix?.Asn, _cdnRanges, _edges); + var reached = addresses?.Of(reachedHost); + var fix = reached == default ? default : geoLocator?.Locate(reached); + var (cdn, cdnSource) = Cdn(reached, reachedHost, fix?.Asn, cdnRanges, edgeHints); if (fix == default && cdn == default) return default; return new InstanceGeo @@ -199,7 +191,7 @@ namespace PrivaPub.Federation.Objects CdnDomain = cdn?.Domain, CdnSource = cdnSource, Ipv6 = reached?.AddressFamily == AddressFamily.InterNetworkV6, - Source = _geo?.Source, + Source = geoLocator?.Source, LocatedAt = DateTime.UtcNow }; } diff --git a/PrivaPub/Federation/Objects/InstanceDocuments.cs b/PrivaPub/Federation/Objects/InstanceDocuments.cs index bc515e2..5e86a06 100644 --- a/PrivaPub/Federation/Objects/InstanceDocuments.cs +++ b/PrivaPub/Federation/Objects/InstanceDocuments.cs @@ -102,7 +102,7 @@ namespace PrivaPub.Federation.Objects public static InstanceApiFacts InstanceApi(JsonElement root) { var registrations = root.ValueKind == JsonValueKind.Object && root.TryGetProperty("registrations", out var r) ? r : default; - string mode; + var mode = default(string); if (registrations.ValueKind == JsonValueKind.Object) mode = Flag(registrations, "enabled") switch { @@ -147,7 +147,7 @@ namespace PrivaPub.Federation.Objects { if (parent.ValueKind != JsonValueKind.Object || !parent.TryGetProperty(name, out var value)) return default; - long? number = value.ValueKind switch + var number = value.ValueKind switch { JsonValueKind.Number when value.TryGetInt64(out var whole) => whole, JsonValueKind.Number when value.TryGetDouble(out var real) && real is >= 0 and < MaxCount => (long)real, diff --git a/PrivaPub/Federation/Objects/NoteParser.cs b/PrivaPub/Federation/Objects/NoteParser.cs index 3c29299..1bbef54 100644 --- a/PrivaPub/Federation/Objects/NoteParser.cs +++ b/PrivaPub/Federation/Objects/NoteParser.cs @@ -41,6 +41,7 @@ namespace PrivaPub.Federation.Objects public PostSource Source { get; init; } public PostPoll Poll { get; init; } public List Flairs { get; init; } = new(); + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0006", Justification = "Null when the note does not state searchableBy (FEP-268d), which is not the same as an empty list.")] public List SearchableBy { get; init; } public InteractionRule QuotePolicy { get; init; } public InteractionRule ReplyPolicy { get; init; } diff --git a/PrivaPub/Federation/Objects/ObjectRecords.cs b/PrivaPub/Federation/Objects/ObjectRecords.cs index c1c8217..fd4188a 100644 --- a/PrivaPub/Federation/Objects/ObjectRecords.cs +++ b/PrivaPub/Federation/Objects/ObjectRecords.cs @@ -21,15 +21,13 @@ namespace PrivaPub.Federation.Objects Task Revise(NoteDocument note, string activityId, CancellationToken token); } - public class ObjectRecords : IObjectRecords + public class ObjectRecords( + IJobQueue queue) : IObjectRecords { public const int MaxRawBytes = 256 * 1024; const int MaxRevisions = 10; static readonly TimeSpan DescriptionAge = TimeSpan.FromDays(7); - readonly IJobQueue _queue; - - public ObjectRecords(IJobQueue queue) => _queue = queue; public async Task Record(NoteDocument note, PostEntity post, ObjectPath path, bool refetched, CancellationToken token) { @@ -99,7 +97,7 @@ namespace PrivaPub.Federation.Objects var known = await DB.Default.Find().Match(i => i.Host == host).ExecuteFirstAsync(token); if (known?.DescribedAt > DateTime.UtcNow - DescriptionAge) return; - await _queue.Enqueue(JobKind.DescribeInstance, host, host, InstanceDescriber.DedupeKey(host, DateTime.UtcNow), token); + await queue.Enqueue(JobKind.DescribeInstance, host, host, InstanceDescriber.DedupeKey(host, DateTime.UtcNow), token); } public static (string Text, string Hash, int Bytes, bool Truncated) Capture(JsonNode raw) diff --git a/PrivaPub/Federation/Outbox/DeliveryService.cs b/PrivaPub/Federation/Outbox/DeliveryService.cs index ba72a52..18126d7 100644 --- a/PrivaPub/Federation/Outbox/DeliveryService.cs +++ b/PrivaPub/Federation/Outbox/DeliveryService.cs @@ -25,24 +25,17 @@ namespace PrivaPub.Federation.Outbox { // again: a delivery made once more on purpose, which an earlier one of the same activity does not stop; deliveries // with the same again are made once - Task Enqueue(LocalActor signer, IEnumerable inboxes, JsonObject activity, CancellationToken token, string again = default); - Task EnqueueToFollowers(LocalActor signer, JsonObject activity, CancellationToken token, IEnumerable extraInboxes = default); + Task Enqueue(LocalActor signer, IEnumerable inboxes, JsonObject activity, string again = default, CancellationToken token = default); + Task EnqueueToFollowers(LocalActor signer, JsonObject activity, IEnumerable extraInboxes = default, CancellationToken token = default); Task> FollowerInboxes(LocalActor actor, CancellationToken token); } public sealed record DeliveryPayload(string SignerId, LocalActorKind SignerKind, string Inbox, string Body); - public class DeliveryService : IDeliveryService + public class DeliveryService( + DbEntities dbEntities, + IJobQueue queue) : IDeliveryService { - readonly DbEntities _dbEntities; - readonly IJobQueue _queue; - - public DeliveryService(DbEntities dbEntities, IJobQueue queue) - { - _dbEntities = dbEntities; - _queue = queue; - } - // what the staff's moderation holds back (completion program R6): a suspended persona (by itself or with its banned // login) delivers nothing, but the Delete of itself, which its deletion sends; and nothing goes to the own inbox of an // account elsewhere the staff suspended (its server's shared inbox still serves the others there) @@ -52,7 +45,7 @@ namespace PrivaPub.Federation.Outbox static bool DeletesItself(LocalActor signer, JsonNode activity) => ActivityJson.Value(activity, "type") == "Delete" && ActivityJson.Id(activity?["object"]) == signer.Uri; - public async Task Enqueue(LocalActor signer, IEnumerable inboxes, JsonObject activity, CancellationToken token, string again = default) + public async Task Enqueue(LocalActor signer, IEnumerable inboxes, JsonObject activity, string again = default, CancellationToken token = default) { if (HeldBack(signer, activity)) return; @@ -90,18 +83,18 @@ namespace PrivaPub.Federation.Outbox }) .ToList(); if (jobs.Count > 0) - await _queue.EnqueueMany(jobs, token); + await queue.EnqueueMany(jobs, token); } - public async Task EnqueueToFollowers(LocalActor signer, JsonObject activity, CancellationToken token, IEnumerable extraInboxes = default) + public async Task EnqueueToFollowers(LocalActor signer, JsonObject activity, IEnumerable extraInboxes = default, CancellationToken token = default) { var inboxes = (await FollowerInboxes(signer, token)).Concat(extraInboxes ?? Enumerable.Empty()); - await Enqueue(signer, inboxes, activity, token); + await Enqueue(signer, inboxes, activity, token: token); } public async Task> FollowerInboxes(LocalActor actor, CancellationToken token) { - var followers = await _dbEntities.Followers + var followers = await dbEntities.Followers .Match(f => f.LocalActorId == actor.Id && f.LocalActorKind == actor.Kind && f.IsAccepted) .ExecuteAsync(token); return followers.Select(f => string.IsNullOrEmpty(f.SharedInboxURL) ? f.InboxURL : f.SharedInboxURL) @@ -110,26 +103,16 @@ namespace PrivaPub.Federation.Outbox } } - public class DeliveryJobHandler : IJobHandler + public class DeliveryJobHandler( + ILocalActorService actors, + IFederationHttp http, + IHostCircuitBreaker breaker, + ILogger logger, + IInteractionLedger ledger = default, + Microsoft.Extensions.Options.IOptionsMonitor federation = default) : IJobHandler { - readonly ILocalActorService _actors; - readonly IFederationHttp _http; - readonly IHostCircuitBreaker _breaker; - readonly ILogger _logger; - readonly IInteractionLedger _ledger; + readonly int _concurrency = Math.Max(1, federation?.CurrentValue.DeliveryConcurrency ?? 8); - readonly int _concurrency; - - public DeliveryJobHandler(ILocalActorService actors, IFederationHttp http, IHostCircuitBreaker breaker, ILogger logger, - IInteractionLedger ledger = default, Microsoft.Extensions.Options.IOptions federation = default) - { - _concurrency = Math.Max(1, federation?.Value.DeliveryConcurrency ?? 8); - _actors = actors; - _http = http; - _breaker = breaker; - _logger = logger; - _ledger = ledger; - } sealed class Attempt { @@ -162,10 +145,10 @@ namespace PrivaPub.Federation.Outbox void Record(Job job, Attempt attempt, JobOutcome outcome) { - if (_ledger == default) + if (ledger == default) return; var shape = attempt.Payload == default ? default : ActivityShape.Of(attempt.Payload.Body); - _ledger.Record(new InteractionEvent + ledger.Record(new InteractionEvent { Channel = Interactions.Out, Host = job.Host, @@ -215,20 +198,20 @@ namespace PrivaPub.Federation.Outbox { var payload = JsonSerializer.Deserialize(job.Payload); attempt.Payload = payload; - if (payload == default || !Uri.TryCreate(payload.Inbox, UriKind.Absolute, out var inbox) || !_http.IsAllowed(inbox)) + if (payload == default || !Uri.TryCreate(payload.Inbox, UriKind.Absolute, out var inbox) || !http.IsAllowed(inbox)) { attempt.Reason = "not-deliverable"; return JobOutcome.Dead("not a deliverable inbox"); } - var unavailableUntil = await _breaker.UnavailableUntil(job.Host, token); + var unavailableUntil = await breaker.UnavailableUntil(job.Host, token); if (unavailableUntil.HasValue) { attempt.Reason = "host-unavailable"; return JobOutcome.Defer(unavailableUntil.Value, "the host is unavailable"); } - var signer = await _actors.FindById(payload.SignerKind, payload.SignerId, token); + var signer = await actors.FindById(payload.SignerKind, payload.SignerId, token); attempt.Signer = signer; if (signer == default) { @@ -255,14 +238,14 @@ namespace PrivaPub.Federation.Outbox var started = Stopwatch.GetTimestamp(); try { - using var response = await _http.Send(request, token); + using var response = await http.Send(request, token); attempt.LatencyMs = (int)Stopwatch.GetElapsedTime(started).TotalMilliseconds; var status = (int)response.StatusCode; attempt.Status = status; attempt.Reason = response.IsSuccessStatusCode ? default : status.ToString(System.Globalization.CultureInfo.InvariantCulture); if (response.IsSuccessStatusCode) { - await _breaker.Succeeded(job.Host, token); + await breaker.Succeeded(job.Host, token); return JobOutcome.Done; } if (response.StatusCode == HttpStatusCode.TooManyRequests @@ -280,15 +263,15 @@ namespace PrivaPub.Federation.Outbox return JobOutcome.Retry($"{status} {response.ReasonPhrase}"); if (status is >= 400 and < 500 && status != 408) { - await _breaker.Succeeded(job.Host, token); - _logger.LogInformation("Delivery to {Inbox} refused with {Status}", payload.Inbox, status); + await breaker.Succeeded(job.Host, token); + logger.LogInformation("Delivery to {Inbox} refused with {Status}", payload.Inbox, status); return JobOutcome.Dead($"{status} {response.ReasonPhrase}"); } // a gateway's 502, 503 or 504 says the server behind it is down, which counts against the host; any other 5xx // says the server is up and failed on this activity (Smithereen's 500 on a document its JSON-LD reader // refused), retried on its own while the host's other deliveries go on if (status is 502 or 503 or 504) - await _breaker.Failed(job.Host, $"{status}", token); + await breaker.Failed(job.Host, $"{status}", token); return JobOutcome.Retry($"{status} {response.ReasonPhrase}"); } catch (BlockedDestinationException ex) @@ -300,7 +283,7 @@ namespace PrivaPub.Federation.Outbox { attempt.LatencyMs = (int)Stopwatch.GetElapsedTime(started).TotalMilliseconds; attempt.Reason = ex is TaskCanceledException ? "timeout" : "network"; - await _breaker.Failed(job.Host, ex.GetType().Name, token); + await breaker.Failed(job.Host, ex.GetType().Name, token); return JobOutcome.Retry(ex.Message); } } diff --git a/PrivaPub/Federation/Outbox/GroupDistributor.cs b/PrivaPub/Federation/Outbox/GroupDistributor.cs index 828e641..3b99f95 100644 --- a/PrivaPub/Federation/Outbox/GroupDistributor.cs +++ b/PrivaPub/Federation/Outbox/GroupDistributor.cs @@ -16,7 +16,8 @@ namespace PrivaPub.Federation.Outbox Task Announce(LocalActor group, JsonObject activity, string objectUri, bool isNewPost, CancellationToken token); } - public class GroupDistributor : IGroupDistributor + public class GroupDistributor( + IDeliveryService delivery) : IGroupDistributor { // so the announce's id resolves (PeasantsController.Grunt); a repeat of the same announce keeps the first // a remote author's server's inbox (its shared one when it has one); none for our own personas @@ -48,12 +49,6 @@ namespace PrivaPub.Federation.Outbox } } - readonly IDeliveryService _delivery; - - public GroupDistributor(IDeliveryService delivery) - { - _delivery = delivery; - } public async Task Announce(LocalActor group, JsonObject activity, string objectUri, bool isNewPost, CancellationToken token) { @@ -78,14 +73,14 @@ namespace PrivaPub.Federation.Outbox // its user's post pending until the community announces it back, and clears that before it answers the echo 400 // ("Object is not remote"). var authorsServer = await AuthorsInbox(activity, token); - await _delivery.EnqueueToFollowers(group, announce, token, authorsServer); + await delivery.EnqueueToFollowers(group, announce, authorsServer, token); await Keep(group, announce, objectUri, token); // a new post or comment is also boosted as itself: microblogs (Mastodon, Akkoma, Misskey) drop an Announce of an // activity, so without it their members never see what is said in the community; Lemmy answers it 400, harmlessly if (isNewPost && !string.IsNullOrEmpty(objectUri)) { var boost = ActivityPubRenderer.Announce(group, objectUri, $"announce-object-{key}"); - await _delivery.EnqueueToFollowers(group, boost, token, authorsServer); + await delivery.EnqueueToFollowers(group, boost, authorsServer, token); await Keep(group, boost, objectUri, token); } } diff --git a/PrivaPub/Federation/Outbox/OutboxPublisher.cs b/PrivaPub/Federation/Outbox/OutboxPublisher.cs index ed06fea..65ad5c6 100644 --- a/PrivaPub/Federation/Outbox/OutboxPublisher.cs +++ b/PrivaPub/Federation/Outbox/OutboxPublisher.cs @@ -23,21 +23,12 @@ namespace PrivaPub.Federation.Outbox Task PublishFeatured(string personaId, PostEntity post, bool featured, CancellationToken token); } - public class OutboxPublisher : IOutboxPublisher + public class OutboxPublisher( + DbEntities dbEntities, + ILocalActorService localActors, + IDeliveryService delivery, + Relays.IRelays relays = default) : IOutboxPublisher { - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - readonly IDeliveryService _delivery; - readonly Relays.IRelays _relays; - - public OutboxPublisher(DbEntities dbEntities, ILocalActorService localActors, IDeliveryService delivery, Relays.IRelays relays = default) - { - _relays = relays; - _dbEntities = dbEntities; - _localActors = localActors; - _delivery = delivery; - } - public async Task> Audience(LocalActor author, PostEntity post, CancellationToken token) { if (post.Visibility == PostVisibility.LocalGeo || post.IsLocalOnly) @@ -47,7 +38,7 @@ namespace PrivaPub.Federation.Outbox var inboxes = new List(); if (post.Visibility is PostVisibility.Public or PostVisibility.Unlisted or PostVisibility.FollowersOnly) - inboxes.AddRange(await _delivery.FollowerInboxes(author, token)); + inboxes.AddRange(await delivery.FollowerInboxes(author, token)); //nothing is addressed to an account that blocked the author (it would refuse it, and Mastodon counts on that) var blockers = (await DB.Default.Find().Match(b => b.AvatarId == author.Id).ExecuteAsync(token)) @@ -61,23 +52,23 @@ namespace PrivaPub.Federation.Outbox .ToList(); foreach (var uri in addressed) { - var actor = await _dbEntities.ForeignAvatars.Match(a => a.ActorURI == uri).ExecuteFirstAsync(token); + var actor = await dbEntities.ForeignAvatars.Match(a => a.ActorURI == uri).ExecuteFirstAsync(token); if (Preferred(actor) is { } inbox) inboxes.Add(inbox); } if (post.Visibility != PostVisibility.Direct && !string.IsNullOrEmpty(post.InReplyToAccountId)) { - var parentAuthor = await _dbEntities.ForeignAvatars.MatchID(post.InReplyToAccountId).ExecuteFirstAsync(token); + var parentAuthor = await dbEntities.ForeignAvatars.MatchID(post.InReplyToAccountId).ExecuteFirstAsync(token); if (Preferred(parentAuthor) is { } inbox && !blockers.Contains(parentAuthor.ActorURI) && !parentAuthor.SuspendedAt.HasValue) inboxes.Add(inbox); } if (post.Visibility is PostVisibility.Public or PostVisibility.Unlisted && !string.IsNullOrEmpty(post.QuotedPostId)) { - var quoted = await _dbEntities.Posts.MatchID(post.QuotedPostId).ExecuteFirstAsync(token); + var quoted = await dbEntities.Posts.MatchID(post.QuotedPostId).ExecuteFirstAsync(token); var quotedAuthor = quoted is { IsFederatedCopy: true } - ? await _dbEntities.ForeignAvatars.Match(a => a.ActorURI == quoted.ActorURI).ExecuteFirstAsync(token) + ? await dbEntities.ForeignAvatars.Match(a => a.ActorURI == quoted.ActorURI).ExecuteFirstAsync(token) : default; if (Preferred(quotedAuthor) is { } inbox && !quotedAuthor.SuspendedAt.HasValue) inboxes.Add(inbox); @@ -86,9 +77,9 @@ namespace PrivaPub.Federation.Outbox // a persona's own public post, outside any group, also goes to the relays we subscribe to (owner decision // 2026-10-06), its edits and deletion with it; a silenced persona's never does (R6): the relays are where strangers // read - if (_relays != default && post.Visibility == PostVisibility.Public && author.Kind == LocalActorKind.Person + if (relays != default && post.Visibility == PostVisibility.Public && author.Kind == LocalActorKind.Person && string.IsNullOrEmpty(post.ReblogOfPostId) && string.IsNullOrEmpty(post.GroupId) && !post.AuthorLimited && !author.Silenced) - inboxes.AddRange(await _relays.Inboxes(token)); + inboxes.AddRange(await relays.Inboxes(token)); return inboxes.Where(i => !string.IsNullOrEmpty(i)).Distinct(StringComparer.Ordinal).ToList(); } @@ -104,13 +95,13 @@ namespace PrivaPub.Federation.Outbox async Task> CircleRecipients(string groupId, CancellationToken token) { - var circle = string.IsNullOrEmpty(groupId) ? default : await _dbEntities.Groups.MatchID(groupId).ExecuteFirstAsync(token); + var circle = string.IsNullOrEmpty(groupId) ? default : await dbEntities.Groups.MatchID(groupId).ExecuteFirstAsync(token); if (circle == default) return Array.Empty(); var remote = circle.Members.Where(m => m.IsForeign).Select(m => m.AvatarId).ToList(); if (remote.Count == 0) return Array.Empty(); - return (await _dbEntities.ForeignAvatars.Match(a => remote.Contains(a.ActorURI)).ExecuteAsync(token)) + return (await dbEntities.ForeignAvatars.Match(a => remote.Contains(a.ActorURI)).ExecuteAsync(token)) .Where(a => !string.IsNullOrEmpty(a.InboxURL)) .ToList(); } @@ -120,19 +111,19 @@ namespace PrivaPub.Federation.Outbox if (post.Visibility == PostVisibility.Circle) { foreach (var member in await CircleRecipients(post.GroupId, token)) - await _delivery.Enqueue(author, new[] { member.InboxURL }, Naming(activity, new[] { member }), token); + await delivery.Enqueue(author, new[] { member.InboxURL }, Naming(activity, new[] { member }), token: token); return; } var inboxes = await Audience(author, post, token); if (inboxes.Count > 0) - await _delivery.Enqueue(author, inboxes, activity, token); + await delivery.Enqueue(author, inboxes, activity, token: token); } // a persona pins its post or unpins it: Add or Remove on its featured collection (/trophies, which serves the same // pins), told to the post's audience as Mastodon tells it public async Task PublishFeatured(string personaId, PostEntity post, bool featured, CancellationToken token) { - var author = await _localActors.FindById(LocalActorKind.Person, personaId, token); + var author = await localActors.FindById(LocalActorKind.Person, personaId, token); if (author is not { IsFederated: true } || post.IsLocalOnly) return; await Publish(author, post, new JsonObject @@ -150,7 +141,7 @@ namespace PrivaPub.Federation.Outbox public async Task PublishUpdate(LocalActor author, PostEntity post, string reason, CancellationToken token) { - var group = string.IsNullOrEmpty(post.GroupId) ? default : await _localActors.FindById(LocalActorKind.Group, post.GroupId, token); + var group = string.IsNullOrEmpty(post.GroupId) ? default : await localActors.FindById(LocalActorKind.Group, post.GroupId, token); await Publish(author, post, ActivityPubRenderer.UpdateOf(post, author, group, reason), token); } @@ -206,7 +197,7 @@ namespace PrivaPub.Federation.Outbox ["cc"] = new JsonArray(actor.Followers), ["object"] = document }; - await _delivery.EnqueueToFollowers(actor, update, token); + await delivery.EnqueueToFollowers(actor, update, token: token); } } } diff --git a/PrivaPub/Federation/Relays/Relays.cs b/PrivaPub/Federation/Relays/Relays.cs index ba6f3dc..fc309e7 100644 --- a/PrivaPub/Federation/Relays/Relays.cs +++ b/PrivaPub/Federation/Relays/Relays.cs @@ -33,31 +33,21 @@ namespace PrivaPub.Federation.Relays // subscribes, and takes what they pass on: public posts, forwarded as their authors sent them (read again from their // origin, as any forwarded post) or announced by the relay. A persona's public posts go to the relays that accepted us // (owner decision 2026-10-06), as Mastodon sends them; nothing else of a persona's does. - public class Relays : IRelays + public class Relays( + IOptionsMonitor options, + IRemoteActorService remoteActors, + ILocalActorService localActors, + IDeliveryService delivery, + Domain.Instance.IInstanceSettings instanceSettings) : IRelays { static readonly TimeSpan AskAgain = TimeSpan.FromDays(1); - readonly IOptions _options; - readonly IRemoteActorService _remoteActors; - readonly ILocalActorService _localActors; - readonly IDeliveryService _delivery; - readonly Domain.Instance.IInstanceSettings _settings; readonly SemaphoreSlim _reconciling = new(1, 1);//the hourly round and the administrator's page, one at a time volatile HashSet _accepted; - public Relays(IOptions options, IRemoteActorService remoteActors, ILocalActorService localActors, IDeliveryService delivery, - Domain.Instance.IInstanceSettings settings) - { - _options = options; - _remoteActors = remoteActors; - _localActors = localActors; - _delivery = delivery; - _settings = settings; - } + public IReadOnlyList Configured => Clean(options.CurrentValue.Relays); - public IReadOnlyList Configured => Clean(_options.Value.Relays); - - public IReadOnlyList Named => Clean(Configured.Concat(_settings.Current.Relays ?? new())); + public IReadOnlyList Named => Clean(Configured.Concat(instanceSettings.Current.Relays ?? new())); static List Clean(IEnumerable addresses) => (addresses ?? Array.Empty()).Where(r => !string.IsNullOrWhiteSpace(r)).Select(r => r.Trim()).Distinct(StringComparer.Ordinal).ToList(); @@ -84,12 +74,12 @@ namespace PrivaPub.Federation.Relays var known = await DB.Default.Find().ExecuteAsync(token); if (configured.Count == 0 && known.Count == 0) return; - var instance = await _localActors.GetInstanceActor(token); + var instance = await localActors.GetInstanceActor(token); var kept = known.Where(k => configured.Contains(k.Configured)).Select(k => k.ActorURI).Where(a => a != default).ToHashSet(StringComparer.Ordinal); foreach (var gone in known.Where(k => !configured.Contains(k.Configured))) { if (gone.State != RelayState.Rejected && !string.IsNullOrEmpty(gone.InboxURL) && !kept.Contains(gone.ActorURI)) - await _delivery.Enqueue(instance, new[] { gone.InboxURL }, Undo(instance, gone.FollowActivityURI), token); + await delivery.Enqueue(instance, new[] { gone.InboxURL }, Undo(instance, gone.FollowActivityURI), token: token); await DB.Default.DeleteAsync(gone.ID); } _accepted = default; @@ -109,7 +99,7 @@ namespace PrivaPub.Federation.Relays subscription.RequestedAt = DateTime.UtcNow; subscription.AnsweredAt = default; await DB.Default.SaveAsync(subscription, token); - await _delivery.Enqueue(instance, new[] { relay.InboxURL }, Follow(instance, subscription.FollowActivityURI), token); + await delivery.Enqueue(instance, new[] { relay.InboxURL }, Follow(instance, subscription.FollowActivityURI), token: token); } _accepted = default; } @@ -150,10 +140,10 @@ namespace PrivaPub.Federation.Relays // the relay's actor, from its address or, for a relay named by its inbox, from the /actor beside it async Task Resolve(string address, CancellationToken token) { - var actor = await _remoteActors.GetActor(address, refresh: false, token); + var actor = await remoteActors.GetActor(address, refresh: false, token); if (actor != default || !address.EndsWith("/inbox", StringComparison.Ordinal)) return actor; - return await _remoteActors.GetActor(address[..^"/inbox".Length] + "/actor", refresh: false, token); + return await remoteActors.GetActor(address[..^"/inbox".Length] + "/actor", refresh: false, token); } static JsonObject Follow(LocalActor instance, string id) => new() diff --git a/PrivaPub/Federation/Signing/HttpSignatures.cs b/PrivaPub/Federation/Signing/HttpSignatures.cs index 95cca1f..74079c9 100644 --- a/PrivaPub/Federation/Signing/HttpSignatures.cs +++ b/PrivaPub/Federation/Signing/HttpSignatures.cs @@ -68,7 +68,7 @@ namespace PrivaPub.Federation.Signing break; var key = header[i..equals].Trim(); i = equals + 1; - string value; + var value = default(string); if (i < header.Length && header[i] == '"') { var close = header.IndexOf('"', i + 1); @@ -89,7 +89,7 @@ namespace PrivaPub.Federation.Signing if (!values.TryGetValue("keyId", out var keyId) || !values.TryGetValue("signature", out var signature)) return default; - byte[] signatureBytes; + var signatureBytes = default(byte[]); try { signatureBytes = Convert.FromBase64String(signature); diff --git a/PrivaPub/Federation/Signing/MessageSignatures.cs b/PrivaPub/Federation/Signing/MessageSignatures.cs index 1e830f8..4de2f93 100644 --- a/PrivaPub/Federation/Signing/MessageSignatures.cs +++ b/PrivaPub/Federation/Signing/MessageSignatures.cs @@ -35,7 +35,7 @@ namespace PrivaPub.Federation.Signing var parameters = Parameters(value[(close + 1)..]); if (!parameters.TryGetValue("keyid", out var keyId) || bytes.Length < 2 || bytes[0] != ':' || bytes[^1] != ':') continue; - byte[] decoded; + var decoded = default(byte[]); try { decoded = Convert.FromBase64String(bytes[1..^1]); diff --git a/PrivaPub/Federation/Signing/SignedFetchAuthorizer.cs b/PrivaPub/Federation/Signing/SignedFetchAuthorizer.cs index 8983cc2..59a3376 100644 --- a/PrivaPub/Federation/Signing/SignedFetchAuthorizer.cs +++ b/PrivaPub/Federation/Signing/SignedFetchAuthorizer.cs @@ -20,20 +20,11 @@ namespace PrivaPub.Federation.Signing // a DM or a circle post refetches it, signed by the account it was for or by its instance actor, and Mastodon deletes its // copy when the refetch answers 404. So the post is served to a signed request from someone it was for, or from the // instance actor of a server where someone it was for lives; everyone else still gets 404. - public class SignedFetchAuthorizer : ISignedFetchAuthorizer + public class SignedFetchAuthorizer( + IRemoteActorService remoteActors, + DbEntities dbEntities, + ILocalActorService localActors = default) : ISignedFetchAuthorizer { - readonly IRemoteActorService _remoteActors; - readonly DbEntities _dbEntities; - - readonly ILocalActorService _localActors; - - public SignedFetchAuthorizer(IRemoteActorService remoteActors, DbEntities dbEntities, ILocalActorService localActors = default) - { - _remoteActors = remoteActors; - _dbEntities = dbEntities; - _localActors = localActors; - } - // the actor whose signature (draft-cavage, or RFC 9421 when there is a base address to check its target against) // verifies on the request public async Task Requester(HttpRequest request, CancellationToken token) @@ -41,11 +32,11 @@ namespace PrivaPub.Federation.Signing var signature = RequestSignature.Of(request); if (signature == default || signature.Problem(request, body: default) != default) return default; - var signed = signature.Signed(request, _localActors?.BaseAddress ?? $"{request.Scheme}://{request.Host}"); - var actor = await _remoteActors.GetActorByKeyId(signature.KeyId, refresh: false, token); + var signed = signature.Signed(request, localActors?.BaseAddress ?? $"{request.Scheme}://{request.Host}"); + var actor = await remoteActors.GetActorByKeyId(signature.KeyId, refresh: false, token); if (actor != default && signature.VerifiedBy(actor.PublicKey, signed)) return actor; - actor = await _remoteActors.GetActorByKeyId(signature.KeyId, refresh: true, token); + actor = await remoteActors.GetActorByKeyId(signature.KeyId, refresh: true, token); return actor != default && signature.VerifiedBy(actor.PublicKey, signed) ? actor : default; } @@ -58,14 +49,14 @@ namespace PrivaPub.Federation.Signing case PostVisibility.Public or PostVisibility.Unlisted: return true; case PostVisibility.Circle: - var circle = string.IsNullOrEmpty(post.GroupId) ? default : await _dbEntities.Groups.MatchID(post.GroupId).ExecuteFirstAsync(token); + var circle = string.IsNullOrEmpty(post.GroupId) ? default : await dbEntities.Groups.MatchID(post.GroupId).ExecuteFirstAsync(token); return circle != default && MayReadCircle(circle, requester); case PostVisibility.Direct: return Addressed(post).Any(uri => Is(requester, uri)); case PostVisibility.FollowersOnly: if (Addressed(post).Any(uri => Is(requester, uri))) return true; - var followers = await _dbEntities.Followers + var followers = await dbEntities.Followers .Match(f => f.LocalActorId == post.GroupUserId && f.LocalActorKind == LocalActorKind.Person && f.IsAccepted) .ExecuteAsync(token); return followers.Any(f => Is(requester, f.ActorURI)); diff --git a/PrivaPub/Infrastructure/Backup/MaintenanceLock.cs b/PrivaPub/Infrastructure/Backup/MaintenanceLock.cs index 71e9b46..90e8146 100644 --- a/PrivaPub/Infrastructure/Backup/MaintenanceLock.cs +++ b/PrivaPub/Infrastructure/Backup/MaintenanceLock.cs @@ -54,12 +54,13 @@ namespace PrivaPub.Infrastructure.Backup public sealed class Held : IAsyncDisposable { - readonly string _owner; readonly Timer _heartbeat; + string Owner { get; } + public Held(string owner) { - _owner = owner; + Owner = owner; _heartbeat = new Timer(_ => _ = DB.Default.Update().Match(l => l.ID == Name && l.Owner == owner) .Modify(l => l.Heartbeat, DateTime.UtcNow).ExecuteAsync(), default, Beat, Beat); } @@ -67,7 +68,7 @@ namespace PrivaPub.Infrastructure.Backup public async ValueTask DisposeAsync() { await _heartbeat.DisposeAsync(); - await DB.Default.Update().Match(l => l.ID == Name && l.Owner == _owner) + await DB.Default.Update().Match(l => l.ID == Name && l.Owner == Owner) .Modify(l => l.Owner, null).Modify(l => l.Heartbeat, DateTime.MinValue).ExecuteAsync(); } } diff --git a/PrivaPub/Infrastructure/Backup/TransferStore.cs b/PrivaPub/Infrastructure/Backup/TransferStore.cs index 6dd3eb6..eb618ad 100644 --- a/PrivaPub/Infrastructure/Backup/TransferStore.cs +++ b/PrivaPub/Infrastructure/Backup/TransferStore.cs @@ -101,7 +101,7 @@ namespace PrivaPub.Infrastructure.Backup file.Seek(offset, SeekOrigin.Begin); var buffer = new byte[81920]; var total = 0L; - int read; + var read = default(int); while ((read = await piece.ReadAsync(buffer, token)) > 0) { total += read; diff --git a/PrivaPub/Infrastructure/Cli/AdminCommands.cs b/PrivaPub/Infrastructure/Cli/AdminCommands.cs index 7a261e1..edc38a2 100644 --- a/PrivaPub/Infrastructure/Cli/AdminCommands.cs +++ b/PrivaPub/Infrastructure/Cli/AdminCommands.cs @@ -41,36 +41,36 @@ namespace PrivaPub.Infrastructure.Cli /// Whether a command runs before migrations: backups are of the database as it was. public static bool BeforeMigrations(string[] args) => args is ["backup", ..] or ["backups"] or ["restore", ..]; - public static async Task Run(string[] args, IServiceProvider services, TextReader input = default, TextWriter output = default) + public static async Task Run(string[] args, IServiceProvider services, TextReader input = default, TextWriter output = default, CancellationToken token = default) { input ??= Console.In; output ??= Console.Out; switch (args) { case [("promote" or "demote") and var verb, var userName]: - return await Role(services, userName, verb == "promote" ? RootRole.Admin : RootRole.User, output); + return await Role(services, userName, verb == "promote" ? RootRole.Admin : RootRole.User, output, token: token); case ["role", var userName, var role] when RootUser.TryParseRole(role, out var parsed): - return await Role(services, userName, parsed, output); + return await Role(services, userName, parsed, output, token: token); case ["create-root", var login, .. var flags] when flags.All(f => f == "--admin"): - return await CreateRoot(services, login, input.ReadLine(), flags.Contains("--admin"), output); + return await CreateRoot(services, login, input.ReadLine(), flags.Contains("--admin"), output, token); case ["move-persona", var persona, var root]: - return await MovePersona(services, persona, root, output); + return await MovePersona(services, persona, root, output, token); case ["delete-root", var root]: - return await DeleteRoot(services, root, output); + return await DeleteRoot(services, root, output, token); case ["reset-totp", var root]: - return await ResetTotp(services, root, output); + return await ResetTotp(services, root, output, token); case ["media", "audit", .. var flags] when flags.All(f => f == "--fix"): - return await AuditMedia(services, flags.Contains("--fix"), output); + return await AuditMedia(services, flags.Contains("--fix"), output, token); case ["backup", "verify", var id]: - return await VerifyBackup(services, id, output); + return await VerifyBackup(services, id, output, token); case ["backup", .. var flags] when BackupFlags(flags, out var kind, out var dbOnly): - return await BackUp(services, kind, dbOnly, output); + return await BackUp(services, kind, dbOnly, output, token); case ["backups"]: return ListBackups(services, output); case ["restore", "--status"]: - return await RestoreStatus(services, output); + return await RestoreStatus(services, output, token); case ["restore", var id] when !id.StartsWith('-'): - return await Restore(services, id, output); + return await Restore(services, id, output, token); default: Console.Error.WriteLine(Usage); return 2; @@ -98,7 +98,7 @@ namespace PrivaPub.Infrastructure.Cli return true; } - static async Task BackUp(IServiceProvider services, string kind, bool dbOnly, TextWriter output) + static async Task BackUp(IServiceProvider services, string kind, bool dbOnly, TextWriter output, CancellationToken token = default) { var (made, error) = await services.GetRequiredService().Create(kind, dbOnly, CancellationToken.None); if (made == default) @@ -123,7 +123,7 @@ namespace PrivaPub.Infrastructure.Cli return 0; } - static async Task VerifyBackup(IServiceProvider services, string id, TextWriter output) + static async Task VerifyBackup(IServiceProvider services, string id, TextWriter output, CancellationToken token = default) { var problems = await services.GetRequiredService().Verify(id, CancellationToken.None); foreach (var problem in problems) @@ -134,7 +134,7 @@ namespace PrivaPub.Infrastructure.Cli return 0; } - static async Task Restore(IServiceProvider services, string id, TextWriter output) + static async Task Restore(IServiceProvider services, string id, TextWriter output, CancellationToken token = default) { var backups = services.GetRequiredService(); var refused = await ServerRestore.Request(backups.Context(), id, "cli", CancellationToken.None); @@ -143,18 +143,18 @@ namespace PrivaPub.Infrastructure.Cli Console.Error.WriteLine(refused); return 1; } - await Log(services, AdminActions.BackupRestore, AdminTargets.Backup, id, id); + await Log(services, AdminActions.BackupRestore, AdminTargets.Backup, id, id, token: token); output.WriteLine($"{id} will be restored: the running service stops within seconds and restores it when it starts again"); output.WriteLine("(systemd starts it again; follow it with journalctl -u privapub, then PrivaPub admin restore --status)"); return 0; } - static async Task RestoreStatus(IServiceProvider services, TextWriter output) + static async Task RestoreStatus(IServiceProvider services, TextWriter output, CancellationToken token = default) { var waiting = RestoreMarker.Read(services.GetRequiredService().Root); if (waiting != default) output.WriteLine($"waiting: {waiting.Backup}, {waiting.State}, attempt {waiting.Attempts} of {RestoreMarker.MaxAttempts}, asked by {waiting.RequestedBy} at {waiting.RequestedAt:u}{(waiting.Error == default ? string.Empty : $": {waiting.Error}")}"); - var last = await DB.Default.Find().Sort(r => r.RestoredAt, Order.Descending).ExecuteFirstAsync(); + var last = await DB.Default.Find().Sort(r => r.RestoredAt, Order.Descending).ExecuteFirstAsync(token); if (last == default) { if (waiting == default) @@ -177,7 +177,7 @@ namespace PrivaPub.Infrastructure.Cli static string Names(List names) => names.Count == 0 ? "none" : string.Join(", ", names); - static async Task AuditMedia(IServiceProvider services, bool fix, TextWriter output) + static async Task AuditMedia(IServiceProvider services, bool fix, TextWriter output, CancellationToken token = default) { var report = await Domain.Media.MediaAudit.Run(services.GetRequiredService(), fix, CancellationToken.None); output.WriteLine($"{report.Files} files served, {report.Held} rows holding media"); @@ -194,15 +194,15 @@ namespace PrivaPub.Infrastructure.Cli // every act below is kept in the staff's log as the command line's ("cli"): a login's by its name alone, a persona's // without the login it went to - static Task Log(IServiceProvider services, string action, string kind, string id, string label, string note = default) => - services.GetRequiredService().Write(AdminAction.Cli, action, kind, id, label, note: note); + static Task Log(IServiceProvider services, string action, string kind, string id, string label, string note = default, CancellationToken token = default) => + services.GetRequiredService().Write(AdminAction.Cli, action, kind, id, label, note: note, token: token); // The command line is the way back, so it may leave the server without an administrator (the client's route refuses // to); it says so, and `role admin` gives one back. - static async Task Role(IServiceProvider services, string userName, RootRole role, TextWriter output, bool created = false) + static async Task Role(IServiceProvider services, string userName, RootRole role, TextWriter output, bool created = false, CancellationToken token = default) { userName = userName.ToLowerInvariant(); - var user = await DB.Default.Find().Match(u => u.UserName == userName && u.DeletedAt == null).ExecuteFirstAsync(); + var user = await DB.Default.Find().Match(u => u.UserName == userName && u.DeletedAt == null).ExecuteFirstAsync(token); if (user == default) { Console.Error.WriteLine($"no root user '{userName}'"); @@ -211,17 +211,17 @@ namespace PrivaPub.Infrastructure.Cli var was = user.Role; user.SetRole(role); - await DB.Default.Update().MatchID(user.ID).Modify(u => u.Policies, user.Policies).Modify(u => u.UpdatedAt, user.UpdatedAt).ExecuteAsync(); + await DB.Default.Update().MatchID(user.ID).Modify(u => u.Policies, user.Policies).Modify(u => u.UpdatedAt, user.UpdatedAt).ExecuteAsync(token); if (role == RootRole.Admin) await ServerSetup.Seal(user.ID, default);//an administrator exists: the client's setup is closed if (!created && was != role) await Log(services, role == RootRole.Admin && was == RootRole.User ? AdminActions.RootPromote : role == RootRole.User && was == RootRole.Admin ? AdminActions.RootDemote - : AdminActions.RootRole, AdminTargets.Root, user.ID, userName, $"{Name(was)} → {Name(role)}"); + : AdminActions.RootRole, AdminTargets.Root, user.ID, userName, $"{Name(was)} → {Name(role)}", token); output.WriteLine($"{userName}: {string.Join(", ", user.Policies)}"); if (was == RootRole.Admin && role != RootRole.Admin - && !await DB.Default.Find().Match(u => u.DeletedAt == null && !u.IsBanned && u.Policies.Contains(Policies.IsAdmin)).ExecuteAnyAsync()) + && !await DB.Default.Find().Match(u => u.DeletedAt == null && !u.IsBanned && u.Policies.Contains(Policies.IsAdmin)).ExecuteAnyAsync(token)) Console.Error.WriteLine("no administrator is left: `PrivaPub admin role admin` makes one"); return 0; } @@ -230,7 +230,7 @@ namespace PrivaPub.Infrastructure.Cli // With sign-up closed, this or the client's setup (while no administrator exists) makes the first root; group invitations // make the rest. - static async Task CreateRoot(IServiceProvider services, string login, string password, bool admin, TextWriter output) + static async Task CreateRoot(IServiceProvider services, string login, string password, bool admin, TextWriter output, CancellationToken token = default) { var form = new LoginForm { UserName = login, Password = password?.Trim() }; var problems = new List(); @@ -239,18 +239,18 @@ namespace PrivaPub.Infrastructure.Cli Console.Error.WriteLine(string.Join(Environment.NewLine, problems.Select(p => p.ErrorMessage))); return 1; } - var created = await services.GetRequiredService().SignUpAsync(form); + var created = await services.GetRequiredService().SignUpAsync(form, token); if (!created.IsValid) { Console.Error.WriteLine(created.ErrorMessage); return 1; } - var made = await DB.Default.Find().Match(u => u.UserName == login.ToLowerInvariant()).ExecuteFirstAsync(); - await Log(services, AdminActions.RootCreate, AdminTargets.Root, made?.ID, login.ToLowerInvariant(), admin ? "administrator" : default); - return admin ? await Role(services, login, RootRole.Admin, output, created: true) : await Report(login, output); + var made = await DB.Default.Find().Match(u => u.UserName == login.ToLowerInvariant()).ExecuteFirstAsync(token); + await Log(services, AdminActions.RootCreate, AdminTargets.Root, made?.ID, login.ToLowerInvariant(), admin ? "administrator" : default, token); + return admin ? await Role(services, login, RootRole.Admin, output, created: true, token) : await Report(login, output, token); } - static Task Report(string login, TextWriter output) + static Task Report(string login, TextWriter output, CancellationToken token = default) { output.WriteLine($"{login.ToLowerInvariant()}: created"); return Task.FromResult(0); @@ -259,23 +259,23 @@ namespace PrivaPub.Infrastructure.Cli // A persona given to another login (owner decision 2026-10-17, made for @thepra): its link moves first, so the old // login can no longer exchange a token for it, then its Mastodon tokens and authorizations end. Its actor, posts and // followers stay as they are, and nobody outside is told: nothing they hold changes. - static async Task MovePersona(IServiceProvider services, string personaName, string login, TextWriter output) + static async Task MovePersona(IServiceProvider services, string personaName, string login, TextWriter output, CancellationToken token = default) { personaName = personaName.TrimStart('@').ToLowerInvariant(); login = login.ToLowerInvariant(); - var persona = await DB.Default.Find().Match(a => a.UserName == personaName && !a.DeletionAt.HasValue).ExecuteFirstAsync(); + var persona = await DB.Default.Find().Match(a => a.UserName == personaName && !a.DeletionAt.HasValue).ExecuteFirstAsync(token); if (persona == default) { Console.Error.WriteLine($"no persona '@{personaName}'"); return 1; } - var root = await DB.Default.Find().Match(u => u.UserName == login).ExecuteFirstAsync(); + var root = await DB.Default.Find().Match(u => u.UserName == login).ExecuteFirstAsync(token); if (root == default || root.DeletedAt.HasValue || root.IsBanned) { Console.Error.WriteLine($"no root user '{login}' that can take it"); return 1; } - var link = await DB.Default.Find().Match(ra => ra.AvatarId == persona.ID).ExecuteFirstAsync(); + var link = await DB.Default.Find().Match(ra => ra.AvatarId == persona.ID).ExecuteFirstAsync(token); if (link == default) { Console.Error.WriteLine($"'@{personaName}' belongs to no login"); @@ -287,52 +287,52 @@ namespace PrivaPub.Infrastructure.Cli return 0; } - await DB.Default.Update().MatchID(link.ID).Modify(ra => ra.RootId, root.ID).ExecuteAsync(); - await services.GetRequiredService().RevokeBySubjectAsync(persona.ID); - await services.GetRequiredService().RevokeBySubjectAsync(persona.ID); - await Domain.Social.WebPush.Forget(new[] { persona.ID });//its Web Push subscriptions go with its tokens (R9) - await Log(services, AdminActions.PersonaMove, AdminTargets.Persona, persona.ID, "@" + personaName, "moved to another login"); + await DB.Default.Update().MatchID(link.ID).Modify(ra => ra.RootId, root.ID).ExecuteAsync(token); + await services.GetRequiredService().RevokeBySubjectAsync(persona.ID, token); + await services.GetRequiredService().RevokeBySubjectAsync(persona.ID, token); + await Domain.Social.WebPush.Forget(new[] { persona.ID }, token);//its Web Push subscriptions go with its tokens (R9) + await Log(services, AdminActions.PersonaMove, AdminTargets.Persona, persona.ID, "@" + personaName, "moved to another login", token); output.WriteLine($"@{personaName}: moved to {login}"); return 0; } // The way back for a login that lost its authenticator and its recovery codes: its two-factor sign-in goes, its // password stays. - static async Task ResetTotp(IServiceProvider services, string login, TextWriter output) + static async Task ResetTotp(IServiceProvider services, string login, TextWriter output, CancellationToken token = default) { login = login.ToLowerInvariant(); - var root = await DB.Default.Find().Match(u => u.UserName == login && u.DeletedAt == null).ExecuteFirstAsync(); - var updated = root == default ? default : await DB.Default.Update().MatchID(root.ID).Modify(u => u.Totp, null).ExecuteAsync(); + var root = await DB.Default.Find().Match(u => u.UserName == login && u.DeletedAt == null).ExecuteFirstAsync(token); + var updated = root == default ? default : await DB.Default.Update().MatchID(root.ID).Modify(u => u.Totp, null).ExecuteAsync(token); if (updated == default || updated.MatchedCount == 0) { Console.Error.WriteLine($"no root user '{login}'"); return 1; } - await Log(services, AdminActions.RootResetTotp, AdminTargets.Root, root.ID, login); + await Log(services, AdminActions.RootResetTotp, AdminTargets.Root, root.ID, login, token: token); output.WriteLine($"{login}: two-factor sign-in is off"); return 0; } // A login deleted from the box as the client deletes its own (RootRemoval): every persona it still has goes with it, // announced deleted, and its sessions end. - static async Task DeleteRoot(IServiceProvider services, string login, TextWriter output) + static async Task DeleteRoot(IServiceProvider services, string login, TextWriter output, CancellationToken token = default) { login = login.ToLowerInvariant(); - var root = await DB.Default.Find().Match(u => u.UserName == login && u.DeletedAt == null).ExecuteFirstAsync(); + var root = await DB.Default.Find().Match(u => u.UserName == login && u.DeletedAt == null).ExecuteFirstAsync(token); if (root == default) { Console.Error.WriteLine($"no root user '{login}'"); return 1; } - var owned = (await DB.Default.Find().Match(ra => ra.RootId == root.ID).ExecuteAsync()).Select(ra => ra.AvatarId).ToList(); - var personas = (await DB.Default.Find().Match(a => owned.Contains(a.ID) && !a.DeletionAt.HasValue).ExecuteAsync()) + var owned = (await DB.Default.Find().Match(ra => ra.RootId == root.ID).ExecuteAsync(token)).Select(ra => ra.AvatarId).ToList(); + var personas = (await DB.Default.Find().Match(a => owned.Contains(a.ID) && !a.DeletionAt.HasValue).ExecuteAsync(token)) .Select(a => "@" + a.UserName).ToList(); if (!await services.GetRequiredService().Remove(root.ID, default)) { Console.Error.WriteLine($"'{login}' could not be deleted"); return 1; } - await Log(services, AdminActions.RootDelete, AdminTargets.Root, root.ID, login); + await Log(services, AdminActions.RootDelete, AdminTargets.Root, root.ID, login, token: token); output.WriteLine($"{login}: deleted{(personas.Count > 0 ? ", with " + string.Join(", ", personas) : string.Empty)}"); return 0; } diff --git a/PrivaPub/Infrastructure/Data/Indexes.cs b/PrivaPub/Infrastructure/Data/Indexes.cs index 81c2da6..ad95343 100644 --- a/PrivaPub/Infrastructure/Data/Indexes.cs +++ b/PrivaPub/Infrastructure/Data/Indexes.cs @@ -256,6 +256,7 @@ namespace PrivaPub.Infrastructure.Data }) .CreateAsync(token); + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0003", Justification = "The index keys are a params array, which has to come last.")] static async Task Plain(CancellationToken token, params System.Linq.Expressions.Expression>[] keys) where T : IEntity { var index = DB.Default.Index(); diff --git a/PrivaPub/Infrastructure/Data/Migrations/_001_deduplicate_before_unique_indexes.cs b/PrivaPub/Infrastructure/Data/Migrations/_001_deduplicate_before_unique_indexes.cs index df5e188..5477e8f 100644 --- a/PrivaPub/Infrastructure/Data/Migrations/_001_deduplicate_before_unique_indexes.cs +++ b/PrivaPub/Infrastructure/Data/Migrations/_001_deduplicate_before_unique_indexes.cs @@ -43,17 +43,17 @@ namespace PrivaPub.Infrastructure.Data.Migrations await DB.Default.SaveAsync(reservations); } - static async Task DeleteAllBut(IEnumerable> groups, Func delete) + static async Task DeleteAllBut(IEnumerable> groups, Func delete, CancellationToken token = default) { foreach (var group in groups) foreach (var duplicate in group.Skip(1)) - await delete(duplicate); + await delete(duplicate, token); } - static Task DeleteForeignAvatar(ForeignAvatar a) => DB.Default.DeleteAsync(a.ID); - static Task DeletePost(Post p) => DB.Default.DeleteAsync(p.ID); - static Task DeleteDmPost(DmPost p) => DB.Default.DeleteAsync(p.ID); - static Task DeleteFollower(Follower f) => DB.Default.DeleteAsync(f.ID); - static Task DeleteLink(RootToAvatar r) => DB.Default.DeleteAsync(r.ID); + static Task DeleteForeignAvatar(ForeignAvatar a, CancellationToken token = default) => DB.Default.DeleteAsync(a.ID); + static Task DeletePost(Post p, CancellationToken token = default) => DB.Default.DeleteAsync(p.ID); + static Task DeleteDmPost(DmPost p, CancellationToken token = default) => DB.Default.DeleteAsync(p.ID); + static Task DeleteFollower(Follower f, CancellationToken token = default) => DB.Default.DeleteAsync(f.ID); + static Task DeleteLink(RootToAvatar r, CancellationToken token = default) => DB.Default.DeleteAsync(r.ID); } } diff --git a/PrivaPub/Infrastructure/Data/Migrations/_005_direct_posts_join_posts.cs b/PrivaPub/Infrastructure/Data/Migrations/_005_direct_posts_join_posts.cs index b9ac389..674ff95 100644 --- a/PrivaPub/Infrastructure/Data/Migrations/_005_direct_posts_join_posts.cs +++ b/PrivaPub/Infrastructure/Data/Migrations/_005_direct_posts_join_posts.cs @@ -61,7 +61,7 @@ namespace PrivaPub.Infrastructure.Data.Migrations static string Remote(string reference) => reference != default && reference.Contains("://") ? reference : default; - static async Task ForeignAccountId(string actorUri) => - (await DB.Default.Find().Match(a => a.ActorURI == actorUri).ExecuteFirstAsync())?.ID; + static async Task ForeignAccountId(string actorUri, CancellationToken token = default) => + (await DB.Default.Find().Match(a => a.ActorURI == actorUri).ExecuteFirstAsync(token))?.ID; } } diff --git a/PrivaPub/Infrastructure/Geo/CdnCatalog.cs b/PrivaPub/Infrastructure/Geo/CdnCatalog.cs index d9d3510..646c7c6 100644 --- a/PrivaPub/Infrastructure/Geo/CdnCatalog.cs +++ b/PrivaPub/Infrastructure/Geo/CdnCatalog.cs @@ -89,7 +89,7 @@ namespace PrivaPub.Infrastructure.Geo // The networks a published list holds; an entry that is not an address or a network is an error, never skipped. public static List Parse(CdnListFormat format, string body) { - IEnumerable entries = format switch + var entries = format switch { CdnListFormat.Lines => body.Split('\n', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries).Where(l => !l.StartsWith('#')), CdnListFormat.StringArray => Root(body), diff --git a/PrivaPub/Infrastructure/Geo/CdnRanges.cs b/PrivaPub/Infrastructure/Geo/CdnRanges.cs index 329e377..020c3b4 100644 --- a/PrivaPub/Infrastructure/Geo/CdnRanges.cs +++ b/PrivaPub/Infrastructure/Geo/CdnRanges.cs @@ -38,7 +38,7 @@ namespace PrivaPub.Infrastructure.Geo return default; if (address.IsIPv4MappedToIPv6) address = address.MapToIPv4(); - Dictionary sets; + var sets = default(Dictionary); lock (_gate) sets = _sets; foreach (var (provider, networks, _) in sets.Values) diff --git a/PrivaPub/Infrastructure/Geo/CdnUpdater.cs b/PrivaPub/Infrastructure/Geo/CdnUpdater.cs index ac72e03..d14367d 100644 --- a/PrivaPub/Infrastructure/Geo/CdnUpdater.cs +++ b/PrivaPub/Infrastructure/Geo/CdnUpdater.cs @@ -12,7 +12,11 @@ namespace PrivaPub.Infrastructure.Geo // Keeps the CDNs' published address ranges current by itself (owner decision 2026-10-04): at start it loads the stored // ones, then once a day it downloads each list again. A list that fails to download or to parse, or comes back empty, // leaves the stored one in place and is tried the next day. Like GeoUpdater, plain HTTPS to fixed hosts, not federation. - public sealed class CdnUpdater : BackgroundService + public sealed class CdnUpdater( + IHttpClientFactory http, + IOptionsMonitor options, + ICdnRanges cdnRanges, + ILogger logger) : BackgroundService { public const string ClientName = "cdn"; static readonly TimeSpan FirstWait = TimeSpan.FromMinutes(1); @@ -20,28 +24,16 @@ namespace PrivaPub.Infrastructure.Geo const int MaxBytes = 16 * 1024 * 1024; const int MaxRanges = 200_000; - readonly IHttpClientFactory _http; - readonly IOptionsMonitor _options; - readonly ICdnRanges _ranges; - readonly ILogger _logger; - - public CdnUpdater(IHttpClientFactory http, IOptionsMonitor options, ICdnRanges ranges, ILogger logger) - { - _http = http; - _options = options; - _ranges = ranges; - _logger = logger; - } protected override async Task ExecuteAsync(CancellationToken stoppingToken) { try { - await _ranges.Load(stoppingToken); + await cdnRanges.Load(stoppingToken); await Task.Delay(FirstWait, stoppingToken); while (!stoppingToken.IsCancellationRequested) { - if (_options.CurrentValue.Cdn.AutoUpdate) + if (options.CurrentValue.Cdn.AutoUpdate) await Update(CdnCatalog.All, stoppingToken); await Task.Delay(Interval + TimeSpan.FromMinutes(Random.Shared.Next(60)), stoppingToken); } @@ -51,7 +43,7 @@ namespace PrivaPub.Infrastructure.Geo } catch (Exception ex) { - _logger.LogWarning(ex, "{Service} stopped", nameof(CdnUpdater)); + logger.LogWarning(ex, "{Service} stopped", nameof(CdnUpdater)); } } @@ -76,13 +68,13 @@ namespace PrivaPub.Infrastructure.Geo set.Sources = provider.Lists.Select(l => l.Url).ToList(); set.FetchedAt = DateTime.UtcNow; await DB.Default.SaveAsync(set, token); - _ranges.Replace(set); + cdnRanges.Replace(set); replaced++; } catch (Exception ex) when (ex is HttpRequestException or InvalidDataException or FormatException or System.Text.Json.JsonException or TaskCanceledException && !token.IsCancellationRequested) { - _logger.LogWarning(ex, "Could not update the published ranges of {Cdn}", provider.Name); + logger.LogWarning(ex, "Could not update the published ranges of {Cdn}", provider.Name); } } return replaced; @@ -94,14 +86,14 @@ namespace PrivaPub.Infrastructure.Geo request.Headers.Accept.ParseAdd("application/json, text/plain;q=0.9"); if (list.Body != default) request.Content = new StringContent(list.Body, Encoding.UTF8, "application/x-www-form-urlencoded"); - using var response = await _http.CreateClient(ClientName).SendAsync(request, HttpCompletionOption.ResponseHeadersRead, token); + using var response = await http.CreateClient(ClientName).SendAsync(request, HttpCompletionOption.ResponseHeadersRead, token); response.EnsureSuccessStatusCode(); if (response.Content.Headers.ContentLength > MaxBytes) throw new InvalidDataException($"more than {MaxBytes} bytes"); await using var stream = await response.Content.ReadAsStreamAsync(token); using var buffer = new MemoryStream(); var chunk = new byte[81920]; - int read; + var read = default(int); while ((read = await stream.ReadAsync(chunk, token)) > 0) { if (buffer.Length + read > MaxBytes) diff --git a/PrivaPub/Infrastructure/Geo/GeoLocator.cs b/PrivaPub/Infrastructure/Geo/GeoLocator.cs index 19c3f36..293b915 100644 --- a/PrivaPub/Infrastructure/Geo/GeoLocator.cs +++ b/PrivaPub/Infrastructure/Geo/GeoLocator.cs @@ -23,14 +23,14 @@ namespace PrivaPub.Infrastructure.Geo public string Source => default; } - public sealed class DbIpLocator : IGeoLocator, IDisposable + public sealed class DbIpLocator( + IOptionsMonitor options, + ILogger logger) : IGeoLocator, IDisposable { public static readonly string CityFile = GeoUpdater.FileOf("city"); public static readonly string AsnFile = GeoUpdater.FileOf("asn"); static readonly TimeSpan CheckInterval = TimeSpan.FromMinutes(10); - readonly IOptionsMonitor _options; - readonly ILogger _logger; readonly object _lock = new(); Reader _city; Reader _asn; @@ -39,12 +39,6 @@ namespace PrivaPub.Infrastructure.Geo DateTime _checkedAt = DateTime.MinValue; bool _warned; - public DbIpLocator(IOptionsMonitor options, ILogger logger) - { - _options = options; - _logger = logger; - } - public string Source { get @@ -60,7 +54,8 @@ namespace PrivaPub.Infrastructure.Geo if (address == default || !IpRangeGuard.IsPublic(address)) return default; Refresh(); - Dictionary place, network; + var place = default(Dictionary); + var network = default(Dictionary); try { // under the lock, so a reload cannot dispose a reader in the middle of a lookup; lookups are rare @@ -82,7 +77,7 @@ namespace PrivaPub.Infrastructure.Geo } catch (Exception ex) when (ex is InvalidDatabaseException or ArgumentException) { - _logger.LogWarning(ex, "The geolocation databases could not be read"); + logger.LogWarning(ex, "The geolocation databases could not be read"); return default; } } @@ -104,13 +99,13 @@ namespace PrivaPub.Infrastructure.Geo if (DateTime.UtcNow - _checkedAt < CheckInterval) return; _checkedAt = DateTime.UtcNow; - var directory = _options.CurrentValue.GeoDirectory; + var directory = options.CurrentValue.GeoDirectory; (_city, _cityStamp) = Open(Path.Combine(directory ?? string.Empty, CityFile), _city, _cityStamp); (_asn, _asnStamp) = Open(Path.Combine(directory ?? string.Empty, AsnFile), _asn, _asnStamp); if (_city == default && _asn == default && !_warned) { _warned = true; - _logger.LogInformation("No geolocation databases in {Directory}; servers are not located", directory); + logger.LogInformation("No geolocation databases in {Directory}; servers are not located", directory); } } } @@ -133,7 +128,7 @@ namespace PrivaPub.Infrastructure.Geo } catch (Exception ex) when (ex is InvalidDatabaseException or IOException) { - _logger.LogWarning(ex, "{Path} is not a readable geolocation database", path); + logger.LogWarning(ex, "{Path} is not a readable geolocation database", path); return (current, stamp); } } diff --git a/PrivaPub/Infrastructure/Geo/GeoUpdater.cs b/PrivaPub/Infrastructure/Geo/GeoUpdater.cs index 09f2bfa..a62e3f4 100644 --- a/PrivaPub/Infrastructure/Geo/GeoUpdater.cs +++ b/PrivaPub/Infrastructure/Geo/GeoUpdater.cs @@ -13,25 +13,17 @@ namespace PrivaPub.Infrastructure.Geo // whether each database was built this month and, if not, fetches this month's (or, early in the month, last month's), // checks it opens as the right kind of database and swaps it in. This, CdnUpdater and SMTP are the server's only traffic // that is not federation, which is why each has its own client instead of IFederationHttp. - public sealed class GeoUpdater : BackgroundService + public sealed class GeoUpdater( + IHttpClientFactory http, + IOptionsMonitor statisticsOptions, + IGeoLocator geoLocator, + ILogger logger) : BackgroundService { public const string ClientName = "geo"; static readonly string[] Kinds = { "city", "asn" }; static readonly TimeSpan FirstWait = TimeSpan.FromSeconds(30); static readonly TimeSpan Interval = TimeSpan.FromHours(24); - readonly IHttpClientFactory _http; - readonly IOptionsMonitor _options; - readonly IGeoLocator _locator; - readonly ILogger _logger; - - public GeoUpdater(IHttpClientFactory http, IOptionsMonitor options, IGeoLocator locator, ILogger logger) - { - _http = http; - _options = options; - _locator = locator; - _logger = logger; - } public static string FileOf(string kind) => $"dbip-{kind}-lite.mmdb"; @@ -42,7 +34,7 @@ namespace PrivaPub.Infrastructure.Geo await Task.Delay(FirstWait, stoppingToken); while (!stoppingToken.IsCancellationRequested) { - if (_options.CurrentValue.Geo.AutoUpdate) + if (statisticsOptions.CurrentValue.Geo.AutoUpdate) await Update(DateTime.UtcNow, stoppingToken); await Task.Delay(Interval + TimeSpan.FromMinutes(Random.Shared.Next(60)), stoppingToken); } @@ -55,7 +47,7 @@ namespace PrivaPub.Infrastructure.Geo // The number of databases replaced. A failure keeps the database already there and is tried again the next day. public async Task Update(DateTime now, CancellationToken token) { - var options = _options.CurrentValue; + var options = statisticsOptions.CurrentValue; var replaced = 0; try { @@ -63,7 +55,7 @@ namespace PrivaPub.Infrastructure.Geo } catch (Exception ex) when (ex is IOException or UnauthorizedAccessException) { - _logger.LogWarning(ex, "Cannot create {Directory}; servers are not located", options.GeoDirectory); + logger.LogWarning(ex, "Cannot create {Directory}; servers are not located", options.GeoDirectory); return 0; } foreach (var kind in Kinds) @@ -79,19 +71,19 @@ namespace PrivaPub.Infrastructure.Geo if (await Install(kind, month, path, options, token)) { replaced++; - _logger.LogInformation("Installed DB-IP Lite {Kind} {Month:yyyy-MM}", kind, month); + logger.LogInformation("Installed DB-IP Lite {Kind} {Month:yyyy-MM}", kind, month); break; } } catch (Exception ex) when (ex is HttpRequestException or IOException or InvalidDatabaseException or InvalidDataException or TaskCanceledException && !token.IsCancellationRequested) { - _logger.LogWarning(ex, "Could not install DB-IP Lite {Kind} {Month:yyyy-MM}", kind, month); + logger.LogWarning(ex, "Could not install DB-IP Lite {Kind} {Month:yyyy-MM}", kind, month); break; } } } - if (replaced > 0 && _locator is DbIpLocator locator) + if (replaced > 0 && geoLocator is DbIpLocator locator) locator.Reload(); return replaced; } @@ -121,7 +113,7 @@ namespace PrivaPub.Infrastructure.Geo var unpacked = path + ".new"; try { - using (var response = await _http.CreateClient(ClientName).GetAsync(url, HttpCompletionOption.ResponseHeadersRead, token)) + using (var response = await http.CreateClient(ClientName).GetAsync(url, HttpCompletionOption.ResponseHeadersRead, token)) { if (response.StatusCode == HttpStatusCode.NotFound) return false; @@ -150,7 +142,7 @@ namespace PrivaPub.Infrastructure.Geo { var buffer = new byte[81920]; long total = 0; - int read; + var read = default(int); while ((read = await source.ReadAsync(buffer, token)) > 0) { total += read; diff --git a/PrivaPub/Infrastructure/Http/EdgeHints.cs b/PrivaPub/Infrastructure/Http/EdgeHints.cs index 17a619b..532b200 100644 --- a/PrivaPub/Infrastructure/Http/EdgeHints.cs +++ b/PrivaPub/Infrastructure/Http/EdgeHints.cs @@ -38,17 +38,14 @@ namespace PrivaPub.Infrastructure.Http // On the federation client: reads each response's CDN fingerprint for its host. A response without one forgets the // host's hint, so a server that leaves its CDN is seen as itself again. - public class EdgeHintsHandler : DelegatingHandler + public class EdgeHintsHandler( + IEdgeHints hints) : DelegatingHandler { - readonly IEdgeHints _hints; - - public EdgeHintsHandler(IEdgeHints hints) => _hints = hints; - protected override async Task SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) { var response = await base.SendAsync(request, cancellationToken); if (request.RequestUri is { } uri && (int)response.StatusCode is >= 200 and < 500) - _hints.Remember(uri.Host, CdnCatalog.FromResponse(response)); + hints.Remember(uri.Host, CdnCatalog.FromResponse(response)); return response; } } diff --git a/PrivaPub/Infrastructure/Http/FederationHttp.cs b/PrivaPub/Infrastructure/Http/FederationHttp.cs index eb66c09..353a2ef 100644 --- a/PrivaPub/Infrastructure/Http/FederationHttp.cs +++ b/PrivaPub/Infrastructure/Http/FederationHttp.cs @@ -42,7 +42,13 @@ namespace PrivaPub.Infrastructure.Http Task> GetStringArray(string url, int maxItems, CancellationToken token); } - public class FederationHttp : IFederationHttp + public class FederationHttp( + IHttpClientFactory httpClientFactory, + IMemoryCache cache, + IOptionsMonitor federationOptions, + IDomainBlocks domainBlocks, + ILogger logger, + IInteractionLedger ledger = default) : IFederationHttp { public const string ClientName = "Federation"; public const int MaxResponseBytes = 1024 * 1024; @@ -58,34 +64,12 @@ namespace PrivaPub.Infrastructure.Http "application/json" }; - readonly IHttpClientFactory _httpClientFactory; - readonly IMemoryCache _cache; - readonly IOptionsMonitor _options; - readonly IDomainBlocks _domainBlocks; - readonly ILogger _logger; - readonly IInteractionLedger _ledger; - public FederationHttp(IHttpClientFactory httpClientFactory, IMemoryCache cache, IOptionsMonitor options, - IDomainBlocks domainBlocks, ILogger logger, IInteractionLedger ledger = default) + sealed class Exchange(string url, string purpose) { - _httpClientFactory = httpClientFactory; - _cache = cache; - _options = options; - _domainBlocks = domainBlocks; - _logger = logger; - _ledger = ledger; - } + public string Host { get; } = Interactions.HostOf(url); + public string Purpose { get; } = purpose; - sealed class Exchange - { - public Exchange(string url, string purpose) - { - Host = Interactions.HostOf(url); - Purpose = purpose; - } - - public readonly string Host; - public readonly string Purpose; public readonly long Started = System.Diagnostics.Stopwatch.GetTimestamp(); public int? Status; public long? Bytes; @@ -102,15 +86,15 @@ namespace PrivaPub.Infrastructure.Http void Record(Exchange exchange) { - if (_ledger == default) + if (ledger == default) return; var trigger = HttpScope.Trigger; if (trigger == HttpScope.Request) { - _ledger.Count(exchange.Host, $"http:{exchange.Purpose}:{exchange.Outcome}", exchange.Bytes ?? 0); + ledger.Count(exchange.Host, $"http:{exchange.Purpose}:{exchange.Outcome}", exchange.Bytes ?? 0); return; } - _ledger.Record(new InteractionEvent + ledger.Record(new InteractionEvent { Channel = Interactions.Http, Host = exchange.Host, @@ -151,7 +135,7 @@ namespace PrivaPub.Infrastructure.Http for (var hop = 0; hop <= MaxRedirects; hop++) { using var request = Request(target, "text/plain"); - using var response = await _httpClientFactory.CreateClient(ClientName).SendAsync(request, HttpCompletionOption.ResponseHeadersRead, timeout.Token); + using var response = await httpClientFactory.CreateClient(ClientName).SendAsync(request, HttpCompletionOption.ResponseHeadersRead, timeout.Token); exchange.Answered(response); if (IsRedirect(response.StatusCode)) { @@ -207,7 +191,7 @@ namespace PrivaPub.Infrastructure.Http for (var hop = 0; hop <= MaxRedirects; hop++) { using var request = Request(target, "application/json"); - using var response = await _httpClientFactory.CreateClient(ClientName).SendAsync(request, HttpCompletionOption.ResponseHeadersRead, timeout.Token); + using var response = await httpClientFactory.CreateClient(ClientName).SendAsync(request, HttpCompletionOption.ResponseHeadersRead, timeout.Token); exchange.Answered(response); if (IsRedirect(response.StatusCode)) { @@ -278,9 +262,9 @@ namespace PrivaPub.Infrastructure.Http { if (target is not { IsAbsoluteUri: true } || !string.IsNullOrEmpty(target.UserInfo)) return false; - if (_domainBlocks?.IsSuspended(target.Host) == true) + if (domainBlocks?.IsSuspended(target.Host) == true) return false; - var options = _options.CurrentValue; + var options = federationOptions.CurrentValue; if (target.Scheme != Uri.UriSchemeHttps && !(options.AllowPlainHttp && target.Scheme == Uri.UriSchemeHttp)) return false; if (options.AllowPrivateNetworks) @@ -322,7 +306,7 @@ namespace PrivaPub.Infrastructure.Http // status; 0 when it never answered) public async Task<(int Status, FetchedJson Json)> GetJsonStatus(string url, string accept, Action sign, CancellationToken token) { - if (Uri.TryCreate(url, UriKind.Absolute, out var target) && _cache.TryGetValue(NegativeKey(target), out Refusal remembered)) + if (Uri.TryCreate(url, UriKind.Absolute, out var target) && cache.TryGetValue(NegativeKey(target), out Refusal remembered)) return (remembered.Status, default); var exchange = new Exchange(url, HttpScope.Purpose ?? "object"); try @@ -344,7 +328,7 @@ namespace PrivaPub.Infrastructure.Http return default; } var negativeKey = NegativeKey(target); - if (_cache.TryGetValue(negativeKey, out _)) + if (cache.TryGetValue(negativeKey, out _)) { exchange.Refused("remembered"); return default; @@ -361,7 +345,7 @@ namespace PrivaPub.Infrastructure.Http request.Headers.TryAddWithoutValidation("If-None-Match", etag); sign?.Invoke(request); - using var response = await _httpClientFactory.CreateClient(ClientName) + using var response = await httpClientFactory.CreateClient(ClientName) .SendAsync(request, HttpCompletionOption.ResponseHeadersRead, timeout.Token); exchange.Answered(response); if (response.StatusCode == HttpStatusCode.NotModified && !string.IsNullOrEmpty(etag)) @@ -412,7 +396,7 @@ namespace PrivaPub.Infrastructure.Http } public bool FailedTemporarily(string url) => - Uri.TryCreate(url, UriKind.Absolute, out var target) && _cache.TryGetValue(NegativeKey(target), out Refusal refusal) && refusal.Transient; + Uri.TryCreate(url, UriKind.Absolute, out var target) && cache.TryGetValue(NegativeKey(target), out Refusal refusal) && refusal.Transient; public async Task<(byte[] Bytes, string ContentType)> GetMedia(string url, long maxBytes, CancellationToken token) { @@ -460,7 +444,7 @@ namespace PrivaPub.Infrastructure.Http { using var request = new HttpRequestMessage(HttpMethod.Get, target); request.Headers.Accept.ParseAdd("image/*, video/*, audio/*"); - using var response = await _httpClientFactory.CreateClient(ClientName).SendAsync(request, HttpCompletionOption.ResponseHeadersRead, timeout.Token); + using var response = await httpClientFactory.CreateClient(ClientName).SendAsync(request, HttpCompletionOption.ResponseHeadersRead, timeout.Token); exchange.Answered(response); if (IsRedirect(response.StatusCode)) { @@ -507,7 +491,7 @@ namespace PrivaPub.Infrastructure.Http catch (Exception ex) when (ex is HttpRequestException or BlockedDestinationException or OperationCanceledException && !token.IsCancellationRequested) { exchange.Failed(ex switch { BlockedDestinationException => "private-address", OperationCanceledException => "timeout", _ => "network" }); - _logger.LogInformation("Media {Url} refused: {Reason}", url, ex.Message); + logger.LogInformation("Media {Url} refused: {Reason}", url, ex.Message); return default; } } @@ -524,7 +508,7 @@ namespace PrivaPub.Infrastructure.Http { using var request = new HttpRequestMessage(HttpMethod.Get, target); request.Headers.Accept.ParseAdd("text/html, application/xhtml+xml"); - using var response = await _httpClientFactory.CreateClient(ClientName).SendAsync(request, HttpCompletionOption.ResponseHeadersRead, timeout.Token); + using var response = await httpClientFactory.CreateClient(ClientName).SendAsync(request, HttpCompletionOption.ResponseHeadersRead, timeout.Token); if (IsRedirect(response.StatusCode)) { var location = response.Headers.Location; @@ -554,7 +538,7 @@ namespace PrivaPub.Infrastructure.Http } catch (Exception ex) when (ex is HttpRequestException or BlockedDestinationException or OperationCanceledException && !token.IsCancellationRequested) { - _logger.LogInformation("Page {Url} refused: {Reason}", url, ex.Message); + logger.LogInformation("Page {Url} refused: {Reason}", url, ex.Message); return default; } } @@ -590,7 +574,7 @@ namespace PrivaPub.Infrastructure.Http using var request = new HttpRequestMessage(HttpMethod.Get, target); request.Headers.Accept.ParseAdd("video/*, audio/*, image/*"); request.Headers.Range = range; - var response = await _httpClientFactory.CreateClient(ClientName).SendAsync(request, HttpCompletionOption.ResponseHeadersRead, token); + var response = await httpClientFactory.CreateClient(ClientName).SendAsync(request, HttpCompletionOption.ResponseHeadersRead, token); exchange.Answered(response); if (IsRedirect(response.StatusCode)) { @@ -624,7 +608,7 @@ namespace PrivaPub.Infrastructure.Http catch (Exception ex) when (ex is HttpRequestException or BlockedDestinationException or OperationCanceledException && !token.IsCancellationRequested) { exchange.Failed(ex switch { BlockedDestinationException => "private-address", OperationCanceledException => "timeout", _ => "network" }); - _logger.LogInformation("Media stream {Url} refused: {Reason}", url, ex.Message); + logger.LogInformation("Media stream {Url} refused: {Reason}", url, ex.Message); return default; } } @@ -636,7 +620,7 @@ namespace PrivaPub.Infrastructure.Http await using var stream = await content.ReadAsStreamAsync(token); var buffer = new byte[limit]; var total = 0; - int read; + var read = default(int); while (total < limit && (read = await stream.ReadAsync(buffer.AsMemory(total, limit - total), token)) > 0) total += read; return buffer[..total]; @@ -646,7 +630,7 @@ namespace PrivaPub.Infrastructure.Http { if (!IsAllowed(request.RequestUri)) throw new BlockedDestinationException(request.RequestUri?.Host); - return await _httpClientFactory.CreateClient(ClientName).SendAsync(request, HttpCompletionOption.ResponseHeadersRead, token); + return await httpClientFactory.CreateClient(ClientName).SendAsync(request, HttpCompletionOption.ResponseHeadersRead, token); } // copies at most limit bytes: how many, or -1 once there are more @@ -655,7 +639,7 @@ namespace PrivaPub.Infrastructure.Http await using var stream = await content.ReadAsStreamAsync(token); var chunk = new byte[64 * 1024]; var copied = 0L; - int read; + var read = default(int); while ((read = await stream.ReadAsync(chunk, token)) > 0) { copied += read; @@ -671,7 +655,7 @@ namespace PrivaPub.Infrastructure.Http await using var stream = await content.ReadAsStreamAsync(token); using var buffer = new MemoryStream(); var chunk = new byte[16 * 1024]; - int read; + var read = default(int); while ((read = await stream.ReadAsync(chunk, token)) > 0) { if (buffer.Length + read > limit) @@ -704,8 +688,8 @@ namespace PrivaPub.Infrastructure.Http exchange.Failed(code); else exchange.Refused(code); - _cache.Set(negativeKey, new Refusal(transient, exchange.Status ?? 0), NegativeCacheLifetime); - _logger.LogInformation("GET {Url} refused: {Reason}", url, reason); + cache.Set(negativeKey, new Refusal(transient, exchange.Status ?? 0), NegativeCacheLifetime); + logger.LogInformation("GET {Url} refused: {Reason}", url, reason); return default; } } diff --git a/PrivaPub/Infrastructure/Http/HttpScope.cs b/PrivaPub/Infrastructure/Http/HttpScope.cs index 37bb61e..9de136d 100644 --- a/PrivaPub/Infrastructure/Http/HttpScope.cs +++ b/PrivaPub/Infrastructure/Http/HttpScope.cs @@ -28,13 +28,10 @@ namespace PrivaPub.Infrastructure.Http return new Restore(previous); } - sealed class Restore : IDisposable + sealed class Restore( + Tags previous) : IDisposable { - readonly Tags _previous; - - public Restore(Tags previous) => _previous = previous; - - public void Dispose() => current.Value = _previous; + public void Dispose() => current.Value = previous; } } } diff --git a/PrivaPub/Infrastructure/Http/SafeHttpHandlerFactory.cs b/PrivaPub/Infrastructure/Http/SafeHttpHandlerFactory.cs index cff7382..3de95e2 100644 --- a/PrivaPub/Infrastructure/Http/SafeHttpHandlerFactory.cs +++ b/PrivaPub/Infrastructure/Http/SafeHttpHandlerFactory.cs @@ -23,11 +23,12 @@ namespace PrivaPub.Infrastructure.Http ConnectTimeout = connectTimeout ?? TimeSpan.FromSeconds(10), PooledConnectionLifetime = TimeSpan.FromMinutes(2), MaxResponseHeadersLength = 64, - ConnectCallback = (context, token) => Connect(context.DnsEndPoint, options.AllowPrivateNetworks, token, connected) + ConnectCallback = (context, token) => Connect(context.DnsEndPoint, options.AllowPrivateNetworks, connected, token) }; - public static async ValueTask Connect(DnsEndPoint endPoint, bool allowPrivateNetworks, CancellationToken token, - IConnectedAddresses connected = default) + public static async ValueTask Connect(DnsEndPoint endPoint, bool allowPrivateNetworks, + IConnectedAddresses connected = default, + CancellationToken token = default) { var addresses = await Resolve(endPoint.Host, token); if (addresses.Length == 0 || !allowPrivateNetworks && !addresses.All(IpRangeGuard.IsPublic)) diff --git a/PrivaPub/Infrastructure/Jobs/HostCircuitBreaker.cs b/PrivaPub/Infrastructure/Jobs/HostCircuitBreaker.cs index 84fe1f6..0e767c0 100644 --- a/PrivaPub/Infrastructure/Jobs/HostCircuitBreaker.cs +++ b/PrivaPub/Infrastructure/Jobs/HostCircuitBreaker.cs @@ -13,17 +13,12 @@ namespace PrivaPub.Infrastructure.Jobs Task Failed(string host, string error, CancellationToken token); } - public class HostCircuitBreaker : IHostCircuitBreaker + public class HostCircuitBreaker( + IMemoryCache cache) : IHostCircuitBreaker { public const int Threshold = 10; static readonly TimeSpan CacheLifetime = TimeSpan.FromSeconds(30); - readonly IMemoryCache _cache; - - public HostCircuitBreaker(IMemoryCache cache) - { - _cache = cache; - } public async Task UnavailableUntil(string host, CancellationToken token) { @@ -43,7 +38,7 @@ namespace PrivaPub.Infrastructure.Jobs .Modify(i => i.LastSuccessAt, DateTime.UtcNow) .Option(o => o.IsUpsert = true) .ExecuteAsync(token); - _cache.Remove(Key(host)); + cache.Remove(Key(host)); } public async Task Failed(string host, string error, CancellationToken token) @@ -61,11 +56,11 @@ namespace PrivaPub.Infrastructure.Jobs await DB.Default.Update().MatchID(instance.ID) .Modify(i => i.UnavailableUntil, now + quarantine) .ExecuteAsync(token); - _cache.Remove(Key(host)); + cache.Remove(Key(host)); } async Task Instance(string host, CancellationToken token) => - await _cache.GetOrCreateAsync(Key(host), async entry => + await cache.GetOrCreateAsync(Key(host), async entry => { entry.AbsoluteExpirationRelativeToNow = CacheLifetime; return await DB.Default.Find().Match(i => i.Host == host).ExecuteFirstAsync(token); diff --git a/PrivaPub/Infrastructure/Jobs/JobWorker.cs b/PrivaPub/Infrastructure/Jobs/JobWorker.cs index a078609..547e51d 100644 --- a/PrivaPub/Infrastructure/Jobs/JobWorker.cs +++ b/PrivaPub/Infrastructure/Jobs/JobWorker.cs @@ -14,25 +14,18 @@ namespace PrivaPub.Infrastructure.Jobs Task Handle(Job job, CancellationToken token); } - public class JobWorker : BackgroundService + public class JobWorker( + IJobQueue jobQueue, + IEnumerable handlers, + ILogger logger) : BackgroundService { static readonly TimeSpan Poll = TimeSpan.FromSeconds(5); static readonly TimeSpan ReapInterval = TimeSpan.FromSeconds(30); - readonly IJobQueue _queue; - readonly IEnumerable _handlers; - readonly ILogger _logger; - - public JobWorker(IJobQueue queue, IEnumerable handlers, ILogger logger) - { - _queue = queue; - _handlers = handlers; - _logger = logger; - } protected override async Task ExecuteAsync(CancellationToken stoppingToken) { - var loops = _handlers.SelectMany(handler => + var loops = handlers.SelectMany(handler => { var inFlight = new ConcurrentDictionary(StringComparer.OrdinalIgnoreCase); return Enumerable.Range(0, handler.Concurrency).Select(_ => Run(handler, inFlight, stoppingToken)); @@ -44,11 +37,11 @@ namespace PrivaPub.Infrastructure.Jobs { while (!stoppingToken.IsCancellationRequested) { - Job job; + var job = default(Job); try { var busy = inFlight.Where(h => h.Value >= handler.PerHostLimit).Select(h => h.Key).ToList(); - job = await _queue.Lease(handler.Kind, busy, stoppingToken); + job = await jobQueue.Lease(handler.Kind, busy, stoppingToken); } catch (OperationCanceledException) when (stoppingToken.IsCancellationRequested) { @@ -56,14 +49,14 @@ namespace PrivaPub.Infrastructure.Jobs } catch (Exception ex) { - _logger.LogError(ex, "{Worker} could not lease a {Kind} job", nameof(JobWorker), handler.Kind); + logger.LogError(ex, "{Worker} could not lease a {Kind} job", nameof(JobWorker), handler.Kind); await Delay(Poll, stoppingToken); continue; } if (job == default) { - await _queue.WaitForWork(handler.Kind, Poll, stoppingToken); + await jobQueue.WaitForWork(handler.Kind, Poll, stoppingToken); continue; } @@ -75,7 +68,7 @@ namespace PrivaPub.Infrastructure.Jobs var renewing = KeepLease(job, running); try { - JobOutcome outcome; + var outcome = default(JobOutcome); try { using var scope = HttpScope.Triggered(handler.Kind.ToString().ToLowerInvariant()); @@ -87,24 +80,24 @@ namespace PrivaPub.Infrastructure.Jobs } catch (OperationCanceledException) when (running.IsCancellationRequested) { - _logger.LogWarning("{Kind} job {Id} lost its lease and was stopped", handler.Kind, job.ID); + logger.LogWarning("{Kind} job {Id} lost its lease and was stopped", handler.Kind, job.ID); continue; } catch (Exception ex) { - _logger.LogError(ex, "{Kind} job {Id} threw", handler.Kind, job.ID); + logger.LogError(ex, "{Kind} job {Id} threw", handler.Kind, job.ID); outcome = JobOutcome.Retry(ex.GetType().Name); } if (outcome.Result != JobResult.Done && job.Attempts >= handler.MaxAttempts && outcome.Result == JobResult.Retry) - _logger.LogWarning("{Kind} job {Id} for {Host} is dead after {Attempts} attempts: {Error}", + logger.LogWarning("{Kind} job {Id} for {Host} is dead after {Attempts} attempts: {Error}", handler.Kind, job.ID, job.Host, job.Attempts, outcome.Error); - if (!await _queue.Finish(job, outcome, handler.MaxAttempts, CancellationToken.None)) - _logger.LogWarning("{Kind} job {Id} lost its lease before it finished; its outcome is dropped", handler.Kind, job.ID); + if (!await jobQueue.Finish(job, outcome, handler.MaxAttempts, CancellationToken.None)) + logger.LogWarning("{Kind} job {Id} lost its lease before it finished; its outcome is dropped", handler.Kind, job.ID); } catch (Exception ex) { - _logger.LogError(ex, "{Kind} job {Id} could not be finished; its lease will expire", handler.Kind, job.ID); + logger.LogError(ex, "{Kind} job {Id} could not be finished; its lease will expire", handler.Kind, job.ID); } finally { @@ -116,9 +109,10 @@ namespace PrivaPub.Infrastructure.Jobs } // renews the lease every third of its length until the handler ends; a lease found lost cancels the handler + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0003", Justification = "Takes the source it cancels when the lease is lost; its token already follows the worker's.")] async Task KeepLease(Job job, CancellationTokenSource running) { - var every = _queue.LeaseFor / 3; + var every = jobQueue.LeaseFor / 3; while (!running.IsCancellationRequested) { try @@ -132,7 +126,7 @@ namespace PrivaPub.Infrastructure.Jobs try { - if (await _queue.Renew(job, CancellationToken.None)) + if (await jobQueue.Renew(job, CancellationToken.None)) continue; await running.CancelAsync(); return; @@ -140,7 +134,7 @@ namespace PrivaPub.Infrastructure.Jobs catch (Exception ex) { // a passing database error: the lease has two more thirds to go, so try again at the next turn - _logger.LogWarning(ex, "{Worker} could not renew the lease of job {Id}", nameof(JobWorker), job.ID); + logger.LogWarning(ex, "{Worker} could not renew the lease of job {Id}", nameof(JobWorker), job.ID); } } } @@ -151,9 +145,9 @@ namespace PrivaPub.Infrastructure.Jobs { try { - var reaped = await _queue.Reap(stoppingToken); + var reaped = await jobQueue.Reap(stoppingToken); if (reaped > 0) - _logger.LogWarning("{Worker} returned {Count} expired leases to the queue", nameof(JobWorker), reaped); + logger.LogWarning("{Worker} returned {Count} expired leases to the queue", nameof(JobWorker), reaped); } catch (OperationCanceledException) when (stoppingToken.IsCancellationRequested) { @@ -161,7 +155,7 @@ namespace PrivaPub.Infrastructure.Jobs } catch (Exception ex) { - _logger.LogError(ex, "{Worker} reaper failed", nameof(JobWorker)); + logger.LogError(ex, "{Worker} reaper failed", nameof(JobWorker)); } await Delay(ReapInterval, stoppingToken); } diff --git a/PrivaPub/Infrastructure/Push/WebPushJob.cs b/PrivaPub/Infrastructure/Push/WebPushJob.cs index 7aa6a58..4ad36ad 100644 --- a/PrivaPub/Infrastructure/Push/WebPushJob.cs +++ b/PrivaPub/Infrastructure/Push/WebPushJob.cs @@ -42,7 +42,15 @@ namespace PrivaPub.Infrastructure.Push // safe handler, with the pasture's exceptions where Federation says so). // A 404 or 410 means the subscription is gone: it is deleted. 408, 429, a 5xx, a timeout or a broken connection retry on // the jobs' backoff; any other answer drops the push (logged by the push service's host alone). - public class WebPushJob : IJobHandler + public class WebPushJob( + IHttpClientFactory http, + IVapid vapid, + IServiceScopeFactory scopes, + IInstanceSettings settings, + ILocalActorService localActors, + IOptionsMonitor federation, + IStringLocalizer localizer, + ILogger logger) : IJobHandler { public const string ClientName = "push"; public static readonly TimeSpan RequestTimeout = TimeSpan.FromSeconds(15); @@ -52,27 +60,6 @@ namespace PrivaPub.Infrastructure.Push const string Urgency = "normal"; const int BodyLength = 140; - readonly IHttpClientFactory _http; - readonly IVapid _vapid; - readonly IServiceScopeFactory _scopes; - readonly IInstanceSettings _settings; - readonly ILocalActorService _localActors; - readonly IOptionsMonitor _federation; - readonly IStringLocalizer _localizer; - readonly ILogger _logger; - - public WebPushJob(IHttpClientFactory http, IVapid vapid, IServiceScopeFactory scopes, IInstanceSettings settings, ILocalActorService localActors, - IOptionsMonitor federation, IStringLocalizer localizer, ILogger logger) - { - _http = http; - _vapid = vapid; - _scopes = scopes; - _settings = settings; - _localActors = localActors; - _federation = federation; - _localizer = localizer; - _logger = logger; - } public JobKind Kind => JobKind.SendPush; public int Concurrency => 4; @@ -96,22 +83,22 @@ namespace PrivaPub.Infrastructure.Push var notification = await DB.Default.Find().Match(n => n.ID == notificationId && n.AvatarId == avatarId).ExecuteFirstAsync(token); if (notification == default || !await WebPush.Pushable(subscription, notification, token)) return JobOutcome.Done; - if (!Uri.TryCreate(subscription.Endpoint, UriKind.Absolute, out var endpoint) || !IsAllowed(endpoint, _federation.CurrentValue)) + if (!Uri.TryCreate(subscription.Endpoint, UriKind.Absolute, out var endpoint) || !IsAllowed(endpoint, federation.CurrentValue)) return JobOutcome.Dead("endpoint"); - byte[] json; - using (var scope = _scopes.CreateScope()) + var json = default(byte[]); + using (var scope = scopes.CreateScope()) { // the token the subscription was made with must still be valid, and the persona's: it goes into the payload if (!await TokenHolds(scope.ServiceProvider.GetRequiredService(), subscription, token)) { - await WebPush.ForgetToken(subscription.TokenId); + await WebPush.ForgetToken(subscription.TokenId, token); return JobOutcome.Done; } var avatar = await DB.Default.Find().Match(a => a.ID == avatarId && a.DeletionAt == null).ExecuteFirstAsync(token); if (avatar == default) { - await WebPush.Forget(new[] { avatarId }); + await WebPush.Forget(new[] { avatarId }, token); return JobOutcome.Done; } var mapped = (await scope.ServiceProvider.GetRequiredService().Notifications(new List { notification }, avatarId, token)) @@ -130,7 +117,7 @@ namespace PrivaPub.Infrastructure.Push }); } - var key = await _vapid.Key(token); + var key = await vapid.Key(token); var p256dh = WebPushCrypto.FromBase64Url(subscription.P256dh); var auth = WebPushCrypto.FromBase64Url(subscription.Auth); if (!WebPushCrypto.AreUsable(p256dh, auth)) @@ -154,24 +141,24 @@ namespace PrivaPub.Infrastructure.Push try { - using var response = await _http.CreateClient(ClientName).SendAsync(request, HttpCompletionOption.ResponseHeadersRead, token); + using var response = await http.CreateClient(ClientName).SendAsync(request, HttpCompletionOption.ResponseHeadersRead, token); var status = (int)response.StatusCode; if (status is >= 200 and < 300) return JobOutcome.Done; if (response.StatusCode is HttpStatusCode.NotFound or HttpStatusCode.Gone) { await DB.Default.DeleteAsync(subscription.ID); - _logger.LogInformation("{Kind}: {Host} answered {Status}, the subscription is gone", Kind, endpoint.Host, status); + logger.LogInformation("{Kind}: {Host} answered {Status}, the subscription is gone", Kind, endpoint.Host, status); return JobOutcome.Done; } if (response.StatusCode is HttpStatusCode.RequestTimeout or HttpStatusCode.TooManyRequests || status >= 500) return JobOutcome.Retry($"status {status}"); - _logger.LogWarning("{Kind}: {Host} refused a push with {Status}; it is dropped", Kind, endpoint.Host, status); + logger.LogWarning("{Kind}: {Host} refused a push with {Status}; it is dropped", Kind, endpoint.Host, status); return JobOutcome.Dead($"status {status}"); } catch (BlockedDestinationException) { - _logger.LogWarning("{Kind}: {Host} does not resolve to a public address; the push is dropped", Kind, endpoint.Host); + logger.LogWarning("{Kind}: {Host} does not resolve to a public address; the push is dropped", Kind, endpoint.Host); return JobOutcome.Dead("blocked destination"); } catch (TaskCanceledException) when (!token.IsCancellationRequested) @@ -180,7 +167,7 @@ namespace PrivaPub.Infrastructure.Push } catch (HttpRequestException ex) when (ex.InnerException is BlockedDestinationException) { - _logger.LogWarning("{Kind}: {Host} does not resolve to a public address; the push is dropped", Kind, endpoint.Host); + logger.LogWarning("{Kind}: {Host} does not resolve to a public address; the push is dropped", Kind, endpoint.Host); return JobOutcome.Dead("blocked destination"); } catch (Exception ex) when (ex is HttpRequestException or IOException or SocketException) @@ -212,10 +199,10 @@ namespace PrivaPub.Infrastructure.Push // so it names a mailbox at its host: RFC 8292 takes only mailto: and https:.) string Subject() { - var email = _settings.Current.ContactEmail?.Trim(); + var email = settings.Current.ContactEmail?.Trim(); if (!string.IsNullOrEmpty(email) && !email.Any(char.IsWhiteSpace) && email.Contains('@')) return "mailto:" + email; - var address = _localActors.BaseAddress; + var address = localActors.BaseAddress; return Uri.TryCreate(address, UriKind.Absolute, out var base_) && base_.Scheme != Uri.UriSchemeHttps ? "mailto:privapub@" + base_.Host : address; @@ -234,17 +221,17 @@ namespace PrivaPub.Infrastructure.Push var name = string.IsNullOrWhiteSpace(mapped.Account?.DisplayName) ? mapped.Account?.Username ?? string.Empty : mapped.Account.DisplayName; return notification.Type switch { - NotificationType.Mention => string.Format(_localizer["You were mentioned by {0}"], name), - NotificationType.Status => string.Format(_localizer["{0} just posted"], name), - NotificationType.Reblog => string.Format(_localizer["{0} boosted your post"], name), - NotificationType.Follow => string.Format(_localizer["{0} is now following you"], name), - NotificationType.FollowRequest => string.Format(_localizer["Pending follower: {0}"], name), - NotificationType.Favourite => string.Format(_localizer["{0} favorited your post"], name), - NotificationType.Poll => string.Format(_localizer["A poll by {0} has ended"], name), - NotificationType.Update => string.Format(_localizer["{0} edited a post"], name), - NotificationType.Quote => string.Format(_localizer["{0} quoted your post"], name), - NotificationType.Reaction => string.Format(_localizer["{0} reacted to your post with {1}"], name, notification.Emoji), - NotificationType.ModerationWarning => _localizer["You have received a moderation warning"], + NotificationType.Mention => string.Format(localizer["You were mentioned by {0}"], name), + NotificationType.Status => string.Format(localizer["{0} just posted"], name), + NotificationType.Reblog => string.Format(localizer["{0} boosted your post"], name), + NotificationType.Follow => string.Format(localizer["{0} is now following you"], name), + NotificationType.FollowRequest => string.Format(localizer["Pending follower: {0}"], name), + NotificationType.Favourite => string.Format(localizer["{0} favorited your post"], name), + NotificationType.Poll => string.Format(localizer["A poll by {0} has ended"], name), + NotificationType.Update => string.Format(localizer["{0} edited a post"], name), + NotificationType.Quote => string.Format(localizer["{0} quoted your post"], name), + NotificationType.Reaction => string.Format(localizer["{0} reacted to your post with {1}"], name, notification.Emoji), + NotificationType.ModerationWarning => localizer["You have received a moderation warning"], _ => name }; } diff --git a/PrivaPub/Infrastructure/Statistics/InteractionLedger.cs b/PrivaPub/Infrastructure/Statistics/InteractionLedger.cs index 7b71105..4721d6d 100644 --- a/PrivaPub/Infrastructure/Statistics/InteractionLedger.cs +++ b/PrivaPub/Infrastructure/Statistics/InteractionLedger.cs @@ -27,7 +27,12 @@ namespace PrivaPub.Infrastructure.Statistics public const string Served = "served"; } - public class InteractionLedger : BackgroundService, IInteractionLedger + public class InteractionLedger( + InteractionSalts salts, + IOptionsMonitor options, + ILogger logger, + IJobQueue queue = default, + IDomainBlocks blocks = default) : BackgroundService, IInteractionLedger { const int Capacity = 10_000; const int BatchSize = 1000; @@ -46,11 +51,6 @@ namespace PrivaPub.Infrastructure.Statistics static readonly TimeSpan TouchInterval = TimeSpan.FromHours(1); static readonly HashSet TouchingPurposes = new(StringComparer.Ordinal) { "actor", "key", "object", "webfinger", "context", "replies" }; - readonly InteractionSalts _salts; - readonly IOptionsMonitor _options; - readonly ILogger _logger; - readonly IJobQueue _queue; - readonly IDomainBlocks _blocks; readonly ConcurrentDictionary _touches = new(StringComparer.Ordinal); readonly ConcurrentDictionary _touchedAt = new(StringComparer.Ordinal); readonly SemaphoreSlim _flushing = new(1, 1); @@ -63,36 +63,26 @@ namespace PrivaPub.Infrastructure.Statistics long _written; long _failed; - public InteractionLedger(InteractionSalts salts, IOptionsMonitor options, ILogger logger, - IJobQueue queue = default, IDomainBlocks blocks = default) - { - _salts = salts; - _options = options; - _logger = logger; - _queue = queue; - _blocks = blocks; - } - public long Dropped => Interlocked.Read(ref _dropped); public void Record(InteractionEvent interaction, string actorUri = default, bool hostClaimed = false) { try { - if (interaction == default || !_options.CurrentValue.Enabled) + if (interaction == default || !options.CurrentValue.Enabled) return; if (!_channel.Writer.TryWrite(new Pending(interaction, actorUri, hostClaimed))) Interlocked.Increment(ref _dropped); } catch (Exception ex) { - _logger.LogDebug(ex, "An interaction could not be recorded"); + logger.LogDebug(ex, "An interaction could not be recorded"); } } public void Count(string host, string key, long bytes = 0) { - if (!_options.CurrentValue.Enabled || string.IsNullOrEmpty(key)) + if (!options.CurrentValue.Enabled || string.IsNullOrEmpty(key)) return; var day = DateTime.UtcNow.Date; host = Interactions.Host(host); @@ -107,7 +97,7 @@ namespace PrivaPub.Infrastructure.Statistics public void CountServer(string section, string key, int? latencyMs = default) { - if (!_options.CurrentValue.Enabled || string.IsNullOrEmpty(key)) + if (!options.CurrentValue.Enabled || string.IsNullOrEmpty(key)) return; var day = DateTime.UtcNow.Date; var field = section == ServerSections.Served ? nameof(ServerDay.Served) : nameof(ServerDay.Client); @@ -145,7 +135,7 @@ namespace PrivaPub.Infrastructure.Statistics } catch (Exception ex) { - _logger.LogWarning(ex, "The interaction ledger could not flush"); + logger.LogWarning(ex, "The interaction ledger could not flush"); await Task.Delay(BatchWait, CancellationToken.None); } } @@ -161,7 +151,7 @@ namespace PrivaPub.Infrastructure.Statistics } catch (Exception ex) { - _logger.LogWarning(ex, "The interaction ledger could not flush on shutdown"); + logger.LogWarning(ex, "The interaction ledger could not flush on shutdown"); } } @@ -209,10 +199,10 @@ namespace PrivaPub.Infrastructure.Statistics .Modify(i => i.LastSeenAt, now) .Modify(b => b.SetOnInsert(i => i.FirstSeenAt, now)) .Option(o => o.IsUpsert = true) - .ExecuteAsync(token)); + .ExecuteAsync(token), token); _knownHosts.Add(host); - if (_queue != default && _blocks?.IsSuspended(host) != true) - await _queue.Enqueue(JobKind.DescribeInstance, host, host, Federation.Objects.InstanceDescriber.DedupeKey(host, now), token); + if (queue != default && blocks?.IsSuspended(host) != true) + await queue.Enqueue(JobKind.DescribeInstance, host, host, Federation.Objects.InstanceDescriber.DedupeKey(host, now), token); } if (_touchedAt.Count > 100_000) _touchedAt.Clear(); @@ -238,7 +228,7 @@ namespace PrivaPub.Infrastructure.Statistics catch (Exception ex) when (ex is not OperationCanceledException) { Interlocked.Add(ref _failed, batch.Count); - _logger.LogWarning(ex, "{Count} interactions could not be written", batch.Count); + logger.LogWarning(ex, "{Count} interactions could not be written", batch.Count); } } } @@ -254,7 +244,7 @@ namespace PrivaPub.Infrastructure.Statistics if (pending.HostClaimed && interaction.Host != Interactions.Unknown && !(await KnownHosts(token)).Contains(interaction.Host)) interaction.Host = Interactions.Unknown; if (pending.ActorUri != default) - interaction.ActorHash = InteractionSalts.Hash(await _salts.For(interaction.At, token), pending.ActorUri); + interaction.ActorHash = InteractionSalts.Hash(await salts.For(interaction.At, token), pending.ActorUri); if (interaction.Host != Interactions.Unknown && Touches(interaction, pending.ActorUri != default)) _touches[interaction.Host] = 0; return interaction; @@ -272,7 +262,7 @@ namespace PrivaPub.Infrastructure.Statistics // two flushes upserting a new day's document at once: one inserts it and the other's insert fails on the unique // key; the second try finds the document and adds to it (MongoDB retries this only for single-document updates) - static async Task Upsert(Func write) + static async Task Upsert(Func write, CancellationToken token = default) { try { @@ -294,7 +284,7 @@ namespace PrivaPub.Infrastructure.Statistics .Match(d => d.Day == key.Day && d.Host == key.Host) .Modify(b => b.Inc($"{nameof(InstanceDay.Reads)}.{key.Key}", count)) .Option(o => o.IsUpsert = true) - .ExecuteAsync(token)); + .ExecuteAsync(token), token); } var day = DateTime.UtcNow.Date; @@ -311,7 +301,7 @@ namespace PrivaPub.Infrastructure.Statistics .Modify(b => b.Inc(d => d.LedgerFailed, failed)) .Modify(b => b.Inc(d => d.LedgerDropped, newlyDropped)) .Option(o => o.IsUpsert = true) - .ExecuteAsync(token)); + .ExecuteAsync(token), token); foreach (var key in server) { if (!_server.TryRemove(key, out var count) || count == 0) @@ -320,7 +310,7 @@ namespace PrivaPub.Infrastructure.Statistics .Match(d => d.Day == key.Day) .Modify(b => b.Inc($"{key.Field}.{key.Key}", count)) .Option(o => o.IsUpsert = true) - .ExecuteAsync(token)); + .ExecuteAsync(token), token); } } diff --git a/PrivaPub/Infrastructure/Statistics/InteractionSalts.cs b/PrivaPub/Infrastructure/Statistics/InteractionSalts.cs index 47ea8bf..831f5f3 100644 --- a/PrivaPub/Infrastructure/Statistics/InteractionSalts.cs +++ b/PrivaPub/Infrastructure/Statistics/InteractionSalts.cs @@ -17,7 +17,7 @@ namespace PrivaPub.Infrastructure.Statistics day = day.Date; if (_known.TryGetValue(day, out var cached)) return cached; - InteractionSalt salt; + var salt = default(InteractionSalt); if (day == DateTime.UtcNow.Date) salt = await DB.Default.UpdateAndGet() .Match(s => s.Day == day) diff --git a/PrivaPub/Infrastructure/Statistics/RollupJob.cs b/PrivaPub/Infrastructure/Statistics/RollupJob.cs index 0b044ba..d4f8460 100644 --- a/PrivaPub/Infrastructure/Statistics/RollupJob.cs +++ b/PrivaPub/Infrastructure/Statistics/RollupJob.cs @@ -11,13 +11,11 @@ using System.Globalization; namespace PrivaPub.Infrastructure.Statistics { - public class RollupJob : IJobHandler + public class RollupJob( + IJobQueue queue) : IJobHandler { public static readonly TimeSpan After = TimeSpan.FromMinutes(30); - readonly IJobQueue _queue; - - public RollupJob(IJobQueue queue) => _queue = queue; public JobKind Kind => JobKind.RollupDay; public int Concurrency => 1; @@ -47,7 +45,7 @@ namespace PrivaPub.Infrastructure.Statistics await DB.Default.DeleteAsync(s => s.Day == day); var next = end; if (next < DateTime.UtcNow.Date.AddDays(1)) - await _queue.EnqueueMany(new[] { For(next) }, token); + await queue.EnqueueMany(new[] { For(next) }, token); return JobOutcome.Done; } @@ -95,21 +93,14 @@ namespace PrivaPub.Infrastructure.Statistics } } - public class StatisticsSchedule : BackgroundService + public class StatisticsSchedule( + IJobQueue queue, + ILogger logger, + IOptionsMonitor options = default) : BackgroundService { static readonly TimeSpan Interval = TimeSpan.FromHours(1); const int CatchUpDays = 7; - readonly IJobQueue _queue; - readonly ILogger _logger; - readonly IOptionsMonitor _options; - - public StatisticsSchedule(IJobQueue queue, ILogger logger, IOptionsMonitor options = default) - { - _queue = queue; - _logger = logger; - _options = options; - } protected override async Task ExecuteAsync(CancellationToken stoppingToken) { @@ -121,7 +112,7 @@ namespace PrivaPub.Infrastructure.Statistics } catch (Exception ex) when (ex is not OperationCanceledException) { - _logger.LogWarning(ex, "Statistics rollups could not be planned"); + logger.LogWarning(ex, "Statistics rollups could not be planned"); } try { @@ -146,12 +137,12 @@ namespace PrivaPub.Infrastructure.Statistics if (!rolled && await DB.Default.Find().Match(e => e.At >= day && e.At < end).ExecuteAnyAsync(token)) jobs.Add(RollupJob.For(day)); } - if (_options?.CurrentValue.Crawler.Enabled == true) + if (options?.CurrentValue.Crawler.Enabled == true) { var now = DateTime.UtcNow; jobs.Add(Federation.Crawler.CrawlPlanner.For(new DateTime(now.Year, now.Month, now.Day, now.Hour, 0, 0, DateTimeKind.Utc))); } - await _queue.EnqueueMany(jobs, token); + await queue.EnqueueMany(jobs, token); } } } diff --git a/PrivaPub/Models/Federation/ObjectRecord.cs b/PrivaPub/Models/Federation/ObjectRecord.cs index 8af03f0..e221673 100644 --- a/PrivaPub/Models/Federation/ObjectRecord.cs +++ b/PrivaPub/Models/Federation/ObjectRecord.cs @@ -30,7 +30,9 @@ namespace PrivaPub.Models.Federation public DateTime? Published { get; set; } public DateTime? Updated { get; set; } public List Revisions { get; set; } = new(); + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0006", Justification = "Null on records older than v1.16, which are read again from the raw form; an empty list would mean none.")] public List Extensions { get; set; }//ObjectFeatures, stored for statistics; null on records older than v1.16 + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0006", Justification = "Null on records older than v1.16, which are read again from the raw form; an empty list would mean none.")] public List ContextNamespaces { get; set; } } diff --git a/PrivaPub/Models/Jobs/RemoteInstance.cs b/PrivaPub/Models/Jobs/RemoteInstance.cs index 63a7268..a123bd8 100644 --- a/PrivaPub/Models/Jobs/RemoteInstance.cs +++ b/PrivaPub/Models/Jobs/RemoteInstance.cs @@ -42,6 +42,7 @@ namespace PrivaPub.Models.Jobs public string InstanceApi { get; set; }//"mastodon-v2" or "mastodon-v1" public string InstanceApiRaw { get; set; }//admin only: it names maintainers and contact accounts public string Title { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0006", Justification = "Null when the server does not report its languages, which is not the same as none.")] public List Languages { get; set; } public string RegistrationMode { get; set; }//open, approval, closed public int? MaxPostChars { get; set; } @@ -82,6 +83,7 @@ namespace PrivaPub.Models.Jobs public long? LocalPosts { get; set; } public bool? OpenRegistrations { get; set; } public string RegistrationMode { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0006", Justification = "Null when the server does not report its languages, which is not the same as none.")] public List Languages { get; set; } public string Country { get; set; } public string City { get; set; } diff --git a/PrivaPub/Models/Media/MediaAttachment.cs b/PrivaPub/Models/Media/MediaAttachment.cs index 10b0f8b..6708e2e 100644 --- a/PrivaPub/Models/Media/MediaAttachment.cs +++ b/PrivaPub/Models/Media/MediaAttachment.cs @@ -15,6 +15,7 @@ namespace PrivaPub.Models.Media public string Blurhash { get; set; } public int? Width { get; set; } public int? Height { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0006", Justification = "Null when no focal point was set, and the image is centred.")] public float[] Focus { get; set; } public double? DurationSeconds { get; set; } // audio and video sent to /api/v2/media are processed by a job: "pending" until then, "failed" (with why) if it can't be diff --git a/PrivaPub/Models/Post/Post.cs b/PrivaPub/Models/Post/Post.cs index c08c7cc..a1b2245 100644 --- a/PrivaPub/Models/Post/Post.cs +++ b/PrivaPub/Models/Post/Post.cs @@ -47,8 +47,9 @@ namespace PrivaPub.Models.Post [BsonIgnoreIfNull] public PostPoll Poll { get; set; } [BsonIgnoreIfNull] - public List Flairs { get; set; } + public List Flairs { get; set; } = []; [BsonIgnoreIfNull] + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0006", Justification = "Null when the post does not state searchableBy (FEP-268d); an empty list would mean nobody may search it.")] public List SearchableBy { get; set; }//FEP-268d on the post itself: outranks its author's public List Location { get; set; } = new(); public float RangeKm { get; set; } = 5.0f; diff --git a/PrivaPub/Models/Post/PostMedia.cs b/PrivaPub/Models/Post/PostMedia.cs index 3c0b2ab..95b8310 100644 --- a/PrivaPub/Models/Post/PostMedia.cs +++ b/PrivaPub/Models/Post/PostMedia.cs @@ -16,6 +16,7 @@ namespace PrivaPub.Models.Post public string Blurhash { get; set; } public int? Width { get; set; } public int? Height { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0006", Justification = "Null when no focal point was set, and the image is centred.")] public float[] Focus { get; set; } public string RemotePreviewURL { get; set; }//the remote thumbnail (attachment icon), served through the proxy public double? DurationSeconds { get; set; } diff --git a/PrivaPub/Models/ServerSetup.cs b/PrivaPub/Models/ServerSetup.cs index 745a3a1..97d2a96 100644 --- a/PrivaPub/Models/ServerSetup.cs +++ b/PrivaPub/Models/ServerSetup.cs @@ -37,7 +37,7 @@ namespace PrivaPub.Models DB.Default.Update().Match(s => s.ID == Name && s.AdminId == null).Modify(s => s.AdminId, adminId).ExecuteAsync(token); /// Gives a claim back when its login couldn't be made; a named administrator is never given back. - public static Task Release() => + public static Task Release(CancellationToken token = default) => DB.Default.DeleteAsync(s => s.ID == Name && s.AdminId == null);//a delete takes no token outside a transaction /// Closes setup for an administrator made elsewhere (the CLI, a server that had one already). diff --git a/PrivaPub/Models/Social/Following.cs b/PrivaPub/Models/Social/Following.cs index ad20d18..2855d29 100644 --- a/PrivaPub/Models/Social/Following.cs +++ b/PrivaPub/Models/Social/Following.cs @@ -14,6 +14,7 @@ namespace PrivaPub.Models.Social public string FollowActivityURI { get; set; } public bool ShowReblogs { get; set; } = true; public bool Notify { get; set; }//Mastodon's notify (R8): a `status` notification for each new post of the account + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0006", Justification = "Null follows every language, as on Mastodon; an empty list would follow none.")] public List Languages { get; set; }//Mastodon's languages (R8): only its posts in these reach the home; null, every language public DateTime CreatedAt { get; set; } = DateTime.UtcNow; public int Resent { get; set; }//how many times a request still unanswered was sent again (FollowService.ResendPending) diff --git a/PrivaPub/Models/Social/Notification.cs b/PrivaPub/Models/Social/Notification.cs index 608e784..07fb394 100644 --- a/PrivaPub/Models/Social/Notification.cs +++ b/PrivaPub/Models/Social/Notification.cs @@ -16,6 +16,7 @@ namespace PrivaPub.Models.Social [MongoDB.Bson.Serialization.Attributes.BsonIgnoreIfNull] public string WarningAction { get; set; }//a warning from this server's staff: Mastodon's AccountWarning action (silence, suspend, delete_statuses) [MongoDB.Bson.Serialization.Attributes.BsonIgnoreIfNull] + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0006", Justification = "Null when the warning is about PostId alone, and the mapper falls back to it.")] public List StatusIds { get; set; }//the posts a warning is about, when more than PostId public bool IsRead { get; set; } public bool Filtered { get; set; }//held back by the persona's notification policy, in a NotificationRequest diff --git a/PrivaPub/Models/Statistics/InteractionEvent.cs b/PrivaPub/Models/Statistics/InteractionEvent.cs index 8a3ac22..75019bc 100644 --- a/PrivaPub/Models/Statistics/InteractionEvent.cs +++ b/PrivaPub/Models/Statistics/InteractionEvent.cs @@ -26,6 +26,7 @@ namespace PrivaPub.Models.Statistics public string Inbox { get; set; }//shared | personal public string Signature { get; set; }//"cavage:rsa-sha256", "none" public string ActorHash { get; set; }//keyed with that day's salt, never reversible, never linkable across days + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0006", Justification = "Statistics store null rather than an empty list when the activity uses no extension.")] public List Features { get; set; } public long? AgeSeconds { get; set; }//Update and Delete: how old the object was public bool Crawl { get; set; } diff --git a/PrivaPub/Models/User/Avatar.cs b/PrivaPub/Models/User/Avatar.cs index 898b282..0316337 100644 --- a/PrivaPub/Models/User/Avatar.cs +++ b/PrivaPub/Models/User/Avatar.cs @@ -68,6 +68,7 @@ namespace PrivaPub.Models.User public string PictureDescription { get; set; } public string HeaderDescription { get; set; } public DateTime? Published { get; set; }//the actor's own published + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0006", Justification = "Statistics store null rather than an empty list when the document uses no extension.")] public List Features { get; set; }//protocol extensions its document uses, for statistics (ActorFeatures) public string ActorURI { get; set; }//id @@ -81,6 +82,7 @@ namespace PrivaPub.Models.User public string FeaturedTagsURL { get; set; }//featuredTags: the hashtags it features (R8) public List Flairs { get; set; } = new();//a community's labels for its posts public List FeedCommunities { get; set; } = new();//a feed's communities, its `following` (Lemmy's multi-communities, PieFed's feeds) + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0006", Justification = "Null when the account does not state searchableBy (FEP-268d); an empty list would mean nobody may search it.")] public List SearchableBy { get; set; }//FEP-268d, when the account states it: outranks IsIndexable public string ModeratorsURL { get; set; }//a community's attributedTo (Lemmy, PieFed, Mbin): the collection of its moderators public List AssertionKeys { get; set; } = new();//its Ed25519 keys (FEP-521a), which prove what it sends (FEP-8b32) diff --git a/PrivaPub/Services/AppConfigurationService.cs b/PrivaPub/Services/AppConfigurationService.cs index b506bae..9d9e86b 100644 --- a/PrivaPub/Services/AppConfigurationService.cs +++ b/PrivaPub/Services/AppConfigurationService.cs @@ -6,14 +6,11 @@ namespace PrivaPub.Services { // The configuration as appsettings has it now. Builds before 2026-10-17 copied it into Mongo on first boot and read that // copy forever after, so a changed SMTP account or language list never took; the copy is no longer read. - public class AppConfigurationService + public class AppConfigurationService( + IOptionsMonitor appConfiguration) { - readonly IOptionsMonitor _appConfiguration; + public AppConfiguration AppConfiguration => appConfiguration.CurrentValue; - public AppConfigurationService(IOptionsMonitor appConfiguration) => _appConfiguration = appConfiguration; - - public AppConfiguration AppConfiguration => _appConfiguration.CurrentValue; - - public Task Init() => Task.CompletedTask; + public Task Init(CancellationToken token = default) => Task.CompletedTask; } } diff --git a/PrivaPub/Services/ClientToServer/Private/IPrivateAvatarUsersService.cs b/PrivaPub/Services/ClientToServer/Private/IPrivateAvatarUsersService.cs index 8a07b1c..e105c4a 100644 --- a/PrivaPub/Services/ClientToServer/Private/IPrivateAvatarUsersService.cs +++ b/PrivaPub/Services/ClientToServer/Private/IPrivateAvatarUsersService.cs @@ -16,46 +16,32 @@ namespace PrivaPub.Services.ClientToServer.Private { public interface IPrivateAvatarUsersService { - Task UpdateAvatar(UpdateAvatarForm form); - Task InsertAvatar(InsertAvatarForm form); + Task UpdateAvatar(UpdateAvatarForm form, CancellationToken token = default); + Task InsertAvatar(InsertAvatarForm form, CancellationToken token = default); Task GetRootAvatars(string rootUserId, CancellationToken token); } - public class PrivateAvatarUsersService : IPrivateAvatarUsersService + public class PrivateAvatarUsersService( + ILocalActorService localActors, + IOutboxPublisher outbox, + DbEntities dbEntities, + IStringLocalizer localizer, + ILogger logger) : IPrivateAvatarUsersService { - readonly ILocalActorService _localActors; - readonly IOutboxPublisher _outbox; - readonly DbEntities _dbEntities; - readonly IStringLocalizer _localizer; - readonly ILogger _logger; - - public PrivateAvatarUsersService(ILocalActorService localActors, - IOutboxPublisher outbox, - DbEntities dbEntities, - IStringLocalizer localizer, - ILogger logger) - { - _localActors = localActors; - _outbox = outbox; - _dbEntities = dbEntities; - _localizer = localizer; - _logger = logger; - } - - public async Task InsertAvatar(InsertAvatarForm form) + public async Task InsertAvatar(InsertAvatarForm form, CancellationToken token = default) { var result = new WebResult(); try { var userName = form.UserName?.Trim().ToLowerInvariant(); if (string.IsNullOrEmpty(userName) || !userName.All(c => char.IsAsciiLetterOrDigit(c) || c == '_')) - return result.Invalidate(_localizer["The username may contain only letters, digits and underscores."]); + return result.Invalidate(localizer["The username may contain only letters, digits and underscores."]); - if (await _localActors.IsUserNameTaken(userName, default)) - return result.Invalidate(_localizer["The username '{0}' is already taken.", userName]); + if (await localActors.IsUserNameTaken(userName, default)) + return result.Invalidate(localizer["The username '{0}' is already taken.", userName]); - if (!await IsValidRootUser(form.RootId)) - return result.Invalidate(_localizer["You can't do this action because of your account status."]); + if (!await IsValidRootUser(form.RootId, token)) + return result.Invalidate(localizer["You can't do this action because of your account status."]); var (privateKey, publicKey) = Keys.NewKeyPair(); var newAvatar = new Avatar @@ -68,53 +54,53 @@ namespace PrivaPub.Services.ClientToServer.Private PrivateKey = privateKey, PublicKey = publicKey, SigningKey = Federation.Signing.IntegrityProofs.NewSeed(), - Domain = _localActors.BaseAddress + Domain = localActors.BaseAddress }; newAvatar.Emojis = PrivaPub.Domain.Content.LocalEmojis.OfProfile(newAvatar); newAvatar.ID = (string)newAvatar.GenerateNewID(); - if (!await _localActors.TryReserveUserName(userName, LocalActorKind.Person, newAvatar.ID, default)) - return result.Invalidate(_localizer["The username '{0}' is already taken.", userName]); + if (!await localActors.TryReserveUserName(userName, LocalActorKind.Person, newAvatar.ID, default)) + return result.Invalidate(localizer["The username '{0}' is already taken.", userName]); if (form.Settings is { IsDefault: false }) Apply(newAvatar.Settings, form.Settings); - var actor = _localActors.FromAvatar(newAvatar); + var actor = localActors.FromAvatar(newAvatar); newAvatar.Url = actor.Uri; newAvatar.InboxURL = actor.Inbox; newAvatar.OutboxURL = actor.Outbox; - await DB.Default.SaveAsync(newAvatar); - await DB.Default.SaveAsync(new RootToAvatar { RootId = form.RootId, AvatarId = newAvatar.ID }); + await DB.Default.SaveAsync(newAvatar, token); + await DB.Default.SaveAsync(new RootToAvatar { RootId = form.RootId, AvatarId = newAvatar.ID }, token); result.Data = ToView(newAvatar); return result; } catch (Exception ex) { - _logger.LogError(ex, $"{nameof(PrivateAvatarUsersService)}.{nameof(InsertAvatar)}"); - return result.Invalidate(_localizer["Something went wrong."], exception: ex); + logger.LogError(ex, $"{nameof(PrivateAvatarUsersService)}.{nameof(InsertAvatar)}"); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } - public async Task UpdateAvatar(UpdateAvatarForm form) + public async Task UpdateAvatar(UpdateAvatarForm form, CancellationToken token = default) { var result = new WebResult(); try { - if (!await IsValidRootUser(form.RootId)) - return result.Invalidate(_localizer["You can't do this action because of your account status."]); + if (!await IsValidRootUser(form.RootId, token)) + return result.Invalidate(localizer["You can't do this action because of your account status."]); - var owns = await _dbEntities.RootToAvatars + var owns = await dbEntities.RootToAvatars .Match(ra => ra.RootId == form.RootId && ra.AvatarId == form.AvatarId) - .ExecuteAnyAsync(); + .ExecuteAnyAsync(token); if (!owns) - return result.Invalidate(_localizer["Avatar not found."], StatusCodes.Status404NotFound); + return result.Invalidate(localizer["Avatar not found."], StatusCodes.Status404NotFound); - var avatar = await _dbEntities.Avatars.MatchID(form.AvatarId).ExecuteFirstAsync(); + var avatar = await dbEntities.Avatars.MatchID(form.AvatarId).ExecuteFirstAsync(token); if (avatar == default || avatar.DeletionAt.HasValue) - return result.Invalidate(_localizer["Avatar not found."], StatusCodes.Status404NotFound); + return result.Invalidate(localizer["Avatar not found."], StatusCodes.Status404NotFound); // a suspended persona's actor stays as it was until the suspension is lifted (R6) if (avatar.SuspendedAt.HasValue) - return result.Invalidate(_localizer["This persona is suspended."], StatusCodes.Status403Forbidden); + return result.Invalidate(localizer["This persona is suspended."], StatusCodes.Status403Forbidden); avatar.Name = form.Name; avatar.Biography = form.Biography; @@ -124,16 +110,16 @@ namespace PrivaPub.Services.ClientToServer.Private if (form.Settings != default) Apply(avatar.Settings ??= new(), form.Settings); avatar.UpdatedAt = DateTime.UtcNow; - await DB.Default.SaveAsync(avatar); - await _outbox.PublishProfile(_localActors.FromAvatar(avatar), default); + await DB.Default.SaveAsync(avatar, token); + await outbox.PublishProfile(localActors.FromAvatar(avatar), default); result.Data = ToView(avatar); return result; } catch (Exception ex) { - _logger.LogError(ex, $"{nameof(PrivateAvatarUsersService)}.{nameof(UpdateAvatar)}"); - return result.Invalidate(_localizer["Something went wrong."], exception: ex); + logger.LogError(ex, $"{nameof(PrivateAvatarUsersService)}.{nameof(UpdateAvatar)}"); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } @@ -142,27 +128,27 @@ namespace PrivaPub.Services.ClientToServer.Private var result = new WebResult(); try { - var avatarIds = (await _dbEntities.RootToAvatars.Match(ra => ra.RootId == rootUserId).ExecuteAsync(token)) + var avatarIds = (await dbEntities.RootToAvatars.Match(ra => ra.RootId == rootUserId).ExecuteAsync(token)) .Select(ra => ra.AvatarId) .ToList(); var avatars = avatarIds.Count == 0 ? new List() - : await _dbEntities.Avatars.Match(a => avatarIds.Contains(a.ID) && !a.DeletionAt.HasValue).ExecuteAsync(token); + : await dbEntities.Avatars.Match(a => avatarIds.Contains(a.ID) && !a.DeletionAt.HasValue).ExecuteAsync(token); result.Data = avatars.Select(ToView).ToList(); return result; } catch (Exception ex) { - _logger.LogError(ex, $"{nameof(PrivateAvatarUsersService)}.{nameof(GetRootAvatars)}"); - return result.Invalidate(_localizer["Something went wrong."], exception: ex); + logger.LogError(ex, $"{nameof(PrivateAvatarUsersService)}.{nameof(GetRootAvatars)}"); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } - async ValueTask IsValidRootUser(string rootUserId) => + async ValueTask IsValidRootUser(string rootUserId, CancellationToken token = default) => !string.IsNullOrEmpty(rootUserId) - && await _dbEntities.RootUsers.MatchID(rootUserId) + && await dbEntities.RootUsers.MatchID(rootUserId) .Match(ru => !ru.DeletedAt.HasValue && !ru.IsBanned) - .ExecuteAnyAsync(); + .ExecuteAnyAsync(token); // The client API carries only the theme; the rest (discoverable, locked, quote policy…) is set through the Mastodon API // and must survive an edit made here. @@ -183,7 +169,7 @@ namespace PrivaPub.Services.ClientToServer.Private { Id = avatar.ID, Url = avatar.Url, - Handle = _localActors.FromAvatar(avatar).Handle, + Handle = localActors.FromAvatar(avatar).Handle, Name = avatar.Name, UserName = avatar.UserName, Biography = avatar.Biography, diff --git a/PrivaPub/Services/ClientToServer/Public/DataService.cs b/PrivaPub/Services/ClientToServer/Public/DataService.cs index 2537932..a29561a 100644 --- a/PrivaPub/Services/ClientToServer/Public/DataService.cs +++ b/PrivaPub/Services/ClientToServer/Public/DataService.cs @@ -3,25 +3,18 @@ using PrivaPub.StaticServices; namespace PrivaPub.Services.ClientToServer.Public { - public class DataService : IDataService + public class DataService( + DbEntities dbCollections, + AppConfigurationService appConfigurationService) : IDataService { - readonly DbEntities DbEntities; - readonly AppConfigurationService AppConfigurationService; - - public DataService(DbEntities dbCollections, AppConfigurationService appConfigurationService) - { - DbEntities = dbCollections; - AppConfigurationService = appConfigurationService; - } - // the build's ref (its tag, or the branch a manual deploy ran from), as /build.json and NodeInfo name it public string GetCurrentVersion() => string.IsNullOrEmpty(BuildInfo.Ref) ? BuildInfo.Commit : BuildInfo.Ref; public async Task> GetLanguages(CancellationToken cancellationToken) { - return (await DbEntities.Languages - .Match(l => AppConfigurationService.AppConfiguration.SupportedLanguages.Contains(l.International2Code)) + return (await dbCollections.Languages + .Match(l => appConfigurationService.AppConfiguration.SupportedLanguages.Contains(l.International2Code)) .ExecuteAsync(cancellationToken)).OrderBy(l => l.NativeName).ToArray(); } } diff --git a/PrivaPub/Services/EmailVerificationJob.cs b/PrivaPub/Services/EmailVerificationJob.cs index 2256634..fc49d8d 100644 --- a/PrivaPub/Services/EmailVerificationJob.cs +++ b/PrivaPub/Services/EmailVerificationJob.cs @@ -17,26 +17,20 @@ namespace PrivaPub.Services // Sends the code that proves a login owns the address it asked for. The code exists only in the email; the row keeps its // hash. An address another login has verified meanwhile gets nothing, so the answer to the request never told whether // the address was taken, and no stranger's inbox receives a code it didn't ask for twice. - public class EmailVerificationJob : IJobHandler + public class EmailVerificationJob( + IMailer mailer, + IStringLocalizer localizer, + ILogger logger) : IJobHandler { public const string Host = "email"; - readonly IMailer _mailer; - readonly IStringLocalizer _localizer; - readonly ILogger _logger; - - public EmailVerificationJob(IMailer mailer, IStringLocalizer localizer, ILogger logger) - { - _mailer = mailer; - _localizer = localizer; - _logger = logger; - } public JobKind Kind => JobKind.SendEmailVerification; public int Concurrency => 1; public int MaxAttempts => 3; public int PerHostLimit => 1; + [System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0011", Justification = "A six-digit code with its leading zeros, not a number shown to a reader.")] public static string NewCode() => RandomNumberGenerator.GetInt32(0, 1_000_000).ToString("D6"); public async Task Handle(Job job, CancellationToken token) @@ -57,15 +51,15 @@ namespace PrivaPub.Services await DB.Default.Update().MatchID(pending.ID).Modify(v => v.CodeHash, RecoveryJob.Hash(code)).ExecuteAsync(token); try { - await _mailer.Send(pending.Email, _localizer["PrivaPub - Confirm your email address"], - string.Format(_localizer[ + await mailer.Send(pending.Email, localizer["PrivaPub - Confirm your email address"], + string.Format(localizer[ "Hello,\n\nThe PrivaPub login {0} asked to use this address. If it was you, enter this code within an hour:\n\n{1}\n\nIf it was not you, ignore this email: the address is not used."], user.UserName, code), token); return JobOutcome.Done; } catch (Exception ex) when (ex is not OperationCanceledException || !token.IsCancellationRequested) { - _logger.LogWarning(ex, "The verification email could not be sent"); + logger.LogWarning(ex, "The verification email could not be sent"); return JobOutcome.Retry("smtp"); } } diff --git a/PrivaPub/Services/GroupUsersService.cs b/PrivaPub/Services/GroupUsersService.cs index d1ff2c8..771cd87 100644 --- a/PrivaPub/Services/GroupUsersService.cs +++ b/PrivaPub/Services/GroupUsersService.cs @@ -30,42 +30,24 @@ namespace PrivaPub.Services Task GetInvitation(string invitationCode, string invitationPassword, CancellationToken token); } - public class GroupUsersService : IGroupUsersService + public class GroupUsersService( + DbEntities dbEntities, + IPasswordHasher passwordHasher, + ILocalActorService localActors, + IDeliveryService delivery, + IStringLocalizer localizer, + ILogger logger, + Domain.Media.IMediaProxy mediaProxy) : IGroupUsersService { - readonly DbEntities _dbEntities; - readonly IPasswordHasher _passwordHasher; - readonly ILocalActorService _localActors; - readonly IDeliveryService _delivery; - readonly Domain.Media.IMediaProxy _proxy; - readonly IStringLocalizer _localizer; - readonly ILogger _logger; - - public GroupUsersService(DbEntities dbEntities, - IPasswordHasher passwordHasher, - ILocalActorService localActors, - IDeliveryService delivery, - IStringLocalizer localizer, - ILogger logger, - Domain.Media.IMediaProxy proxy) - { - _proxy = proxy; - _dbEntities = dbEntities; - _passwordHasher = passwordHasher; - _localActors = localActors; - _delivery = delivery; - _localizer = localizer; - _logger = logger; - } - public async Task GetGroups(string rootUserId, string avatarId, CancellationToken token) { var result = new WebResult(); try { if (!await OwnsAvatar(rootUserId, avatarId, token)) - return result.Invalidate(_localizer["Avatar not found."], StatusCodes.Status404NotFound); + return result.Invalidate(localizer["Avatar not found."], StatusCodes.Status404NotFound); - var groups = await _dbEntities.Groups + var groups = await dbEntities.Groups .Match(g => !g.DeletionAt.HasValue && g.Members.Any(m => !m.IsForeign && m.AvatarId == avatarId)) .ExecuteAsync(token); result.Data = groups.Select(g => ToView(g, avatarId)).ToList(); @@ -73,8 +55,8 @@ namespace PrivaPub.Services } catch (Exception ex) { - _logger.LogError(ex, $"{nameof(GroupUsersService)}.{nameof(GetGroups)}"); - return result.Invalidate(_localizer["Something went wrong."], exception: ex); + logger.LogError(ex, $"{nameof(GroupUsersService)}.{nameof(GetGroups)}"); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } @@ -84,11 +66,11 @@ namespace PrivaPub.Services try { if (!await OwnsAvatar(rootUserId, form.AvatarId, token)) - return result.Invalidate(_localizer["Avatar not found."], StatusCodes.Status404NotFound); + return result.Invalidate(localizer["Avatar not found."], StatusCodes.Status404NotFound); var userName = form.UserName.ToLowerInvariant(); - if (await _localActors.IsUserNameTaken(userName, token)) - return result.Invalidate(_localizer["The username '{0}' is already taken.", userName]); + if (await localActors.IsUserNameTaken(userName, token)) + return result.Invalidate(localizer["The username '{0}' is already taken.", userName]); var (privateKey, publicKey) = Keys.NewKeyPair(); var group = new GroupEntity @@ -96,7 +78,7 @@ namespace PrivaPub.Services UserName = userName, Name = form.Name, Description = form.Description, - Domain = _localActors.BaseAddress, + Domain = localActors.BaseAddress, PrivateKey = privateKey, PublicKey = publicKey, Kind = form.IsCommunity ? GroupKind.Community : GroupKind.Circle, @@ -105,13 +87,13 @@ namespace PrivaPub.Services ManuallyApprovesMembers = form.ManuallyApprovesMembers, OwnerAvatarId = form.AvatarId, InvitationCode = NewInvitationCode(), - HashedInvitationPassword = string.IsNullOrEmpty(form.InvitationPassword) ? default : _passwordHasher.Hash(form.InvitationPassword), + HashedInvitationPassword = string.IsNullOrEmpty(form.InvitationPassword) ? default : passwordHasher.Hash(form.InvitationPassword), Members = new() { new GroupMember { AvatarId = form.AvatarId, Role = GroupRole.Owner } } }; group.ID = (string)group.GenerateNewID(); - if (!await _localActors.TryReserveUserName(userName, LocalActorKind.Group, group.ID, token)) - return result.Invalidate(_localizer["The username '{0}' is already taken.", userName]); - var actor = _localActors.FromGroup(group); + if (!await localActors.TryReserveUserName(userName, LocalActorKind.Group, group.ID, token)) + return result.Invalidate(localizer["The username '{0}' is already taken.", userName]); + var actor = localActors.FromGroup(group); group.Url = actor.Uri; group.InboxURL = actor.Inbox; group.OutboxURL = actor.Outbox; @@ -122,8 +104,8 @@ namespace PrivaPub.Services } catch (Exception ex) { - _logger.LogError(ex, $"{nameof(GroupUsersService)}.{nameof(InsertGroup)}"); - return result.Invalidate(_localizer["Something went wrong."], exception: ex); + logger.LogError(ex, $"{nameof(GroupUsersService)}.{nameof(InsertGroup)}"); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } @@ -134,7 +116,7 @@ namespace PrivaPub.Services { var group = await ManagedGroup(rootUserId, form.AvatarId, form.GroupId, token); if (group == default) - return result.Invalidate(_localizer["Group not found."], StatusCodes.Status404NotFound); + return result.Invalidate(localizer["Group not found."], StatusCodes.Status404NotFound); if (form.Name != default) group.Name = form.Name; @@ -149,7 +131,7 @@ namespace PrivaPub.Services if (form.RemoveInvitationPassword) group.HashedInvitationPassword = default; else if (!string.IsNullOrEmpty(form.InvitationPassword)) - group.HashedInvitationPassword = _passwordHasher.Hash(form.InvitationPassword); + group.HashedInvitationPassword = passwordHasher.Hash(form.InvitationPassword); if (form.RegenerateInvitationCode) group.InvitationCode = NewInvitationCode(); group.UpdatedAt = DateTime.UtcNow; @@ -160,8 +142,8 @@ namespace PrivaPub.Services } catch (Exception ex) { - _logger.LogError(ex, $"{nameof(GroupUsersService)}.{nameof(UpdateGroup)}"); - return result.Invalidate(_localizer["Something went wrong."], exception: ex); + logger.LogError(ex, $"{nameof(GroupUsersService)}.{nameof(UpdateGroup)}"); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } @@ -171,21 +153,21 @@ namespace PrivaPub.Services try { if (!await OwnsAvatar(rootUserId, form.AvatarId, token)) - return result.Invalidate(_localizer["Avatar not found."], StatusCodes.Status404NotFound); + return result.Invalidate(localizer["Avatar not found."], StatusCodes.Status404NotFound); - var group = await _dbEntities.Groups + var group = await dbEntities.Groups .Match(g => g.InvitationCode == form.InvitationCode && !g.DeletionAt.HasValue) .ExecuteFirstAsync(token); if (group == default) - return result.Invalidate(_localizer["Invalid invitation."], StatusCodes.Status404NotFound); + return result.Invalidate(localizer["Invalid invitation."], StatusCodes.Status404NotFound); if (!string.IsNullOrEmpty(group.HashedInvitationPassword)) { var (verified, _) = string.IsNullOrEmpty(form.InvitationPassword) ? (false, false) - : _passwordHasher.Check(group.HashedInvitationPassword, form.InvitationPassword); + : passwordHasher.Check(group.HashedInvitationPassword, form.InvitationPassword); if (!verified) - return result.Invalidate(_localizer["Invalid password."], StatusCodes.Status406NotAcceptable); + return result.Invalidate(localizer["Invalid password."], StatusCodes.Status406NotAcceptable); } if (!group.Members.Any(m => !m.IsForeign && m.AvatarId == form.AvatarId)) @@ -201,8 +183,8 @@ namespace PrivaPub.Services } catch (Exception ex) { - _logger.LogError(ex, $"{nameof(GroupUsersService)}.{nameof(JoinGroup)}"); - return result.Invalidate(_localizer["Something went wrong."], exception: ex); + logger.LogError(ex, $"{nameof(GroupUsersService)}.{nameof(JoinGroup)}"); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } @@ -210,8 +192,8 @@ namespace PrivaPub.Services // followers (so /groupies and /flock agree) and gets its posts in the home timeline. async Task FollowAsMember(GroupEntity group, string avatarId, CancellationToken token) { - var persona = await _localActors.FindById(LocalActorKind.Person, avatarId, token); - var target = _localActors.FromGroup(group); + var persona = await localActors.FindById(LocalActorKind.Person, avatarId, token); + var target = localActors.FromGroup(group); if (persona == default) return; await DB.Default.Update() @@ -239,20 +221,20 @@ namespace PrivaPub.Services try { if (!await OwnsAvatar(rootUserId, form.AvatarId, token)) - return result.Invalidate(_localizer["Avatar not found."], StatusCodes.Status404NotFound); + return result.Invalidate(localizer["Avatar not found."], StatusCodes.Status404NotFound); - var group = await _dbEntities.Groups.MatchID(form.GroupId).ExecuteFirstAsync(token); + var group = await dbEntities.Groups.MatchID(form.GroupId).ExecuteFirstAsync(token); if (group == default) - return result.Invalidate(_localizer["Group not found."], StatusCodes.Status404NotFound); + return result.Invalidate(localizer["Group not found."], StatusCodes.Status404NotFound); if (group.OwnerAvatarId == form.AvatarId) - return result.Invalidate(_localizer["The owner cannot leave the group."]); + return result.Invalidate(localizer["The owner cannot leave the group."]); group.Members.RemoveAll(m => !m.IsForeign && m.AvatarId == form.AvatarId); group.UpdatedAt = DateTime.UtcNow; await DB.Default.SaveAsync(group, token); // leaving is unfollowing, as joining was following - var groupUri = _localActors.FromGroup(group).Uri; - var personaUri = (await _localActors.FindById(LocalActorKind.Person, form.AvatarId, token))?.Uri; + var groupUri = localActors.FromGroup(group).Uri; + var personaUri = (await localActors.FindById(LocalActorKind.Person, form.AvatarId, token))?.Uri; await DB.Default.DeleteAsync(f => f.AvatarId == form.AvatarId && f.TargetActorURI == groupUri); if (personaUri != default) await DB.Default.DeleteAsync(f => f.LocalActorId == group.ID && f.LocalActorKind == LocalActorKind.Group && f.ActorURI == personaUri); @@ -260,8 +242,8 @@ namespace PrivaPub.Services } catch (Exception ex) { - _logger.LogError(ex, $"{nameof(GroupUsersService)}.{nameof(LeaveGroup)}"); - return result.Invalidate(_localizer["Something went wrong."], exception: ex); + logger.LogError(ex, $"{nameof(GroupUsersService)}.{nameof(LeaveGroup)}"); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } @@ -272,13 +254,13 @@ namespace PrivaPub.Services { var group = await ManagedGroup(rootUserId, form.AvatarId, form.GroupId, token); if (group == default) - return result.Invalidate(_localizer["Group not found."], StatusCodes.Status404NotFound); + return result.Invalidate(localizer["Group not found."], StatusCodes.Status404NotFound); - var follower = await _dbEntities.Followers + var follower = await dbEntities.Followers .Match(f => f.LocalActorId == group.ID && f.LocalActorKind == LocalActorKind.Group && f.ActorURI == form.MemberActorURI) .ExecuteFirstAsync(token); if (follower == default) - return result.Invalidate(_localizer["Request not found."], StatusCodes.Status404NotFound); + return result.Invalidate(localizer["Request not found."], StatusCodes.Status404NotFound); follower.IsAccepted = true; await DB.Default.SaveAsync(follower, token); @@ -288,7 +270,7 @@ namespace PrivaPub.Services await DB.Default.SaveAsync(group, token); } - var actor = _localActors.FromGroup(group); + var actor = localActors.FromGroup(group); var follow = new System.Text.Json.Nodes.JsonObject { ["id"] = follower.FollowActivityURI, @@ -297,13 +279,13 @@ namespace PrivaPub.Services ["object"] = actor.Uri }; var accept = ActivityPubRenderer.Accept(actor, follow, $"accept-{follower.ID}-{DateTime.UtcNow.Ticks}"); - await _delivery.Enqueue(actor, new[] { follower.InboxURL }, accept, token); + await delivery.Enqueue(actor, new[] { follower.InboxURL }, accept, token: token); return result; } catch (Exception ex) { - _logger.LogError(ex, $"{nameof(GroupUsersService)}.{nameof(ApproveMember)}"); - return result.Invalidate(_localizer["Something went wrong."], exception: ex); + logger.LogError(ex, $"{nameof(GroupUsersService)}.{nameof(ApproveMember)}"); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } @@ -312,12 +294,12 @@ namespace PrivaPub.Services var result = new WebResult(); var group = string.IsNullOrEmpty(invitationCode) ? default - : await _dbEntities.Groups.Match(g => g.InvitationCode == invitationCode && !g.DeletionAt.HasValue).ExecuteFirstAsync(token); + : await dbEntities.Groups.Match(g => g.InvitationCode == invitationCode && !g.DeletionAt.HasValue).ExecuteFirstAsync(token); if (group == default) - return result.Invalidate(_localizer["Invalid invitation."], StatusCodes.Status404NotFound); + return result.Invalidate(localizer["Invalid invitation."], StatusCodes.Status404NotFound); if (!string.IsNullOrEmpty(group.HashedInvitationPassword) - && (string.IsNullOrEmpty(invitationPassword) || !_passwordHasher.Check(group.HashedInvitationPassword, invitationPassword).verified)) - return result.Invalidate(_localizer["Invalid password."], StatusCodes.Status406NotAcceptable); + && (string.IsNullOrEmpty(invitationPassword) || !passwordHasher.Check(group.HashedInvitationPassword, invitationPassword).verified)) + return result.Invalidate(localizer["Invalid password."], StatusCodes.Status406NotAcceptable); result.Data = group; return result; } @@ -331,31 +313,31 @@ namespace PrivaPub.Services { var group = await ManagedGroup(rootUserId, avatarId, groupId, token); if (group == default) - return result.Invalidate(_localizer["Group not found."], StatusCodes.Status404NotFound); + return result.Invalidate(localizer["Group not found."], StatusCodes.Status404NotFound); var members = new List(); foreach (var member in group.Members) { if (member.IsForeign) { - var foreign = await _dbEntities.ForeignAvatars.Match(a => a.ActorURI == member.AvatarId).ExecuteFirstAsync(token); + var foreign = await dbEntities.ForeignAvatars.Match(a => a.ActorURI == member.AvatarId).ExecuteFirstAsync(token); members.Add(Remote(member.AvatarId, foreign, member.Role, member.JoinedAt, pending: false)); continue; } - if (await _localActors.FindById(LocalActorKind.Person, member.AvatarId, token) is { } local) + if (await localActors.FindById(LocalActorKind.Person, member.AvatarId, token) is { } local) members.Add(new ViewGroupMember { ActorUri = local.Uri, Handle = local.Handle, Name = local.Name ?? local.UserName, PictureUrl = local.PictureURL, IsLocal = true, Role = member.Role.ToString().ToLowerInvariant(), Since = member.JoinedAt }); } - var asking = await _dbEntities.Followers + var asking = await dbEntities.Followers .Match(f => f.LocalActorId == group.ID && f.LocalActorKind == LocalActorKind.Group && !f.IsAccepted) .Sort(f => f.CreationDate, Order.Ascending) .ExecuteAsync(token); foreach (var request in asking.Where(r => members.All(m => m.ActorUri != r.ActorURI))) { - var foreign = await _dbEntities.ForeignAvatars.Match(a => a.ActorURI == request.ActorURI).ExecuteFirstAsync(token); + var foreign = await dbEntities.ForeignAvatars.Match(a => a.ActorURI == request.ActorURI).ExecuteFirstAsync(token); members.Add(Remote(request.ActorURI, foreign, GroupRole.Member, request.CreationDate, pending: true)); } result.Data = members; @@ -363,8 +345,8 @@ namespace PrivaPub.Services } catch (Exception ex) { - _logger.LogError(ex, $"{nameof(GroupUsersService)}.{nameof(GetMembers)}"); - return result.Invalidate(_localizer["Something went wrong."], exception: ex); + logger.LogError(ex, $"{nameof(GroupUsersService)}.{nameof(GetMembers)}"); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } @@ -374,7 +356,7 @@ namespace PrivaPub.Services ActorUri = actorUri, Handle = foreign == default ? actorUri : $"{foreign.UserName}@{foreign.Domain}", Name = foreign?.Name ?? foreign?.UserName, - PictureUrl = _proxy.Wrap(foreign?.PictureURL), + PictureUrl = mediaProxy.Wrap(foreign?.PictureURL), IsPending = pending, Role = role.ToString().ToLowerInvariant(), Since = since @@ -388,20 +370,20 @@ namespace PrivaPub.Services { var group = await ManagedGroup(rootUserId, form.AvatarId, form.GroupId, token); if (group == default) - return result.Invalidate(_localizer["Group not found."], StatusCodes.Status404NotFound); - var request = await _dbEntities.Followers + return result.Invalidate(localizer["Group not found."], StatusCodes.Status404NotFound); + var request = await dbEntities.Followers .Match(f => f.LocalActorId == group.ID && f.LocalActorKind == LocalActorKind.Group && f.ActorURI == form.MemberActorURI && !f.IsAccepted) .ExecuteFirstAsync(token); if (request == default) - return result.Invalidate(_localizer["Request not found."], StatusCodes.Status404NotFound); + return result.Invalidate(localizer["Request not found."], StatusCodes.Status404NotFound); await DB.Default.DeleteAsync(request.ID); await RejectFollow(group, request, token); return result; } catch (Exception ex) { - _logger.LogError(ex, $"{nameof(GroupUsersService)}.{nameof(RejectMember)}"); - return result.Invalidate(_localizer["Something went wrong."], exception: ex); + logger.LogError(ex, $"{nameof(GroupUsersService)}.{nameof(RejectMember)}"); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } @@ -414,27 +396,27 @@ namespace PrivaPub.Services { var group = await ManagedGroup(rootUserId, form.AvatarId, form.GroupId, token); if (group == default) - return result.Invalidate(_localizer["Group not found."], StatusCodes.Status404NotFound); - var localMember = await _localActors.FindByUri(form.MemberActorURI, token); + return result.Invalidate(localizer["Group not found."], StatusCodes.Status404NotFound); + var localMember = await localActors.FindByUri(form.MemberActorURI, token); var member = group.Members.FirstOrDefault(m => localMember is { Kind: LocalActorKind.Person } ? !m.IsForeign && m.AvatarId == localMember.Id : m.IsForeign && m.AvatarId == form.MemberActorURI); if (member == default) - return result.Invalidate(_localizer["Member not found."], StatusCodes.Status404NotFound); + return result.Invalidate(localizer["Member not found."], StatusCodes.Status404NotFound); if (member.Role == GroupRole.Owner) - return result.Invalidate(_localizer["The owner cannot leave the group."]); + return result.Invalidate(localizer["The owner cannot leave the group."]); group.Members.Remove(member); group.UpdatedAt = DateTime.UtcNow; await DB.Default.SaveAsync(group, token); - var follower = await _dbEntities.Followers + var follower = await dbEntities.Followers .Match(f => f.LocalActorId == group.ID && f.LocalActorKind == LocalActorKind.Group && f.ActorURI == form.MemberActorURI) .ExecuteFirstAsync(token); if (follower != default) await DB.Default.DeleteAsync(follower.ID); if (localMember is { Kind: LocalActorKind.Person }) { - var groupUri = _localActors.FromGroup(group).Uri; + var groupUri = localActors.FromGroup(group).Uri; await DB.Default.DeleteAsync(f => f.AvatarId == localMember.Id && f.TargetActorURI == groupUri); } else if (follower != default) @@ -443,8 +425,8 @@ namespace PrivaPub.Services } catch (Exception ex) { - _logger.LogError(ex, $"{nameof(GroupUsersService)}.{nameof(RemoveMember)}"); - return result.Invalidate(_localizer["Something went wrong."], exception: ex); + logger.LogError(ex, $"{nameof(GroupUsersService)}.{nameof(RemoveMember)}"); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } @@ -452,7 +434,7 @@ namespace PrivaPub.Services { if (string.IsNullOrEmpty(follower.InboxURL)) return; - var actor = _localActors.FromGroup(group); + var actor = localActors.FromGroup(group); var follow = new System.Text.Json.Nodes.JsonObject { ["id"] = follower.FollowActivityURI, @@ -462,14 +444,14 @@ namespace PrivaPub.Services }; var reject = ActivityPubRenderer.Accept(actor, follow, $"reject-{follower.ID}-{DateTime.UtcNow.Ticks}"); reject["type"] = "Reject"; - await _delivery.Enqueue(actor, new[] { follower.InboxURL }, reject, token); + await delivery.Enqueue(actor, new[] { follower.InboxURL }, reject, token: token); } async Task ManagedGroup(string rootUserId, string avatarId, string groupId, CancellationToken token) { if (!await OwnsAvatar(rootUserId, avatarId, token)) return default; - var group = await _dbEntities.Groups.MatchID(groupId).ExecuteFirstAsync(token); + var group = await dbEntities.Groups.MatchID(groupId).ExecuteFirstAsync(token); if (group == default || group.DeletionAt.HasValue) return default; var role = group.Members.FirstOrDefault(m => !m.IsForeign && m.AvatarId == avatarId)?.Role; @@ -479,7 +461,7 @@ namespace PrivaPub.Services // a suspended persona does nothing in its groups (R6) async Task OwnsAvatar(string rootUserId, string avatarId, CancellationToken token) => !string.IsNullOrEmpty(rootUserId) && !string.IsNullOrEmpty(avatarId) && !Domain.Moderation.Restrictions.IsSuspended(avatarId) - && await _dbEntities.RootToAvatars.Match(ra => ra.RootId == rootUserId && ra.AvatarId == avatarId).ExecuteAnyAsync(token); + && await dbEntities.RootToAvatars.Match(ra => ra.RootId == rootUserId && ra.AvatarId == avatarId).ExecuteAnyAsync(token); static PostingPolicy? Policy(string value) => value?.ToLowerInvariant() switch { @@ -493,7 +475,7 @@ namespace PrivaPub.Services ViewGroup ToView(GroupEntity group, string avatarId) { - var actor = _localActors.FromGroup(group); + var actor = localActors.FromGroup(group); var isManager = group.Members.Any(m => !m.IsForeign && m.AvatarId == avatarId && m.Role is GroupRole.Owner or GroupRole.Moderator); return new ViewGroup { diff --git a/PrivaPub/Services/IRootUsersService.cs b/PrivaPub/Services/IRootUsersService.cs index 8954d0b..cef374b 100644 --- a/PrivaPub/Services/IRootUsersService.cs +++ b/PrivaPub/Services/IRootUsersService.cs @@ -7,44 +7,44 @@ namespace PrivaPub.Services { public interface IRootUsersService { - Task LoginAsync(LoginForm loginForm); + Task LoginAsync(LoginForm loginForm, CancellationToken token = default); - Task SignUpAsync(LoginForm signUpForm); + Task SignUpAsync(LoginForm signUpForm, CancellationToken token = default); - Task BanUserAsync(UsersIds usersIds); + Task BanUserAsync(UsersIds usersIds, CancellationToken token = default); - Task UnbanUserAsync(UsersIds usersIds); + Task UnbanUserAsync(UsersIds usersIds, CancellationToken token = default); - Task RemoveUserAsync(UsersIds usersIds); - Task RemoveSelfAsync(string rootId, string password); + Task RemoveUserAsync(UsersIds usersIds, CancellationToken token = default); + Task RemoveSelfAsync(string rootId, string password, CancellationToken token = default); /// Whether a login's password is this one, after the same hashing whatever the answer. - Task PasswordMatches(string rootId, string password); + Task PasswordMatches(string rootId, string password, CancellationToken token = default); - Task UpdateUserPasswordAsync(UserPasswordForm userPasswordForm, string userId); + Task UpdateUserPasswordAsync(UserPasswordForm userPasswordForm, string userId, CancellationToken token = default); - Task GetUserSettingsAsync(string userId, LoginForm loginForm = default); + Task GetUserSettingsAsync(string userId, LoginForm loginForm = default, CancellationToken token = default); - Task UpdateUserSettingsAsync(ViewUserSettings userSettings, string userId); + Task UpdateUserSettingsAsync(ViewUserSettings userSettings, string userId, CancellationToken token = default); - Task SetupAndSendRecoveryEmail(PasswordRecoveryForm passwordRecoveryForm, string host); + Task SetupAndSendRecoveryEmail(PasswordRecoveryForm passwordRecoveryForm, string host, CancellationToken token = default); - Task IsValidRecoveryCode(string recoveryCode); + Task IsValidRecoveryCode(string recoveryCode, CancellationToken token = default); - Task ChangePassword(NewPasswordForm newPasswordForm); + Task ChangePassword(NewPasswordForm newPasswordForm, CancellationToken token = default); - Task AccountAsync(string rootId); + Task AccountAsync(string rootId, CancellationToken token = default); - Task RequestEmailChangeAsync(string rootId, EmailChangeForm form); + Task RequestEmailChangeAsync(string rootId, EmailChangeForm form, CancellationToken token = default); - Task VerifyEmailAsync(string rootId, string code); + Task VerifyEmailAsync(string rootId, string code, CancellationToken token = default); - Task RemoveEmailAsync(string rootId, string password); + Task RemoveEmailAsync(string rootId, string password, CancellationToken token = default); - Task TotpSetupAsync(string rootId, string password); + Task TotpSetupAsync(string rootId, string password, CancellationToken token = default); - Task TotpEnableAsync(string rootId, string code); + Task TotpEnableAsync(string rootId, string code, CancellationToken token = default); - Task TotpDisableAsync(string rootId, string password, string code); + Task TotpDisableAsync(string rootId, string password, string code, CancellationToken token = default); } } \ No newline at end of file diff --git a/PrivaPub/Services/Mailer.cs b/PrivaPub/Services/Mailer.cs index 4949a07..0806904 100644 --- a/PrivaPub/Services/Mailer.cs +++ b/PrivaPub/Services/Mailer.cs @@ -16,22 +16,15 @@ namespace PrivaPub.Services // The server's one way to send an email: through the SMTP account in appsettings (AppConfiguration:EmailConfiguration), // read as it is now. Only jobs call it, so nobody waits on SMTP. - public class Mailer : IMailer + public class Mailer( + IOptionsMonitor app, + Domain.Instance.IInstanceSettings settings) : IMailer { - readonly IOptionsMonitor _app; - readonly Domain.Instance.IInstanceSettings _settings; - - public Mailer(IOptionsMonitor app, Domain.Instance.IInstanceSettings settings) - { - _app = app; - _settings = settings; - } - public async Task Send(string to, string subject, string body, CancellationToken token) { - var email = _app.CurrentValue.EmailConfiguration; + var email = app.CurrentValue.EmailConfiguration; var message = new MimeMessage(); - message.From.Add(new MailboxAddress(_settings.Current.Title, email.SmtpUsername));//the server's name, as its administrator set it + message.From.Add(new MailboxAddress(settings.Current.Title, email.SmtpUsername));//the server's name, as its administrator set it message.To.Add(MailboxAddress.Parse(to)); message.Subject = subject; message.Body = new TextPart("plain") { Text = body }; diff --git a/PrivaPub/Services/PersonaRemoval.cs b/PrivaPub/Services/PersonaRemoval.cs index d74b234..ebb4d72 100644 --- a/PrivaPub/Services/PersonaRemoval.cs +++ b/PrivaPub/Services/PersonaRemoval.cs @@ -52,7 +52,7 @@ namespace PrivaPub.Services ["object"] = actor.Uri, ["to"] = new JsonArray(ActivityPubRenderer.Public), ["cc"] = new JsonArray(actor.Followers) - }, token); + }, token: token); } } @@ -64,46 +64,33 @@ namespace PrivaPub.Services // announcements, the feeds it read, its featured hashtags, endorsements, notes and dismissed suggestions, its media) // goes with it. Its link to its login stays, so the login keeps no other // trace than that. - public class PersonaRemoval : IPersonaRemoval + public class PersonaRemoval( + DbEntities dbEntities, + ILocalActorService localActors, + IDeliveryService delivery, + IMediaService mediaService, + IGroupRemoval groups, + IOpenIddictTokenManager openIddictTokenManager, + IOpenIddictAuthorizationManager authorizations) : IPersonaRemoval { - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - readonly IDeliveryService _delivery; - readonly IMediaService _media; - readonly IGroupRemoval _groups; - readonly IOpenIddictTokenManager _tokens; - readonly IOpenIddictAuthorizationManager _authorizations; - - public PersonaRemoval(DbEntities dbEntities, ILocalActorService localActors, IDeliveryService delivery, IMediaService media, IGroupRemoval groups, - IOpenIddictTokenManager tokens, IOpenIddictAuthorizationManager authorizations) - { - _dbEntities = dbEntities; - _localActors = localActors; - _delivery = delivery; - _media = media; - _groups = groups; - _tokens = tokens; - _authorizations = authorizations; - } - public async Task Remove(string avatarId, CancellationToken token) { - var avatar = string.IsNullOrEmpty(avatarId) ? default : await _dbEntities.Avatars.MatchID(avatarId).Match(a => !a.DeletionAt.HasValue).ExecuteFirstAsync(token); + var avatar = string.IsNullOrEmpty(avatarId) ? default : await dbEntities.Avatars.MatchID(avatarId).Match(a => !a.DeletionAt.HasValue).ExecuteFirstAsync(token); if (avatar == default) return false; var now = DateTime.UtcNow; // nothing acts as it while it goes - await _tokens.RevokeBySubjectAsync(avatar.ID, token); - await _authorizations.RevokeBySubjectAsync(avatar.ID, token); - await Domain.Social.WebPush.Forget(new[] { avatar.ID });//its Web Push subscriptions with its tokens (R9) + await openIddictTokenManager.RevokeBySubjectAsync(avatar.ID, token); + await authorizations.RevokeBySubjectAsync(avatar.ID, token); + await Domain.Social.WebPush.Forget(new[] { avatar.ID }, token);//its Web Push subscriptions with its tokens (R9) Streams.CloseFor(avatar.ID); - foreach (var group in await _dbEntities.Groups.Match(g => g.OwnerAvatarId == avatar.ID && !g.DeletionAt.HasValue).ExecuteAsync(token)) - await _groups.Remove(group.ID, token); - var persona = _localActors.FromAvatar(avatar); - var followed = (await _dbEntities.Followings.Match(f => f.AvatarId == avatar.ID && !f.TargetIsLocal).ExecuteAsync(token)) + foreach (var group in await dbEntities.Groups.Match(g => g.OwnerAvatarId == avatar.ID && !g.DeletionAt.HasValue).ExecuteAsync(token)) + await groups.Remove(group.ID, token); + var persona = localActors.FromAvatar(avatar); + var followed = (await dbEntities.Followings.Match(f => f.AvatarId == avatar.ID && !f.TargetIsLocal).ExecuteAsync(token)) .Select(f => f.TargetActorURI); - await ActorDeletion.Announce(persona, followed, _dbEntities, _delivery, token); + await ActorDeletion.Announce(persona, followed, dbEntities, delivery, token); await DB.Default.Update().MatchID(avatar.ID).Modify(a => a.DeletionAt, now).ExecuteAsync(token); await Empty(avatar.ID, now, token); await DB.Default.DeleteAsync(m => m.AvatarId == avatar.ID); @@ -125,7 +112,7 @@ namespace PrivaPub.Services // nothing of it publishes later, and none of its files stays served: its posts' media, its pictures and what its // scheduled posts held await DB.Default.DeleteAsync(s => s.AvatarId == avatar.ID); - await _media.Trash(m => m.OwnerAvatarId == avatar.ID, "persona removed", token); + await mediaService.Trash(m => m.OwnerAvatarId == avatar.ID, "persona removed", token); return true; } @@ -153,26 +140,18 @@ namespace PrivaPub.Services // with the persona that owns it): a Delete of the group's actor to its followers and its members elsewhere, its name kept // reserved while its documents answer 410, and the personas here that followed or joined it no longer do. The posts made // in it stay their authors'. - public class GroupRemoval : IGroupRemoval + public class GroupRemoval( + DbEntities dbEntities, + ILocalActorService localActors, + IDeliveryService delivery) : IGroupRemoval { - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - readonly IDeliveryService _delivery; - - public GroupRemoval(DbEntities dbEntities, ILocalActorService localActors, IDeliveryService delivery) - { - _dbEntities = dbEntities; - _localActors = localActors; - _delivery = delivery; - } - public async Task Remove(string groupId, CancellationToken token) { - var group = string.IsNullOrEmpty(groupId) ? default : await _dbEntities.Groups.MatchID(groupId).Match(g => !g.DeletionAt.HasValue).ExecuteFirstAsync(token); + var group = string.IsNullOrEmpty(groupId) ? default : await dbEntities.Groups.MatchID(groupId).Match(g => !g.DeletionAt.HasValue).ExecuteFirstAsync(token); if (group == default) return false; - var actor = _localActors.FromGroup(group); - await ActorDeletion.Announce(actor, group.Members.Where(m => m.IsForeign).Select(m => m.AvatarId), _dbEntities, _delivery, token); + var actor = localActors.FromGroup(group); + await ActorDeletion.Announce(actor, group.Members.Where(m => m.IsForeign).Select(m => m.AvatarId), dbEntities, delivery, token); await DB.Default.Update().MatchID(group.ID).Modify(g => g.DeletionAt, DateTime.UtcNow).ExecuteAsync(token); await DB.Default.DeleteAsync(f => f.TargetActorURI == actor.Uri); await DB.Default.DeleteAsync(f => f.LocalActorId == group.ID && f.LocalActorKind == LocalActorKind.Group); diff --git a/PrivaPub/Services/PostsService.cs b/PrivaPub/Services/PostsService.cs index ed665b4..e7c11a9 100644 --- a/PrivaPub/Services/PostsService.cs +++ b/PrivaPub/Services/PostsService.cs @@ -35,35 +35,22 @@ namespace PrivaPub.Services Task GetDms(string rootUserId, string avatarId, string dmGroupId, CancellationToken token); } - public class PostsService : IPostsService + public class PostsService( + DbEntities dbEntities, + ILocalActorService localActors, + IStatusService statuses, + IStringLocalizer localizer, + ILogger logger) : IPostsService { const int PageSize = 50; - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - readonly IStatusService _statuses; - readonly IStringLocalizer _localizer; - readonly ILogger _logger; - - public PostsService(DbEntities dbEntities, - ILocalActorService localActors, - IStatusService statuses, - IStringLocalizer localizer, - ILogger logger) - { - _dbEntities = dbEntities; - _localActors = localActors; - _statuses = statuses; - _localizer = localizer; - _logger = logger; - } public async Task InsertPost(string rootUserId, InsertPostForm form, CancellationToken token) { var author = await OwnedAvatar(rootUserId, form.AvatarId, token); if (author == default) - return new WebResult().Invalidate(_localizer["Avatar not found."], StatusCodes.Status404NotFound); - return await Answer(() => _statuses.Publish(author, new StatusDraft + return new WebResult().Invalidate(localizer["Avatar not found."], StatusCodes.Status404NotFound); + return await Answer(() => statuses.Publish(author, new StatusDraft { Text = form.Text, Title = form.Title, @@ -75,15 +62,15 @@ namespace PrivaPub.Services Latitude = form.Latitude, Longitude = form.Longitude, RangeKm = form.RangeKm - }, token), nameof(InsertPost)); + }, token), nameof(InsertPost), token); } public async Task DeletePost(string rootUserId, DeletePostForm form, CancellationToken token) { var author = await OwnedAvatar(rootUserId, form.AvatarId, token); if (author == default) - return new WebResult().Invalidate(_localizer["Avatar not found."], StatusCodes.Status404NotFound); - var result = await Answer(() => _statuses.Remove(author, form.PostId, token), nameof(DeletePost)); + return new WebResult().Invalidate(localizer["Avatar not found."], StatusCodes.Status404NotFound); + var result = await Answer(() => statuses.Remove(author, form.PostId, token), nameof(DeletePost), token); result.Data = default; return result; } @@ -92,14 +79,14 @@ namespace PrivaPub.Services { var author = await OwnedAvatar(rootUserId, form.AvatarId, token); if (author == default) - return new WebResult().Invalidate(_localizer["Avatar not found."], StatusCodes.Status404NotFound); - return await Answer(() => _statuses.Edit(author, form.PostId, new StatusDraft + return new WebResult().Invalidate(localizer["Avatar not found."], StatusCodes.Status404NotFound); + return await Answer(() => statuses.Edit(author, form.PostId, new StatusDraft { Text = form.Text, Title = form.Title, SpoilerText = form.SpoilerText, Sensitive = form.HasContentWarning - }, token), nameof(UpdatePost)); + }, token), nameof(UpdatePost), token); } public async Task GetPosts(string rootUserId, string avatarId, string groupId, CancellationToken token) @@ -109,18 +96,18 @@ namespace PrivaPub.Services { var avatar = await OwnedAvatar(rootUserId, avatarId, token); if (avatar == default) - return result.Invalidate(_localizer["Avatar not found."], StatusCodes.Status404NotFound); + return result.Invalidate(localizer["Avatar not found."], StatusCodes.Status404NotFound); - var query = _dbEntities.Posts; + var query = dbEntities.Posts; if (string.IsNullOrEmpty(groupId)) query.Match(p => p.GroupUserId == avatar.Id && p.Visibility != PostVisibility.Direct); else { - var isMember = await _dbEntities.Groups + var isMember = await dbEntities.Groups .Match(g => g.ID == groupId && g.Members.Any(m => !m.IsForeign && m.AvatarId == avatar.Id)) .ExecuteAnyAsync(token); if (!isMember) - return result.Invalidate(_localizer["Group not found."], StatusCodes.Status404NotFound); + return result.Invalidate(localizer["Group not found."], StatusCodes.Status404NotFound); query.Match(p => p.GroupId == groupId); } @@ -130,8 +117,8 @@ namespace PrivaPub.Services } catch (Exception ex) { - _logger.LogError(ex, $"{nameof(PostsService)}.{nameof(GetPosts)}"); - return result.Invalidate(_localizer["Something went wrong."], exception: ex); + logger.LogError(ex, $"{nameof(PostsService)}.{nameof(GetPosts)}"); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } @@ -139,17 +126,17 @@ namespace PrivaPub.Services { var author = await OwnedAvatar(rootUserId, form.AvatarId, token); if (author == default) - return new WebResult().Invalidate(_localizer["Avatar not found."], StatusCodes.Status404NotFound); + return new WebResult().Invalidate(localizer["Avatar not found."], StatusCodes.Status404NotFound); if (string.IsNullOrEmpty(form.DmGroupId) && form.Recipients.Count == 0) - return new WebResult().Invalidate(_localizer["At least one recipient is required."]); - return await Answer(() => _statuses.Publish(author, new StatusDraft + return new WebResult().Invalidate(localizer["At least one recipient is required."]); + return await Answer(() => statuses.Publish(author, new StatusDraft { Text = form.Text, Sensitive = form.HasContentWarning, Visibility = PostVisibility.Direct, ConversationId = form.DmGroupId, Recipients = form.Recipients - }, token), nameof(InsertDm)); + }, token), nameof(InsertDm), token); } public async Task GetDms(string rootUserId, string avatarId, string dmGroupId, CancellationToken token) @@ -159,11 +146,11 @@ namespace PrivaPub.Services { var avatar = await OwnedAvatar(rootUserId, avatarId, token); if (avatar == default) - return result.Invalidate(_localizer["Avatar not found."], StatusCodes.Status404NotFound); + return result.Invalidate(localizer["Avatar not found."], StatusCodes.Status404NotFound); if (string.IsNullOrEmpty(dmGroupId)) { - var groups = await _dbEntities.DmGroups + var groups = await dbEntities.DmGroups .Match(g => !g.DeletionAt.HasValue && g.Members.Any(m => !m.IsForeign && m.AvatarId == avatar.Id)) .Sort(g => g.UpdatedAt, Order.Descending) .ExecuteAsync(token); @@ -176,13 +163,13 @@ namespace PrivaPub.Services return result; } - var isMember = await _dbEntities.DmGroups + var isMember = await dbEntities.DmGroups .Match(g => g.ID == dmGroupId && g.Members.Any(m => !m.IsForeign && m.AvatarId == avatar.Id)) .ExecuteAnyAsync(token); if (!isMember) - return result.Invalidate(_localizer["Conversation not found."], StatusCodes.Status404NotFound); + return result.Invalidate(localizer["Conversation not found."], StatusCodes.Status404NotFound); - var dms = await _dbEntities.Posts + var dms = await dbEntities.Posts .Match(p => p.ConversationId == dmGroupId && p.Visibility == PostVisibility.Direct) .Match(VisibilityPolicy.IsShown) .Sort(p => p.CreationDate, Order.Descending) @@ -193,8 +180,8 @@ namespace PrivaPub.Services } catch (Exception ex) { - _logger.LogError(ex, $"{nameof(PostsService)}.{nameof(GetDms)}"); - return result.Invalidate(_localizer["Something went wrong."], exception: ex); + logger.LogError(ex, $"{nameof(PostsService)}.{nameof(GetDms)}"); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } @@ -205,9 +192,9 @@ namespace PrivaPub.Services var result = new WebResult(); var viewer = await OwnedAvatar(rootUserId, avatarId, token); if (viewer == default) - return result.Invalidate(_localizer["Avatar not found."], StatusCodes.Status404NotFound); + return result.Invalidate(localizer["Avatar not found."], StatusCodes.Status404NotFound); if (latitude is < -90 or > 90 || longitude is < -180 or > 180) - return result.Invalidate(_localizer["Invalid model."]); + return result.Invalidate(localizer["Invalid model."]); var query = new MongoDB.Bson.BsonDocument { @@ -229,21 +216,21 @@ namespace PrivaPub.Services return result; } - async Task Answer(Func> action, string operation) + async Task Answer(Func> action, string operation, CancellationToken token = default) { var result = new WebResult(); try { var outcome = await action(); if (!outcome.Ok) - return result.Invalidate(_localizer[outcome.Error], outcome.Status); + return result.Invalidate(localizer[outcome.Error], outcome.Status); result.Data = ToView(outcome.Post); return result; } catch (Exception ex) { - _logger.LogError(ex, "{Service}.{Operation}", nameof(PostsService), operation); - return result.Invalidate(_localizer["Something went wrong."], exception: ex); + logger.LogError(ex, "{Service}.{Operation}", nameof(PostsService), operation); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } @@ -261,10 +248,10 @@ namespace PrivaPub.Services { 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 ViewPost ToView(PostEntity post) => new() diff --git a/PrivaPub/Services/RecoveryJob.cs b/PrivaPub/Services/RecoveryJob.cs index 5e39b23..ce1a7a7 100644 --- a/PrivaPub/Services/RecoveryJob.cs +++ b/PrivaPub/Services/RecoveryJob.cs @@ -18,21 +18,14 @@ namespace PrivaPub.Services // Sends a password recovery link. Every request queues one of these, for an account that exists or not, so the answer // to the request and its timing say nothing; SMTP's slowness and failures happen here, where nobody waits on them. // The code exists only in the email: the database keeps its hash, for an hour. Only a verified address is written to. - public class RecoveryJob : IJobHandler + public class RecoveryJob( + IMailer mailer, + IStringLocalizer localizer, + ILogger logger) : IJobHandler { public const string Host = "recovery"; public static readonly TimeSpan CodeLifetime = TimeSpan.FromHours(1); - readonly IMailer _mailer; - readonly IStringLocalizer _localizer; - readonly ILogger _logger; - - public RecoveryJob(IMailer mailer, IStringLocalizer localizer, ILogger logger) - { - _mailer = mailer; - _localizer = localizer; - _logger = logger; - } public JobKind Kind => JobKind.SendRecovery; public int Concurrency => 1; @@ -55,15 +48,15 @@ namespace PrivaPub.Services await DB.Default.SaveAsync(new EmailRecovery { RootUserId = user.ID, CodeHash = Hash(code), ExpiresAt = DateTime.UtcNow + CodeLifetime }, token); try { - await _mailer.Send(user.Email, _localizer["PrivaPub - Password recovery link"], - string.Format(_localizer[ + await mailer.Send(user.Email, localizer["PrivaPub - Password recovery link"], + string.Format(localizer[ "Hello,\n\nSomeone asked to reset the password of the PrivaPub login {0}. If it was you, open this link within an hour:\n{1}\n\nIf it was not you, ignore this email: nothing changes."], user.UserName, $"{payload.Host}/password-recovery?rc={code}"), token); return JobOutcome.Done; } catch (Exception ex) when (ex is not OperationCanceledException || !token.IsCancellationRequested) { - _logger.LogWarning(ex, "The recovery email could not be sent"); + logger.LogWarning(ex, "The recovery email could not be sent"); return JobOutcome.Retry("smtp"); } } diff --git a/PrivaPub/Services/RequestLocalizationOptionsService.cs b/PrivaPub/Services/RequestLocalizationOptionsService.cs index 286c132..124372a 100644 --- a/PrivaPub/Services/RequestLocalizationOptionsService.cs +++ b/PrivaPub/Services/RequestLocalizationOptionsService.cs @@ -6,24 +6,19 @@ using System.Globalization; namespace PrivaPub.Services { - public class RequestLocalizationOptionsService + public class RequestLocalizationOptionsService( + AppConfigurationService appConfigurationService) { RequestLocalizationOptions RequestLocalizationOptions { get; set; } - readonly AppConfigurationService AppConfigurationService; - public RequestLocalizationOptionsService(AppConfigurationService appConfigurationService) - { - AppConfigurationService = appConfigurationService; - } - - public async Task Get() + public async Task Get(CancellationToken token = default) { if (RequestLocalizationOptions != default) return RequestLocalizationOptions; - if (AppConfigurationService.AppConfiguration == default) - await AppConfigurationService.Init(); + if (appConfigurationService.AppConfiguration == default) + await appConfigurationService.Init(token); RequestLocalizationOptions = new RequestLocalizationOptions(); - var cultures = AppConfigurationService + var cultures = appConfigurationService .AppConfiguration .SupportedLanguages .Select(sl => new CultureInfo(sl)) diff --git a/PrivaPub/Services/RootRemoval.cs b/PrivaPub/Services/RootRemoval.cs index aa9b9ca..a697862 100644 --- a/PrivaPub/Services/RootRemoval.cs +++ b/PrivaPub/Services/RootRemoval.cs @@ -14,30 +14,22 @@ namespace PrivaPub.Services // is deleted (PersonaRemoval: each group it owns, a Delete of the actor to everyone who follows it and everyone it // follows, its posts emptied, its name kept reserved and its documents answering 410). The root's sessions end first, so // nothing acts as it while it goes, and it keeps only a deleted-{id} name. - public class RootRemoval : IRootRemoval + public class RootRemoval( + DbEntities dbEntities, + IRootSessions sessions, + IPersonaRemoval personas) : IRootRemoval { - readonly DbEntities _dbEntities; - readonly IRootSessions _sessions; - readonly IPersonaRemoval _personas; - - public RootRemoval(DbEntities dbEntities, IRootSessions sessions, IPersonaRemoval personas) - { - _dbEntities = dbEntities; - _sessions = sessions; - _personas = personas; - } - public async Task Remove(string rootId, CancellationToken token) { - var root = await _dbEntities.RootUsers.MatchID(rootId).Match(u => u.DeletedAt == null).ExecuteFirstAsync(token); + var root = await dbEntities.RootUsers.MatchID(rootId).Match(u => u.DeletedAt == null).ExecuteFirstAsync(token); if (root == default) return false; - await _sessions.Revoke(root.ID, token); + await sessions.Revoke(root.ID, token); var now = DateTime.UtcNow; - var avatarIds = (await _dbEntities.RootToAvatars.Match(ra => ra.RootId == root.ID).ExecuteAsync(token)).Select(ra => ra.AvatarId).ToList(); + var avatarIds = (await dbEntities.RootToAvatars.Match(ra => ra.RootId == root.ID).ExecuteAsync(token)).Select(ra => ra.AvatarId).ToList(); foreach (var avatarId in avatarIds) - await _personas.Remove(avatarId, token); + await personas.Remove(avatarId, token); await DB.Default.Update().MatchID(root.ID) .Modify(u => u.UserName, $"deleted-{root.ID}")//unique, so a second deletion never collides with the first diff --git a/PrivaPub/Services/RootSessions.cs b/PrivaPub/Services/RootSessions.cs index b8a620a..56562fa 100644 --- a/PrivaPub/Services/RootSessions.cs +++ b/PrivaPub/Services/RootSessions.cs @@ -18,21 +18,12 @@ namespace PrivaPub.Services // and the Mastodon API tokens and authorizations of each of its personas, with their Web Push subscriptions. Used when its password is changed or // recovered, when it signs out everywhere and when it is deleted. End signs out one session only: the device that // asked (its Mastodon tokens it revokes itself). - public class RootSessions : IRootSessions + public class RootSessions( + DbEntities dbEntities, + IOpenIddictTokenManager openIddictTokenManager, + IOpenIddictAuthorizationManager authorizations, + AuthTokenManager authTokens) : IRootSessions { - readonly DbEntities _dbEntities; - readonly IOpenIddictTokenManager _tokens; - readonly IOpenIddictAuthorizationManager _authorizations; - readonly AuthTokenManager _authTokens; - - public RootSessions(DbEntities dbEntities, IOpenIddictTokenManager tokens, IOpenIddictAuthorizationManager authorizations, AuthTokenManager authTokens) - { - _dbEntities = dbEntities; - _tokens = tokens; - _authorizations = authorizations; - _authTokens = authTokens; - } - public async Task Revoke(string rootId, CancellationToken token) { await DB.Default.Update().MatchID(rootId) @@ -40,14 +31,14 @@ namespace PrivaPub.Services .Modify(u => u.SessionStamp, Guid.NewGuid().ToString("N")) .Modify(u => u.EndedSessions, new List())//the new stamp ends those too .ExecuteAsync(token); - var links = await _dbEntities.RootToAvatars.Match(ra => ra.RootId == rootId).ExecuteAsync(token); + var links = await dbEntities.RootToAvatars.Match(ra => ra.RootId == rootId).ExecuteAsync(token); foreach (var link in links) { - await _tokens.RevokeBySubjectAsync(link.AvatarId, token); - await _authorizations.RevokeBySubjectAsync(link.AvatarId, token); + await openIddictTokenManager.RevokeBySubjectAsync(link.AvatarId, token); + await authorizations.RevokeBySubjectAsync(link.AvatarId, token); } // their Web Push subscriptions go with their tokens (R9) - await Domain.Social.WebPush.Forget(links.Select(l => l.AvatarId).ToList()); + await Domain.Social.WebPush.Forget(links.Select(l => l.AvatarId).ToList(), token); } // remembered as long as one of its tokens could still be valid; the ones that have expired are forgotten meanwhile @@ -58,7 +49,7 @@ namespace PrivaPub.Services .Modify(b => b.PullFilter(u => u.EndedSessions, s => s.Until < now)) .ExecuteAsync(token); await DB.Default.Update().MatchID(rootId) - .Modify(b => b.Push(u => u.EndedSessions, new EndedSession { Sid = sessionId, Until = now + _authTokens.Lifetime })) + .Modify(b => b.Push(u => u.EndedSessions, new EndedSession { Sid = sessionId, Until = now + authTokens.Lifetime })) .ExecuteAsync(token); } } diff --git a/PrivaPub/Services/RootUsersService.cs b/PrivaPub/Services/RootUsersService.cs index 60c059a..8a4a807 100644 --- a/PrivaPub/Services/RootUsersService.cs +++ b/PrivaPub/Services/RootUsersService.cs @@ -20,53 +20,32 @@ using System.Text.Json; namespace PrivaPub.Services { - public class RootUsersService : IRootUsersService + public class RootUsersService( + IJobQueue jobs, + IRootSessions sessions, + IRootRemoval removal, + IStringLocalizer localizer, + ILogger logger, + IPasswordHasher passwordHasher, + DbEntities dbEntities, + AppConfigurationService appConfigurationService) : IRootUsersService { - readonly DbEntities DbEntities; - readonly IPasswordHasher PasswordHasher; - readonly IStringLocalizer Localizer; - readonly ILogger Logger; - readonly AppConfigurationService AppConfigurationService; - readonly IJobQueue Jobs; - readonly IRootSessions Sessions; - readonly IRootRemoval Removal; - - public RootUsersService( - IJobQueue jobs, - IRootSessions sessions, - IRootRemoval removal, - IStringLocalizer localizer, - ILogger logger, - IPasswordHasher passwordHasher, - DbEntities dbEntities, - AppConfigurationService appConfigurationService) - { - Jobs = jobs; - Sessions = sessions; - Removal = removal; - DbEntities = dbEntities; - PasswordHasher = passwordHasher; - Localizer = localizer; - Logger = logger; - AppConfigurationService = appConfigurationService; - } - public const string NoMatch = "That username and password do not match."; static string _decoy; // a hash nobody's password matches, so an unknown login costs the same hashing as a wrong password - string Decoy => _decoy ??= PasswordHasher.Hash(Convert.ToHexString(System.Security.Cryptography.RandomNumberGenerator.GetBytes(16))); + string Decoy => _decoy ??= passwordHasher.Hash(Convert.ToHexString(System.Security.Cryptography.RandomNumberGenerator.GetBytes(16))); - public async Task SignUpAsync(LoginForm signUpForm) + public async Task SignUpAsync(LoginForm signUpForm, CancellationToken token = default) { var result = new WebResult(); try { signUpForm.UserName = signUpForm.UserName.ToLower(); - if (await DbEntities.RootUsers.Match(u => u.UserName == signUpForm.UserName).ExecuteAnyAsync()) - return result.Invalidate(Localizer["Username '{0}' already taken.", signUpForm.UserName]); + if (await dbEntities.RootUsers.Match(u => u.UserName == signUpForm.UserName).ExecuteAnyAsync(token)) + return result.Invalidate(localizer["Username '{0}' already taken.", signUpForm.UserName]); - var signUpPasswordHashed = PasswordHasher.Hash(signUpForm.Password); + var signUpPasswordHashed = passwordHasher.Hash(signUpForm.Password); var newUser = new RootUser { UserName = signUpForm.UserName, @@ -74,7 +53,7 @@ namespace PrivaPub.Services }; var cultureLanguage = CultureInfo.CurrentCulture.TwoLetterISOLanguageName; - var language = await DbEntities.Languages.Match(l => l.International2Code == cultureLanguage).ExecuteFirstAsync(); + var language = await dbEntities.Languages.Match(l => l.International2Code == cultureLanguage).ExecuteFirstAsync(token); newUser.Settings = new RootUserSettings { LanguageCode = language?.International2Code ?? "en", @@ -86,7 +65,7 @@ namespace PrivaPub.Services PreferSystemTheming = signUpForm.PreferSystemTheming, ThemeIsDarkMode = signUpForm.ThemeIsDarkMode }; - await DB.Default.SaveAsync(newUser); + await DB.Default.SaveAsync(newUser, token); result.Data = (newUser, ToViewSettings(newUser.Settings)); @@ -94,12 +73,12 @@ namespace PrivaPub.Services } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(SignUpAsync)}()"); - return result.Invalidate(Localizer["Something went wrong."], exception: ex); + logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(SignUpAsync)}()"); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } - public async Task LoginAsync(LoginForm loginForm) + public async Task LoginAsync(LoginForm loginForm, CancellationToken token = default) { var result = new WebResult(); try @@ -107,33 +86,33 @@ namespace PrivaPub.Services // One answer, after the same work, whether the login is unknown, deleted or the password wrong: sign-in must not // tell anyone which logins exist. Only someone who knows the password learns the login is banned. loginForm.UserName = loginForm.UserName.ToLower(); - var user = await DbEntities.RootUsers.Match(u => u.UserName == loginForm.UserName && u.DeletedAt == null).ExecuteFirstAsync(); - var (verified, needsUpgrade) = PasswordHasher.Check(user?.HashedPassword ?? Decoy, loginForm.Password); + var user = await dbEntities.RootUsers.Match(u => u.UserName == loginForm.UserName && u.DeletedAt == null).ExecuteFirstAsync(token); + var (verified, needsUpgrade) = passwordHasher.Check(user?.HashedPassword ?? Decoy, loginForm.Password); if (user?.HashedPassword == default || !verified) - return result.Invalidate(Localizer[NoMatch]); + return result.Invalidate(localizer[NoMatch]); if (user.IsBanned) - return result.Invalidate(Localizer["User '{0}' banned.", user.UserName]); + return result.Invalidate(localizer["User '{0}' banned.", user.UserName]); // only a correct password learns that two-factor is on: it is asked for with a 428 if (user.Totp?.EnabledAt != default) { if (string.IsNullOrWhiteSpace(loginForm.OneTimeCode)) - return result.Invalidate(Localizer[TwoFactor.CodeNeeded], StatusCodes.Status428PreconditionRequired); + return result.Invalidate(localizer[TwoFactor.CodeNeeded], StatusCodes.Status428PreconditionRequired); if (!await TwoFactor.Consume(user, loginForm.OneTimeCode, CancellationToken.None)) - return result.Invalidate(Localizer[TwoFactor.CodeInvalid]); + return result.Invalidate(localizer[TwoFactor.CodeInvalid]); } // hashed again at today's iterations; matched on the old hash, so two sign-ins at once never undo each other if (needsUpgrade) { var oldHash = user.HashedPassword; - user.HashedPassword = PasswordHasher.Hash(loginForm.Password); + user.HashedPassword = passwordHasher.Hash(loginForm.Password); await DB.Default.Update() .Match(u => u.ID == user.ID && u.HashedPassword == oldHash) .Modify(u => u.HashedPassword, user.HashedPassword) - .ExecuteAsync(); + .ExecuteAsync(token); } - var userSettingsResult = await GetUserSettingsAsync(user.ID, loginForm); + var userSettingsResult = await GetUserSettingsAsync(user.ID, loginForm, token); var userSettings = (ViewUserSettings)userSettingsResult.Data; result.Data = (user, userSettings); @@ -142,27 +121,27 @@ namespace PrivaPub.Services } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(LoginAsync)}()"); - return result.Invalidate(Localizer["Something went wrong."], exception: ex); + logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(LoginAsync)}()"); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } - public async Task UpdateUserSettingsAsync(ViewUserSettings userSettings, string userId) + public async Task UpdateUserSettingsAsync(ViewUserSettings userSettings, string userId, CancellationToken token = default) { var result = new WebResult(); try { - var isSupportedLanguage = AppConfigurationService.AppConfiguration.SupportedLanguages.Contains(userSettings.LanguageCode); + var isSupportedLanguage = appConfigurationService.AppConfiguration.SupportedLanguages.Contains(userSettings.LanguageCode); if (!isSupportedLanguage) - return result.Invalidate(Localizer["Language code '{0}' unsupported.", userSettings.LanguageCode]); + return result.Invalidate(localizer["Language code '{0}' unsupported.", userSettings.LanguageCode]); - var languageCodeExists = await DbEntities.Languages - .Match(l => l.International2Code == userSettings.LanguageCode).ExecuteAnyAsync(); + var languageCodeExists = await dbEntities.Languages + .Match(l => l.International2Code == userSettings.LanguageCode).ExecuteAnyAsync(token); if (!languageCodeExists) - return result.Invalidate(Localizer["Language code '{0}' doesn't exist.", userSettings.LanguageCode]); + return result.Invalidate(localizer["Language code '{0}' doesn't exist.", userSettings.LanguageCode]); - var language = await DbEntities.Languages.Match(l => l.International2Code == userSettings.LanguageCode) - .ExecuteFirstAsync(); + var language = await dbEntities.Languages.Match(l => l.International2Code == userSettings.LanguageCode) + .ExecuteFirstAsync(token); _ = await DB.Default.Update() .MatchID(userId) .Modify(u => u.Settings.LanguageCode, language.International2Code) @@ -175,98 +154,98 @@ namespace PrivaPub.Services .Modify(u => u.Settings.IconsThemeIndexColour, userSettings.IconsThemeIndexColour) .Modify(u => u.Settings.SavedAt, DateTime.UtcNow) .Modify(u => u.UpdatedAt, DateTime.UtcNow) - .ExecuteAsync(); + .ExecuteAsync(token); return result; } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(UpdateUserSettingsAsync)}()"); - return result.Invalidate(Localizer["Something went wrong."], exception: ex); + logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(UpdateUserSettingsAsync)}()"); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } - public async Task UpdateUserPasswordAsync(UserPasswordForm userPasswordForm, string userId) + public async Task UpdateUserPasswordAsync(UserPasswordForm userPasswordForm, string userId, CancellationToken token = default) { var result = new WebResult(); try { - var user = await DbEntities.RootUsers.Match(u => u.ID == userId && u.DeletedAt == null).ExecuteFirstAsync(); + var user = await dbEntities.RootUsers.Match(u => u.ID == userId && u.DeletedAt == null).ExecuteFirstAsync(token); if (user == null) - return result.Invalidate(Localizer["Username '{0}' not found.", userId]); + return result.Invalidate(localizer["Username '{0}' not found.", userId]); - var (verified, needsUpgrade) = PasswordHasher.Check(user.HashedPassword, userPasswordForm.OldPassword); + var (verified, needsUpgrade) = passwordHasher.Check(user.HashedPassword, userPasswordForm.OldPassword); if (!verified) - return result.Invalidate(Localizer["Wrong password."]); + return result.Invalidate(localizer["Wrong password."]); await DB.Default.Update().MatchID(user.ID) - .Modify(u => u.HashedPassword, PasswordHasher.Hash(userPasswordForm.NewPassword)) + .Modify(u => u.HashedPassword, passwordHasher.Hash(userPasswordForm.NewPassword)) .Modify(u => u.UpdatedAt, DateTime.UtcNow) - .ExecuteAsync(); + .ExecuteAsync(token); // whoever else is signed in may be why the password changed: every session ends, and the caller gets a new one - await Sessions.Revoke(user.ID, CancellationToken.None); - user = await DbEntities.RootUsers.MatchID(user.ID).ExecuteFirstAsync(); + await sessions.Revoke(user.ID, CancellationToken.None); + user = await dbEntities.RootUsers.MatchID(user.ID).ExecuteFirstAsync(token); result.Data = (user, ToViewSettings(user.Settings)); return result; } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(UpdateUserPasswordAsync)}()"); - return result.Invalidate(Localizer["Something went wrong."], exception: ex); + logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(UpdateUserPasswordAsync)}()"); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } - public async Task RemoveUserAsync(UsersIds usersIds) + public async Task RemoveUserAsync(UsersIds usersIds, CancellationToken token = default) { var result = new WebResult(); try { var removed = 0; foreach (var id in usersIds.UserIdList.Distinct()) - if (await Removal.Remove(id, CancellationToken.None)) + if (await removal.Remove(id, CancellationToken.None)) removed++; if (removed == 0) - return result.Invalidate(Localizer["User already deleted."]); + return result.Invalidate(localizer["User already deleted."]); return result; } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(RemoveUserAsync)}()"); - return result.Invalidate(Localizer["Something went wrong."], exception: ex); + logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(RemoveUserAsync)}()"); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } // A root deletes itself only with its password, so a stolen session cannot. - public async Task RemoveSelfAsync(string rootId, string password) + public async Task RemoveSelfAsync(string rootId, string password, CancellationToken token = default) { var result = new WebResult(); try { - var user = await DbEntities.RootUsers.MatchID(rootId).Match(u => u.DeletedAt == null).ExecuteFirstAsync(); - var (verified, _) = PasswordHasher.Check(user?.HashedPassword ?? Decoy, password ?? string.Empty); + var user = await dbEntities.RootUsers.MatchID(rootId).Match(u => u.DeletedAt == null).ExecuteFirstAsync(token); + var (verified, _) = passwordHasher.Check(user?.HashedPassword ?? Decoy, password ?? string.Empty); if (user?.HashedPassword == default || !verified) - return result.Invalidate(Localizer[NoMatch], StatusCodes.Status403Forbidden); - await Removal.Remove(user.ID, CancellationToken.None); + return result.Invalidate(localizer[NoMatch], StatusCodes.Status403Forbidden); + await removal.Remove(user.ID, CancellationToken.None); return result; } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(RemoveSelfAsync)}()"); - return result.Invalidate(Localizer["Something went wrong."], exception: ex); + logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(RemoveSelfAsync)}()"); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } // what can't be undone asks for the password again (a persona's or a group's deletion, by its login or an administrator) - public async Task PasswordMatches(string rootId, string password) + public async Task PasswordMatches(string rootId, string password, CancellationToken token = default) { - var user = string.IsNullOrEmpty(rootId) ? default : await DbEntities.RootUsers.MatchID(rootId).Match(u => u.DeletedAt == null).ExecuteFirstAsync(); - var (verified, _) = PasswordHasher.Check(user?.HashedPassword ?? Decoy, password ?? string.Empty); + var user = string.IsNullOrEmpty(rootId) ? default : await dbEntities.RootUsers.MatchID(rootId).Match(u => u.DeletedAt == null).ExecuteFirstAsync(token); + var (verified, _) = passwordHasher.Check(user?.HashedPassword ?? Decoy, password ?? string.Empty); return user?.HashedPassword != default && verified; } - public async Task BanUserAsync(UsersIds usersIds) + public async Task BanUserAsync(UsersIds usersIds, CancellationToken token = default) { var result = new WebResult(); try @@ -274,18 +253,18 @@ namespace PrivaPub.Services await DB.Default.Update() .Match(u => usersIds.UserIdList.Contains(u.ID)) .Modify(u => u.IsBanned, true) - .ExecuteAsync(); + .ExecuteAsync(token); return result; } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(BanUserAsync)}()"); - return result.Invalidate(Localizer["Something went wrong."], exception: ex); + logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(BanUserAsync)}()"); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } - public async Task UnbanUserAsync(UsersIds usersIds) + public async Task UnbanUserAsync(UsersIds usersIds, CancellationToken token = default) { var result = new WebResult(); try @@ -293,25 +272,25 @@ namespace PrivaPub.Services await DB.Default.Update() .Match(u => usersIds.UserIdList.Contains(u.ID)) .Modify(u => u.IsBanned, false) - .ExecuteAsync(); + .ExecuteAsync(token); return result; } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(UnbanUserAsync)}()"); - return result.Invalidate(Localizer["Something went wrong."], exception: ex); + logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(UnbanUserAsync)}()"); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } - public async Task GetUserSettingsAsync(string userId, LoginForm loginForm = default) + public async Task GetUserSettingsAsync(string userId, LoginForm loginForm = default, CancellationToken token = default) { var result = new WebResult(); try { - var user = await DbEntities.RootUsers.MatchID(userId).ExecuteFirstAsync(); + var user = await dbEntities.RootUsers.MatchID(userId).ExecuteFirstAsync(token); if (user == default) - return result.Invalidate(Localizer["User not found."], StatusCodes.Status404NotFound); + return result.Invalidate(localizer["User not found."], StatusCodes.Status404NotFound); if (loginForm != default && loginForm.ThemeIsDarkMode != user.Settings.ThemeIsDarkMode) { @@ -319,7 +298,7 @@ namespace PrivaPub.Services await DB.Default.Update() .MatchID(userId) .Modify(u => u.Settings.ThemeIsDarkMode, loginForm.ThemeIsDarkMode) - .ExecuteAsync(); + .ExecuteAsync(token); } result.Data = ToViewSettings(user.Settings); @@ -327,8 +306,8 @@ namespace PrivaPub.Services } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(GetUserSettingsAsync)}()"); - return result.Invalidate(Localizer["Something went wrong."], exception: ex); + logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(GetUserSettingsAsync)}()"); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } @@ -336,72 +315,72 @@ namespace PrivaPub.Services // The same answer, after the same work, whether the account exists, has an email or can be written to: recovery must // not tell anyone which logins or addresses exist. RecoveryJob does the rest, out of the request. - public async Task SetupAndSendRecoveryEmail(PasswordRecoveryForm passwordRecoveryForm, string host) + public async Task SetupAndSendRecoveryEmail(PasswordRecoveryForm passwordRecoveryForm, string host, CancellationToken token = default) { var result = new WebResult(); try { var userName = passwordRecoveryForm.UserName?.ToLowerInvariant(); var user = passwordRecoveryForm.IsEmailDisabled - ? await DbEntities.RootUsers.Match(u => u.UserName == userName && u.DeletedAt == null).ExecuteFirstAsync() - : await DbEntities.RootUsers.Match(u => u.Email == passwordRecoveryForm.Email && u.IsEmailValidated && u.DeletedAt == null).ExecuteFirstAsync(); - await Jobs.Enqueue(JobKind.SendRecovery, JsonSerializer.Serialize(new RecoveryPayload(user?.ID, host)), RecoveryJob.Host, + ? await dbEntities.RootUsers.Match(u => u.UserName == userName && u.DeletedAt == null).ExecuteFirstAsync(token) + : await dbEntities.RootUsers.Match(u => u.Email == passwordRecoveryForm.Email && u.IsEmailValidated && u.DeletedAt == null).ExecuteFirstAsync(token); + await jobs.Enqueue(JobKind.SendRecovery, JsonSerializer.Serialize(new RecoveryPayload(user?.ID, host)), RecoveryJob.Host, dedupeKey: default, CancellationToken.None); - result.Data = Localizer[RecoverySent].Value; + result.Data = (string)localizer[RecoverySent]; return result; } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(SetupAndSendRecoveryEmail)}()"); - return result.Invalidate(Localizer["Something went wrong."], exception: ex); + logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(SetupAndSendRecoveryEmail)}()"); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } - Task LiveRecovery(string recoveryCode) + Task LiveRecovery(string recoveryCode, CancellationToken token = default) { var hash = RecoveryJob.Hash(recoveryCode); var now = DateTime.UtcNow; - return DbEntities.EmailRecoveries.Match(er => er.CodeHash == hash && er.ExpiresAt > now).ExecuteFirstAsync(); + return dbEntities.EmailRecoveries.Match(er => er.CodeHash == hash && er.ExpiresAt > now).ExecuteFirstAsync(token); } - public async Task IsValidRecoveryCode(string recoveryCode) + public async Task IsValidRecoveryCode(string recoveryCode, CancellationToken token = default) { var result = new WebResult(); try { - result.Data = await LiveRecovery(recoveryCode) != default; + result.Data = await LiveRecovery(recoveryCode, token) != default; return result; } catch (Exception ex) { - return result.Invalidate(Localizer["Something went wrong."], exception: ex); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } // A recovered password ends every session the root had: whoever had them may be why it was recovered. - public async Task ChangePassword(NewPasswordForm newPasswordForm) + public async Task ChangePassword(NewPasswordForm newPasswordForm, CancellationToken token = default) { var result = new WebResult(); try { - var recovery = await LiveRecovery(newPasswordForm.RecoveryCode); + var recovery = await LiveRecovery(newPasswordForm.RecoveryCode, token); var user = recovery == default ? default - : await DbEntities.RootUsers.MatchID(recovery.RootUserId).Match(u => u.DeletedAt == null && !u.IsBanned).ExecuteFirstAsync(); + : await dbEntities.RootUsers.MatchID(recovery.RootUserId).Match(u => u.DeletedAt == null && !u.IsBanned).ExecuteFirstAsync(token); if (user == default) - return result.Invalidate(Localizer["Invalid recovery code."], StatusCodes.Status404NotFound); + return result.Invalidate(localizer["Invalid recovery code."], StatusCodes.Status404NotFound); await DB.Default.Update().MatchID(user.ID) - .Modify(u => u.HashedPassword, PasswordHasher.Hash(newPasswordForm.NewPassword)) + .Modify(u => u.HashedPassword, passwordHasher.Hash(newPasswordForm.NewPassword)) .Modify(u => u.UpdatedAt, DateTime.UtcNow) - .ExecuteAsync(); + .ExecuteAsync(token); await DB.Default.DeleteAsync(er => er.RootUserId == user.ID); - await Sessions.Revoke(user.ID, CancellationToken.None); + await sessions.Revoke(user.ID, CancellationToken.None); return result; } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(ChangePassword)}()"); - return result.Invalidate(Localizer["Something went wrong."], exception: ex); + logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(ChangePassword)}()"); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } @@ -421,16 +400,16 @@ namespace PrivaPub.Services public const string EmailCodeSent = "If that address can be used, a code is on its way to it. It works for one hour."; public const string EmailCodeInvalid = "That code is not valid."; - public async Task AccountAsync(string rootId) + public async Task AccountAsync(string rootId, CancellationToken token = default) { var result = new WebResult(); try { - var user = await DbEntities.RootUsers.MatchID(rootId).Match(u => u.DeletedAt == null).ExecuteFirstAsync(); + var user = await dbEntities.RootUsers.MatchID(rootId).Match(u => u.DeletedAt == null).ExecuteFirstAsync(token); if (user == default) - return result.Invalidate(Localizer["User not found."], StatusCodes.Status404NotFound); + return result.Invalidate(localizer["User not found."], StatusCodes.Status404NotFound); var now = DateTime.UtcNow; - var pending = await DB.Default.Find().Match(v => v.RootUserId == rootId && v.ExpiresAt > now).ExecuteFirstAsync(); + var pending = await DB.Default.Find().Match(v => v.RootUserId == rootId && v.ExpiresAt > now).ExecuteFirstAsync(token); result.Data = new ViewAccount { UserName = user.UserName, @@ -445,22 +424,22 @@ namespace PrivaPub.Services } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(AccountAsync)}()"); - return result.Invalidate(Localizer["Something went wrong."], exception: ex); + logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(AccountAsync)}()"); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } // Only with the password, so a stolen session can't move recovery to its own inbox. The answer is the same sentence // whether or not the address is free; EmailVerificationJob sends the code, or nothing when another login holds it. - public async Task RequestEmailChangeAsync(string rootId, EmailChangeForm form) + public async Task RequestEmailChangeAsync(string rootId, EmailChangeForm form, CancellationToken token = default) { var result = new WebResult(); try { - var user = await DbEntities.RootUsers.MatchID(rootId).Match(u => u.DeletedAt == null).ExecuteFirstAsync(); - var (verified, _) = PasswordHasher.Check(user?.HashedPassword ?? Decoy, form.Password ?? string.Empty); + var user = await dbEntities.RootUsers.MatchID(rootId).Match(u => u.DeletedAt == null).ExecuteFirstAsync(token); + var (verified, _) = passwordHasher.Check(user?.HashedPassword ?? Decoy, form.Password ?? string.Empty); if (user?.HashedPassword == default || !verified) - return result.Invalidate(Localizer["Wrong password."], StatusCodes.Status403Forbidden); + return result.Invalidate(localizer["Wrong password."], StatusCodes.Status403Forbidden); await DB.Default.DeleteAsync(v => v.RootUserId == user.ID); var pending = new EmailVerification @@ -469,94 +448,94 @@ namespace PrivaPub.Services Email = form.Email.Trim().ToLowerInvariant(), ExpiresAt = DateTime.UtcNow + EmailVerification.Lifetime }; - await DB.Default.SaveAsync(pending); - await Jobs.Enqueue(JobKind.SendEmailVerification, JsonSerializer.Serialize(new EmailVerificationPayload(pending.ID)), + await DB.Default.SaveAsync(pending, token); + await jobs.Enqueue(JobKind.SendEmailVerification, JsonSerializer.Serialize(new EmailVerificationPayload(pending.ID)), EmailVerificationJob.Host, dedupeKey: default, CancellationToken.None); - result.Data = Localizer[EmailCodeSent].Value; + result.Data = (string)localizer[EmailCodeSent]; return result; } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(RequestEmailChangeAsync)}()"); - return result.Invalidate(Localizer["Something went wrong."], exception: ex); + logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(RequestEmailChangeAsync)}()"); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } // One answer for every failure (wrong, expired, five tries spent, or the address verified by another login meanwhile) - public async Task VerifyEmailAsync(string rootId, string code) + public async Task VerifyEmailAsync(string rootId, string code, CancellationToken token = default) { var result = new WebResult(); try { var now = DateTime.UtcNow; - var pending = await DB.Default.Find().Match(v => v.RootUserId == rootId && v.ExpiresAt > now).ExecuteFirstAsync(); + var pending = await DB.Default.Find().Match(v => v.RootUserId == rootId && v.ExpiresAt > now).ExecuteFirstAsync(token); if (pending == default || string.IsNullOrEmpty(pending.CodeHash)) - return result.Invalidate(Localizer[EmailCodeInvalid]); + return result.Invalidate(localizer[EmailCodeInvalid]); if (pending.CodeHash != RecoveryJob.Hash(code?.Trim())) { if (pending.Attempts + 1 >= EmailVerification.MaxAttempts) await DB.Default.DeleteAsync(pending.ID); else - await DB.Default.Update().MatchID(pending.ID).Modify(b => b.Inc(v => v.Attempts, 1)).ExecuteAsync(); - return result.Invalidate(Localizer[EmailCodeInvalid]); + await DB.Default.Update().MatchID(pending.ID).Modify(b => b.Inc(v => v.Attempts, 1)).ExecuteAsync(token); + return result.Invalidate(localizer[EmailCodeInvalid]); } await DB.Default.DeleteAsync(pending.ID); - if (await DbEntities.RootUsers.Match(u => u.Email == pending.Email && u.IsEmailValidated && u.ID != rootId && u.DeletedAt == null).ExecuteAnyAsync()) - return result.Invalidate(Localizer[EmailCodeInvalid]); + if (await dbEntities.RootUsers.Match(u => u.Email == pending.Email && u.IsEmailValidated && u.ID != rootId && u.DeletedAt == null).ExecuteAnyAsync(token)) + return result.Invalidate(localizer[EmailCodeInvalid]); await DB.Default.Update().MatchID(rootId) .Modify(u => u.Email, pending.Email) .Modify(u => u.IsEmailValidated, true) .Modify(u => u.UpdatedAt, now) - .ExecuteAsync(); - return await AccountAsync(rootId); + .ExecuteAsync(token); + return await AccountAsync(rootId, token); } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(VerifyEmailAsync)}()"); - return result.Invalidate(Localizer["Something went wrong."], exception: ex); + logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(VerifyEmailAsync)}()"); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } // Two-factor sign-in (TwoFactor): set up with the password, turned on by the app's first code (which also proves the // app holds the secret), turned off with the password and a code. Turning it on ends every other session. - public async Task TotpSetupAsync(string rootId, string password) + public async Task TotpSetupAsync(string rootId, string password, CancellationToken token = default) { var result = new WebResult(); try { - var user = await DbEntities.RootUsers.MatchID(rootId).Match(u => u.DeletedAt == null).ExecuteFirstAsync(); - var (verified, _) = PasswordHasher.Check(user?.HashedPassword ?? Decoy, password ?? string.Empty); + var user = await dbEntities.RootUsers.MatchID(rootId).Match(u => u.DeletedAt == null).ExecuteFirstAsync(token); + var (verified, _) = passwordHasher.Check(user?.HashedPassword ?? Decoy, password ?? string.Empty); if (user?.HashedPassword == default || !verified) - return result.Invalidate(Localizer["Wrong password."], StatusCodes.Status403Forbidden); + return result.Invalidate(localizer["Wrong password."], StatusCodes.Status403Forbidden); if (user.Totp?.EnabledAt != default) - return result.Invalidate(Localizer["Two-factor sign-in is on already: turn it off first."], StatusCodes.Status409Conflict); + return result.Invalidate(localizer["Two-factor sign-in is on already: turn it off first."], StatusCodes.Status409Conflict); var secret = TwoFactor.NewSecret(); await DB.Default.Update().MatchID(rootId) .Modify(u => u.Totp, new RootTotp { PendingSecret = secret, PendingSince = DateTime.UtcNow }) - .ExecuteAsync(); + .ExecuteAsync(token); var uri = TwoFactor.OtpAuthUri(secret, user.UserName); result.Data = new ViewTotpSetup { Secret = secret, OtpAuthUri = uri, QrDataUri = TwoFactor.QrDataUri(uri) }; return result; } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(TotpSetupAsync)}()"); - return result.Invalidate(Localizer["Something went wrong."], exception: ex); + logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(TotpSetupAsync)}()"); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } - public async Task TotpEnableAsync(string rootId, string code) + public async Task TotpEnableAsync(string rootId, string code, CancellationToken token = default) { var result = new WebResult(); try { - var user = await DbEntities.RootUsers.MatchID(rootId).Match(u => u.DeletedAt == null).ExecuteFirstAsync(); + var user = await dbEntities.RootUsers.MatchID(rootId).Match(u => u.DeletedAt == null).ExecuteFirstAsync(token); if (user?.Totp is not { EnabledAt: null, PendingSecret: not null } pending || pending.PendingSince < DateTime.UtcNow.AddHours(-1)) - return result.Invalidate(Localizer["Set up two-factor sign-in again: that setup expired."], StatusCodes.Status409Conflict); + return result.Invalidate(localizer["Set up two-factor sign-in again: that setup expired."], StatusCodes.Status409Conflict); if (TwoFactor.Step(pending.PendingSecret, code) is not { } step) - return result.Invalidate(Localizer[TwoFactor.CodeInvalid]); + return result.Invalidate(localizer[TwoFactor.CodeInvalid]); var codes = TwoFactor.NewRecoveryCodes(); await DB.Default.Update().MatchID(rootId) @@ -567,66 +546,66 @@ namespace PrivaPub.Services LastStep = step, RecoveryCodeHashes = codes.Select(TwoFactor.HashRecovery).ToList() }) - .ExecuteAsync(); - await Sessions.Revoke(rootId, CancellationToken.None); - user = await DbEntities.RootUsers.MatchID(rootId).ExecuteFirstAsync(); + .ExecuteAsync(token); + await sessions.Revoke(rootId, CancellationToken.None); + user = await dbEntities.RootUsers.MatchID(rootId).ExecuteFirstAsync(token); result.Data = (user, ToViewSettings(user.Settings), codes); return result; } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(TotpEnableAsync)}()"); - return result.Invalidate(Localizer["Something went wrong."], exception: ex); + logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(TotpEnableAsync)}()"); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } - public async Task TotpDisableAsync(string rootId, string password, string code) + public async Task TotpDisableAsync(string rootId, string password, string code, CancellationToken token = default) { var result = new WebResult(); try { - var user = await DbEntities.RootUsers.MatchID(rootId).Match(u => u.DeletedAt == null).ExecuteFirstAsync(); - var (verified, _) = PasswordHasher.Check(user?.HashedPassword ?? Decoy, password ?? string.Empty); + var user = await dbEntities.RootUsers.MatchID(rootId).Match(u => u.DeletedAt == null).ExecuteFirstAsync(token); + var (verified, _) = passwordHasher.Check(user?.HashedPassword ?? Decoy, password ?? string.Empty); if (user?.HashedPassword == default || !verified) - return result.Invalidate(Localizer["Wrong password."], StatusCodes.Status403Forbidden); + return result.Invalidate(localizer["Wrong password."], StatusCodes.Status403Forbidden); if (user.Totp?.EnabledAt == default) - return await AccountAsync(rootId); + return await AccountAsync(rootId, token); if (!await TwoFactor.Consume(user, code, CancellationToken.None)) - return result.Invalidate(Localizer[TwoFactor.CodeInvalid]); + return result.Invalidate(localizer[TwoFactor.CodeInvalid]); - await DB.Default.Update().MatchID(rootId).Modify(u => u.Totp, null).ExecuteAsync(); - return await AccountAsync(rootId); + await DB.Default.Update().MatchID(rootId).Modify(u => u.Totp, null).ExecuteAsync(token); + return await AccountAsync(rootId, token); } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(TotpDisableAsync)}()"); - return result.Invalidate(Localizer["Something went wrong."], exception: ex); + logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(TotpDisableAsync)}()"); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } - public async Task RemoveEmailAsync(string rootId, string password) + public async Task RemoveEmailAsync(string rootId, string password, CancellationToken token = default) { var result = new WebResult(); try { - var user = await DbEntities.RootUsers.MatchID(rootId).Match(u => u.DeletedAt == null).ExecuteFirstAsync(); - var (verified, _) = PasswordHasher.Check(user?.HashedPassword ?? Decoy, password ?? string.Empty); + var user = await dbEntities.RootUsers.MatchID(rootId).Match(u => u.DeletedAt == null).ExecuteFirstAsync(token); + var (verified, _) = passwordHasher.Check(user?.HashedPassword ?? Decoy, password ?? string.Empty); if (user?.HashedPassword == default || !verified) - return result.Invalidate(Localizer["Wrong password."], StatusCodes.Status403Forbidden); + return result.Invalidate(localizer["Wrong password."], StatusCodes.Status403Forbidden); await DB.Default.Update().MatchID(rootId) .Modify(u => u.Email, null) .Modify(u => u.IsEmailValidated, false) .Modify(u => u.UpdatedAt, DateTime.UtcNow) - .ExecuteAsync(); + .ExecuteAsync(token); await DB.Default.DeleteAsync(v => v.RootUserId == rootId); await DB.Default.DeleteAsync(r => r.RootUserId == rootId); - return await AccountAsync(rootId); + return await AccountAsync(rootId, token); } catch (Exception ex) { - Logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(RemoveEmailAsync)}()"); - return result.Invalidate(Localizer["Something went wrong."], exception: ex); + logger.LogError(ex, $"{nameof(RootUsersService)}.{nameof(RemoveEmailAsync)}()"); + return result.Invalidate(localizer["Something went wrong."], exception: ex); } } } diff --git a/PrivaPub/StaticServices/AuthTokenManager.cs b/PrivaPub/StaticServices/AuthTokenManager.cs index 6a289b9..9ce14a1 100644 --- a/PrivaPub/StaticServices/AuthTokenManager.cs +++ b/PrivaPub/StaticServices/AuthTokenManager.cs @@ -10,7 +10,8 @@ using System.Text; namespace PrivaPub.StaticServices { - public class AuthTokenManager + public class AuthTokenManager( + IConfiguration configuration) { public const string SessionStamp = "ss"; const string SessionStampClaim = SessionStamp;//the root's RootUser.SessionStamp when issued; JwtEvents refuses a stale one @@ -18,20 +19,14 @@ namespace PrivaPub.StaticServices // (RootUser.EndedSessions). Not "sid", which JwtBearer maps to another claim type on the way in. public const string SessionId = "si"; - readonly IConfiguration Configuration; - public AuthTokenManager(IConfiguration configuration) - { - Configuration = configuration; - } - - public TimeSpan Lifetime => TimeSpan.FromHours(int.Parse(Configuration["AppConfiguration:Jwt:HoursTimeout"])); + public TimeSpan Lifetime => TimeSpan.FromHours(int.Parse(configuration["AppConfiguration:Jwt:HoursTimeout"])); /// A token for the root; a renewal passes the session it renews, a new sign-in gets a new one. public JwtUser GenerateToken(RootUser user, ViewUserSettings userSettings, string sessionId = default) { var expiration = DateTime.UtcNow + Lifetime; - var securityKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(Configuration["AppConfiguration:Jwt:Key"])); + var securityKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(configuration["AppConfiguration:Jwt:Key"])); var jwtUser = new JwtUser { UserId = user.ID, @@ -53,7 +48,7 @@ namespace PrivaPub.StaticServices claims.Add(new(Policies.IsModerator, $"{user.Policies.Contains(Policies.IsModerator)}".ToLower())); claims.Add(new(Policies.IsAdmin, $"{user.Policies.Contains(Policies.IsAdmin)}".ToLower())); - var token = new JwtSecurityToken(issuer: Configuration["AppConfiguration:Jwt:Issuer"], audience: Configuration["AppConfiguration:Jwt:Audience"], + var token = new JwtSecurityToken(issuer: configuration["AppConfiguration:Jwt:Issuer"], audience: configuration["AppConfiguration:Jwt:Audience"], claims: claims, notBefore: DateTime.UtcNow, expires: expiration, diff --git a/PrivaPub/Web/Pages/OAuth/OAuthPages.cs b/PrivaPub/Web/Pages/OAuth/OAuthPages.cs index a64862e..0ddc42f 100644 --- a/PrivaPub/Web/Pages/OAuth/OAuthPages.cs +++ b/PrivaPub/Web/Pages/OAuth/OAuthPages.cs @@ -24,15 +24,9 @@ using static OpenIddict.Abstractions.OpenIddictConstants; namespace PrivaPub.Web.Pages.OAuth { [EnableRateLimiting(RateLimiting.Accounts)] - public class LoginModel : PageModel + public class LoginModel( + IRootUsersService users) : PageModel { - readonly IRootUsersService _users; - - public LoginModel(IRootUsersService users) - { - _users = users; - } - [BindProperty(SupportsGet = true)] public string ReturnUrl { get; set; } @@ -40,7 +34,7 @@ namespace PrivaPub.Web.Pages.OAuth public void OnGet() => Harden(); - public async Task OnPostAsync([FromForm] string userName, [FromForm] string password, [FromForm] string oneTimeCode) + public async Task OnPostAsync([FromForm] string userName, [FromForm] string password, [FromForm] string oneTimeCode, CancellationToken token = default) { Harden(); if (string.IsNullOrEmpty(userName) || string.IsNullOrEmpty(password)) @@ -48,7 +42,7 @@ namespace PrivaPub.Web.Pages.OAuth Error = "Enter your username and password."; return Page(); } - var result = await _users.LoginAsync(new LoginForm { UserName = userName, Password = password, OneTimeCode = oneTimeCode }); + var result = await users.LoginAsync(new LoginForm { UserName = userName, Password = password, OneTimeCode = oneTimeCode }, token); if (result.StatusCode == StatusCodes.Status428PreconditionRequired) { Error = "Enter the code from your authenticator app, or a recovery code, with your password."; @@ -75,19 +69,11 @@ namespace PrivaPub.Web.Pages.OAuth } [IgnoreAntiforgeryToken] - public class AuthorizeModel : PageModel + public class AuthorizeModel( + DbEntities dbEntities, + ILocalActorService localActors, + OpenIddict.Abstractions.IOpenIddictApplicationManager applications) : PageModel { - readonly DbEntities _dbEntities; - readonly ILocalActorService _localActors; - readonly OpenIddict.Abstractions.IOpenIddictApplicationManager _applications; - - public AuthorizeModel(DbEntities dbEntities, ILocalActorService localActors, OpenIddict.Abstractions.IOpenIddictApplicationManager applications) - { - _dbEntities = dbEntities; - _localActors = localActors; - _applications = applications; - } - public string ApplicationName { get; private set; } public IReadOnlyList RequestedScopes { get; private set; } = Array.Empty(); public IReadOnlyList Avatars { get; private set; } = Array.Empty(); @@ -98,7 +84,7 @@ namespace PrivaPub.Web.Pages.OAuth public async Task OnPostAsync([FromForm] string avatarId, [FromForm] string decision, CancellationToken token) { var request = HttpContext.GetOpenIddictServerRequest(); - var rootId = await SignedInRoot(); + var rootId = await SignedInRoot(token); if (request == default || rootId == default) return await Show(token); @@ -110,8 +96,8 @@ namespace PrivaPub.Web.Pages.OAuth }), OpenIddictServerAspNetCoreDefaults.AuthenticationScheme); var owns = !string.IsNullOrEmpty(avatarId) - && await _dbEntities.RootToAvatars.Match(r => r.RootId == rootId && r.AvatarId == avatarId).ExecuteAnyAsync(token); - var avatar = owns ? await _localActors.FindById(LocalActorKind.Person, avatarId, token) : default; + && await dbEntities.RootToAvatars.Match(r => r.RootId == rootId && r.AvatarId == avatarId).ExecuteAnyAsync(token); + var avatar = owns ? await localActors.FindById(LocalActorKind.Person, avatarId, token) : default; if (avatar is not { Suspended: false })//a suspended persona signs in nowhere (R6) return await Show(token); @@ -130,7 +116,7 @@ namespace PrivaPub.Web.Pages.OAuth if (request == default) return BadRequest(); - var rootId = await SignedInRoot(); + var rootId = await SignedInRoot(token); var forceLogin = string.Equals((string)request["force_login"], "true", StringComparison.OrdinalIgnoreCase) && Request.Query["signed_in"] != "1"; if (rootId == default || forceLogin) @@ -139,13 +125,13 @@ namespace PrivaPub.Web.Pages.OAuth return Redirect($"/oauth/login?returnUrl={Uri.EscapeDataString("/oauth/authorize?" + query)}"); } - var application = await _applications.FindByClientIdAsync(request.ClientId, token); - ApplicationName = application == default ? "an application" : await _applications.GetDisplayNameAsync(application, token) ?? "an application"; + var application = await applications.FindByClientIdAsync(request.ClientId, token); + ApplicationName = application == default ? "an application" : await applications.GetDisplayNameAsync(application, token) ?? "an application"; RequestedScopes = MastodonScopes.Parse(request.Scope); - var avatarIds = (await _dbEntities.RootToAvatars.Match(r => r.RootId == rootId).ExecuteAsync(token)).Select(r => r.AvatarId).ToList(); + var avatarIds = (await dbEntities.RootToAvatars.Match(r => r.RootId == rootId).ExecuteAsync(token)).Select(r => r.AvatarId).ToList(); var avatars = new List(); foreach (var id in avatarIds) - if (await _localActors.FindById(LocalActorKind.Person, id, token) is { Suspended: false } avatar) + if (await localActors.FindById(LocalActorKind.Person, id, token) is { Suspended: false } avatar) avatars.Add(avatar); Avatars = avatars; Parameters = request.GetParameters() @@ -157,13 +143,13 @@ namespace PrivaPub.Web.Pages.OAuth return Page(); } - async Task SignedInRoot() + async Task SignedInRoot(CancellationToken token = default) { var login = await HttpContext.AuthenticateAsync(OAuthSetup.LoginScheme); var rootId = login.Succeeded ? login.Principal.FindFirstValue(ClaimTypes.NameIdentifier) : default; if (rootId == default) return default; - var root = await _dbEntities.RootUsers.MatchID(rootId).ExecuteFirstAsync(); + var root = await dbEntities.RootUsers.MatchID(rootId).ExecuteFirstAsync(token); return root is { IsBanned: false, DeletedAt: null } ? rootId : default; } } diff --git a/PrivaPub/Web/Pages/Pages.cs b/PrivaPub/Web/Pages/Pages.cs index b4c2657..ad4b83b 100644 --- a/PrivaPub/Web/Pages/Pages.cs +++ b/PrivaPub/Web/Pages/Pages.cs @@ -41,18 +41,12 @@ namespace PrivaPub.Web.Pages } } - public class ProfileModel : PublicPageModel + public class ProfileModel( + ILocalActorService localActors, + DbEntities dbEntities) : PublicPageModel { const int PageSize = 20; - readonly ILocalActorService _localActors; - readonly DbEntities _dbEntities; - - public ProfileModel(ILocalActorService localActors, DbEntities dbEntities) - { - _localActors = localActors; - _dbEntities = dbEntities; - } public LocalActor Actor { get; private set; } public string BiographyHtml { get; private set; } @@ -60,7 +54,7 @@ namespace PrivaPub.Web.Pages public async Task OnGetAsync(string user, CancellationToken token) { - Actor = await _localActors.FindByUserName(user, token); + Actor = await localActors.FindByUserName(user, token); if (Actor is not { IsFederated: true, IsCircle: false, Suspended: false } || Actor.IsServerActor) return NotFound(); if (WantsActivityJson()) @@ -69,8 +63,8 @@ namespace PrivaPub.Web.Pages Harden(); BiographyHtml = ActivityPubRenderer.Html(Actor.Summary); var posts = await (Actor.Kind == LocalActorKind.Group - ? _dbEntities.Posts.Match(p => p.GroupId == Actor.Id) - : _dbEntities.Posts.Match(p => p.GroupUserId == Actor.Id && !p.IsFederatedCopy)) + ? dbEntities.Posts.Match(p => p.GroupId == Actor.Id) + : dbEntities.Posts.Match(p => p.GroupUserId == Actor.Id && !p.IsFederatedCopy)) .Match(VisibilityPolicy.IsPublic) .Match(p => p.ReblogOfPostId == null) .Sort(p => p.ID, Order.Descending) @@ -83,7 +77,7 @@ namespace PrivaPub.Web.Pages if (post.IsFederatedCopy) continue; if (!authors.TryGetValue(post.GroupUserId, out var author)) - authors[post.GroupUserId] = author = await _localActors.FindById(LocalActorKind.Person, post.GroupUserId, token); + authors[post.GroupUserId] = author = await localActors.FindById(LocalActorKind.Person, post.GroupUserId, token); if (author is { Suspended: false }) views.Add(PostView.From(post, author)); } @@ -93,18 +87,12 @@ namespace PrivaPub.Web.Pages } // The hashtag links our posts carry (/tags/{tag}): this server's public posts with that tag, as a page like a profile's. - public class TagModel : PublicPageModel + public class TagModel( + ILocalActorService localActors, + DbEntities dbEntities) : PublicPageModel { const int PageSize = 20; - readonly ILocalActorService _localActors; - readonly DbEntities _dbEntities; - - public TagModel(ILocalActorService localActors, DbEntities dbEntities) - { - _localActors = localActors; - _dbEntities = dbEntities; - } public string Tag { get; private set; } public IReadOnlyList Posts { get; private set; } = Array.Empty(); @@ -115,7 +103,7 @@ namespace PrivaPub.Web.Pages if (string.IsNullOrEmpty(Tag) || Tag.Length > 100) return NotFound(); Harden(); - var posts = await _dbEntities.Posts + var posts = await dbEntities.Posts .Match(p => p.Tags.Contains(Tag) && !p.IsFederatedCopy && p.ReblogOfPostId == null && p.Visibility == PostVisibility.Public) .Match(VisibilityPolicy.IsPublic) .Match(VisibilityPolicy.IsListed) @@ -127,7 +115,7 @@ namespace PrivaPub.Web.Pages foreach (var post in posts) { if (!authors.TryGetValue(post.GroupUserId, out var author)) - authors[post.GroupUserId] = author = await _localActors.FindById(LocalActorKind.Person, post.GroupUserId, token); + authors[post.GroupUserId] = author = await localActors.FindById(LocalActorKind.Person, post.GroupUserId, token); if (author is { IsFederated: true, Suspended: false }) views.Add(PostView.From(post, author)); } @@ -136,27 +124,20 @@ namespace PrivaPub.Web.Pages } } - public class StatusModel : PublicPageModel + public class StatusModel( + ILocalActorService localActors, + DbEntities dbEntities) : PublicPageModel { - readonly ILocalActorService _localActors; - readonly DbEntities _dbEntities; - - public StatusModel(ILocalActorService localActors, DbEntities dbEntities) - { - _localActors = localActors; - _dbEntities = dbEntities; - } - public LocalActor Actor { get; private set; } public PostView Post { get; private set; } public string ObjectUri { get; private set; } public async Task OnGetAsync(string user, string id, CancellationToken token) { - Actor = await _localActors.FindByUserName(user, token); + Actor = await localActors.FindByUserName(user, token); if (Actor is not { IsFederated: true, Kind: LocalActorKind.Person, Suspended: false }) return NotFound(); - var post = await _dbEntities.Posts + var post = await dbEntities.Posts .Match(p => p.ID == id && p.GroupUserId == Actor.Id && !p.IsFederatedCopy && p.ReblogOfPostId == null) .Match(VisibilityPolicy.IsPublic) .ExecuteFirstAsync(token); @@ -172,24 +153,14 @@ namespace PrivaPub.Web.Pages } } - public class StargazingModel : PublicPageModel + public class StargazingModel( + Microsoft.Extensions.Options.IOptionsMonitor options, + Microsoft.Extensions.Options.IOptionsMonitor app, + Infrastructure.Geo.IGeoLocator geo) : PublicPageModel { - readonly Microsoft.Extensions.Options.IOptionsMonitor _options; - readonly Microsoft.Extensions.Options.IOptionsMonitor _app; - - readonly Infrastructure.Geo.IGeoLocator _geo; - - public StargazingModel(Microsoft.Extensions.Options.IOptionsMonitor options, - Microsoft.Extensions.Options.IOptionsMonitor app, Infrastructure.Geo.IGeoLocator geo) - { - _options = options; - _app = app; - _geo = geo; - } - - public bool CrawlerEnabled => _options.CurrentValue.Crawler.Enabled; - public string GeoSource => _geo.Source; - public string UserAgent => Federation.Crawler.Stargazer.UserAgent(_app.CurrentValue.BackendBaseAddress); + public bool CrawlerEnabled => options.CurrentValue.Crawler.Enabled; + public string GeoSource => geo.Source; + public string UserAgent => Federation.Crawler.Stargazer.UserAgent(app.CurrentValue.BackendBaseAddress); public void OnGet() => Harden(); } diff --git a/nuget.config b/nuget.config new file mode 100644 index 0000000..6f123d5 --- /dev/null +++ b/nuget.config @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + +