X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub%2FProcessor.php;h=7639d0f2a325d97ee6dc3ea6a9f2fb48a4f0d6b4;hb=ce7ec11d1d40b21c68086962791f985d407f1cd1;hp=aaf5a251858d2a2eb3035e9c1c5cb47bd1e9a8c9;hpb=e247a14d2bc75a83abc04329fd8b9a2af2e13d5b;p=friendica.git

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index aaf5a25185..7639d0f2a3 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -8,6 +8,7 @@ use Friendica\Database\DBA;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Config;
+use Friendica\Core\PConfig;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Model\Contact;
@@ -110,7 +111,11 @@ class Processor
 					continue;
 				}
 
-				$item['body'] .= "\n[img]" . $attach['url'] . '[/img]';
+				if (empty($attach['name'])) {
+					$item['body'] .= "\n[img]" . $attach['url'] . '[/img]';
+				} else {
+					$item['body'] .= "\n[img=" . $attach['url'] . ']' . $attach['name'] . '[/img]';
+				}
 			} else {
 				if (!empty($item["attach"])) {
 					$item["attach"] .= ',';
@@ -410,9 +415,7 @@ class Processor
 
 			if ($isForum) {
 				$item['contact-id'] = Contact::getIdForURL($activity['actor'], $receiver, true);
-			}
-
-			if (empty($item['contact-id'])) {
+			} else {
 				$item['contact-id'] = Contact::getIdForURL($activity['author'], $receiver, true);
 			}
 
@@ -533,8 +536,9 @@ class Processor
 	/**
 	 * Fetches missing posts
 	 *
-	 * @param $url
-	 * @param $child
+	 * @param string $url message URL
+	 * @param array $child activity array with the child of this message
+	 * @return boolean success
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function fetchMissingActivity($url, $child = [])
@@ -548,12 +552,12 @@ class Processor
 		$object = ActivityPub::fetchContent($url, $uid);
 		if (empty($object)) {
 			Logger::log('Activity ' . $url . ' was not fetchable, aborting.');
-			return;
+			return false;
 		}
 
 		if (empty($object['id'])) {
 			Logger::log('Activity ' . $url . ' has got not id, aborting. ' . json_encode($object));
-			return;
+			return false;
 		}
 
 		if (!empty($child['author'])) {
@@ -592,6 +596,8 @@ class Processor
 
 		ActivityPub\Receiver::processActivity($ldactivity);
 		Logger::log('Activity ' . $url . ' had been fetched and processed.');
+
+		return true;
 	}
 
 	/**