From 68d6e11d831cc3092e7011b90be36fa28fd0cbab Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 11 Oct 2022 20:10:39 +0000
Subject: [PATCH 1/3] Fix attached media in quoted posts

---
 src/Content/Item.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/Content/Item.php b/src/Content/Item.php
index 539814655f..7a86135f9f 100644
--- a/src/Content/Item.php
+++ b/src/Content/Item.php
@@ -666,8 +666,19 @@ class Item
 			$shared_content .= '[h3]' . $item['title'] . "[/h3]\n";
 		}
 
+		$shared = BBCode::fetchShareAttributes($item['body']);
+
+		$item['body'] = Post\Media::addAttachmentsToBody($item['uri-id'], $item['body']);
+
 		// If it is a reshared post then reformat it to avoid display problems with two share elements
 		if (Diaspora::isReshare($item['body'], false)) {
+			if (!empty($shared['guid'])) {
+				$encaspulated_share = self::createSharedPostByGuid($shared['guid']);
+				if (!empty($encaspulated_share)) {
+					$item['body'] = preg_replace("/\[share.*?\](.*)\[\/share\]/ism", $encaspulated_share, $item['body']);
+				}
+			}
+	
 			$item['body'] = HTML::toBBCode(BBCode::convertForUriId($item['uri-id'], $item['body'], BBCode::ACTIVITYPUB));
 		}
 

From f1f13db24fbeb9caa8d16bf4cdc858d7a3455456 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 11 Oct 2022 20:48:47 +0000
Subject: [PATCH 2/3] Simplified code

---
 src/Content/Item.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/Content/Item.php b/src/Content/Item.php
index 7a86135f9f..1b07c5585c 100644
--- a/src/Content/Item.php
+++ b/src/Content/Item.php
@@ -672,11 +672,8 @@ class Item
 
 		// If it is a reshared post then reformat it to avoid display problems with two share elements
 		if (Diaspora::isReshare($item['body'], false)) {
-			if (!empty($shared['guid'])) {
-				$encaspulated_share = self::createSharedPostByGuid($shared['guid']);
-				if (!empty($encaspulated_share)) {
-					$item['body'] = preg_replace("/\[share.*?\](.*)\[\/share\]/ism", $encaspulated_share, $item['body']);
-				}
+			if (!empty($shared['guid']) && ($encaspulated_share = self::createSharedPostByGuid($shared['guid']))) {
+				$item['body'] = preg_replace("/\[share.*?\](.*)\[\/share\]/ism", $encaspulated_share, $item['body']);
 			}
 	
 			$item['body'] = HTML::toBBCode(BBCode::convertForUriId($item['uri-id'], $item['body'], BBCode::ACTIVITYPUB));

From 0e82f64d71b598a1349ac22973148715f7182fdd Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 11 Oct 2022 21:39:28 +0000
Subject: [PATCH 3/3] Only attach images

---
 src/Content/Item.php     | 2 +-
 src/Model/Post/Media.php | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Content/Item.php b/src/Content/Item.php
index 1b07c5585c..d1cdbc679b 100644
--- a/src/Content/Item.php
+++ b/src/Content/Item.php
@@ -668,7 +668,7 @@ class Item
 
 		$shared = BBCode::fetchShareAttributes($item['body']);
 
-		$item['body'] = Post\Media::addAttachmentsToBody($item['uri-id'], $item['body']);
+		$item['body'] = Post\Media::addAttachmentsToBody($item['uri-id'], $item['body'], [Post\Media::IMAGE]);
 
 		// If it is a reshared post then reformat it to avoid display problems with two share elements
 		if (Diaspora::isReshare($item['body'], false)) {
diff --git a/src/Model/Post/Media.php b/src/Model/Post/Media.php
index 8fb10ddd88..ce00b205c5 100644
--- a/src/Model/Post/Media.php
+++ b/src/Model/Post/Media.php
@@ -648,11 +648,13 @@ class Media
 	/**
 	 * Add media attachments to the body
 	 *
-	 * @param int $uriid
+	 * @param int    $uriid
 	 * @param string $body
+	 * @param array  $types
+	 *
 	 * @return string body
 	 */
-	public static function addAttachmentsToBody(int $uriid, string $body = ''): string
+	public static function addAttachmentsToBody(int $uriid, string $body = '', array $types = [self::IMAGE, self::AUDIO, self::VIDEO]): string
 	{
 		if (empty($body)) {
 			$item = Post::selectFirst(['body'], ['uri-id' => $uriid]);
@@ -665,7 +667,7 @@ class Media
 
 		$body = preg_replace("/\s*\[attachment .*?\].*?\[\/attachment\]\s*/ism", '', $body);
 
-		foreach (self::getByURIId($uriid, [self::IMAGE, self::AUDIO, self::VIDEO]) as $media) {
+		foreach (self::getByURIId($uriid, $types) as $media) {
 			if (Item::containsLink($body, $media['preview'] ?? $media['url'], $media['type'])) {
 				continue;
 			}