X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FDiaspora.php;h=dd6c2115b5e32714a868bae0ee589465ca76bf31;hb=fdaff4303952427f222ee21f6b501d5087e25932;hp=c0fd4fd3291360710855235a7d93ea8e45745223;hpb=3fcc45a72011895ff6767697cf7256a44f27c303;p=friendica.git

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index c0fd4fd329..dd6c2115b5 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -83,14 +83,21 @@ class Diaspora
 			return $contacts;
 		}
 
-		$items = Post::select(['author-id', 'author-link', 'parent-author-link', 'parent-guid', 'guid'],
-			['parent' => $item['parent'], 'gravity' => [Item::GRAVITY_COMMENT, Item::GRAVITY_ACTIVITY]]);
+		$items = Post::select(
+			['author-id', 'author-link', 'parent-author-link', 'parent-guid', 'guid'],
+			['parent' => $item['parent'], 'gravity' => [Item::GRAVITY_COMMENT, Item::GRAVITY_ACTIVITY]]
+		);
 		while ($item = Post::fetch($items)) {
-			$contact = DBA::selectFirst('contact', ['id', 'url', 'name', 'protocol', 'batch', 'network'],
-				['id' => $item['author-id']]);
-			if (!DBA::isResult($contact) || empty($contact['batch']) ||
+			$contact = DBA::selectFirst(
+				'contact',
+				['id', 'url', 'name', 'protocol', 'batch', 'network'],
+				['id' => $item['author-id']]
+			);
+			if (
+				!DBA::isResult($contact) || empty($contact['batch']) ||
 				($contact['network'] != Protocol::DIASPORA) ||
-				Strings::compareLink($item['parent-author-link'], $item['author-link'])) {
+				Strings::compareLink($item['parent-author-link'], $item['author-link'])
+			) {
 				continue;
 			}
 
@@ -260,7 +267,7 @@ class Diaspora
 				if ($no_exit) {
 					return false;
 				} else {
-					throw new \Friendica\Network\HTTPException\BadRequestException();
+					throw new HTTPException\BadRequestException();
 				}
 			}
 		} else {
@@ -270,11 +277,11 @@ class Diaspora
 		$basedom = XML::parseString($xml, true);
 
 		if (!is_object($basedom)) {
-			Logger::notice('Received data does not seem to be an XML. Discarding. '.$xml);
+			Logger::notice('Received data does not seem to be an XML. Discarding. ' . $xml);
 			if ($no_exit) {
 				return false;
 			} else {
-				throw new \Friendica\Network\HTTPException\BadRequestException();
+				throw new HTTPException\BadRequestException();
 			}
 		}
 
@@ -300,7 +307,7 @@ class Diaspora
 			if ($no_exit) {
 				return false;
 			} else {
-				throw new \Friendica\Network\HTTPException\BadRequestException();
+				throw new HTTPException\BadRequestException();
 			}
 		}
 
@@ -315,7 +322,7 @@ class Diaspora
 			if ($no_exit) {
 				return false;
 			} else {
-				throw new \Friendica\Network\HTTPException\BadRequestException();
+				throw new HTTPException\BadRequestException();
 			}
 		}
 
@@ -325,7 +332,7 @@ class Diaspora
 			if ($no_exit) {
 				return false;
 			} else {
-				throw new \Friendica\Network\HTTPException\BadRequestException();
+				throw new HTTPException\BadRequestException();
 			}
 		}
 
@@ -417,7 +424,7 @@ class Diaspora
 
 		if (!$base) {
 			Logger::notice('unable to locate salmon data in xml');
-			throw new \Friendica\Network\HTTPException\BadRequestException();
+			throw new HTTPException\BadRequestException();
 		}
 
 
@@ -437,14 +444,11 @@ class Diaspora
 		$encoding = $base->encoding;
 		$alg = $base->alg;
 
-
-		$signed_data = $data.'.'.Strings::base64UrlEncode($type).'.'.Strings::base64UrlEncode($encoding).'.'.Strings::base64UrlEncode($alg);
-
+		$signed_data = $data . '.' . Strings::base64UrlEncode($type) . '.' . Strings::base64UrlEncode($encoding) . '.' . Strings::base64UrlEncode($alg);
 
 		// decode the data
 		$data = Strings::base64UrlDecode($data);
 
