notfire/Iceshrimp.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[backend/queue] JobData shouldn't inherit from Job

Browse source
This commit is contained in:
Laura Hausmann 2024-03-29 15:34:01 +01:00
parent cdadb63e19
commit f39479ca6b
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Iceshrimp.Backend/Core/Queues/BackgroundTaskQueue.cs
View file

@ -198,7 +198,7 @@ public class BackgroundTaskQueue()
[JsonDerivedType(typeof(DriveFileDeleteJobData), "driveFileDelete")] [JsonDerivedType(typeof(DriveFileDeleteJobData), "driveFileDelete")]
[JsonDerivedType(typeof(PollExpiryJobData), "pollExpiry")] [JsonDerivedType(typeof(PollExpiryJobData), "pollExpiry")]
[JsonDerivedType(typeof(MuteExpiryJobData), "muteExpiry")] [JsonDerivedType(typeof(MuteExpiryJobData), "muteExpiry")]
public class BackgroundTaskJobData : Job; public abstract class BackgroundTaskJobData;
public class DriveFileDeleteJobData : BackgroundTaskJobData public class DriveFileDeleteJobData : BackgroundTaskJobData
{ {

4
Iceshrimp.Backend/Core/Queues/InboxQueue.cs
View file

@ -30,12 +30,12 @@ public class InboxQueue() : PostgresJobQueue<InboxJobData>("inbox", InboxQueuePr
var apHandler = scope.GetRequiredService<ActivityPub.ActivityHandlerService>(); var apHandler = scope.GetRequiredService<ActivityPub.ActivityHandlerService>();
var logger = scope.GetRequiredService<ILogger<InboxQueue>>(); var logger = scope.GetRequiredService<ILogger<InboxQueue>>();
logger.LogTrace("Preparation took {ms} ms", jobData.Duration); logger.LogTrace("Preparation took {ms} ms", job.Duration);
await apHandler.PerformActivityAsync(activity, jobData.InboxUserId, jobData.AuthenticatedUserId); 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("body")] public required string Body { get; set; }
[JR] [J("inboxUserId")] public required string? InboxUserId { get; set; } [JR] [J("inboxUserId")] public required string? InboxUserId { get; set; }

2
Iceshrimp.Backend/Core/Queues/PreDeliverQueue.cs
View file

@ -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("serializedActivity")] public required string SerializedActivity { get; set; }
[JR] [J("actorId")] public required string ActorId { get; set; } [JR] [J("actorId")] public required string ActorId { get; set; }