X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FFeed.php;h=ebd6f5ed3008ddf1f569d55b78ec08501092cbac;hb=da20b4865187c4b34528a7c949ba9f96e9fbb6b1;hp=6fd5ea7f87f096e50d03d96c348c7a17cb2a4d0b;hpb=68502daed09a69804650a6501baefc3a3fdf61b7;p=friendica.git

diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index 6fd5ea7f87..ebd6f5ed30 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
  *
@@ -29,11 +29,9 @@ use Friendica\Content\Text\HTML;
 use Friendica\Core\Cache\Duration;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
-use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
-use Friendica\Model\Conversation;
 use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Model\Tag;
@@ -235,6 +233,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 +483,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 +538,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,12 +890,12 @@ class Feed
 		$params = ['order' => ['received' => true], 'limit' => $max_items];
 
 		if ($filter === 'posts') {
-			$ret = Item::selectThread([], $condition, $params);
+			$ret = Post::selectThread(Item::DELIVER_FIELDLIST, $condition, $params);
 		} else {
-			$ret = Item::select([], $condition, $params);
+			$ret = Post::select(Item::DELIVER_FIELDLIST, $condition, $params);
 		}
 
-		$items = Item::inArray($ret);
+		$items = Post::toArray($ret);
 
 		$doc = new DOMDocument('1.0', 'utf-8');
 		$doc->formatOutput = true;
@@ -1041,7 +1044,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;
 		}