-
 		if ($public) {
 			$inner_decrypted = $data;
 		} else {
@@ -456,21 +460,21 @@ class Diaspora
 		// Once we have the author URI, go to the web and try to find their public key
 		// (first this will look it up locally if it is in the diaspora-contact cache)
 		// This will also convert diaspora public key from pkcs#1 to pkcs#8
-		Logger::notice('Fetching key for ' . $author);
+		Logger::info('Fetching key for ' . $author);
 		$key = self::key($author);
 		if (!$key) {
 			Logger::notice('Could not retrieve author key.');
-			throw new \Friendica\Network\HTTPException\BadRequestException();
+			throw new HTTPException\BadRequestException();
 		}
 
 		$verify = Crypto::rsaVerify($signed_data, $signature, $key);
 
 		if (!$verify) {
 			Logger::notice('Message did not verify. Discarding.');
-			throw new \Friendica\Network\HTTPException\BadRequestException();
+			throw new HTTPException\BadRequestException();
 		}
 
-		Logger::notice('Message verified.');
+		Logger::info('Message verified.');
 
 		return [
 			'message' => $inner_decrypted,
@@ -492,8 +496,7 @@ class Diaspora
 	 */
 	public static function dispatchPublic(array $msg, int $direction)
 	{
-		$enabled = intval(DI::config()->get('system', 'diaspora_enabled'));
-		if (!$enabled) {
+		if (!DI::config()->get('system', 'diaspora_enabled')) {
 			Logger::notice('Diaspora is disabled');
 			return false;
 		}
@@ -719,7 +722,8 @@ class Diaspora
 
 				$signed_data .= $entry;
 			}
-			if (!in_array($fieldname, ['parent_author_signature', 'target_author_signature'])
+			if (
+				!in_array($fieldname, ['parent_author_signature', 'target_author_signature'])
 				|| ($orig_type == 'relayable_retraction')
 			) {
 				XML::copy($entry, $fields, $fieldname);
@@ -792,10 +796,10 @@ class Diaspora
 	 */
 	private static function key(WebFingerUri $uri): string
 	{
-		Logger::notice('Fetching diaspora key', ['handle' => $uri->getAddr(), 'callstack' => System::callstack(20)]);
+		Logger::info('Fetching diaspora key', ['handle' => $uri->getAddr(), 'callstack' => System::callstack(20)]);
 		try {
 			return DI::dsprContact()->getByAddr($uri)->pubKey;
-		} catch (HTTPException\NotFoundException|\InvalidArgumentException $e) {
+		} catch (HTTPException\NotFoundException | \InvalidArgumentException $e) {
 			return '';
 		}
 	}
@@ -932,7 +936,7 @@ class Diaspora
 	{
 		$item = Post::selectFirst(['id'], ['uid' => $uid, 'guid' => $guid]);
 		if (DBA::isResult($item)) {
-			Logger::notice('Message ' . $guid . ' already exists for user ' . $uid);
+			Logger::notice('Message already exists.', ['uid' => $uid, 'guid' => $guid, 'id' => $item['id']]);
 			return $item['id'];
 		}
 
@@ -943,6 +947,7 @@ class Diaspora
 	 * Checks for links to posts in a message
 	 *
 	 * @param array $item The item array
+	 *
 	 * @return void
 	 */
 	private static function fetchGuid(array $item)
@@ -1146,7 +1151,7 @@ class Diaspora
 	{
 		// Check for Diaspora (and Friendica) typical paths
 		if (!preg_match('=(https?://.+)/(?:posts|display|objects)/([a-zA-Z0-9-_@.:%]+[a-zA-Z0-9])=i', $url, $matches)) {
-			Logger::info('Invalid url', ['url' => $url]);
+			Logger::notice('Invalid url', ['url' => $url]);
 			return false;
 		}
 
@@ -1167,7 +1172,7 @@ class Diaspora
 			Logger::info('Found', ['id' => $item['id']]);
 			return $item['id'];
 		} else {
-			Logger::info('Not found', ['guid' => $guid, 'uid' => $uid]);
+			Logger::notice('Not found', ['guid' => $guid, 'uid' => $uid]);
 			return false;
 		}
 	}
@@ -1185,9 +1190,11 @@ class Diaspora
 	 */
 	private static function parentItem(int $uid, string $guid, WebFingerUri $author, array $contact)
 	{
-		$fields = ['id', 'parent', 'body', 'wall', 'uri', 'guid', 'private', 'origin',
+		$fields = [
+			'id', 'parent', 'body', 'wall', 'uri', 'guid', 'private', 'origin',
 			'author-name', 'author-link', 'author-avatar', 'gravity',
-			'owner-name', 'owner-link', 'owner-avatar'];
+			'owner-name', 'owner-link', 'owner-avatar'
+		];
 
 		$condition = ['uid' => $uid, 'guid' => $guid];
 		$item = Post::selectFirst($fields, $condition);
@@ -1215,7 +1222,7 @@ class Diaspora
 			Logger::notice('Parent item not found: parent: ' . $guid . ' - user: ' . $uid);
 			return false;
 		} else {
-			Logger::notice('Parent item found: parent: ' . $guid . ' - user: ' . $uid);
+			Logger::info('Parent item found: parent: ' . $guid . ' - user: ' . $uid);
 			return $item;
 		}
 	}
@@ -1355,7 +1362,7 @@ class Diaspora
 			return false;
 		}
 
-		Logger::notice('Got migration for ' . $old_author . ', to ' . $new_author . ' with user ' . $importer['uid']);
+		Logger::info('Got migration for ' . $old_author . ', to ' . $new_author . ' with user ' . $importer['uid']);
 
 		// Check signature
 		$signed_text = 'AccountMigration:' . $old_author . ':' . $new_author;
@@ -1389,7 +1396,7 @@ class Diaspora
 
 		Contact::update($fields, ['addr' => $old_author->getAddr()]);
 
-		Logger::notice('Contacts are updated.');
+		Logger::info('Contacts are updated.');
 
 		return true;
 	}
@@ -1412,7 +1419,7 @@ class Diaspora
 		}
 		DBA::close($contacts);
 
-		Logger::notice('Removed contacts for ' . $author_handle);
+		Logger::info('Removed contacts for ' . $author_handle);
 
 		return true;
 	}
