Transmit via BCC if contact is hidden, don't store announces

[friendica.git] / src / Protocol / ActivityPub / Receiver.php

diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php
index ac75155b20c6bccee5659eb6f1751e61e029231f..61e9f8e9c6d8374e88ffc2578d1f78b05529e720 100644 (file)
--- a/src/Protocol/ActivityPub/Receiver.php
+++ b/src/Protocol/ActivityPub/Receiver.php
@@ -332,7 +332,10 @@ class Receiver
                        return;
                }
 
-               self::storeConversation($object_data, $body);
+               // Only store content related stuff - and no announces, since they possibly overwrite the original content
+               if (in_array($object_data['object_type'], self::CONTENT_TYPES) && ($type != 'as:Announce')) {
+                       self::storeConversation($object_data, $body);
+               }
 
                // Internal flag for thread completion. See Processor.php
                if (!empty($activity['thread-completion'])) {