X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FFeed.php;h=65b0696effb5a3fd9b20dd8dc817c64a9507f8c8;hb=c5b46fe748121c2d31c605cab9711626c8ce34f3;hp=8ab7066ea99e4bfc7ca56e28c9bd143527e83872;hpb=13a91e63aa5896014a010d30f4070f475306a397;p=friendica.git

diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index 8ab7066ea9..65b0696eff 100644
--- a/src/Protocol/Feed.php
+++ b/src/Protocol/Feed.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,11 +22,12 @@
 namespace Friendica\Protocol;
 
 use DOMDocument;
+use DOMElement;
 use DOMXPath;
 use Friendica\Content\PageInfo;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
-use Friendica\Core\Cache\Duration;
+use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
@@ -42,6 +43,7 @@ use Friendica\Util\ParseUrl;
 use Friendica\Util\Proxy;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
+use GuzzleHttp\Exception\TransferException;
 
 /**
  * This class contain functions to import feeds (RSS/RDF/Atom)
@@ -58,16 +60,18 @@ class Feed
 	 * @return array Returns the header and the first item in dry run mode
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function import($xml, array $importer = [], array $contact = [])
+	public static function import(string $xml, array $importer = [], array $contact = []): array
 	{
 		$dryRun = empty($importer) && empty($contact);
 
 		if ($dryRun) {
 			Logger::info("Test Atom/RSS feed");
 		} else {
-			Logger::info("Import Atom/RSS feed '" . $contact["name"] . "' (Contact " . $contact["id"] . ") for user " . $importer["uid"]);
+			Logger::info('Import Atom/RSS feed "' . $contact['name'] . '" (Contact ' . $contact['id'] . ') for user ' . $importer['uid']);
 		}
 
+		$xml = trim($xml);
+
 		if (empty($xml)) {
 			Logger::info('XML is empty.');
 			return [];
@@ -82,14 +86,14 @@ class Feed
 		}
 
 		$doc = new DOMDocument();
-		@$doc->loadXML(trim($xml));
+		@$doc->loadXML($xml);
 		$xpath = new DOMXPath($doc);
 		$xpath->registerNamespace('atom', ActivityNamespace::ATOM1);
-		$xpath->registerNamespace('dc', "http://purl.org/dc/elements/1.1/");
-		$xpath->registerNamespace('content', "http://purl.org/rss/1.0/modules/content/");
-		$xpath->registerNamespace('rdf', "http://www.w3.org/1999/02/22-rdf-syntax-ns#");
-		$xpath->registerNamespace('rss', "http://purl.org/rss/1.0/");
-		$xpath->registerNamespace('media', "http://search.yahoo.com/mrss/");
+		$xpath->registerNamespace('dc', 'http://purl.org/dc/elements/1.1/');
+		$xpath->registerNamespace('content', 'http://purl.org/rss/1.0/modules/content/');
+		$xpath->registerNamespace('rdf', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#');
+		$xpath->registerNamespace('rss', 'http://purl.org/rss/1.0/');
+		$xpath->registerNamespace('media', 'http://search.yahoo.com/mrss/');
 		$xpath->registerNamespace('poco', ActivityNamespace::POCO);
 
 		$author = [];
@@ -97,11 +101,11 @@ class Feed
 
 		// Is it RDF?
 		if ($xpath->query('/rdf:RDF/rss:channel')->length > 0) {
-			$author["author-link"] = XML::getFirstNodeValue($xpath, '/rdf:RDF/rss:channel/rss:link/text()');
-			$author["author-name"] = XML::getFirstNodeValue($xpath, '/rdf:RDF/rss:channel/rss:title/text()');
+			$author['author-link'] = XML::getFirstNodeValue($xpath, '/rdf:RDF/rss:channel/rss:link/text()');
+			$author['author-name'] = XML::getFirstNodeValue($xpath, '/rdf:RDF/rss:channel/rss:title/text()');
 
-			if (empty($author["author-name"])) {
-				$author["author-name"] = XML::getFirstNodeValue($xpath, '/rdf:RDF/rss:channel/rss:description/text()');
+			if (empty($author['author-name'])) {
+				$author['author-name'] = XML::getFirstNodeValue($xpath, '/rdf:RDF/rss:channel/rss:description/text()');
 			}
 			$entries = $xpath->query('/rdf:RDF/rss:item');
 		}
@@ -110,133 +114,151 @@ class Feed
 		if ($xpath->query('/atom:feed')->length > 0) {
 			$alternate = XML::getFirstAttributes($xpath, "atom:link[@rel='alternate']");
 			if (is_object($alternate)) {
-				foreach ($alternate AS $attribute) {
-					if ($attribute->name == "href") {
-						$author["author-link"] = $attribute->textContent;
+				foreach ($alternate as $attribute) {
+					if ($attribute->name == 'href') {
+						$author['author-link'] = $attribute->textContent;
 					}
 				}
 			}
 
-			if (empty($author["author-link"])) {
+			if (empty($author['author-link'])) {
 				$self = XML::getFirstAttributes($xpath, "atom:link[@rel='self']");
 				if (is_object($self)) {
-					foreach ($self AS $attribute) {
-						if ($attribute->name == "href") {
-							$author["author-link"] = $attribute->textContent;
+					foreach ($self as $attribute) {
+						if ($attribute->name == 'href') {
+							$author['author-link'] = $attribute->textContent;
 						}
 					}
 				}
 			}
 
-			if (empty($author["author-link"])) {
-				$author["author-link"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:id/text()');
+			if (empty($author['author-link'])) {
+				$author['author-link'] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:id/text()');
 			}
-			$author["author-avatar"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:logo/text()');
+			$author['author-avatar'] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:logo/text()');
 
-			$author["author-name"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:title/text()');
+			$author['author-name'] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:title/text()');
 
-			if (empty($author["author-name"])) {
-				$author["author-name"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:subtitle/text()');
+			if (empty($author['author-name'])) {
+				$author['author-name'] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:subtitle/text()');
 			}
 
-			if (empty($author["author-name"])) {
-				$author["author-name"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:author/atom:name/text()');
+			if (empty($author['author-name'])) {
+				$author['author-name'] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:author/atom:name/text()');
 			}
 
 			$value = XML::getFirstNodeValue($xpath, 'atom:author/poco:displayName/text()');
-			if ($value != "") {
-				$author["author-name"] = $value;
+			if ($value != '') {
+				$author['author-name'] = $value;
 			}
 
 			if ($dryRun) {
-				$author["author-id"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:author/atom:id/text()');
+				$author['author-id'] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:author/atom:id/text()');
 
 				// See https://tools.ietf.org/html/rfc4287#section-3.2.2
 				$value = XML::getFirstNodeValue($xpath, 'atom:author/atom:uri/text()');
-				if ($value != "") {
-					$author["author-link"] = $value;
+				if ($value != '') {
+					$author['author-link'] = $value;
 				}
 
 				$value = XML::getFirstNodeValue($xpath, 'atom:author/poco:preferredUsername/text()');
-				if ($value != "") {
-					$author["author-nick"] = $value;
+				if ($value != '') {
+					$author['author-nick'] = $value;
 				}
 
 				$value = XML::getFirstNodeValue($xpath, 'atom:author/poco:address/poco:formatted/text()');
-				if ($value != "") {
-					$author["author-location"] = $value;
+				if ($value != '') {
+					$author['author-location'] = $value;
 				}
 
 				$value = XML::getFirstNodeValue($xpath, 'atom:author/poco:note/text()');
-				if ($value != "") {
-					$author["author-about"] = $value;
+				if ($value != '') {
+					$author['author-about'] = $value;
 				}
 
 				$avatar = XML::getFirstAttributes($xpath, "atom:author/atom:link[@rel='avatar']");
 				if (is_object($avatar)) {
-					foreach ($avatar AS $attribute) {
-						if ($attribute->name == "href") {
-							$author["author-avatar"] = $attribute->textContent;
+					foreach ($avatar as $attribute) {
+						if ($attribute->name == 'href') {
+							$author['author-avatar'] = $attribute->textContent;
 						}
 					}
 				}
 			}
 
-			$author["edited"] = $author["created"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:updated/text()');
+			$author['edited'] = $author['created'] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:updated/text()');
 
-			$author["app"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:generator/text()');
+			$author['app'] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:generator/text()');
 
 			$entries = $xpath->query('/atom:feed/atom:entry');
 		}
 
 		// Is it RSS?
 		if ($xpath->query('/rss/channel')->length > 0) {
-			$author["author-link"] = XML::getFirstNodeValue($xpath, '/rss/channel/link/text()');
+			$author['author-link'] = XML::getFirstNodeValue($xpath, '/rss/channel/link/text()');
 
-			$author["author-name"] = XML::getFirstNodeValue($xpath, '/rss/channel/title/text()');
-			$author["author-avatar"] = XML::getFirstNodeValue($xpath, '/rss/channel/image/url/text()');
+			$author['author-name'] = XML::getFirstNodeValue($xpath, '/rss/channel/title/text()');
 
-			if (empty($author["author-name"])) {
-				$author["author-name"] = XML::getFirstNodeValue($xpath, '/rss/channel/copyright/text()');
+			if (empty($author['author-name'])) {
+				$author['author-name'] = XML::getFirstNodeValue($xpath, '/rss/channel/copyright/text()');
 			}
 
-			if (empty($author["author-name"])) {
-				$author["author-name"] = XML::getFirstNodeValue($xpath, '/rss/channel/description/text()');
+			if (empty($author['author-name'])) {
+				$author['author-name'] = XML::getFirstNodeValue($xpath, '/rss/channel/description/text()');
 			}
 
-			$author["edited"] = $author["created"] = XML::getFirstNodeValue($xpath, '/rss/channel/pubDate/text()');
+			$author['author-avatar'] = XML::getFirstNodeValue($xpath, '/rss/channel/image/url/text()');
 
-			$author["app"] = XML::getFirstNodeValue($xpath, '/rss/channel/generator/text()');
+			if (empty($author['author-avatar'])) {
+				$avatar = XML::getFirstAttributes($xpath, '/rss/channel/itunes:image');
+				if (is_object($avatar)) {
+					foreach ($avatar as $attribute) {
+						if ($attribute->name == 'href') {
+							$author['author-avatar'] = $attribute->textContent;
+						}
+					}
+				}
+			}
+
+			$author['author-about'] = HTML::toBBCode(XML::getFirstNodeValue($xpath, '/rss/channel/description/text()'), $basepath);
+
+			if (empty($author['author-about'])) {
+				$author['author-about'] = XML::getFirstNodeValue($xpath, '/rss/channel/itunes:summary/text()');
+			}
+
+			$author['edited'] = $author['created'] = XML::getFirstNodeValue($xpath, '/rss/channel/pubDate/text()');
+
+			$author['app'] = XML::getFirstNodeValue($xpath, '/rss/channel/generator/text()');
 
 			$entries = $xpath->query('/rss/channel/item');
 		}
 
 		if (!$dryRun) {
-			$author["author-link"] = $contact["url"];
+			$author['author-link'] = $contact['url'];
 
-			if (empty($author["author-name"])) {
-				$author["author-name"] = $contact["name"];
+			if (empty($author['author-name'])) {
+				$author['author-name'] = $contact['name'];
 			}
 
-			$author["author-avatar"] = $contact["thumb"];
+			$author['author-avatar'] = $contact['thumb'];
 
-			$author["owner-link"] = $contact["url"];
-			$author["owner-name"] = $contact["name"];
-			$author["owner-avatar"] = $contact["thumb"];
+			$author['owner-link'] = $contact['url'];
+			$author['owner-name'] = $contact['name'];
+			$author['owner-avatar'] = $contact['thumb'];
 		}
 
 		$header = [];
-		$header["uid"] = $importer["uid"] ?? 0;
-		$header["network"] = Protocol::FEED;
-		$header["wall"] = 0;
-		$header["origin"] = 0;
-		$header["gravity"] = GRAVITY_PARENT;
-		$header["private"] = Item::PUBLIC;
-		$header["verb"] = Activity::POST;
-		$header["object-type"] = Activity\ObjectType::NOTE;
-		$header["post-type"] = Item::PT_ARTICLE;
-
-		$header["contact-id"] = $contact["id"] ?? 0;
+		$header['uid'] = $importer['uid'] ?? 0;
+		$header['network'] = Protocol::FEED;
+		$header['wall'] = 0;
+		$header['origin'] = 0;
+		$header['gravity'] = GRAVITY_PARENT;
+		$header['private'] = Item::PUBLIC;
+		$header['verb'] = Activity::POST;
+		$header['object-type'] = Activity\ObjectType::NOTE;
+		$header['post-type'] = Item::PT_ARTICLE;
+
+		$header['contact-id'] = $contact['id'] ?? 0;
 
 		if (!is_object($entries)) {
 			Logger::info("There are no entries in this feed.");
@@ -263,52 +285,64 @@ class Feed
 
 			$alternate = XML::getFirstAttributes($xpath, "atom:link[@rel='alternate']", $entry);
 			if (!is_object($alternate)) {
-				$alternate = XML::getFirstAttributes($xpath, "atom:link", $entry);
+				$alternate = XML::getFirstAttributes($xpath, 'atom:link', $entry);
 			}
 			if (is_object($alternate)) {
-				foreach ($alternate AS $attribute) {
-					if ($attribute->name == "href") {
-						$item["plink"] = $attribute->textContent;
+				foreach ($alternate as $attribute) {
+					if ($attribute->name == 'href') {
+						$item['plink'] = $attribute->textContent;
 					}
 				}
 			}
 
-			if (empty($item["plink"])) {
-				$item["plink"] = XML::getFirstNodeValue($xpath, 'link/text()', $entry);
+			if (empty($item['plink'])) {
+				$item['plink'] = XML::getFirstNodeValue($xpath, 'link/text()', $entry);
 			}
 
-			if (empty($item["plink"])) {
-				$item["plink"] = XML::getFirstNodeValue($xpath, 'rss:link/text()', $entry);
+			if (empty($item['plink'])) {
+				$item['plink'] = XML::getFirstNodeValue($xpath, 'rss:link/text()', $entry);
 			}
 
-			$item["uri"] = XML::getFirstNodeValue($xpath, 'atom:id/text()', $entry);
+			// Add the base path if missing
+			$item['plink'] = Network::addBasePath($item['plink'], $basepath);
+
+			$item['uri'] = XML::getFirstNodeValue($xpath, 'atom:id/text()', $entry);
 
-			if (empty($item["uri"])) {
-				$item["uri"] = XML::getFirstNodeValue($xpath, 'guid/text()', $entry);
+			$guid = XML::getFirstNodeValue($xpath, 'guid/text()', $entry);
+			if (!empty($guid)) {
+				$item['uri'] = $guid;
+
+				// Don't use the GUID value directly but instead use it as a basis for the GUID
+				$item['guid'] = Item::guidFromUri($guid, parse_url($guid, PHP_URL_HOST) ?? parse_url($item['plink'], PHP_URL_HOST));
 			}
 
-			if (empty($item["uri"])) {
-				$item["uri"] = $item["plink"];
+			if (empty($item['uri'])) {
+				$item['uri'] = $item['plink'];
 			}
 
-			// Add the base path if missing
-			$item["uri"] = Network::addBasePath($item["uri"], $basepath);
-			$item["plink"] = Network::addBasePath($item["plink"], $basepath);
+			$orig_plink = $item['plink'];
 
-			$orig_plink = $item["plink"];
+			try {
+				$item['plink'] = DI::httpClient()->finalUrl($item['plink']);
+			} catch (TransferException $exception) {
+				Logger::notice('Item URL couldn\'t get expanded', ['url' => $item['plink'], 'exception' => $exception]);
+			}
 
-			$item["plink"] = DI::httpClient()->finalUrl($item["plink"]);
+			$item['title'] = XML::getFirstNodeValue($xpath, 'atom:title/text()', $entry);
 
-			$item["title"] = XML::getFirstNodeValue($xpath, 'atom:title/text()', $entry);
+			if (empty($item['title'])) {
+				$item['title'] = XML::getFirstNodeValue($xpath, 'title/text()', $entry);
+			}
 
-			if (empty($item["title"])) {
-				$item["title"] = XML::getFirstNodeValue($xpath, 'title/text()', $entry);
+			if (empty($item['title'])) {
+				$item['title'] = XML::getFirstNodeValue($xpath, 'rss:title/text()', $entry);
 			}
-			if (empty($item["title"])) {
-				$item["title"] = XML::getFirstNodeValue($xpath, 'rss:title/text()', $entry);
+
+			if (empty($item['title'])) {
+				$item['title'] = XML::getFirstNodeValue($xpath, 'itunes:title/text()', $entry);
 			}
 
-			$item["title"] = html_entity_decode($item["title"], ENT_QUOTES, 'UTF-8');
+			$item['title'] = html_entity_decode($item['title'], ENT_QUOTES, 'UTF-8');
 
 			$published = XML::getFirstNodeValue($xpath, 'atom:published/text()', $entry);
 
@@ -330,22 +364,22 @@ class Feed
 				$published = $updated;
 			}
 
-			if ($published != "") {
-				$item["created"] = $published;
+			if ($published != '') {
+				$item['created'] = $published;
 			}
 
-			if ($updated != "") {
-				$item["edited"] = $updated;
+			if ($updated != '') {
+				$item['edited'] = $updated;
 			}
 
 			if (!$dryRun) {
 				$condition = ["`uid` = ? AND `uri` = ? AND `network` IN (?, ?)",
-					$importer["uid"], $item["uri"], Protocol::FEED, Protocol::DFRN];
+					$importer['uid'], $item['uri'], Protocol::FEED, Protocol::DFRN];
 				$previous = Post::selectFirst(['id', 'created'], $condition);
 				if (DBA::isResult($previous)) {
 					// Use the creation date when the post had been stored. It can happen this date changes in the feed.
 					$creation_dates[] = $previous['created'];
-					Logger::info("Item with uri " . $item["uri"] . " for user " . $importer["uid"] . " already existed under id " . $previous["id"]);
+					Logger::info('Item with URI ' . $item['uri'] . ' for user ' . $importer['uid'] . ' already existed under id ' . $previous['id']);
 					continue;
 				}
 				$creation_dates[] = DateTimeFormat::utc($item['created']);
@@ -361,14 +395,14 @@ class Feed
 				$creator = XML::getFirstNodeValue($xpath, 'dc:creator/text()', $entry);
 			}
 
-			if ($creator != "") {
-				$item["author-name"] = $creator;
+			if ($creator != '') {
+				$item['author-name'] = $creator;
 			}
 
 			$creator = XML::getFirstNodeValue($xpath, 'dc:creator/text()', $entry);
 
-			if ($creator != "") {
-				$item["author-name"] = $creator;
+			if ($creator != '') {
+				$item['author-name'] = $creator;
 			}
 
 			/// @TODO ?
@@ -378,29 +412,38 @@ class Feed
 			$attachments = [];
 
 			$enclosures = $xpath->query("enclosure|atom:link[@rel='enclosure']", $entry);
-			foreach ($enclosures AS $enclosure) {
-				$href = "";
+			foreach ($enclosures as $enclosure) {
+				$href = '';
 				$length = null;
 				$type = null;
 
-				foreach ($enclosure->attributes AS $attribute) {
-					if (in_array($attribute->name, ["url", "href"])) {
+				foreach ($enclosure->attributes as $attribute) {
+					if (in_array($attribute->name, ['url', 'href'])) {
 						$href = $attribute->textContent;
-					} elseif ($attribute->name == "length") {
+					} elseif ($attribute->name == 'length') {
 						$length = (int)$attribute->textContent;
-					} elseif ($attribute->name == "type") {
+					} elseif ($attribute->name == 'type') {
 						$type = $attribute->textContent;
 					}
 				}
 
 				if (!empty($href)) {
-					$attachments[] = ['type' => Post\Media::DOCUMENT, 'url' => $href, 'mimetype' => $type, 'size' => $length];
+					$attachment = ['type' => Post\Media::UNKNOWN, 'url' => $href, 'mimetype' => $type, 'size' => $length];
+
+					$attachment = Post\Media::fetchAdditionalData($attachment);
+
+					// By now we separate the visible media types (audio, video, image) from the rest
+					// In the future we should try to avoid the DOCUMENT type and only use the real one - but not in the RC phase.
+					if (!in_array($attachment['type'], [Post\Media::AUDIO, Post\Media::IMAGE, Post\Media::VIDEO])) {
+						$attachment['type'] = Post\Media::DOCUMENT;
+					}
+					$attachments[] = $attachment;
 				}
 			}
 
 			$taglist = [];
-			$categories = $xpath->query("category", $entry);
-			foreach ($categories AS $category) {
+			$categories = $xpath->query('category', $entry);
+			foreach ($categories as $category) {
 				$taglist[] = $category->nodeValue;
 			}
 
@@ -427,20 +470,21 @@ class Feed
 
 			// remove the content of the title if it is identically to the body
 			// This helps with auto generated titles e.g. from tumblr
-			if (self::titleIsBody($item["title"], $body)) {
-				$item["title"] = "";
+			if (self::titleIsBody($item['title'], $body)) {
+				$item['title'] = '';
 			}
-			$item["body"] = HTML::toBBCode($body, $basepath);
+			$item['body'] = HTML::toBBCode($body, $basepath);
 
 			// Remove tracking pixels
-			$item["body"] = preg_replace("/\[img=1x1\]([^\[\]]*)\[\/img\]/Usi", '', $item["body"]);
+			$item['body'] = preg_replace("/\[img=1x1\]([^\[\]]*)\[\/img\]/Usi", '', $item['body']);
 
-			if (($item["body"] == '') && ($item["title"] != '')) {
-				$item["body"] = $item["title"];
-				$item["title"] = '';
+			if (($item['body'] == '') && ($item['title'] != '')) {
+				$item['body'] = $item['title'];
+				$item['title'] = '';
 			}
 
 			if ($dryRun) {
+				$item['attachments'] = $attachments;
 				$items[] = $item;
 				break;
 			} elseif (!Item::isValid($item)) {
@@ -452,36 +496,36 @@ class Feed
 			}
 
 			$preview = '';
-			if (!empty($contact["fetch_further_information"]) && ($contact["fetch_further_information"] < 3)) {
+			if (!empty($contact['fetch_further_information']) && ($contact['fetch_further_information'] < 3)) {
 				// Handle enclosures and treat them as preview picture
-				foreach ($attachments AS $attachment) {
-					if ($attachment["mimetype"] == "image/jpeg") {
-						$preview = $attachment["url"];
+				foreach ($attachments as $attachment) {
+					if ($attachment['mimetype'] == 'image/jpeg') {
+						$preview = $attachment['url'];
 					}
 				}
 
 				// Remove a possible link to the item itself
-				$item["body"] = str_replace($item["plink"], '', $item["body"]);
-				$item["body"] = trim(preg_replace('/\[url\=\](\w+.*?)\[\/url\]/i', '', $item["body"]));
+				$item['body'] = str_replace($item['plink'], '', $item['body']);
+				$item['body'] = trim(preg_replace('/\[url\=\](\w+.*?)\[\/url\]/i', '', $item['body']));
 
 				// Replace the content when the title is longer than the body
-				$replace = (strlen($item["title"]) > strlen($item["body"]));
+				$replace = (strlen($item['title']) > strlen($item['body']));
 
 				// Replace it, when there is an image in the body
-				if (strstr($item["body"], '[/img]')) {
+				if (strstr($item['body'], '[/img]')) {
 					$replace = true;
 				}
 
 				// Replace it, when there is a link in the body
-				if (strstr($item["body"], '[/url]')) {
+				if (strstr($item['body'], '[/url]')) {
 					$replace = true;
 				}
 
-				$saved_body = $item["body"];
-				$saved_title = $item["title"];
+				$saved_body = $item['body'];
+				$saved_title = $item['title'];
 
 				if ($replace) {
-					$item["body"] = trim($item["title"]);
+					$item['body'] = trim($item['title']);
 				}
 
 				$data = ParseUrl::getSiteinfoCached($item['plink']);
@@ -496,13 +540,13 @@ class Feed
 					}
 				}
 
-				$data = PageInfo::queryUrl($item["plink"], false, $preview, ($contact["fetch_further_information"] == 2), $contact["ffi_keyword_denylist"] ?? '');
+				$data = PageInfo::queryUrl($item['plink'], false, $preview, ($contact['fetch_further_information'] == 2), $contact['ffi_keyword_denylist'] ?? '');
 
 				if (!empty($data)) {
 					// Take the data that was provided by the feed if the query is empty
 					if (($data['type'] == 'link') && empty($data['title']) && empty($data['text'])) {
 						$data['title'] = $saved_title;
-						$item["body"] = $saved_body;
+						$item['body'] = $saved_body;
 					}
 
 					$data_text = strip_tags(trim($data['text'] ?? ''));
@@ -513,29 +557,52 @@ class Feed
 					}
 
 					// We always strip the title since it will be added in the page information
-					$item["title"] = "";
-					$item["body"] = $item["body"] . "\n" . PageInfo::getFooterFromData($data, false);
-					$taglist = $contact["fetch_further_information"] == 2 ? PageInfo::getTagsFromUrl($item["plink"], $preview, $contact["ffi_keyword_denylist"] ?? '') : [];
-					$item["object-type"] = Activity\ObjectType::BOOKMARK;
+					$item['title'] = '';
+					$item['body'] = $item['body'] . "\n" . PageInfo::getFooterFromData($data, false);
+					$taglist = $contact['fetch_further_information'] == 2 ? PageInfo::getTagsFromUrl($item['plink'], $preview, $contact['ffi_keyword_denylist'] ?? '') : [];
+					$item['object-type'] = Activity\ObjectType::BOOKMARK;
 					$attachments = [];
+
+					foreach (['audio', 'video'] as $elementname) {
+						if (!empty($data[$elementname])) {
+							foreach ($data[$elementname] as $element) {
+								if (!empty($element['src'])) {
+									$src = $element['src'];
+								} elseif (!empty($element['content'])) {
+									$src = $element['content'];
+								} else {
+									continue;
+								}
+
+								$attachments[] = [
+									'type'        => ($elementname == 'audio') ? Post\Media::AUDIO : Post\Media::VIDEO,
+									'url'         => $src,
+									'preview'     => $element['image']       ?? null,
+									'mimetype'    => $element['contenttype'] ?? null,
+									'name'        => $element['name']        ?? null,
+									'description' => $element['description'] ?? null,
+								];
+							}
+						}
+					}
 				}
 			} else {
 				if (!empty($summary)) {
-					$item["body"] = '[abstract]' . HTML::toBBCode($summary, $basepath) . "[/abstract]\n" . $item["body"];
+					$item['body'] = '[abstract]' . HTML::toBBCode($summary, $basepath) . "[/abstract]\n" . $item['body'];
 				}
 
-				if (!empty($contact["fetch_further_information"]) && ($contact["fetch_further_information"] == 3)) {
+				if (!empty($contact['fetch_further_information']) && ($contact['fetch_further_information'] == 3)) {
 					if (empty($taglist)) {
-						$taglist = PageInfo::getTagsFromUrl($item["plink"], $preview, $contact["ffi_keyword_denylist"] ?? '');
+						$taglist = PageInfo::getTagsFromUrl($item['plink'], $preview, $contact['ffi_keyword_denylist'] ?? '');
 					}
-					$item["body"] .= "\n" . self::tagToString($taglist);
+					$item['body'] .= "\n" . self::tagToString($taglist);
 				} else {
 					$taglist = [];
 				}
 
 				// Add the link to the original feed entry if not present in feed
-				if (($item['plink'] != '') && !strstr($item["body"], $item['plink'])) {
-					$item["body"] .= "[hr][url]" . $item['plink'] . "[/url]";
+				if (($item['plink'] != '') && !strstr($item['body'], $item['plink']) && !in_array($item['plink'], array_column($attachments, 'url'))) {
+					$item['body'] .= '[hr][url]' . $item['plink'] . '[/url]';
 				}
 			}
 
@@ -560,7 +627,7 @@ class Feed
 			}
 
 			$condition = ['uid' => $item['uid'], 'uri' => $item['uri']];
-			if (!Post::exists($condition) && !Post\Delayed::exists($item["uri"], $item['uid'])) {
+			if (!Post::exists($condition) && !Post\Delayed::exists($item['uri'], $item['uid'])) {
 				if (!$notify) {
 					Post\Delayed::publish($item, $notify, $taglist, $attachments);
 				} else {
@@ -568,7 +635,7 @@ class Feed
 						'taglist' => $taglist, 'attachments' => $attachments];
 				}
 			} else {
-				Logger::info('Post already created or exists in the delayed posts queue', ['uid' => $item['uid'], 'uri' => $item["uri"]]);
+				Logger::info('Post already created or exists in the delayed posts queue', ['uid' => $item['uid'], 'uri' => $item['uri']]);
 			}
 		}
 
@@ -611,13 +678,13 @@ class Feed
 			self::adjustPollFrequency($contact, $creation_dates);
 		}
 
-		return ["header" => $author, "items" => $items];
+		return ['header' => $author, 'items' => $items];
 	}
 
 	/**
 	 * Automatically adjust the poll frequency according to the post frequency
 	 *
-	 * @param array $contact
+	 * @param array $contact Contact array
 	 * @param array $creation_dates
 	 * @return void
 	 */
