Merge pull request #9206 from annando/global-direction

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

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index d8ec1a80d82d406f3905e2824846675eff3138af..a239ae7a1ac964f2b4b588501fc57a067a71e656 100644 (file)
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -206,9 +206,6 @@ class Processor
                } else {
                        $item['gravity'] = GRAVITY_COMMENT;
                        $item['object-type'] = Activity\ObjectType::COMMENT;
-
-                       // Ensure that the comment reaches all receivers of the referring post
-                       $activity['receiver'] = self::addReceivers($activity);
                }
 
                if (empty($activity['directmessage']) && ($activity['id'] != $activity['reply-to-id']) && !Item::exists(['uri' => $activity['reply-to-id']])) {
@@ -330,35 +327,6 @@ class Processor
                }
        }
 
-       /**
-        * Add users to the receiver list of the given public activity.
-        * This is used to ensure that the activity will be stored in every thread.
-        *
-        * @param array $activity Activity array
-        * @return array Modified receiver list
-        */
-       private static function addReceivers(array $activity)
-       {
-               if (!in_array(0, $activity['receiver'])) {
-                       // Private activities will not be modified
-                       return $activity['receiver'];
-               }
-
-               // Add all owners of the referring item to the receivers
-               $original = $receivers = $activity['receiver'];
-               $items = Item::select(['uid'], ['uri' => $activity['object_id']]);
-               while ($item = DBA::fetch($items)) {
-                       $receivers['uid:' . $item['uid']] = $item['uid'];
-               }
-               DBA::close($items);
-
-               if (count($original) != count($receivers)) {
-                       Logger::info('Improved data', ['id' => $activity['id'], 'object' => $activity['object_id'], 'original' => $original, 'improved' => $receivers]);
-               }
-
-               return $receivers;
-       }
-
        /**
         * Prepare the item array for an activity
         *
@@ -377,8 +345,6 @@ class Processor
 
                $item['diaspora_signed_text'] = $activity['diaspora:like'] ?? '';
 
-               $activity['receiver'] = self::addReceivers($activity);
-
                self::postItem($activity, $item);
        }
 
@@ -544,6 +510,12 @@ class Processor
                                case Receiver::TARGET_FOLLOWER:
                                        $item['post-type'] = Item::PT_FOLLOWER;
                                        break;
+                               case Receiver::TARGET_ANSWER:
+                                       $item['post-type'] = Item::PT_COMMENT;
+                                       break;
+                               case Receiver::TARGET_GLOBAL:
+                                       $item['post-type'] = Item::PT_GLOBAL;
+                                       break;
                                default:
                                        $item['post-type'] = Item::PT_ARTICLE;
                        }
@@ -773,7 +745,7 @@ class Processor
 
                $ldactivity['thread-completion'] = true;
 
-               ActivityPub\Receiver::processActivity($ldactivity, json_encode($activity));
+               ActivityPub\Receiver::processActivity($ldactivity, json_encode($activity), $uid, true, false, [$actor]);
 
                Logger::notice('Activity had been fetched and processed.', ['url' => $url, 'object' => $activity['id']]);