@@ -1435,7 +1442,7 @@ class Diaspora
 		} elseif ($person_uri) {
 			try {
 				return DI::dsprContact()->selectOneByAddr($person_uri)->baseurl . '/objects/' . $guid;
-			} catch (HTTPException\NotFoundException|\InvalidArgumentException $e) {
+			} catch (HTTPException\NotFoundException | \InvalidArgumentException $e) {
 				return '';
 			}
 		}
@@ -1472,7 +1479,6 @@ class Diaspora
 				$contact = DI::dsprContact()->getByUrl(new Uri($match[3]));
 				Tag::storeByHash($uriid, $match[1], $contact->name ?: $contact->nick, $contact->url);
 			} catch (\Throwable $e) {
-
 			}
 		}
 	}
@@ -1531,7 +1537,7 @@ class Diaspora
 
 		try {
 			$author_url = (string)DI::dsprContact()->getByAddr($author)->url;
-		} catch (HTTPException\NotFoundException|\InvalidArgumentException $e) {
+		} catch (HTTPException\NotFoundException | \InvalidArgumentException $e) {
 			Logger::notice('Unable to find author details', ['author' => $author->getAddr()]);
 			return false;
 		}
@@ -1783,7 +1789,7 @@ class Diaspora
 
 		try {
 			$author_url = (string)DI::dsprContact()->getByAddr($author)->url;
-		} catch (HTTPException\NotFoundException|\InvalidArgumentException $e) {
+		} catch (HTTPException\NotFoundException | \InvalidArgumentException $e) {
 			Logger::notice('Unable to find author details', ['author' => $author->getAddr()]);
 			return false;
 		}
@@ -1896,7 +1902,7 @@ class Diaspora
 
 		try {
 			$author = DI::dsprContact()->getByAddr($author_uri);
-		} catch (HTTPException\NotFoundException|\InvalidArgumentException $e) {
+		} catch (HTTPException\NotFoundException | \InvalidArgumentException $e) {
 			Logger::notice('Unable to find author details', ['author' => $author_uri->getAddr()]);
 			return false;
 		}
@@ -1968,7 +1974,7 @@ class Diaspora
 
 		try {
 			$author_url = (string)DI::dsprContact()->getByAddr($author)->url;
-		} catch (HTTPException\NotFoundException|\InvalidArgumentException $e) {
+		} catch (HTTPException\NotFoundException | \InvalidArgumentException $e) {
 			Logger::notice('unable to find author details', ['author' => $author->getAddr()]);
 			return false;
 		}
@@ -2013,8 +2019,10 @@ class Diaspora
 		Logger::info('Participation stored', ['id' => $message_id, 'guid' => $guid, 'parent_guid' => $parent_guid, 'author' => $author]);
 
 		// Send all existing comments and likes to the requesting server
