diff --git a/Iceshrimp.Backend/Core/Queues/BackgroundTaskQueue.cs b/Iceshrimp.Backend/Core/Queues/BackgroundTaskQueue.cs index f8753bab..b4562c71 100644 --- a/Iceshrimp.Backend/Core/Queues/BackgroundTaskQueue.cs +++ b/Iceshrimp.Backend/Core/Queues/BackgroundTaskQueue.cs @@ -198,7 +198,7 @@ public class BackgroundTaskQueue() [JsonDerivedType(typeof(DriveFileDeleteJobData), "driveFileDelete")] [JsonDerivedType(typeof(PollExpiryJobData), "pollExpiry")] [JsonDerivedType(typeof(MuteExpiryJobData), "muteExpiry")] -public class BackgroundTaskJobData : Job; +public abstract class BackgroundTaskJobData; public class DriveFileDeleteJobData : BackgroundTaskJobData { diff --git a/Iceshrimp.Backend/Core/Queues/InboxQueue.cs b/Iceshrimp.Backend/Core/Queues/InboxQueue.cs index 00afb4c1..08376653 100644 --- a/Iceshrimp.Backend/Core/Queues/InboxQueue.cs +++ b/Iceshrimp.Backend/Core/Queues/InboxQueue.cs @@ -30,12 +30,12 @@ public class InboxQueue() : PostgresJobQueue("inbox", InboxQueuePr var apHandler = scope.GetRequiredService(); var logger = scope.GetRequiredService>(); - logger.LogTrace("Preparation took {ms} ms", jobData.Duration); + logger.LogTrace("Preparation took {ms} ms", job.Duration); await apHandler.PerformActivityAsync(activity, jobData.InboxUserId, jobData.AuthenticatedUserId); } } -public class InboxJobData : Job +public class InboxJobData { [JR] [J("body")] public required string Body { get; set; } [JR] [J("inboxUserId")] public required string? InboxUserId { get; set; } diff --git a/Iceshrimp.Backend/Core/Queues/PreDeliverQueue.cs b/Iceshrimp.Backend/Core/Queues/PreDeliverQueue.cs index 20b40dfd..2ea13512 100644 --- a/Iceshrimp.Backend/Core/Queues/PreDeliverQueue.cs +++ b/Iceshrimp.Backend/Core/Queues/PreDeliverQueue.cs @@ -130,7 +130,7 @@ public class PreDeliverQueue() } } -public class PreDeliverJobData : Job +public class PreDeliverJobData { [JR] [J("serializedActivity")] public required string SerializedActivity { get; set; } [JR] [J("actorId")] public required string ActorId { get; set; }