@@ -727,7 +794,7 @@ class Feed
 
 		if ($contact['rating'] != $priority) {
 			Logger::notice('Adjusting priority', ['old' => $contact['rating'], 'new' => $priority, 'id' => $contact['id'], 'uid' => $contact['uid'], 'url' => $contact['url']]);
-			DBA::update('contact', ['rating' => $priority], ['id' => $contact['id']]);
+			Contact::update(['rating' => $priority], ['id' => $contact['id']]);
 		}
 	}
 
@@ -737,7 +804,7 @@ class Feed
 	 * @param array $contact
 	 * @return int Poll interval in minutes
 	 */
-	public static function getPollInterval(array $contact)
+	public static function getPollInterval(array $contact): int
 	{
 		if (in_array($contact['network'], [Protocol::MAIL, Protocol::FEED])) {
 			$ratings = [0, 3, 7, 8, 9, 10];
@@ -786,39 +853,39 @@ class Feed
 	 * @param array $tags
 	 * @return string tag string
 	 */
-	private static function tagToString(array $tags)
+	private static function tagToString(array $tags): string
 	{
 		$tagstr = '';
 
 		foreach ($tags as $tag) {
-			if ($tagstr != "") {
-				$tagstr .= ", ";
+			if ($tagstr != '') {
+				$tagstr .= ', ';
 			}
 
-			$tagstr .= "#[url=" . DI::baseUrl() . "/search?tag=" . urlencode($tag) . "]" . $tag . "[/url]";
+			$tagstr .= '#[url=' . DI::baseUrl() . '/search?tag=' . urlencode($tag) . ']' . $tag . '[/url]';
 		}
 
 		return $tagstr;
 	}
 
-	private static function titleIsBody($title, $body)
+	private static function titleIsBody(string $title, string $body): bool
 	{
 		$title = strip_tags($title);
 		$title = trim($title);
 		$title = html_entity_decode($title, ENT_QUOTES, 'UTF-8');
-		$title = str_replace(["\n", "\r", "\t", " "], ["", "", "", ""], $title);
+		$title = str_replace(["\n", "\r", "\t", " "], ['', '', '', ''], $title);
 
 		$body = strip_tags($body);
 		$body = trim($body);
 		$body = html_entity_decode($body, ENT_QUOTES, 'UTF-8');
-		$body = str_replace(["\n", "\r", "\t", " "], ["", "", "", ""], $body);
+		$body = str_replace(["\n", "\r", "\t", " "], ['', '', '', ''], $body);
 
 		if (strlen($title) < strlen($body)) {
 			$body = substr($body, 0, strlen($title));
 		}
 
-		if (($title != $body) && (substr($title, -3) == "...")) {
-			$pos = strrpos($title, "...");
+		if (($title != $body) && (substr($title, -3) == '...')) {
+			$pos = strrpos($title, '...');
 			if ($pos > 0) {
 				$title = substr($title, 0, $pos);
 				$body = substr($body, 0, $pos);
@@ -848,7 +915,7 @@ class Feed
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function atom($owner_nick, $last_update, $max_items = 300, $filter = 'activity', $nocache = false)
+	public static function atom(string $owner_nick, string $last_update, int $max_items = 300, string $filter = 'activity', bool $nocache = false)
 	{
 		$stamp = microtime(true);
 
@@ -857,7 +924,12 @@ class Feed
 			return;
 		}
 
-		$cachekey = "feed:feed:" . $owner_nick . ":" . $filter . ":" . $last_update;
+		$cachekey = 'feed:feed:' . $owner_nick . ':' . $filter . ':' . $last_update;
+
+		// Display events in the users's timezone
+		if (strlen($owner['timezone'])) {
+			DI::app()->setTimeZone($owner['timezone']);
+		}
 
 		$previous_created = $last_update;
 
@@ -871,11 +943,11 @@ class Feed
 		}
 
 		$check_date = empty($last_update) ? '' : DateTimeFormat::utc($last_update);
-		$authorid = Contact::getIdForURL($owner["url"]);
+		$authorid = Contact::getIdForURL($owner['url']);
 
 		$condition = ["`uid` = ? AND `received` > ? AND NOT `deleted` AND `gravity` IN (?, ?)
 			AND `private` != ? AND `visible` AND `wall` AND `parent-network` IN (?, ?, ?, ?)",
-			$owner["uid"], $check_date, GRAVITY_PARENT, GRAVITY_COMMENT,
+			$owner['uid'], $check_date, GRAVITY_PARENT, GRAVITY_COMMENT,
 			Item::PRIVATE, Protocol::ACTIVITYPUB,
 			Protocol::OSTATUS, Protocol::DFRN, Protocol::DIASPORA];
 
@@ -886,7 +958,7 @@ class Feed
 
 		if ($owner['account-type'] != User::ACCOUNT_TYPE_COMMUNITY) {
 			$condition[0] .= " AND `contact-id` = ? AND `author-id` = ?";
-			$condition[] = $owner["id"];
+			$condition[] = $owner['id'];
 			$condition[] = $authorid;
 		}
 
@@ -906,7 +978,7 @@ class Feed
 		$root = self::addHeader($doc, $owner, $filter);
 
 		foreach ($items as $item) {
-			$entry = self::entry($doc, $item, $owner);
+			$entry = self::noteEntry($doc, $item, $owner);
 			$root->appendChild($entry);
 
 			if ($last_update < $item['created']) {
@@ -931,16 +1003,16 @@ class Feed
 	 * @param array       $owner     Contact data of the poster
 	 * @param string      $filter    The related feed filter (activity, posts or comments)
 	 *
-	 * @return object header root element
+	 * @return DOMElement Header root element
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	private static function addHeader(DOMDocument $doc, array $owner, $filter)
+	private static function addHeader(DOMDocument $doc, array $owner, string $filter): DOMElement
 	{
 		$root = $doc->createElementNS(ActivityNamespace::ATOM1, 'feed');
 		$doc->appendChild($root);
 
 		$title = '';
-		$selfUri = '/feed/' . $owner["nick"] . '/';
+		$selfUri = '/feed/' . $owner['nick'] . '/';
 		switch ($filter) {
 			case 'activity':
 				$title = DI::l10n()->t('%s\'s timeline', $owner['name']);
@@ -955,24 +1027,24 @@ class Feed
 				break;
 		}
 
-		$attributes = ["uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION . "-" . DB_UPDATE_VERSION];
-		XML::addElement($doc, $root, "generator", FRIENDICA_PLATFORM, $attributes);
-		XML::addElement($doc, $root, "id", DI::baseUrl() . "/profile/" . $owner["nick"]);
-		XML::addElement($doc, $root, "title", $title);
-		XML::addElement($doc, $root, "subtitle", sprintf("Updates from %s on %s", $owner["name"], DI::config()->get('config', 'sitename')));
-		XML::addElement($doc, $root, "logo", Contact::getAvatarUrlForId($owner['id'], Proxy::SIZE_SMALL, $owner['updated']));
-		XML::addElement($doc, $root, "updated", DateTimeFormat::utcNow(DateTimeFormat::ATOM));
+		$attributes = ['uri' => 'https://friendi.ca', 'version' => FRIENDICA_VERSION . '-' . DB_UPDATE_VERSION];
+		XML::addElement($doc, $root, 'generator', FRIENDICA_PLATFORM, $attributes);
+		XML::addElement($doc, $root, 'id', DI::baseUrl() . '/profile/' . $owner['nick']);
+		XML::addElement($doc, $root, 'title', $title);
+		XML::addElement($doc, $root, 'subtitle', sprintf("Updates from %s on %s", $owner['name'], DI::config()->get('config', 'sitename')));
+		XML::addElement($doc, $root, 'logo', User::getAvatarUrl($owner, Proxy::SIZE_SMALL));
+		XML::addElement($doc, $root, 'updated', DateTimeFormat::utcNow(DateTimeFormat::ATOM));
 
 		$author = self::addAuthor($doc, $owner);
 		$root->appendChild($author);
 
-		$attributes = ["href" => $owner["url"], "rel" => "alternate", "type" => "text/html"];
-		XML::addElement($doc, $root, "link", "", $attributes);
+		$attributes = ['href' => $owner['url'], 'rel' => 'alternate', 'type' => 'text/html'];
+		XML::addElement($doc, $root, 'link', '', $attributes);
 
-		OStatus::hublinks($doc, $root, $owner["nick"]);
+		OStatus::addHubLink($doc, $root, $owner['nick']);
 
-		$attributes = ["href" => DI::baseUrl() . $selfUri, "rel" => "self", "type" => "application/atom+xml"];
-		XML::addElement($doc, $root, "link", "", $attributes);
+		$attributes = ['href' => DI::baseUrl() . $selfUri, 'rel' => 'self', 'type' => 'application/atom+xml'];
+		XML::addElement($doc, $root, 'link', '', $attributes);
 
 		return $root;
 	}
@@ -982,83 +1054,19 @@ class Feed
 	 *
 	 * @param DOMDocument $doc          XML document
 	 * @param array       $owner        Contact data of the poster
-	 *
-	 * @return \DOMElement author element
+	 * @return DOMElement author element
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	private static function addAuthor(DOMDocument $doc, array $owner)
+	private static function addAuthor(DOMDocument $doc, array $owner): DOMElement
 	{
-		$author = $doc->createElement("author");
-		XML::addElement($doc, $author, "uri", $owner["url"]);
-		XML::addElement($doc, $author, "name", $owner["nick"]);
-		XML::addElement($doc, $author, "email", $owner["addr"]);
+		$author = $doc->createElement('author');
+		XML::addElement($doc, $author, 'uri', $owner['url']);
+		XML::addElement($doc, $author, 'name', $owner['nick']);
+		XML::addElement($doc, $author, 'email', $owner['addr']);
 
 		return $author;
 	}
 
-	/**
-	 * Adds an entry element to the XML document
-	 *
-	 * @param DOMDocument $doc       XML document
-	 * @param array       $item      Data of the item that is to be posted
-	 * @param array       $owner     Contact data of the poster
-	 * @param bool        $toplevel  optional default false
-	 *
-	 * @return \DOMElement Entry element
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-	 * @throws \ImagickException
-	 */
-	private static function entry(DOMDocument $doc, array $item, array $owner)
-	{
-		$xml = null;
-
-		$repeated_guid = OStatus::getResharedGuid($item);
-		if ($repeated_guid != "") {
-			$xml = self::reshareEntry($doc, $item, $owner, $repeated_guid);
-		}
-
-		if ($xml) {
-			return $xml;
-		}
-
-		return self::noteEntry($doc, $item, $owner);
-	}
-
-		/**
-	 * Adds an entry element with reshared content
-	 *
-	 * @param DOMDocument $doc           XML document
-	 * @param array       $item          Data of the item that is to be posted
-	 * @param array       $owner         Contact data of the poster
-	 * @param string      $repeated_guid guid
-	 * @param bool        $toplevel      Is it for en entry element (false) or a feed entry (true)?
-	 *
-	 * @return bool Entry element
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-	 * @throws \ImagickException
-	 */
-	private static function reshareEntry(DOMDocument $doc, array $item, array $owner, $repeated_guid)
-	{
-		if (($item['gravity'] != GRAVITY_PARENT) && (Strings::normaliseLink($item["author-link"]) != Strings::normaliseLink($owner["url"]))) {
-			Logger::info('Feed entry author does not match feed owner', ['owner' => $owner["url"], 'author' => $item["author-link"]]);
-		}
-
-		$entry = OStatus::entryHeader($doc, $owner, $item, false);
-
-		$condition = ['uid' => $owner["uid"], 'guid' => $repeated_guid, 'private' => [Item::PUBLIC, Item::UNLISTED],
-			'network' => Protocol::FEDERATED];
-		$repeated_item = Post::selectFirst(Item::DELIVER_FIELDLIST, $condition);
-		if (!DBA::isResult($repeated_item)) {
-			return false;
-		}
-
-		self::entryContent($doc, $entry, $item, self::getTitle($repeated_item), Activity::SHARE, false);
-
-		self::entryFooter($doc, $entry, $item, $owner);
-
-		return $entry;
-	}
-
 	/**
 	 * Adds a regular entry element
 	 *
@@ -1066,15 +1074,14 @@ class Feed
 	 * @param array       $item      Data of the item that is to be posted
 	 * @param array       $owner     Contact data of the poster
 	 * @param bool        $toplevel  Is it for en entry element (false) or a feed entry (true)?
-	 *
-	 * @return \DOMElement Entry element
+	 * @return DOMElement Entry element
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	private static function noteEntry(DOMDocument $doc, array $item, array $owner)
+	private static function noteEntry(DOMDocument $doc, array $item, array $owner): DOMElement
 	{
-		if (($item['gravity'] != GRAVITY_PARENT) && (Strings::normaliseLink($item["author-link"]) != Strings::normaliseLink($owner["url"]))) {
-			Logger::info('Feed entry author does not match feed owner', ['owner' => $owner["url"], 'author' => $item["author-link"]]);
+		if (($item['gravity'] != GRAVITY_PARENT) && (Strings::normaliseLink($item['author-link']) != Strings::normaliseLink($owner['url']))) {
+			Logger::info('Feed entry author does not match feed owner', ['owner' => $owner['url'], 'author' => $item['author-link']]);
 		}
 
 		$entry = OStatus::entryHeader($doc, $owner, $item, false);
@@ -1096,31 +1103,30 @@ class Feed
 	 * @param string      $title     Title for the post
 	 * @param string      $verb      The activity verb
 	 * @param bool        $complete  Add the "status_net" element?
-	 * @param bool        $feed_mode Behave like a regular feed for users if true
 	 * @return void
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	private static function entryContent(DOMDocument $doc, \DOMElement $entry, array $item, $title, $verb = "", $complete = true)
+	private static function entryContent(DOMDocument $doc, DOMElement $entry, array $item, $title, string $verb = '', bool $complete = true)
 	{
-		if ($verb == "") {
+		if ($verb == '') {
 			$verb = OStatus::constructVerb($item);
 		}
 
-		XML::addElement($doc, $entry, "id", $item["uri"]);
-		XML::addElement($doc, $entry, "title", html_entity_decode($title, ENT_QUOTES, 'UTF-8'));
+		XML::addElement($doc, $entry, 'id', $item['uri']);
+		XML::addElement($doc, $entry, 'title', html_entity_decode($title, ENT_QUOTES, 'UTF-8'));
 
 		$body = OStatus::formatPicturePost($item['body'], $item['uri-id']);
 
 		$body = BBCode::convertForUriId($item['uri-id'], $body, BBCode::ACTIVITYPUB);
 
-		XML::addElement($doc, $entry, "content", $body, ["type" => "html"]);
+		XML::addElement($doc, $entry, 'content', $body, ['type' => 'html']);
 
-		XML::addElement($doc, $entry, "link", "", ["rel" => "alternate", "type" => "text/html",
-								"href" => DI::baseUrl()."/display/".$item["guid"]]
+		XML::addElement($doc, $entry, 'link', '', ['rel' => 'alternate', 'type' => 'text/html',
+								'href' => DI::baseUrl() . '/display/' . $item['guid']]
 		);
 
-		XML::addElement($doc, $entry, "published", DateTimeFormat::utc($item["created"]."+00:00", DateTimeFormat::ATOM));
-		XML::addElement($doc, $entry, "updated", DateTimeFormat::utc($item["edited"]."+00:00", DateTimeFormat::ATOM));
+		XML::addElement($doc, $entry, 'published', DateTimeFormat::utc($item['created'] . '+00:00', DateTimeFormat::ATOM));
+		XML::addElement($doc, $entry, 'updated', DateTimeFormat::utc($item['edited'] . '+00:00', DateTimeFormat::ATOM));
 	}
 
 	/**
@@ -1141,27 +1147,31 @@ class Feed
 		if ($item['gravity'] != GRAVITY_PARENT) {
 			$parent = Post::selectFirst(['guid', 'author-link', 'owner-link'], ['id' => $item['parent']]);
 
-			$thrparent = Post::selectFirst(['guid', 'author-link', 'owner-link', 'plink'], ['uid' => $owner["uid"], 'uri' => $item['thr-parent']]);
+			$thrparent = Post::selectFirst(['guid', 'author-link', 'owner-link', 'plink'], ['uid' => $owner['uid'], 'uri' => $item['thr-parent']]);
 
 			if (DBA::isResult($thrparent)) {
-				$mentioned[$thrparent["author-link"]] = $thrparent["author-link"];
-				$mentioned[$thrparent["owner-link"]] = $thrparent["owner-link"];
-				$parent_plink = $thrparent["plink"];
+				$mentioned[$thrparent['author-link']] = $thrparent['author-link'];
+				$mentioned[$thrparent['owner-link']]  = $thrparent['owner-link'];
+				$parent_plink                         = $thrparent['plink'];
+			} elseif (DBA::isResult($parent)) {
+				$mentioned[$parent['author-link']] = $parent['author-link'];
+				$mentioned[$parent['owner-link']]  = $parent['owner-link'];
+				$parent_plink                      = DI::baseUrl() . '/display/' . $parent['guid'];
 			} else {
-				$mentioned[$parent["author-link"]] = $parent["author-link"];
-				$mentioned[$parent["owner-link"]] = $parent["owner-link"];
-				$parent_plink = DI::baseUrl()."/display/".$parent["guid"];
+				DI::logger()->notice('Missing parent and thr-parent for child item', ['item' => $item]);
 			}
 
-			$attributes = [
-					"ref" => $item['thr-parent'],
-					"href" => $parent_plink];
-			XML::addElement($doc, $entry, "thr:in-reply-to", "", $attributes);
+			if (isset($parent_plink)) {
+				$attributes = [
+					'ref'  => $item['thr-parent'],
+					'href' => $parent_plink];
+				XML::addElement($doc, $entry, 'thr:in-reply-to', '', $attributes);
 
-			$attributes = [
-					"rel" => "related",
-					"href" => $parent_plink];
-			XML::addElement($doc, $entry, "link", "", $attributes);
+				$attributes = [
+					'rel'  => 'related',
+					'href' => $parent_plink];
+				XML::addElement($doc, $entry, 'link', '', $attributes);
+			}
 		}
 
 		// uri-id isn't present for follow entry pseudo-items
@@ -1172,7 +1182,7 @@ class Feed
 
 		foreach ($tags as $tag) {
 			if ($tag['type'] == Tag::HASHTAG) {
-				XML::addElement($doc, $entry, "category", "", ["term" => $tag['name']]);
+				XML::addElement($doc, $entry, 'category', '', ['term' => $tag['name']]);
 			}
 		}
 
@@ -1185,28 +1195,28 @@ class Feed
 	 * @param array $item
 	 * @return string title
 	 */
-	private static function getTitle(array $item)
+	private static function getTitle(array $item): string
 	{
 		if ($item['title'] != '') {
 			return BBCode::convertForUriId($item['uri-id'], $item['title'], BBCode::ACTIVITYPUB);
 		}
 
 		// Fetch information about the post
-		$siteinfo = BBCode::getAttachedData($item["body"]);
-		if (isset($siteinfo["title"])) {
-			return $siteinfo["title"];
+		$siteinfo = BBCode::getAttachedData($item['body']);
+		if (isset($siteinfo['title'])) {
+			return $siteinfo['title'];
 		}
 
 		// If no bookmark is found then take the first line
 		// Remove the share element before fetching the first line
-		$title = trim(preg_replace("/\[share.*?\](.*?)\[\/share\]/ism","\n$1\n",$item['body']));
+		$title = trim(preg_replace("/\[share.*?\](.*?)\[\/share\]/ism", "\n$1\n", $item['body']));
 
 		$title = BBCode::toPlaintext($title)."\n";
 		$pos = strpos($title, "\n");
-		$trailer = "";
+		$trailer = '';
 		if (($pos == 0) || ($pos > 100)) {
 			$pos = 100;
-			$trailer = "...";
+			$trailer = '...';
 		}
 
 		return substr($title, 0, $pos) . $trailer;