From 6ced694b53ee0e9cc34f24f2d4fd7dc5e4bf79e3 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 14 Nov 2025 14:10:46 +0000 Subject: [PATCH] more streamline with jsalmon signature removal --- Zotlabs/Daemon/Notifier.php | 4 ++-- Zotlabs/Lib/Libzot.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php index 9fdb1defb..30c6e431d 100644 --- a/Zotlabs/Daemon/Notifier.php +++ b/Zotlabs/Daemon/Notifier.php @@ -317,10 +317,10 @@ class Notifier { return; } - $m = get_iconfig($target_item, 'activitypub', 'signed_data'); + $m = get_iconfig($target_item, 'activitypub', 'rawmsg'); // Re-use existing signature unless the activity type changed to a Tombstone, which won't verify. if ($m && (!intval($target_item['item_deleted']))) { - self::$encoded_item = json_decode($m, true); + self::$encoded_item = $m; } else { $activity = Activity::encode_activity($target_item); diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php index 08a3f27c9..fb49f9ab5 100644 --- a/Zotlabs/Lib/Libzot.php +++ b/Zotlabs/Lib/Libzot.php @@ -1298,9 +1298,9 @@ class Libzot { $item['comment_policy'] = 'authenticated'; } - if (isset($AS->meta['signed_data']) && $AS->meta['signed_data']) { - IConfig::Set($item, 'activitypub', 'signed_data', $AS->meta['signed_data'], false); - } + // We currently do this in Activity::decode_note(). + // TODO: what do we do if this part moves to addons? Or maybe be we should not? + // IConfig::Set($item, 'activitypub', 'rawmsg', $AS->data, false); logger('Activity received: ' . print_r($item, true), LOGGER_DATA, LOG_DEBUG); logger('Activity recipients: ' . print_r($deliveries, true), LOGGER_DATA, LOG_DEBUG);