From cdbfa34066f588a656a9ac2e81a05bf6d7f606a6 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 17 Nov 2022 20:01:32 +0000 Subject: [PATCH] "View" activities are now ignored --- src/Protocol/ActivityPub/Receiver.php | 5 +++++ src/Protocol/ActivityPub/Transmitter.php | 4 ++-- static/defaults.config.php | 4 ---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php index 80eb602a0f..4e2bcceafb 100644 --- a/src/Protocol/ActivityPub/Receiver.php +++ b/src/Protocol/ActivityPub/Receiver.php @@ -559,6 +559,11 @@ class Receiver return true; } + if ($type == 'as:View') { + Logger::info('View activities are ignored.', ['signer' => $signer, 'http_signer' => $http_signer]); + return true; + } + if (!JsonLD::fetchElement($activity, 'as:object', '@id')) { Logger::info('Empty object', ['activity' => $activity]); return true; diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php index ca9a605fc4..1d71e93337 100644 --- a/src/Protocol/ActivityPub/Transmitter.php +++ b/src/Protocol/ActivityPub/Transmitter.php @@ -657,7 +657,7 @@ class Transmitter $is_forum_thread = false; } - if (self::isAnnounce($item) || DI::config()->get('debug', 'total_ap_delivery') || self::isAPPost($last_id)) { + if (self::isAnnounce($item) || self::isAPPost($last_id)) { // Will be activated in a later step $networks = Protocol::FEDERATED; } else { @@ -902,7 +902,7 @@ class Transmitter } } - if (DI::config()->get('debug', 'total_ap_delivery') || $all_ap) { + if ($all_ap) { // Will be activated in a later step $networks = Protocol::FEDERATED; } else { diff --git a/static/defaults.config.php b/static/defaults.config.php index ea9fca2f56..a6c98abd14 100644 --- a/static/defaults.config.php +++ b/static/defaults.config.php @@ -720,10 +720,6 @@ return [ // Store untrusted content in the inbox entries 'ap_inbox_store_untrusted' => false, - // total_ap_delivery (Boolean) - // Deliver via AP to every possible receiver and we suppress the delivery to these contacts with other protocols - 'total_ap_delivery' => false, - // ap_log_unknown (Boolean) // Logs every unknown ActivityPub activity 'ap_log_unknown' => false, -- 2.39.5