-		$comments = Post::select(['id', 'uri-id', 'parent-author-network', 'author-network', 'verb', 'gravity'],
-			['parent' => $toplevel_parent_item['id'], 'gravity' => [Item::GRAVITY_COMMENT, Item::GRAVITY_ACTIVITY]]);
+		$comments = Post::select(
+			['id', 'uri-id', 'parent-author-network', 'author-network', 'verb', 'gravity'],
+			['parent' => $toplevel_parent_item['id'], 'gravity' => [Item::GRAVITY_COMMENT, Item::GRAVITY_ACTIVITY]]
+		);
 		while ($comment = Post::fetch($comments)) {
 			if (($comment['gravity'] == Item::GRAVITY_ACTIVITY) && !in_array($comment['verb'], [Activity::LIKE, Activity::DISLIKE])) {
 				Logger::info('Unsupported activities are not relayed', ['item' => $comment['id'], 'verb' => $comment['verb']]);
@@ -2057,7 +2065,7 @@ class Diaspora
 	}
 
 	/**
-	 * Processes poll participations - unssupported
+	 * Processes poll participations - unsupported
 	 *
 	 * @param array  $importer Array of the importer user
 	 * @param object $data     The message object
@@ -2089,7 +2097,7 @@ class Diaspora
 			return false;
 		}
 
-		$name = XML::unescape($data->first_name).((strlen($data->last_name)) ? ' ' . XML::unescape($data->last_name) : '');
+		$name = XML::unescape($data->first_name) . ((strlen($data->last_name)) ? ' ' . XML::unescape($data->last_name) : '');
 		$image_url = XML::unescape($data->image_url);
 		$birthday = XML::unescape($data->birthday);
 		$about = Markdown::toBBCode(XML::unescape($data->bio));
@@ -2136,10 +2144,12 @@ class Diaspora
 			$birthday = $contact['bd'];
 		}
 
-		$fields = ['name' => $name, 'location' => $location,
+		$fields = [
+			'name' => $name, 'location' => $location,
 			'name-date' => DateTimeFormat::utcNow(), 'about' => $about,
 			'addr' => $author->getAddr(), 'nick' => $author->getUser(), 'keywords' => $keywords,
-			'unsearchable' => !$searchable, 'sensitive' => $nsfw];
+			'unsearchable' => !$searchable, 'sensitive' => $nsfw
+		];
 
 		if (!empty($birthday)) {
 			$fields['bd'] = $birthday;
@@ -2191,7 +2201,7 @@ class Diaspora
 		$author = WebFingerUri::fromString($author_handle);
 
 		// the current protocol version doesn't know these fields
-		// That means that we will assume their existance
+		// That means that we will assume their existence
 		if (isset($data->following)) {
 			$following = (XML::unescape($data->following) == 'true');
 		} else {
@@ -2242,14 +2252,14 @@ class Diaspora
 		} elseif (!$following && $sharing) {
 			Logger::info("Author " . $author . " wants to share with us.");
 		} elseif ($following && $sharing) {
-			Logger::info("Author " . $author . " wants to have a bidirectional conection.");
+			Logger::info("Author " . $author . " wants to have a bidirectional connection.");
 		} elseif ($following && !$sharing) {
 			Logger::info("Author " . $author . " wants to listen to us.");
 		}
 
 		try {
 			$author_url = (string)DI::dsprContact()->getByAddr($author)->url;
-		} catch (HTTPException\NotFoundException|\InvalidArgumentException $e) {
+		} catch (HTTPException\NotFoundException | \InvalidArgumentException $e) {
 			Logger::notice('Cannot resolve diaspora handle for recipient', ['author' => $author->getAddr(), 'recipient' => $recipient]);
 			return false;
 		}
@@ -2426,7 +2436,7 @@ class Diaspora
 
 		try {
 			$author = DI::dsprContact()->getByAddr($author_uri);
-		} catch (HTTPException\NotFoundException|\InvalidArgumentException $e) {
+		} catch (HTTPException\NotFoundException | \InvalidArgumentException $e) {
 			Logger::notice('Unable to find details for author', ['author' => $author_uri->getAddr()]);
 			return false;
 		}
@@ -2556,19 +2566,21 @@ class Diaspora
 	 *
 	 * @param int $uriid
 	 * @param object $photo
+	 *
 	 * @return void
 	 */
 	private static function storePhotoAsMedia(int $uriid, $photo)
 	{
 		// @TODO Need to find object type, roland@f.haeder.net
-		Logger::debug('photo='.get_class($photo));
-		$data = [];
-		$data['uri-id'] = $uriid;
-		$data['type'] = Post\Media::IMAGE;
-		$data['url'] = XML::unescape($photo->remote_photo_path) . XML::unescape($photo->remote_photo_name);
-		$data['height'] = (int)XML::unescape($photo->height ?? 0);
-		$data['width'] = (int)XML::unescape($photo->width ?? 0);
-		$data['description'] = XML::unescape($photo->text ?? '');
+		Logger::debug('photo=' . get_class($photo));
+		$data = [
+			'uri-id'      => $uriid,
+			'type'        => Post\Media::IMAGE,
+			'url'         => XML::unescape($photo->remote_photo_path) . XML::unescape($photo->remote_photo_name),
+			'height'      => (int)XML::unescape($photo->height ?? 0),
+			'width'       => (int)XML::unescape($photo->width ?? 0),
+			'description' => XML::unescape($photo->text ?? ''),
+		];
 
 		Post\Media::insert($data);
 	}
@@ -2640,11 +2652,32 @@ class Diaspora
 
 		$raw_body = $body = Markdown::toBBCode($text);
 
-		$datarray = [];
+		$datarray = [
+			'guid'        => $guid,
+			'plink'       => self::plink($author, $guid),
+			'uid'         => $importer['uid'],
+			'contact-id'  => $contact['id'],
+			'network'     => Protocol::DIASPORA,
+			'author-link' => $contact['url'],
+			'author-id'   => Contact::getIdForURL($contact['url'], 0),
+			'verb'        => Activity::POST,
+			'gravity'     => Item::GRAVITY_PARENT,
+			'protocol'    => Conversation::PARCEL_DIASPORA,
+			'source'      => $xml,
+			'body'        => self::replacePeopleGuid($body, $contact['url']),
+			'raw-body'    => self::replacePeopleGuid($raw_body, $contact['url']),
+			'private'     => (($public == 'false') ? Item::PRIVATE : Item::PUBLIC),
+			// Default is note (aka. comment), later below is being checked the real type
+			'object-type' => Activity\ObjectType::NOTE,
+			'post-type'   => Item::PT_NOTE,
+		];
 
-		$datarray['guid'] = $guid;
-		$datarray['uri'] = $datarray['thr-parent'] = self::getUriFromGuid($guid, $author);
-		$datarray['uri-id'] = ItemURI::insert(['uri' => $datarray['uri'], 'guid' => $datarray['guid']]);
+		$datarray['uri']        = $datarray['thr-parent'] = self::getUriFromGuid($guid, $author);
+		$datarray['uri-id']     = ItemURI::insert(['uri' => $datarray['uri'], 'guid' => $datarray['guid']]);
+		$datarray['owner-link'] = $datarray['author-link'];
+		$datarray['owner-id']   = $datarray['author-id'];
+
+		$datarray = self::setDirection($datarray, $direction);
 
 		// Attach embedded pictures to the body
 		if ($data->photo) {
@@ -2655,11 +2688,7 @@ class Diaspora
 			$datarray['object-type'] = Activity\ObjectType::IMAGE;
 			$datarray['post-type'] = Item::PT_IMAGE;
 		} elseif ($data->poll) {
-			$datarray['object-type'] = Activity\ObjectType::NOTE;
 			$datarray['post-type'] = Item::PT_POLL;
-		} else {
-			$datarray['object-type'] = Activity\ObjectType::NOTE;
-			$datarray['post-type'] = Item::PT_NOTE;
 		}
 
 		/// @todo enable support for polls
@@ -2671,27 +2700,6 @@ class Diaspora
 
 		/// @todo enable support for events
 
-		$datarray['uid'] = $importer['uid'];
-		$datarray['contact-id'] = $contact['id'];
-		$datarray['network'] = Protocol::DIASPORA;
-
-		$datarray['author-link'] = $contact['url'];
-		$datarray['author-id'] = Contact::getIdForURL($contact['url'], 0);
-
-		$datarray['owner-link'] = $datarray['author-link'];
-		$datarray['owner-id'] = $datarray['author-id'];
-
-		$datarray['verb'] = Activity::POST;
-		$datarray['gravity'] = Item::GRAVITY_PARENT;
-
-		$datarray['protocol'] = Conversation::PARCEL_DIASPORA;
-		$datarray['source'] = $xml;
-
-		$datarray = self::setDirection($datarray, $direction);
-
-		$datarray['body'] = self::replacePeopleGuid($body, $contact['url']);
-		$datarray['raw-body'] = self::replacePeopleGuid($raw_body, $contact['url']);
-
 		self::storeMentions($datarray['uri-id'], $text);
 		Tag::storeRawTagsFromBody($datarray['uri-id'], $datarray['body']);
 
@@ -2704,8 +2712,6 @@ class Diaspora
 			$datarray['app'] = $provider_display_name;
 		}
 
