X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FFeed.php;h=fdfe9be7d5e836b57621b65cb6a6f693124ac48c;hb=dc69116572c7ab45987c6ecb19edfa1bca5068b7;hp=7ff86c1db7d247b1e893078b90f77792095d9670;hpb=b6da15557b6d5c8a8eb5e20c1c9bb937440e2927;p=friendica.git

diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index 7ff86c1db7..fdfe9be7d5 100644
--- a/src/Protocol/Feed.php
+++ b/src/Protocol/Feed.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
  *
@@ -24,12 +24,15 @@ namespace Friendica\Protocol;
 use DOMDocument;
 use DOMElement;
 use DOMXPath;
+use Friendica\App;
+use Friendica\Contact\LocalRelationship\Entity\LocalRelationship;
 use Friendica\Content\PageInfo;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
+use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
@@ -38,6 +41,7 @@ use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Model\Tag;
 use Friendica\Model\User;
+use Friendica\Network\HTTPException;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\ParseUrl;
@@ -89,7 +93,9 @@ class Feed
 		$doc = new DOMDocument();
 		@$doc->loadXML($xml);
 		$xpath = new DOMXPath($doc);
+
 		$xpath->registerNamespace('atom', ActivityNamespace::ATOM1);
+		$xpath->registerNamespace('atom03', ActivityNamespace::ATOM03);
 		$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#');
@@ -98,6 +104,7 @@ class Feed
 		$xpath->registerNamespace('poco', ActivityNamespace::POCO);
 
 		$author = [];
+		$atomns = 'atom';
 		$entries = null;
 		$protocol = Conversation::PARCEL_UNKNOWN;
 
@@ -113,10 +120,22 @@ class Feed
 			$entries = $xpath->query('/rdf:RDF/rss:item');
 		}
 
