Fixing processing forum posts

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

diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php
index 88c23f2be63623989f6b782caae210faed72c5d8..d59a5da0ea8517564347b87eb0f9dcaab8e6ac4f 100644 (file)
--- a/src/Protocol/ActivityPub/Receiver.php
+++ b/src/Protocol/ActivityPub/Receiver.php
@@ -387,29 +387,23 @@ class Receiver
 
                        case 'as:Announce':
                                if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
-                                       $profile = APContact::getByURL($object_data['actor']);
-                                       // 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');
+                                       $object_data['thread-completion'] = true;
 
                                        $item = ActivityPub\Processor::createItem($object_data);
                                        ActivityPub\Processor::postItem($object_data, $item);
 
-                                       // Add the bottom reshare information only for persons
-                                       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');
-                                               $announce_object_data['object_id'] = $object_data['object_id'];
-                                               $announce_object_data['object_type'] = $object_data['object_type'];
-                                               $announce_object_data['push'] = $push;
-
-                                               if (!empty($body)) {
-                                                       $announce_object_data['raw'] = $body;
-                                               }
+                                       $announce_object_data = self::processObject($activity);
+                                       $announce_object_data['name'] = $type;
+                                       $announce_object_data['author'] = JsonLD::fetchElement($activity, 'as:actor', '@id');
+                                       $announce_object_data['object_id'] = $object_data['object_id'];
+                                       $announce_object_data['object_type'] = $object_data['object_type'];
+                                       $announce_object_data['push'] = $push;
 
-                                               ActivityPub\Processor::createActivity($announce_object_data, Activity::ANNOUNCE);
+                                       if (!empty($body)) {
+                                               $announce_object_data['raw'] = $body;
                                        }
+
+                                       ActivityPub\Processor::createActivity($announce_object_data, Activity::ANNOUNCE);
                                }
                                break;