Merge branch 'post-reason' of github.com:annando/friendica into post-reason

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

diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index a9c163964e0c5ca74983bbf2f99b009aebb5aba4..ecd18431855713b3bc940d3db9179a0d5c13ee56 100644 (file)
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -31,7 +31,6 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\APContact;
 use Friendica\Model\Contact;
-use Friendica\Model\Conversation;
 use Friendica\Model\GServer;
 use Friendica\Model\Item;
 use Friendica\Model\Photo;
@@ -1232,30 +1231,22 @@ class Transmitter
                }
 
                if (!$item['deleted']) {
-                       $condition = ['item-uri' => $item['uri'], 'protocol' => Conversation::PARCEL_ACTIVITYPUB];
-                       $conversation = DBA::selectFirst('conversation', ['source'], $condition);
-                       if (!$item['origin'] && DBA::isResult($conversation)) {
-                               $data = json_decode($conversation['source'], true);
-                               if (!empty($data['type'])) {
-                                       if (in_array($data['type'], ['Create', 'Update'])) {
-                                               if ($object_mode) {
-                                                       unset($data['@context']);
-                                                       unset($data['signature']);
-                                               }
-                                               Logger::info('Return stored conversation', ['item' => $item_id]);
-                                               return $data;
-                                       } elseif (in_array('as:' . $data['type'], Receiver::CONTENT_TYPES)) {
-                                               if (!empty($data['@context'])) {
-                                                       $context = $data['@context'];
-                                                       unset($data['@context']);
-                                               }
-                                               unset($data['actor']);
-                                               $object = $data;
-                                       }
+                       $data = Post\Activity::getByURIId($item['uri-id']);
+                       if (!$item['origin'] && !empty($data)) {
+                               if ($object_mode) {
+                                       unset($data['@context']);
+                                       unset($data['signature']);
                                }
+                               Logger::info('Return stored conversation', ['item' => $item_id]);
+                               return $data;
                        }
                }
 
+               if (!$item['origin'] && empty($object)) {
+                       Logger::debug('Post is not ours and is not stored', ['id' => $item_id, 'uri-id' => $item['uri-id']]);
+                       return false;
+               }
+
                $type = self::getTypeOfItem($item);
 
                if (!$object_mode) {
@@ -1515,26 +1506,6 @@ class Transmitter
                return $body;
        }
 
-       /**
-        * Fetches the "context" value for a givem item array from the "conversation" table
-        *
-        * @param array $item Item array
-        * @return string with context url
-        * @throws \Exception
-        */
-       private static function fetchContextURLForItem(array $item): string
-       {
-               $conversation = DBA::selectFirst('conversation', ['conversation-href', 'conversation-uri'], ['item-uri' => $item['parent-uri']]);
-               if (DBA::isResult($conversation) && !empty($conversation['conversation-href'])) {
-                       $context_uri = $conversation['conversation-href'];
-               } elseif (DBA::isResult($conversation) && !empty($conversation['conversation-uri'])) {
-                       $context_uri = $conversation['conversation-uri'];
-               } else {
-                       $context_uri = $item['parent-uri'] . '#context';
-               }
-               return $context_uri;
-       }
-
        /**
         * Returns if the post contains sensitive content ("nsfw")
         *
@@ -1646,7 +1617,7 @@ class Transmitter
                $data['url'] = $link ?? $item['plink'];
                $data['attributedTo'] = $item['author-link'];
                $data['sensitive'] = self::isSensitive($item['uri-id']);
-               $data['context'] = self::fetchContextURLForItem($item);
+               $data['conversation'] = $data['context'] = $item['conversation'];
 
                if (!empty($item['title'])) {
                        $data['name'] = BBCode::toPlaintext($item['title'], false);