Issue 14250: fix lost quoted posts

diff --git a/src/Content/Item.php b/src/Content/Item.php
index 41879b75b9f81104dbe01c1036847f3c1b3a13c6..28d980473a73201b6511297d85296b7ed45ac5ce 100644 (file)
--- a/src/Content/Item.php
+++ b/src/Content/Item.php
@@ -1032,7 +1032,7 @@ class Item
                        }
 
                        $this->emailer->send(new ItemCCEMail(
-                               $this->app,
+                               $this->userSession,
                                $this->l10n,
                                $this->baseURL,
                                $post,

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index d42483a4e0eebcd2c23461736568e70dacd5d29d..2dd7c05d70e6a1f779b225af3c444cad2b60d573 100644 (file)
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -873,6 +873,9 @@ class Processor
                        } elseif ($uri_id = ItemURI::getIdByURI($activity['quote-url'], false)) {
                                Logger::info('Quote was not fetched but the uri-id existed', ['guid' => $item['guid'], 'uri-id' => $item['uri-id'], 'quote' => $activity['quote-url'], 'uri-id' => $uri_id]);
                                $item['quote-uri-id'] = $uri_id;
+                       } elseif (Queue::exists($activity['quote-url'], 'as:Create')) {
+                               Logger::info('Quote is queued but not processed yet', ['guid' => $item['guid'], 'uri-id' => $item['uri-id'], 'quote' => $activity['quote-url'], 'uri-id' => $uri_id]);
+                               $item['quote-uri-id'] = ItemURI::getIdByURI($activity['quote-url']);
                        } else {
                                Logger::info('Quote was not fetched', ['guid' => $item['guid'], 'uri-id' => $item['uri-id'], 'quote' => $activity['quote-url']]);
                        }