Merge pull request #7458 from annando/fix-7449

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

diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php
index f830f857a745e0752ccf5bc2de2a5c575db4b839..bb676b396e338113ee517be084f8dfde49ec994e 100644 (file)
--- a/src/Protocol/ActivityPub/Receiver.php
+++ b/src/Protocol/ActivityPub/Receiver.php
@@ -386,15 +386,14 @@ class Receiver
                        case 'as:Announce':
                                if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
                                        $profile = APContact::getByURL($object_data['actor']);
-                                       if ($profile['type'] == 'Person') {
-                                               // Reshared posts from persons appear as summary at the bottom
-                                               // If this isn't set, then a single reshare appears on top. This is used for groups.
-                                               $object_data['thread-completion'] = true;
-                                       }
+                                       // Reshared posts from persons appear as summary at the bottom
+                                       // If this isn't set, then a single reshare appears on top. This is used for groups.
+                                       $object_data['thread-completion'] = ($profile['type'] != 'Group');
+
                                        ActivityPub\Processor::createItem($object_data);
 
                                        // Add the bottom reshare information only for persons
-                                       if ($profile['type'] == 'Person') {
+                                       if ($profile['type'] != 'Group') {
                                                $announce_object_data = self::processObject($activity);
                                                $announce_object_data['name'] = $type;
                                                $announce_object_data['author'] = JsonLD::fetchElement($activity, 'as:actor', '@id');