From 6d5f7b5f4af710d4e9fcadeb0f953b7a20600986 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Sun, 18 Aug 2024 19:19:21 +0200 Subject: [PATCH] [backend/federation] Support ASLike activities with content instead of _misskey_reaction --- .../Core/Federation/ActivityPub/ActivityHandlerService.cs | 4 ++-- .../Core/Federation/ActivityStreams/Types/ASActivity.cs | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Iceshrimp.Backend/Core/Federation/ActivityPub/ActivityHandlerService.cs b/Iceshrimp.Backend/Core/Federation/ActivityPub/ActivityHandlerService.cs index 6c5200ed..b3318223 100644 --- a/Iceshrimp.Backend/Core/Federation/ActivityPub/ActivityHandlerService.cs +++ b/Iceshrimp.Backend/Core/Federation/ActivityPub/ActivityHandlerService.cs @@ -269,8 +269,8 @@ public class ActivityHandlerService( await UnfollowAsync(followee, resolvedActor); break; case ASLike { Object: ASNote note } like: - if (like.MisskeyReaction != null) - await noteSvc.RemoveReactionFromNoteAsync(note, resolvedActor, like.MisskeyReaction); + if ((like.Content ?? like.MisskeyReaction) is { } reaction) + await noteSvc.RemoveReactionFromNoteAsync(note, resolvedActor, reaction); else await noteSvc.UnlikeNoteAsync(note, resolvedActor); break; diff --git a/Iceshrimp.Backend/Core/Federation/ActivityStreams/Types/ASActivity.cs b/Iceshrimp.Backend/Core/Federation/ActivityStreams/Types/ASActivity.cs index 5ce022c8..136f46fc 100644 --- a/Iceshrimp.Backend/Core/Federation/ActivityStreams/Types/ASActivity.cs +++ b/Iceshrimp.Backend/Core/Federation/ActivityStreams/Types/ASActivity.cs @@ -129,6 +129,10 @@ public class ASLike : ASActivity [J($"{Constants.MisskeyNs}#_misskey_reaction")] [JC(typeof(VC))] public string? MisskeyReaction { get; set; } + + [J($"{Constants.ActivityStreamsNs}#content")] + [JC(typeof(VC))] + public string? Content { get; set; } [J($"{Constants.ActivityStreamsNs}#tag")] [JC(typeof(ASTagConverter))]