Quoted reshares containing quoted reshares should now look fine

diff --git a/src/Content/Item.php b/src/Content/Item.php
index 1b787ca4d75ffd80d5387e3b5fde60773747cada..5321cf14646ce39b69a0b6b658928a693289087b 100644 (file)
--- a/src/Content/Item.php
+++ b/src/Content/Item.php
@@ -37,7 +37,6 @@ use Friendica\Model\Photo;
 use Friendica\Model\Tag;
 use Friendica\Model\Post;
 use Friendica\Protocol\Activity;
-use Friendica\Protocol\Diaspora;
 use Friendica\Util\Profiler;
 use Friendica\Util\Proxy;
 use Friendica\Util\XML;
@@ -590,14 +589,14 @@ class Item
                        return $body;
                }
 
-               $fields = ['uri-id', 'uri', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink', 'network'];
+               $fields = ['uri-id', 'uri', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink', 'network', 'quote-uri-id'];
                $shared_item = Post::selectFirst($fields, ['uri-id' => $item['quote-uri-id'], 'uid' => [$item['uid'], 0], 'private' => [ItemModel::PUBLIC, ItemModel::UNLISTED]]);
                if (!DBA::isResult($shared_item)) {
                        Logger::notice('Post does not exist.', ['uri-id' => $item['quote-uri-id'], 'uid' => $item['uid']]);
                        return $body;
                }
 
-               return BBCode::removeSharedData($body) . "\n" . $this->createSharedBlockByArray($shared_item, true);
+               return trim(BBCode::removeSharedData($body) . "\n" . $this->createSharedBlockByArray($shared_item, true));
        }
 
        /**
@@ -651,10 +650,13 @@ class Item
 
                // If it is a reshared post then reformat it to avoid display problems with two share elements
                if (!empty($shared)) {
-                       if (!empty($shared['guid']) && ($encaspulated_share = $this->createSharedPostByGuid($shared['guid'], $add_media))) {
-                               $item['body'] = preg_replace("/\[share.*?\](.*)\[\/share\]/ism", $encaspulated_share, $item['body']);
+                       if (!empty($shared['guid']) && ($encaspulated_share = $this->createSharedPostByGuid($shared['guid'], true))) {
+                               if (!empty(BBCode::fetchShareAttributes($item['body']))) {
+                                       $item['body'] = preg_replace("/\[share.*?\](.*)\[\/share\]/ism", $encaspulated_share, $item['body']);
+                               } else {
+                                       $item['body'] .= $encaspulated_share;
+                               }
                        }
-
                        $item['body'] = HTML::toBBCode(BBCode::convertForUriId($item['uri-id'], $item['body'], BBCode::ACTIVITYPUB));
                }
 

diff --git a/src/Model/Item.php b/src/Model/Item.php
index b12624aa49a248e5b25a5d8981d17840e3c2cacb..400e03a401d925fdb9b8ae92b09c312605c882a5 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -2962,7 +2962,7 @@ class Item
 
                $body = $item['body'] ?? '';
 
-               $fields = ['uri-id', 'uri', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink', 'network', 'has-media'];
+               $fields = ['uri-id', 'uri', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink', 'network', 'has-media', 'quote-uri-id'];
 
                $shared_uri_id = 0;
                $shared_links  = [];