From 1b5fa55bdcc6d0d62bc5ee2a6182027b9d552318 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 11 Nov 2019 22:37:50 +0000
Subject: [PATCH 1/2] Fix image links with descriptions in API and AP
 transmission

---
 include/api.php                          |  1 +
 src/Model/Photo.php                      | 21 +++++++++++++++++++++
 src/Protocol/ActivityPub/Transmitter.php | 24 ++++++++++++++++++++----
 3 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/include/api.php b/include/api.php
index d5eb9c5418..8325e39b71 100644
--- a/include/api.php
+++ b/include/api.php
@@ -2554,6 +2554,7 @@ function api_get_attachments(&$body)
 {
 	$text = $body;
 	$text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $text);
+	$text = preg_replace("/\[img\=(.*?)\](.*?)\[\/img\]/ism", '[img]$1[/img]', $text);
 
 	$URLSearchString = "^\[\]";
 	$ret = preg_match_all("/\[img\]([$URLSearchString]*)\[\/img\]/ism", $text, $images);
diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 10e80a4fb5..bf0acf53eb 100644
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -715,4 +715,25 @@ class Photo extends BaseObject
 
 		return DBA::exists('photo', ['resource-id' => $guid]);
 	}
+
+	/**
+	 * Tests if the link points to a locally stored picture page
+	 *
+	 * @param string $name Page link
+	 * @return boolean
+	 * @throws \Exception
+	 */
+	public static function isLocalLink($name)
+	{
+		$a = \get_app();
+		$base = $a->getBaseURL();
+
+		$guid = str_replace(Strings::normaliseLink($base), '', Strings::normaliseLink($name));
+		$guid = preg_replace("=/photos/.*/image/(.*)=ism", '$1', $guid);
+		if (empty($guid)) {
+			return false;
+		}
+
+		return DBA::exists('photo', ['resource-id' => $guid]);
+	}
 }
diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index c5f3bae470..3f962b8cf9 100644
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -19,6 +19,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\Conversation;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
+use Friendica\Model\Photo;
 use Friendica\Model\Term;
 use Friendica\Model\User;
 use Friendica\Protocol\Activity;
@@ -1097,19 +1098,34 @@ class Transmitter
 	}
 
 	/**
-	 * Remove image elements and replaces them with links to the image
+	 * Remove image elements since they are added as attachment
 	 *
 	 * @param string $body
 	 *
-	 * @return string with replaced elements
+	 * @return string with removed images
 	 */
 	private static function removePictures($body)
 	{
 		// Simplify image codes
 		$body = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $body);
+		$body = preg_replace("/\[img\=(.*?)\](.*?)\[\/img\]/ism", '[img]$1[/img]', $body);
 
-		$body = preg_replace("/\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]/Usi", '[url]$1[/url]', $body);
-		$body = preg_replace("/\[img\]([^\[\]]*)\[\/img\]/Usi", '[url]$1[/url]', $body);
+		// Now remove local links
+		$body = preg_replace_callback(
+			'/\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]/Usi',
+			function ($match) {
+				// We remove the link when it is a link to a local photo page
+				if (Photo::isLocalLink($match[1])) {
+					return '';
+				}
+				// otherwise we just return the link
+				return '[url]' . $match[1] . '[/url]';
+			},
+			$body
+		);
+
+		// Remove all pictures
+		$body = preg_replace("/\[img\]([^\[\]]*)\[\/img\]/Usi", '', $body);
 
 		return $body;
 	}

From 8997361609017e1bc73f8241971c118fb71c70f2 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 11 Nov 2019 23:13:36 +0000
Subject: [PATCH 2/2] Better function name

---
 src/Model/Photo.php                      | 2 +-
 src/Protocol/ActivityPub/Transmitter.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index bf0acf53eb..db3c4d429b 100644
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -723,7 +723,7 @@ class Photo extends BaseObject
 	 * @return boolean
 	 * @throws \Exception
 	 */
-	public static function isLocalLink($name)
+	public static function isLocalPage($name)
 	{
 		$a = \get_app();
 		$base = $a->getBaseURL();
diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index 3f962b8cf9..a7be1e9c52 100644
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -1115,7 +1115,7 @@ class Transmitter
 			'/\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]/Usi',
 			function ($match) {
 				// We remove the link when it is a link to a local photo page
-				if (Photo::isLocalLink($match[1])) {
+				if (Photo::isLocalPage($match[1])) {
 					return '';
 				}
 				// otherwise we just return the link