From 385f5843f7bbb5280bb796601e2804b11e2c9b07 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Wed, 24 Apr 2024 04:05:26 +0200 Subject: [PATCH] [backend/helpers] Rename LDHelpers.Compact(ASActivity) to LDHelpers.CompactToPayload --- .../Core/Federation/ActivityStreams/LdHelpers.cs | 9 +++++++-- Iceshrimp.Backend/Core/Queues/PreDeliverQueue.cs | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Iceshrimp.Backend/Core/Federation/ActivityStreams/LdHelpers.cs b/Iceshrimp.Backend/Core/Federation/ActivityStreams/LdHelpers.cs index c40a9490..75556e26 100644 --- a/Iceshrimp.Backend/Core/Federation/ActivityStreams/LdHelpers.cs +++ b/Iceshrimp.Backend/Core/Federation/ActivityStreams/LdHelpers.cs @@ -106,14 +106,19 @@ public static class LdHelpers return payload; } - public static string Compact(this ASActivity activity) + public static string CompactToPayload(this ASActivity activity) { - var compacted = Compact((object)activity) ?? throw new Exception("Failed to compact signed activity"); + var compacted = Compact(activity) ?? throw new Exception("Failed to compact signed activity"); var payload = JsonConvert.SerializeObject(compacted, JsonSerializerSettings); return payload; } + public static JObject? Compact(this ASObject obj) + { + return Compact((object)obj); + } + public static JObject? Compact(object obj) { return Compact(JToken.FromObject(obj, JsonSerializer)); diff --git a/Iceshrimp.Backend/Core/Queues/PreDeliverQueue.cs b/Iceshrimp.Backend/Core/Queues/PreDeliverQueue.cs index 2ea13512..a548b584 100644 --- a/Iceshrimp.Backend/Core/Queues/PreDeliverQueue.cs +++ b/Iceshrimp.Backend/Core/Queues/PreDeliverQueue.cs @@ -72,7 +72,7 @@ public class PreDeliverQueue() } else { - payload = activity.Compact(); + payload = activity.CompactToPayload(); } foreach (var inboxQueryResult in inboxQueryResults)