+		if ($xpath->query('/opml')->length > 0) {
+			$protocol = Conversation::PARCEL_OPML;
+			$author['author-name'] = XML::getFirstNodeValue($xpath, '/opml/head/title/text()');
+			$entries = $xpath->query('/opml/body/outline');
+		}
+
 		// Is it Atom?
 		if ($xpath->query('/atom:feed')->length > 0) {
 			$protocol = Conversation::PARCEL_ATOM;
-			$alternate = XML::getFirstAttributes($xpath, "atom:link[@rel='alternate']");
+		} elseif ($xpath->query('/atom03:feed')->length > 0) {
+			$protocol = Conversation::PARCEL_ATOM03;
+			$atomns = 'atom03';
+		}
+
+		if (in_array($protocol, [Conversation::PARCEL_ATOM, Conversation::PARCEL_ATOM03])) {
+			$alternate = XML::getFirstAttributes($xpath, $atomns . ":link[@rel='alternate']");
 			if (is_object($alternate)) {
 				foreach ($alternate as $attribute) {
 					if ($attribute->name == 'href') {
@@ -126,7 +145,7 @@ class Feed
 			}
 
 			if (empty($author['author-link'])) {
-				$self = XML::getFirstAttributes($xpath, "atom:link[@rel='self']");
+				$self = XML::getFirstAttributes($xpath, $atomns . ":link[@rel='self']");
 				if (is_object($self)) {
 					foreach ($self as $attribute) {
 						if ($attribute->name == 'href') {
@@ -137,50 +156,50 @@ class Feed
 			}
 
 			if (empty($author['author-link'])) {
-				$author['author-link'] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:id/text()');
+				$author['author-link'] = XML::getFirstNodeValue($xpath, '/' . $atomns . ':feed/' . $atomns . ':id/text()');
 			}
-			$author['author-avatar'] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:logo/text()');
+			$author['author-avatar'] = XML::getFirstNodeValue($xpath, '/' . $atomns . ':feed/' . $atomns . ':logo/text()');
 
-			$author['author-name'] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:title/text()');
+			$author['author-name'] = XML::getFirstNodeValue($xpath, '/' . $atomns . ':feed/' . $atomns . ':title/text()');
 
 			if (empty($author['author-name'])) {
-				$author['author-name'] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:subtitle/text()');
+				$author['author-name'] = XML::getFirstNodeValue($xpath, '/' . $atomns . ':feed/' . $atomns . ':subtitle/text()');
 			}
 
 			if (empty($author['author-name'])) {
-				$author['author-name'] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:author/atom:name/text()');
+				$author['author-name'] = XML::getFirstNodeValue($xpath, '/' . $atomns . ':feed/' . $atomns . ':author/' . $atomns . ':name/text()');
 			}
 
-			$value = XML::getFirstNodeValue($xpath, 'atom:author/poco:displayName/text()');
+			$value = XML::getFirstNodeValue($xpath, '' . $atomns . ':author/poco:displayName/text()');
 			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, '/' . $atomns . ':feed/' . $atomns . ':author/' . $atomns . ':id/text()');
 
 				// See https://tools.ietf.org/html/rfc4287#section-3.2.2
-				$value = XML::getFirstNodeValue($xpath, 'atom:author/atom:uri/text()');
+				$value = XML::getFirstNodeValue($xpath, $atomns . ':author/' . $atomns . ':uri/text()');
 				if ($value != '') {
 					$author['author-link'] = $value;
 				}
 
-				$value = XML::getFirstNodeValue($xpath, 'atom:author/poco:preferredUsername/text()');
+				$value = XML::getFirstNodeValue($xpath, $atomns . ':author/poco:preferredUsername/text()');
 				if ($value != '') {
 					$author['author-nick'] = $value;
 				}
 
-				$value = XML::getFirstNodeValue($xpath, 'atom:author/poco:address/poco:formatted/text()');
+				$value = XML::getFirstNodeValue($xpath, $atomns . ':author/poco:address/poco:formatted/text()');
 				if ($value != '') {
 					$author['author-location'] = $value;
 				}
 
-				$value = XML::getFirstNodeValue($xpath, 'atom:author/poco:note/text()');
+				$value = XML::getFirstNodeValue($xpath, $atomns . ':author/poco:note/text()');
 				if ($value != '') {
 					$author['author-about'] = $value;
 				}
 
-				$avatar = XML::getFirstAttributes($xpath, "atom:author/atom:link[@rel='avatar']");
+				$avatar = XML::getFirstAttributes($xpath, $atomns . ":author/' . $atomns . ':link[@rel='avatar']");
 				if (is_object($avatar)) {
 					foreach ($avatar as $attribute) {
 						if ($attribute->name == 'href') {
@@ -190,11 +209,11 @@ class Feed
 				}
 			}
 
-			$author['edited'] = $author['created'] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:updated/text()');
+			$author['edited'] = $author['created'] = XML::getFirstNodeValue($xpath, '/' . $atomns . ':feed/' . $atomns . ':updated/text()');
 
-			$author['app'] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:generator/text()');
+			$author['app'] = XML::getFirstNodeValue($xpath, '/' . $atomns . ':feed/' . $atomns . ':generator/text()');
 
-			$entries = $xpath->query('/atom:feed/atom:entry');
+			$entries = $xpath->query('/' . $atomns . ':feed/' . $atomns . ':entry');
 		}
 
 		// Is it RSS?
@@ -252,20 +271,21 @@ class Feed
 			$author['owner-avatar'] = $contact['thumb'];
 		}
 
-		$header = [];
-		$header['uid'] = $importer['uid'] ?? 0;
-		$header['network'] = Protocol::FEED;
+		$header = [
+			'uid'         => $importer['uid'] ?? 0,
+			'network'     => Protocol::FEED,
+			'wall'        => 0,
+			'origin'      => 0,
+			'gravity'     => Item::GRAVITY_PARENT,
+			'private'     => Item::PUBLIC,
+			'verb'        => Activity::POST,
+			'object-type' => Activity\ObjectType::NOTE,
+			'post-type'   => Item::PT_ARTICLE,
+			'contact-id'  => $contact['id'] ?? 0,
+		];
+
 		$datarray['protocol'] = $protocol;
 		$datarray['direction'] = Conversation::PULL;
-		$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.");
@@ -289,10 +309,11 @@ class Feed
 			$entry = $entries->item($i);
 
 			$item = array_merge($header, $author);
+			$body = '';
 
-			$alternate = XML::getFirstAttributes($xpath, "atom:link[@rel='alternate']", $entry);
+			$alternate = XML::getFirstAttributes($xpath, $atomns . ":link[@rel='alternate']", $entry);
 			if (!is_object($alternate)) {
-				$alternate = XML::getFirstAttributes($xpath, 'atom:link', $entry);
+				$alternate = XML::getFirstAttributes($xpath, $atomns . ':link', $entry);
 			}
 			if (is_object($alternate)) {
 				foreach ($alternate as $attribute) {
@@ -302,6 +323,40 @@ class Feed
 				}
 			}
 
+			if ($entry->nodeName == 'outline') {
+				$isrss = false;
+				$plink = '';
+				$uri = '';
+				foreach ($entry->attributes as $attribute) {
+					switch ($attribute->nodeName) {
+						case 'title':
+							$item['title'] = $attribute->nodeValue;
+							break;
+
+						case 'text':
+							$body = $attribute->nodeValue;
+							break;
+
+						case 'htmlUrl':
+							$plink = $attribute->nodeValue;
+							break;
+
+						case 'xmlUrl':
+							$uri = $attribute->nodeValue;
+							break;
+
+						case 'type':
+							$isrss = $attribute->nodeValue == 'rss';
+							break;
+					}
+				}
+				$item['plink'] = $plink ?: $uri;
+				$item['uri'] = $uri ?: $plink;
+				if (!$isrss || empty($item['uri'])) {
+					continue;
+				}
+			}
+
 			if (empty($item['plink'])) {
 				$item['plink'] = XML::getFirstNodeValue($xpath, 'link/text()', $entry);
 			}
@@ -313,7 +368,9 @@ class Feed
 			// 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, $atomns . ':id/text()', $entry);
+			}
 
 			$guid = XML::getFirstNodeValue($xpath, 'guid/text()', $entry);
 			if (!empty($guid)) {
@@ -335,7 +392,9 @@ class Feed
 				Logger::notice('Item URL couldn\'t get expanded', ['url' => $item['plink'], 'exception' => $exception]);
 			}
 
-			$item['title'] = XML::getFirstNodeValue($xpath, 'atom:title/text()', $entry);
+			if (empty($item['title'])) {
+				$item['title'] = XML::getFirstNodeValue($xpath, $atomns . ':title/text()', $entry);
+			}
 
 			if (empty($item['title'])) {
 				$item['title'] = XML::getFirstNodeValue($xpath, 'title/text()', $entry);
@@ -351,7 +410,7 @@ class Feed
 
 			$item['title'] = html_entity_decode($item['title'], ENT_QUOTES, 'UTF-8');
 
-			$published = XML::getFirstNodeValue($xpath, 'atom:published/text()', $entry);
+			$published = XML::getFirstNodeValue($xpath, $atomns . ':published/text()', $entry);
 
 			if (empty($published)) {
 				$published = XML::getFirstNodeValue($xpath, 'pubDate/text()', $entry);
@@ -361,7 +420,7 @@ class Feed
 				$published = XML::getFirstNodeValue($xpath, 'dc:date/text()', $entry);
 			}
 
-			$updated = XML::getFirstNodeValue($xpath, 'atom:updated/text()', $entry);
+			$updated = XML::getFirstNodeValue($xpath, $atomns . ':updated/text()', $entry);
 
 			if (empty($updated) && !empty($published)) {
 				$updated = $published;
@@ -372,16 +431,18 @@ class Feed
 			}
 
 			if ($published != '') {
-				$item['created'] = $published;
+				$item['created'] = trim($published);
 			}
 
 			if ($updated != '') {
-				$item['edited'] = $updated;
+				$item['edited'] = trim($updated);
 			}
 
 			if (!$dryRun) {
-				$condition = ["`uid` = ? AND `uri` = ? AND `network` IN (?, ?)",
-					$importer['uid'], $item['uri'], Protocol::FEED, Protocol::DFRN];
+				$condition = [
+					"`uid` = ? AND `uri` = ? AND `network` IN (?, ?)",
+					$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.
@@ -395,7 +456,7 @@ class Feed
 			$creator = XML::getFirstNodeValue($xpath, 'author/text()', $entry);
 
 			if (empty($creator)) {
-				$creator = XML::getFirstNodeValue($xpath, 'atom:author/atom:name/text()', $entry);
+				$creator = XML::getFirstNodeValue($xpath, $atomns . ':author/' . $atomns . ':name/text()', $entry);
 			}
 
 			if (empty($creator)) {
@@ -418,33 +479,35 @@ class Feed
 
 			$attachments = [];
 
-			$enclosures = $xpath->query("enclosure|atom:link[@rel='enclosure']", $entry);
-			foreach ($enclosures as $enclosure) {
-				$href = '';
-				$length = null;
-				$type = null;
-
-				foreach ($enclosure->attributes as $attribute) {
-					if (in_array($attribute->name, ['url', 'href'])) {
-						$href = $attribute->textContent;
-					} elseif ($attribute->name == 'length') {
-						$length = (int)$attribute->textContent;
-					} elseif ($attribute->name == 'type') {
-						$type = $attribute->textContent;
+			$enclosures = $xpath->query("enclosure|$atomns:link[@rel='enclosure']", $entry);
+			if (!empty($enclosures)) {
+				foreach ($enclosures as $enclosure) {
+					$href = '';
+					$length = null;
+					$type = null;
+
+					foreach ($enclosure->attributes as $attribute) {
+						if (in_array($attribute->name, ['url', 'href'])) {
+							$href = $attribute->textContent;
+						} elseif ($attribute->name == 'length') {
+							$length = (int)$attribute->textContent;
+						} elseif ($attribute->name == 'type') {
+							$type = $attribute->textContent;
+						}
 					}
-				}
 
-				if (!empty($href)) {
-					$attachment = ['type' => Post\Media::UNKNOWN, 'url' => $href, 'mimetype' => $type, 'size' => $length];
+					if (!empty($href)) {
+						$attachment = ['uri-id' => -1, 'type' => Post\Media::UNKNOWN, 'url' => $href, 'mimetype' => $type, 'size' => $length];
 
-					$attachment = Post\Media::fetchAdditionalData($attachment);
+						$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;
+						// 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;
 					}
-					$attachments[] = $attachment;
 				}
 			}
 
@@ -454,13 +517,15 @@ class Feed
 				$taglist[] = $category->nodeValue;
 			}
 
-			$body = trim(XML::getFirstNodeValue($xpath, 'atom:content/text()', $entry));
+			if (empty($body)) {
+				$body = trim(XML::getFirstNodeValue($xpath, $atomns . ':content/text()', $entry));
+			}
 
 			if (empty($body)) {
 				$body = trim(XML::getFirstNodeValue($xpath, 'content:encoded/text()', $entry));
 			}
 
-			$summary = trim(XML::getFirstNodeValue($xpath, 'atom:summary/text()', $entry));
+			$summary = trim(XML::getFirstNodeValue($xpath, $atomns . ':summary/text()', $entry));
 
 			if (empty($summary)) {
 				$summary = trim(XML::getFirstNodeValue($xpath, 'description/text()', $entry));
@@ -502,8 +567,10 @@ class Feed
 				continue;
 			}
 
+			$fetch_further_information = $contact['fetch_further_information'] ?? LocalRelationship::FFI_NONE;
+
 			$preview = '';
-			if (!empty($contact['fetch_further_information']) && ($contact['fetch_further_information'] < 3)) {
+			if (in_array($fetch_further_information, [LocalRelationship::FFI_INFORMATION, LocalRelationship::FFI_BOTH])) {
 				// Handle enclosures and treat them as preview picture
 				foreach ($attachments as $attachment) {
 					if ($attachment['mimetype'] == 'image/jpeg') {
@@ -547,7 +614,12 @@ class Feed
 					}
 				}
 
-				$data = PageInfo::queryUrl($item['plink'], false, $preview, ($contact['fetch_further_information'] == 2), $contact['ffi_keyword_denylist'] ?? '');
+				$data = PageInfo::queryUrl(
+					$item['plink'],
+					false,
+					$fetch_further_information == LocalRelationship::FFI_BOTH,
+					$contact['ffi_keyword_denylist'] ?? ''
+				);
 
 				if (!empty($data)) {
 					// Take the data that was provided by the feed if the query is empty
@@ -566,7 +638,7 @@ 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'] ?? '') : [];
+					$taglist = $fetch_further_information == LocalRelationship::FFI_BOTH ? PageInfo::getTagsFromUrl($item['plink'], $preview, $contact['ffi_keyword_denylist'] ?? '') : [];
 					$item['object-type'] = Activity\ObjectType::BOOKMARK;
 					$attachments = [];
 
@@ -598,7 +670,7 @@ class Feed
 					$item['body'] = '[abstract]' . HTML::toBBCode($summary, $basepath) . "[/abstract]\n" . $item['body'];
 				}
 
-				if (!empty($contact['fetch_further_information']) && ($contact['fetch_further_information'] == 3)) {
+				if ($fetch_further_information == LocalRelationship::FFI_KEYWORD) {
 					if (empty($taglist)) {
 						$taglist = PageInfo::getTagsFromUrl($item['plink'], $preview, $contact['ffi_keyword_denylist'] ?? '');
 					}
@@ -620,17 +692,19 @@ class Feed
 			Logger::info('Stored feed', ['item' => $item]);
 
 			$notify = Item::isRemoteSelf($contact, $item);
+			$item['wall'] = (bool)$notify;
 
-			// Distributed items should have a well formatted URI.
-			// Additionally we have to avoid conflicts with identical URI between imported feeds and these items.
+			// Distributed items should have a well-formatted URI.
+			// Additionally, we have to avoid conflicts with identical URI between imported feeds and these items.
 			if ($notify) {
-				$item['guid'] = Item::guidFromUri($orig_plink, DI::baseUrl()->getHostname());
-				$item['uri'] = Item::newURI($item['guid']);
+				$item['guid'] = Item::guidFromUri($orig_plink, DI::baseUrl()->getHost());
+				$item['uri']  = Item::newURI($item['guid']);
+				unset($item['plink']);
 				unset($item['thr-parent']);
 				unset($item['parent-uri']);
 
 				// Set the delivery priority for "remote self" to "medium"
-				$notify = PRIORITY_MEDIUM;
+				$notify = Worker::PRIORITY_MEDIUM;
 			}
 
 			$condition = ['uid' => $item['uid'], 'uri' => $item['uri']];
@@ -638,8 +712,10 @@ class Feed
 				if (!$notify) {
 					Post\Delayed::publish($item, $notify, $taglist, $attachments);
 				} else {
-					$postings[] = ['item' => $item, 'notify' => $notify,
-						'taglist' => $taglist, 'attachments' => $attachments];
+					$postings[] = [
+						'item' => $item, 'notify' => $notify,
+						'taglist' => $taglist, 'attachments' => $attachments
+					];
 				}
 			} else {
 				Logger::info('Post already created or exists in the delayed posts queue', ['uid' => $item['uid'], 'uri' => $item['uri']]);
@@ -846,7 +922,7 @@ class Feed
 
 		$min_poll_interval = max(1, DI::config()->get('system', 'min_poll_interval'));
 
-		$poll_intervals = [$min_poll_interval, 15, 30, 60, 120, 180, 360, 720 ,1440, 10080, 43200];
+		$poll_intervals = [$min_poll_interval, 15, 30, 60, 120, 180, 360, 720, 1440, 10080, 43200];
 
 		//$poll_intervals = [$min_poll_interval . ' minute', '15 minute', '30 minute',
 		//	'1 hour', '2 hour', '3 hour', '6 hour', '12 hour' ,'1 day', '1 week', '1 month'];
@@ -912,39 +988,34 @@ class Feed
 	 * Updates the provided last_update parameter if the result comes from the
 	 * cache or it is empty
 	 *
-	 * @param string  $owner_nick  Nickname of the feed owner
+	 * @param array   $owner       owner-view record of the feed owner
 	 * @param string  $last_update Date of the last update
 	 * @param integer $max_items   Number of maximum items to fetch
 	 * @param string  $filter      Feed items filter (activity, posts or comments)
 	 * @param boolean $nocache     Wether to bypass caching
 	 *
 	 * @return string Atom feed
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function atom(string $owner_nick, string $last_update, int $max_items = 300, string $filter = 'activity', bool $nocache = false)
+	public static function atom(array $owner, string $last_update, int $max_items = 300, string $filter = 'activity', bool $nocache = false)
 	{
 		$stamp = microtime(true);
 
-		$owner = User::getOwnerDataByNick($owner_nick);
-		if (!$owner) {
-			return;
-		}
-
-		$cachekey = 'feed:feed:' . $owner_nick . ':' . $filter . ':' . $last_update;
+		$cachekey = 'feed:feed:' . $owner['nickname'] . ':' . $filter . ':' . $last_update;
 
-		// Display events in the users's timezone
+		// Display events in the user's timezone
 		if (strlen($owner['timezone'])) {
 			DI::app()->setTimeZone($owner['timezone']);
 		}
 
 		$previous_created = $last_update;
 
-		// Don't cache when the last item was posted less then 15 minutes ago (Cache duration)
-		if ((time() - strtotime($owner['last-item'])) < 15*60) {
+		// Don't cache when the last item was posted less than 15 minutes ago (Cache duration)
+		if ((time() - strtotime($owner['last-item'])) < 15 * 60) {
 			$result = DI::cache()->get($cachekey);
 			if (!$nocache && !is_null($result)) {
-				Logger::info('Cached feed duration', ['seconds' => number_format(microtime(true) - $stamp, 3), 'nick' => $owner_nick, 'filter' => $filter, 'created' => $previous_created]);
+				Logger::info('Cached feed duration', ['seconds' => number_format(microtime(true) - $stamp, 3), 'nick' => $owner['nickname'], 'filter' => $filter, 'created' => $previous_created]);
 				return $result['feed'];
 			}
 		}
@@ -952,15 +1023,17 @@ class Feed
 		$check_date = empty($last_update) ? '' : DateTimeFormat::utc($last_update);
 		$authorid = Contact::getIdForURL($owner['url']);
 
-		$condition = ["`uid` = ? AND `received` > ? AND NOT `deleted` AND `gravity` IN (?, ?)
+		$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, Item::GRAVITY_PARENT, Item::GRAVITY_COMMENT,
 			Item::PRIVATE, Protocol::ACTIVITYPUB,
-			Protocol::OSTATUS, Protocol::DFRN, Protocol::DIASPORA];
+			Protocol::OSTATUS, Protocol::DFRN, Protocol::DIASPORA
+		];
 
 		if ($filter === 'comments') {
 			$condition[0] .= " AND `gravity` = ? ";
-			$condition[] = GRAVITY_COMMENT;
+			$condition[] = Item::GRAVITY_COMMENT;
 		}
 
 		if ($owner['account-type'] != User::ACCOUNT_TYPE_COMMUNITY) {
@@ -998,7 +1071,7 @@ class Feed
 		$msg = ['feed' => $feeddata, 'last_update' => $last_update];
 		DI::cache()->set($cachekey, $msg, Duration::QUARTER_HOUR);
 
-		Logger::info('Feed duration', ['seconds' => number_format(microtime(true) - $stamp, 3), 'nick' => $owner_nick, 'filter' => $filter, 'created' => $previous_created]);
+		Logger::info('Feed duration', ['seconds' => number_format(microtime(true) - $stamp, 3), 'nick' => $owner['nickname'], 'filter' => $filter, 'created' => $previous_created]);
 
 		return $feeddata;
 	}
@@ -1034,8 +1107,8 @@ class Feed
 				break;
 		}
 
-		$attributes = ['uri' => 'https://friendi.ca', 'version' => FRIENDICA_VERSION . '-' . DB_UPDATE_VERSION];
-		XML::addElement($doc, $root, 'generator', FRIENDICA_PLATFORM, $attributes);
+		$attributes = ['uri' => 'https://friendi.ca', 'version' => App::VERSION . '-' . DB_UPDATE_VERSION];
+		XML::addElement($doc, $root, 'generator', App::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')));
@@ -1087,7 +1160,7 @@ class Feed
 	 */
 	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']))) {
+		if (($item['gravity'] != Item::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']]);
 		}
 
@@ -1122,14 +1195,22 @@ class Feed
 		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 = Post\Media::addAttachmentsToBody($item['uri-id'], DI::contentItem()->addSharedPost($item));
+		$body = Post\Media::addHTMLLinkToBody($item['uri-id'], $body);
 
 		$body = BBCode::convertForUriId($item['uri-id'], $body, BBCode::ACTIVITYPUB);
 
 		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));
@@ -1151,7 +1232,7 @@ class Feed
 	{
 		$mentioned = [];
 
-		if ($item['gravity'] != GRAVITY_PARENT) {
+		if ($item['gravity'] != Item::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']]);
@@ -1171,12 +1252,14 @@ class Feed
 			if (isset($parent_plink)) {
 				$attributes = [
 					'ref'  => $item['thr-parent'],
-					'href' => $parent_plink];
+					'href' => $parent_plink
+				];
 				XML::addElement($doc, $entry, 'thr:in-reply-to', '', $attributes);
 
 				$attributes = [
 					'rel'  => 'related',
-					'href' => $parent_plink];
+					'href' => $parent_plink
+				];
 				XML::addElement($doc, $entry, 'link', '', $attributes);
 			}
 		}
@@ -1209,16 +1292,16 @@ class Feed
 		}
 
 		// Fetch information about the post
-		$siteinfo = BBCode::getAttachedData($item['body']);
-		if (isset($siteinfo['title'])) {
-			return $siteinfo['title'];
+		$media = Post\Media::getByURIId($item['uri-id'], [Post\Media::HTML]);
+		if (!empty($media) && !empty($media[0]['name']) && ($media[0]['name'] != $media[0]['url'])) {
+			return $media[0]['name'];
 		}
 
 		// 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 = BBCode::toPlaintext($title)."\n";
+		$title = BBCode::toPlaintext($title) . "\n";
 		$pos = strpos($title, "\n");
 		$trailer = '';
 		if (($pos == 0) || ($pos > 100)) {