X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FFeed.php;h=65af597f169962526514a596cf5e5a60c2bb64fb;hb=75e450bc1540a3547f6d337dc61de7cfae7a4c83;hp=027efb2d47cc100eb8268be3f2df264dc21c3a92;hpb=8a3995a740a109b2bcac9b88fee6ecc55dd97c85;p=friendica.git

diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index 027efb2d47..65af597f16 100644
--- a/src/Protocol/Feed.php
+++ b/src/Protocol/Feed.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -235,6 +235,7 @@ class Feed
 		$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;
 
@@ -484,7 +485,7 @@ class Feed
 					$item["body"] = trim($item["title"]);
 				}
 
-				$data = ParseUrl::getSiteinfoCached($item['plink'], true);
+				$data = ParseUrl::getSiteinfoCached($item['plink']);
 				if (!empty($data['text']) && !empty($data['title']) && (mb_strlen($item['body']) < mb_strlen($data['text']))) {
 					// When the fetched page info text is longer than the body, we do try to enhance the body
 					if (!empty($item['body']) && (strpos($data['title'], $item['body']) === false) && (strpos($data['text'], $item['body']) === false)) {
@@ -539,6 +540,10 @@ class Feed
 				}
 			}
 
+			if (empty($item['title'])) {
+				$item['post-type'] = Item::PT_NOTE;
+			}
+
 			Logger::info('Stored feed', ['item' => $item]);
 
 			$notify = Item::isRemoteSelf($contact, $item);
@@ -887,9 +892,9 @@ class Feed
 		$params = ['order' => ['received' => true], 'limit' => $max_items];
 
 		if ($filter === 'posts') {
-			$ret = Post::selectThread([], $condition, $params);
+			$ret = Post::selectThread(Item::DELIVER_FIELDLIST, $condition, $params);
 		} else {
-			$ret = Post::select([], $condition, $params);
+			$ret = Post::select(Item::DELIVER_FIELDLIST, $condition, $params);
 		}
 
 		$items = Post::toArray($ret);
@@ -1041,7 +1046,7 @@ class Feed
 
 		$condition = ['uid' => $owner["uid"], 'guid' => $repeated_guid, 'private' => [Item::PUBLIC, Item::UNLISTED],
 			'network' => Protocol::FEDERATED];
-		$repeated_item = Post::selectFirst([], $condition);
+		$repeated_item = Post::selectFirst(Item::DELIVER_FIELDLIST, $condition);
 		if (!DBA::isResult($repeated_item)) {
 			return false;
 		}