-		$datarray['plink'] = self::plink($author, $guid);
-		$datarray['private'] = (($public == 'false') ? Item::PRIVATE : Item::PUBLIC);
 		$datarray['changed'] = $datarray['created'] = $datarray['edited'] = $created_at;
 
 		if (isset($address['address'])) {
@@ -2743,7 +2749,7 @@ class Diaspora
 	 * ************************************************************************************** */
 
 	/**
-	 * returnes the handle of a contact
+	 * returns the handle of a contact
 	 *
 	 * @param array $contact contact array
 	 *
@@ -2757,7 +2763,7 @@ class Diaspora
 		}
 
 		// Normally we should have a filled "addr" field - but in the past this wasn't the case
-		// So - just in case - we build the the address here.
+		// So - just in case - we build the address here.
 		if ($contact['nickname'] != '') {
 			$nick = $contact['nickname'];
 		} else {
@@ -2826,7 +2832,7 @@ class Diaspora
 	public static function buildMagicEnvelope(string $msg, array $user): string
 	{
 		$b64url_data = Strings::base64UrlEncode($msg);
-		$data = str_replace(["\n", "\r", " ", "\t"], ['', '', '', ''], $b64url_data);
+		$data = str_replace(["\n", "\r", ' ', "\t"], ['', '', '', ''], $b64url_data);
 
 		$key_id = Strings::base64UrlEncode(self::myHandle($user));
 		$type = 'application/xml';
@@ -2844,18 +2850,18 @@ class Diaspora
 
 		$xmldata = [
 			'me:env' => [
-				'me:data' => $data,
-				'@attributes' => ['type' => $type],
-				'me:encoding' => $encoding,
-				'me:alg' => $alg,
-				'me:sig' => $sig,
+				'me:data'      => $data,
+				'@attributes'  => ['type' => $type],
+				'me:encoding'  => $encoding,
+				'me:alg'       => $alg,
+				'me:sig'       => $sig,
 				'@attributes2' => ['key_id' => $key_id]
 			]
 		];
 
 		$namespaces = ['me' => ActivityNamespace::SALMON_ME];
 
-		return XML::fromArray($xmldata, $xml, false, $namespaces);
+		return XML::fromArray($xmldata, $dummy, false, $namespaces);
 	}
 
 	/**
@@ -2930,8 +2936,7 @@ class Diaspora
 		try {
 			$target = DI::dsprContact()->getByAddr(WebFingerUri::fromString($contact['addr']));
 			$dest_url = $public_batch ? $target->batch : $target->notify;
-		} catch (HTTPException\NotFoundException|\InvalidArgumentException $e) {
-
+		} catch (HTTPException\NotFoundException | \InvalidArgumentException $e) {
 		}
 
 		if (empty($dest_url)) {
@@ -2943,7 +2948,7 @@ class Diaspora
 			return 0;
 		}
 
-		Logger::notice('transmit: ' . $logid . '-' . $guid . ' ' . $dest_url);
+		Logger::info('transmit: ' . $logid . '-' . $guid . ' ' . $dest_url);
 
 		if (!intval(DI::config()->get('system', 'diaspora_test'))) {
 			$content_type = (($public_batch) ? 'application/magic-envelope+xml' : 'application/json');
@@ -2955,7 +2960,13 @@ class Diaspora
 			return 200;
 		}
 
-		Logger::notice('transmit: ' . $logid . '-' . $guid . ' to ' . $dest_url . ' returns: ' . $return_code);
+		if (!empty($contact['gsid']) && (empty($return_code) || $postResult->isTimeout())) {
+			GServer::setFailureById($contact['gsid']);
+		} elseif (!empty($contact['gsid']) && ($return_code >= 200) && ($return_code <= 299)) {
+			GServer::setReachableById($contact['gsid'], Protocol::DIASPORA);
+		}
+
+		Logger::info('transmit: ' . $logid . '-' . $guid . ' to ' . $dest_url . ' returns: ' . $return_code);
 
 		return $return_code ? $return_code : -1;
 	}
@@ -2968,12 +2979,11 @@ class Diaspora
 	 * @param array  $message The message data
 	 *
 	 * @return string The post XML
+	 * @throws \Exception
 	 */
 	public static function buildPostXml(string $type, array $message): string
 	{
-		$data = [$type => $message];
-
-		return XML::fromArray($data, $xml);
+		return XML::fromArray([$type => $message]);
 	}
 
 	/**
@@ -3006,8 +3016,7 @@ class Diaspora
 		if (!empty($contact['addr'])) {
 			try {
 				$pubkey = DI::dsprContact()->getByAddr(WebFingerUri::fromString($contact['addr']))->pubKey;
-			} catch (HTTPException\NotFoundException|\InvalidArgumentException $e) {
-
+			} catch (HTTPException\NotFoundException | \InvalidArgumentException $e) {
 			}
 		} else {
 			// The "addr" field should always be filled.
@@ -3053,8 +3062,10 @@ class Diaspora
 		// If the item belongs to a user, we take this user id.
 		if ($item['uid'] == 0) {
 			// @todo Possibly use an administrator account?
-			$condition = ['verified' => true, 'blocked' => false,
-				'account_removed' => false, 'account_expired' => false, 'account-type' => User::ACCOUNT_TYPE_PERSON];
+			$condition = [
+				'verified' => true, 'blocked' => false,
+				'account_removed' => false, 'account_expired' => false, 'account-type' => User::ACCOUNT_TYPE_PERSON
+			];
 			$first_user = DBA::selectFirst('user', ['uid'], $condition, ['order' => ['uid']]);
 			$owner = User::getOwnerDataById($first_user['uid']);
 		} else {
@@ -3094,7 +3105,7 @@ class Diaspora
 		$old_handle = DI::pConfig()->get($uid, 'system', 'previous_addr');
 		$profile = self::createProfileData($uid);
 
-		$signed_text = 'AccountMigration:'.$old_handle.':'.$profile['author'];
+		$signed_text = 'AccountMigration:' . $old_handle . ':' . $profile['author'];
 		$signature = base64_encode(Crypto::rsaSign($signed_text, $owner['uprvkey'], 'sha256'));
 
 		$message = [
@@ -3311,14 +3322,23 @@ class Diaspora
 
 			$type = 'reshare';
 		} else {
+			$native_photos = DI::config()->get('diaspora', 'native_photos');
+			if ($native_photos) {
+				$item['body'] = Post\Media::removeFromEndOfBody($item['body']);
+				$attach_media = [Post\Media::AUDIO, Post\Media::VIDEO];
+			} else {
+				$attach_media = [Post\Media::AUDIO, Post\Media::IMAGE, Post\Media::VIDEO];
+			}
+
 			$title = $item['title'];
-			$body  = Post\Media::addAttachmentsToBody($item['uri-id'], DI::contentItem()->addSharedPost($item));
+			$body  = Post\Media::addAttachmentsToBody($item['uri-id'], DI::contentItem()->addSharedPost($item), $attach_media);
+			$body  = Post\Media::addHTMLLinkToBody($item['uri-id'], $body);
 
 			// Fetch the title from an attached link - if there is one
 			if (empty($item['title']) && DI::pConfig()->get($owner['uid'], 'system', 'attach_link_title')) {
-				$page_data = BBCode::getAttachmentData($item['body']);
-				if (!empty($page_data['type']) && !empty($page_data['title']) && ($page_data['type'] == 'link')) {
-					$title = $page_data['title'];
+				$media = Post\Media::getByURIId($item['uri-id'], [Post\Media::HTML]);
+				if (!empty($media) && !empty($media[0]['name']) && ($media[0]['name'] != $media[0]['url'])) {
+					$title = $media[0]['name'];
 				}
 			}
 
@@ -3360,6 +3380,10 @@ class Diaspora
 				'location' => $location
 			];
 
+			if ($native_photos) {
+				$message = self::addPhotos($item, $message);
+			}
+
 			// Diaspora rejects messages when they contain a location without "lat" or "lng"
 			if (!isset($location['lat']) || !isset($location['lng'])) {
 				unset($message['location']);
@@ -3370,9 +3394,11 @@ class Diaspora
 				if (count($event)) {
 					$message['event'] = $event;
 
-					if (!empty($event['location']['address']) &&
+					if (
+						!empty($event['location']['address']) &&
 						!empty($event['location']['lat']) &&
-						!empty($event['location']['lng'])) {
+						!empty($event['location']['lng'])
+					) {
 						$message['location'] = $event['location'];
 					}
 
@@ -3394,10 +3420,49 @@ class Diaspora
 		return $msg;
 	}
 
+	/**
+	 * Add photo elements to the message array
+	 *
+	 * @param array $item
+	 * @param array $message
+	 * @return array
+	 */
+	private static function addPhotos(array $item, array $message): array
+	{
+		$medias = Post\Media::getByURIId($item['uri-id'], [Post\Media::IMAGE]);
+		$public = ($item['private'] == Item::PRIVATE ? 'false' : 'true');
+
+		$counter = 0;
+		foreach ($medias as $media) {
+			if (Item::containsLink($item['body'], $media['preview'] ?? $media['url'], $media['type'])) {
+				continue;
+			}
+
+			$name = basename($media['url']);
+			$path = str_replace($name, '', $media['url']);
+
+			$message[++$counter . ':photo'] = [
+				'guid'                => Item::guid(['uri' => $media['url']], false),
+				'author'              => $item['author-addr'],
+				'public'              => $public,
+				'created_at'          => $item['created'],
+				'remote_photo_path'   => $path,
+				'remote_photo_name'   => $name,
+				'status_message_guid' => $item['guid'],
+				'height'              => $media['height'],
+				'width'               => $media['width'],
+				'text'                => $media['description'],
+			];
+		}
+
+		return $message;
+	}
+
 	private static function prependParentAuthorMention(string $body, string $profile_url): string
 	{
 		$profile = Contact::getByURL($profile_url, false, ['addr', 'name']);
-		if (!empty($profile['addr'])
+		if (
+			!empty($profile['addr'])
 			&& !strstr($body, $profile['addr'])
 			&& !strstr($body, $profile_url)
 		) {
@@ -3530,6 +3595,7 @@ class Diaspora
 		}
 
 		$body = Post\Media::addAttachmentsToBody($item['uri-id'], DI::contentItem()->addSharedPost($item));
+		$body = Post\Media::addHTMLLinkToBody($item['uri-id'], $body);
 
 		// The replied to autor mention is prepended for clarity if:
 		// - Item replied isn't yours
@@ -3851,9 +3917,9 @@ class Diaspora
 				$kw = str_replace('  ', ' ', $kw);
 				$arr = explode(' ', $kw);
 				if (count($arr)) {
-					for ($x = 0; $x < 5; $x ++) {
+					for ($x = 0; $x < 5; $x++) {
 						if (!empty($arr[$x])) {
-							$data['tag_string'] .= '#'. trim($arr[$x]) .' ';
+							$data['tag_string'] .= '#' . trim($arr[$x]) . ' ';
 						}
 					}
 				}
@@ -3976,7 +4042,7 @@ class Diaspora
 			return false;
 		}
 
-		if (!self::parentSupportDiaspora($item['thr-parent-id'])) {
+		if (!self::parentSupportDiaspora($item['thr-parent-id'], $uid)) {
 			Logger::info('One of the parents does not support Diaspora. A signature will not be created.', ['uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
 			return false;
 		}
@@ -3995,13 +4061,14 @@ class Diaspora
 	 * Check if the parent and their parents support Diaspora
 	 *
 	 * @param integer $parent_id
+	 * @param integer $uid
 	 * @return boolean
 	 * @throws InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	private static function parentSupportDiaspora(int $parent_id): bool
+	private static function parentSupportDiaspora(int $parent_id, int $uid): bool
 	{
-		$parent_post = Post::selectFirstPost(['gravity', 'signed_text', 'author-link', 'thr-parent-id'], ['uri-id' => $parent_id]);
+		$parent_post = Post::selectFirst(['gravity', 'signed_text', 'author-link', 'thr-parent-id', 'protocol'], ['uri-id' => $parent_id, 'uid' => [0, $uid]]);
 		if (empty($parent_post['thr-parent-id'])) {
 			Logger::warning('Parent post does not exist.', ['parent-id' => $parent_id]);
 			return false;
@@ -4012,13 +4079,13 @@ class Diaspora
 			return false;
 		}
 
-		if (($parent_post['gravity'] == Item::GRAVITY_COMMENT) && empty($parent_post['signed_text'])) {
+		if (($parent_post['protocol'] != Conversation::PARCEL_DIASPORA) && ($parent_post['gravity'] == Item::GRAVITY_COMMENT) && empty($parent_post['signed_text'])) {
 			Logger::info('Parent comment has got no Diaspora signature.', ['parent-id' => $parent_id]);
 			return false;
 		}
 
 		if ($parent_post['gravity'] == Item::GRAVITY_COMMENT) {
-			return self::parentSupportDiaspora($parent_post['thr-parent-id']);
+			return self::parentSupportDiaspora($parent_post['thr-parent-id'], $uid);
 		}
 
 		return true;
@@ -4038,7 +4105,7 @@ class Diaspora
 			'body'         => '',
 			'quote-uri-id' => $UriId,
 			'allow_cid'    => $owner['allow_cid'] ?? '',
-			'allow_gid'    => $owner['allow_gid']?? '',
+			'allow_gid'    => $owner['allow_gid'] ?? '',
 			'deny_cid'     => $owner['deny_cid'] ?? '',
 			'deny_gid'     => $owner['deny_gid'] ?? '',
 		];