Only search for empty quoted reshares (Diaspora type)

diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php
index f8885b5b07853ebba3f45f29895530f4f340becc..aa7c016180493f5e77d78a147aa18452893fde72 100644 (file)
--- a/src/Content/Conversation.php
+++ b/src/Content/Conversation.php
@@ -1020,7 +1020,7 @@ class Conversation
 
                DBA::close($thread_items);
 
-               $quotes = Post::select(array_merge(ItemModel::DISPLAY_FIELDLIST, ['featured', 'contact-uid', 'gravity', 'post-type', 'post-reason']), ['quote-uri-id' => array_column($quoteuriids, 'uri-id'), 'uid' => 0]);
+               $quotes = Post::select(array_merge(ItemModel::DISPLAY_FIELDLIST, ['featured', 'contact-uid', 'gravity', 'post-type', 'post-reason']), ['quote-uri-id' => array_column($quoteuriids, 'uri-id'), 'body' => '', 'uid' => 0]);
                while ($quote = Post::fetch($quotes)) {
                        $row = $quote;
 

diff --git a/src/Factory/Api/Mastodon/Status.php b/src/Factory/Api/Mastodon/Status.php
index 698c127f722209bbe2f9fcd9d4fbd398319bd696..df5970d2982ac7043aa699e58fc1ad3d11d8521a 100644 (file)
--- a/src/Factory/Api/Mastodon/Status.php
+++ b/src/Factory/Api/Mastodon/Status.php
@@ -117,7 +117,8 @@ class Status extends BaseFactory
                        'deleted'       => false
                ]) + Post::countPosts([
                        'quote-uri-id' => $uriId,
-                       'deleted'       => false
+                       'body'         => '',
+                       'deleted'      => false
                ]);
 
                $count_like = Post::countPosts([
@@ -152,6 +153,7 @@ class Status extends BaseFactory
                        'quote-uri-id' => $uriId,
                        'uid'           => $uid,
                        'origin'        => true,
+                       'body'          => '',
                        'deleted'       => false
                ]);
                $userAttributes = new \Friendica\Object\Api\Mastodon\Status\UserAttributes(

diff --git a/src/Module/Api/Mastodon/Statuses/Unreblog.php b/src/Module/Api/Mastodon/Statuses/Unreblog.php
index faacefe38d00454a61ad028ba567f7f760f3a700..afb84e2630049d91d01e60e1cf80eed831cdb522 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/Unreblog.php
+++ b/src/Module/Api/Mastodon/Statuses/Unreblog.php
@@ -50,7 +50,7 @@ class Unreblog extends BaseApi
                }
 
                if ($item['network'] == Protocol::DIASPORA) {
-                       $item = Post::selectFirstForUser($uid, ['id'], ['quote-uri-id' => $this->parameters['id'], 'origin' => true, 'uid' => $uid]);
+                       $item = Post::selectFirstForUser($uid, ['id'], ['quote-uri-id' => $this->parameters['id'], 'body' => '', 'origin' => true, 'uid' => $uid]);
                        if (empty($item['id'])) {
                                DI::mstdnError()->RecordNotFound();
                        }

diff --git a/src/Module/Item/Activity.php b/src/Module/Item/Activity.php
index c52882efb8d0b56d68eb4bafabb78a94a76e4a05..bcfb83513b4115d00036d6e74fa45411b6abb37c 100644 (file)
--- a/src/Module/Item/Activity.php
+++ b/src/Module/Item/Activity.php
@@ -53,7 +53,7 @@ class Activity extends BaseModule
                if (in_array($verb, ['announce', 'unannounce'])) {
                        $item = Post::selectFirst(['network', 'uri-id'], ['id' => $itemId, 'uid' => [DI::userSession()->getLocalUserId(), 0]]);
                        if ($item['network'] == Protocol::DIASPORA) {
-                               $quote = Post::selectFirst(['id'], ['quote-uri-id' => $item['uri-id'], 'origin' => true, 'uid' => DI::userSession()->getLocalUserId()]);
+                               $quote = Post::selectFirst(['id'], ['quote-uri-id' => $item['uri-id'], 'body' => '', 'origin' => true, 'uid' => DI::userSession()->getLocalUserId()]);
                                if (!empty($quote['id'])) {
                                        if (!Item::markForDeletionById($quote['id'])) {
                                                throw new HTTPException\BadRequestException();