From 164e6b350d35b5d8c9b3660238a262752a20da93 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 2 Dec 2019 21:19:47 +0000
Subject: [PATCH] API: Improve attachment removal functionality for the status
 text

---
 include/api.php           | 35 ++---------------------------------
 tests/include/ApiTest.php | 10 ----------
 2 files changed, 2 insertions(+), 43 deletions(-)

diff --git a/include/api.php b/include/api.php
index 22fe64097b..27793ac280 100644
--- a/include/api.php
+++ b/include/api.php
@@ -2498,7 +2498,7 @@ function api_convert_item($item)
 		$statustext = mb_substr($statustext, 0, 1000) . "... \n" . ($item['plink'] ?? '');
 	}
 
-	$statushtml = BBCode::convert(api_clean_attachments($body), false);
+	$statushtml = BBCode::convert(BBCode::removeAttachment($body), false);
 
 	// Workaround for clients with limited HTML parser functionality
 	$search = ["<br>", "<blockquote>", "</blockquote>",
@@ -5409,42 +5409,11 @@ function api_clean_plain_items($text)
 	}
 
 	// Simplify "attachment" element
-	$text = api_clean_attachments($text);
+	$text = BBCode::removeAttachment($text);
 
 	return $text;
 }
 
-/**
- * @brief Removes most sharing information for API text export
- *
- * @param string $body The original body
- *
- * @return string Cleaned body
- * @throws InternalServerErrorException
- */
-function api_clean_attachments($body)
-{
-	$data = BBCode::getAttachmentData($body);
-
-	if (empty($data)) {
-		return $body;
-	}
-	$body = "";
-
-	if (isset($data["text"])) {
-		$body = $data["text"];
-	}
-	if (($body == "") && isset($data["title"])) {
-		$body = $data["title"];
-	}
-	if (isset($data["url"])) {
-		$body .= "\n".$data["url"];
-	}
-	$body .= $data["after"];
-
-	return $body;
-}
-
 /**
  *
  * @param array $contacts
diff --git a/tests/include/ApiTest.php b/tests/include/ApiTest.php
index 3410f3049d..245529fb21 100644
--- a/tests/include/ApiTest.php
+++ b/tests/include/ApiTest.php
@@ -3775,16 +3775,6 @@ class ApiTest extends DatabaseTest
 		$this->assertEquals('some_text [url="some_url"]"some_url"[/url]', $result);
 	}
 
-	/**
-	 * Test the api_clean_attachments() function.
-	 *
-	 * @return void
-	 */
-	public function testApiCleanAttachments()
-	{
-		$this->markTestIncomplete();
-	}
-
 	/**
 	 * Test the api_best_nickname() function.
 	 *
-- 
2.39.5