"View" activities are now ignored

diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php
index 80eb602a0f33e6efbf835b95eeafaabd970ce7bd..4e2bcceafbc0efc8bf3cfa6b1e6a59066ff8149b 100644 (file)
--- 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 ca9a605fc40d0180dc0c2b75963da5fc9f7fc914..1d71e93337dc3835794d52506d347c31b4a90807 100644 (file)
--- 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 ea9fca2f5693115aa64e764c8be5360fe75448d0..a6c98abd14640f17361fcb5bf6c8307e91148dc6 100644 (file)
--- 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,