Remove parameter-less call of OStatus\Salmon module in DFRN\Notify

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

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 79626abbb8efcab4e372b70a30e2dc956f605374..8e21a664469bc7a7e274dcb4bbc01f9e67c84f60 100644 (file)
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -431,7 +431,7 @@ class Processor
                        $item['owner-id'] = $item['author-id'];
                } else {
                        $actor = APContact::getByURL($item['owner-link'], false);
-                       $item['isForum'] = ($actor['type'] == 'Group');
+                       $item['isForum'] = ($actor['type'] ?? 'Person') == 'Group';
                }
 
                $item['uri'] = $activity['id'];
@@ -827,10 +827,26 @@ class Processor
 
                $content = self::addMentionLinks($content, $activity['tags']);
 
+               if (!empty($activity['quote-url'])) {
+                       $id = Item::fetchByLink($activity['quote-url']);
+                       if ($id) {
+                               $shared_item = Post::selectFirst(['uri-id'], ['id' => $id]);
+                               $item['quote-uri-id'] = $shared_item['uri-id'];
+                       } else {
+                               Logger::info('Quote was not fetched', ['guid' => $item['guid'], 'uri-id' => $item['uri-id'], 'quote' => $activity['quote-url']]);
+                       }
+               }
+
                if (!empty($activity['source'])) {
                        $item['body'] = $activity['source'];
                        $item['raw-body'] = $content;
-                       $item['body'] = Item::improveSharedDataInBody($item);
+
+                       $quote_uri_id = Item::getQuoteUriId($item['body']);
+                       if (empty($item['quote-uri-id']) && !empty($quote_uri_id)) {
+                               $item['quote-uri-id'] = $quote_uri_id;
+                       }
+
+                       $item['body'] = BBCode::removeSharedData($item['body']);
                } else {
                        $parent_uri = $item['parent-uri'] ?? $item['thr-parent'];
                        if (empty($activity['directmessage']) && ($parent_uri != $item['uri']) && ($item['gravity'] == Item::GRAVITY_COMMENT)) {
@@ -848,10 +864,6 @@ class Processor
                        }
                        $item['content-warning'] = HTML::toBBCode($activity['summary'] ?? '');
                        $item['raw-body'] = $item['body'] = $content;
-
-                       if (!empty($activity['quote-url'])) {
-                               $item['body'] .= DI::contentItem()->createSharedPostByUrl($activity['quote-url']);
-                       }
                }
 
                self::storeFromBody($item);
@@ -945,7 +957,7 @@ class Processor
                }
 
                $tags = array_column(Tag::getByURIId($item['uri-id'], [Tag::HASHTAG]), 'name');
-               if (Relay::isSolicitedPost($tags, $item['body'], $item['author-id'], $item['uri'], Protocol::ACTIVITYPUB)) {
+               if (Relay::isSolicitedPost($tags, $item['body'], $item['author-id'], $item['uri'], Protocol::ACTIVITYPUB, $activity['thread-completion'] ?? 0)) {
                        Logger::debug('Post is accepted because of the relay settings', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri']]);
                        return true;
                } else {
@@ -1173,7 +1185,7 @@ class Processor
                if (!empty($item['parent-uri-id'])) {
                        if (Post::exists(['uri-id' => $item['parent-uri-id'], 'uid' => $receiver])) {
                                $has_parents = true;
-                       } elseif ($add_parent && Post::exists(['uri-id' => $item['parent-uri'], 'uid' => 0])) {
+                       } elseif ($add_parent && Post::exists(['uri-id' => $item['parent-uri-id'], 'uid' => 0])) {
                                $stored = Item::storeForUserByUriId($item['parent-uri-id'], $receiver, $fields);
                                $has_parents = (bool)$stored;
                                if ($stored) {
@@ -1586,7 +1598,7 @@ class Processor
                        }
                }
 
-               return Relay::isSolicitedPost($messageTags, $body, $authorid, $id, Protocol::ACTIVITYPUB);
+               return Relay::isSolicitedPost($messageTags, $body, $authorid, $id, Protocol::ACTIVITYPUB, $activity['thread-completion'] ?? 0);
        }
 
        /**