X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FFeed.php;h=a83819742e00c5e0d2edbf6ce3499d7d44982e7c;hb=d3e085bd5a1ae0380647594d5b2ad0c224465c42;hp=3253a1309b2e456ea7f5eaa8583888229727e758;hpb=da66730e4f142c3557cdf7343bc420f7b80c883e;p=friendica.git

diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index 3253a1309b..a83819742e 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,14 @@ namespace Friendica\Protocol;
 use DOMDocument;
 use DOMElement;
 use DOMXPath;
+use Friendica\App;
 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 +40,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;
@@ -373,16 +376,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.
@@ -436,7 +441,7 @@ class Feed
 				}
 
 				if (!empty($href)) {
-					$attachment = ['type' => Post\Media::UNKNOWN, 'url' => $href, 'mimetype' => $type, 'size' => $length];
+					$attachment = ['uri-id' => -1, 'type' => Post\Media::UNKNOWN, 'url' => $href, 'mimetype' => $type, 'size' => $length];
 
 					$attachment = Post\Media::fetchAdditionalData($attachment);
 
@@ -621,17 +626,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']];
@@ -639,8 +646,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']]);
@@ -847,7 +856,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'];
@@ -913,28 +922,23 @@ 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['nickname'] . ':' . $filter . ':' . $last_update;
 
-		$cachekey = 'feed:feed:' . $owner_nick . ':' . $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']);
 		}
@@ -942,10 +946,10 @@ class Feed
 		$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) {
+		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'];
 			}
 		}
@@ -953,11 +957,13 @@ 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, 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` = ? ";
@@ -999,7 +1005,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;
 	}
@@ -1035,8 +1041,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')));
@@ -1123,14 +1129,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));
@@ -1172,12 +1186,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);
 			}
 		}
@@ -1210,16 +1226,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)) {