X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FFeed.php;h=ebd6f5ed3008ddf1f569d55b78ec08501092cbac;hb=5211c12b0c752f186c1358d9347c24838725120a;hp=f674f7081512d252d19bbadfc9011745df91e838;hpb=ef4f192a75ee4499f85db3491fae0e0917f11bf2;p=friendica.git

diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index f674f70815..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;
@@ -49,65 +47,6 @@ use Friendica\Util\XML;
  */
 class Feed
 {
-	/**
-	 * consume - process atom feed and update anything/everything we might need to update
-	 *
-	 * $xml = the (atom) feed to consume - RSS isn't as fully supported but may work for simple feeds.
-	 *
-	 * $importer = the contact_record (joined to user_record) of the local user who owns this relationship.
-	 *             It is this person's stuff that is going to be updated.
-	 * $contact =  the person who is sending us stuff. If not set, we MAY be processing a "follow" activity
-	 *             from an external network and MAY create an appropriate contact record. Otherwise, we MUST
-	 *             have a contact record.
-	 * $hub = should we find a hub declation in the feed, pass it back to our calling process, who might (or
-	 *        might not) try and subscribe to it.
-	 * $datedir sorts in reverse order
-	 * $pass - by default ($pass = 0) we cannot guarantee that a parent item has been
-	 *      imported prior to its children being seen in the stream unless we are certain
-	 *      of how the feed is arranged/ordered.
-	 * With $pass = 1, we only pull parent items out of the stream.
-	 * With $pass = 2, we only pull children (comments/likes).
-	 *
-	 * So running this twice, first with pass 1 and then with pass 2 will do the right
-	 * thing regardless of feed ordering. This won't be adequate in a fully-threaded
-	 * model where comments can have sub-threads. That would require some massive sorting
-	 * to get all the feed items into a mostly linear ordering, and might still require
-	 * recursion.
-	 *
-	 * @param       $xml
-	 * @param array $importer
-	 * @param array $contact
-	 * @param       $hub
-	 * @throws ImagickException
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-	 */
-	public static function consume($xml, array $importer, array $contact, &$hub)
-	{
-		if ($contact['network'] === Protocol::OSTATUS) {
-			Logger::info('Consume OStatus messages');
-			OStatus::import($xml, $importer, $contact, $hub);
-
-			return;
-		}
-
-		if ($contact['network'] === Protocol::FEED) {
-			Logger::info('Consume feeds');
-			self::import($xml, $importer, $contact);
-
-			return;
-		}
-
-		if ($contact['network'] === Protocol::DFRN) {
-			Logger::info('Consume DFRN messages');
-			$dfrn_importer = DFRN::getImporter($contact['id'], $importer['uid']);
-			if (!empty($dfrn_importer)) {
-				Logger::info('Now import the DFRN feed');
-				DFRN::import($xml, $dfrn_importer, true, Conversation::PARCEL_LEGACY_DFRN);
-				return;
-			}
-		}
-	}
-
 	/**
 	 * Read a RSS/RDF/Atom feed and create an item entry for it
 	 *
@@ -294,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;
 
@@ -400,7 +340,7 @@ class Feed
 			if (!$dryRun) {
 				$condition = ["`uid` = ? AND `uri` = ? AND `network` IN (?, ?)",
 					$importer["uid"], $item["uri"], Protocol::FEED, Protocol::DFRN];
-				$previous = Item::selectFirst(['id', 'created'], $condition);
+				$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'];
@@ -543,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)) {
@@ -598,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);
@@ -615,7 +559,7 @@ class Feed
 			}
 
 			$condition = ['uid' => $item['uid'], 'uri' => $item['uri']];
-			if (!Item::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 {
@@ -946,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;
@@ -1100,7 +1044,7 @@ class Feed
 
 		$condition = ['uid' => $owner["uid"], 'guid' => $repeated_guid, 'private' => [Item::PUBLIC, Item::UNLISTED],
 			'network' => Protocol::FEDERATED];
-		$repeated_item = Item::selectFirst([], $condition);
+		$repeated_item = Post::selectFirst(Item::DELIVER_FIELDLIST, $condition);
 		if (!DBA::isResult($repeated_item)) {
 			return false;
 		}
@@ -1192,9 +1136,9 @@ class Feed
 		$mentioned = [];
 
 		if ($item['gravity'] != GRAVITY_PARENT) {
-			$parent = Item::selectFirst(['guid', 'author-link', 'owner-link'], ['id' => $item['parent']]);
+			$parent = Post::selectFirst(['guid', 'author-link', 'owner-link'], ['id' => $item['parent']]);
 
-			$thrparent = Item::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"];