X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FDFRN.php;h=df974729bab07261d01cfe7b8645d167727391cc;hb=7c138dd15c0c28a480f06feaedfa09916ba8461f;hp=23a287a9a1b2c3fc8e077c1f8932f87aec8acc39;hpb=ee5207410c71492b2e771479ff1890d8ef4552da;p=friendica.git

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 23a287a9a1..df974729ba 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.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
  *
@@ -34,11 +34,11 @@ use Friendica\Model\Contact;
 use Friendica\Model\Conversation;
 use Friendica\Model\Event;
 use Friendica\Model\FContact;
+use Friendica\Model\GServer;
 use Friendica\Model\Item;
 use Friendica\Model\ItemURI;
 use Friendica\Model\Mail;
-use Friendica\Model\Notify;
-use Friendica\Model\Notify\Type;
+use Friendica\Model\Notification;
 use Friendica\Model\PermissionSet;
 use Friendica\Model\Post;
 use Friendica\Model\Post\Category;
@@ -311,23 +311,26 @@ class DFRN
 	}
 
 	/**
-	 * Generate an atom entry for a given item id
+	 * Generate an atom entry for a given uri id and user
 	 *
-	 * @param int     $item_id      The item id
+	 * @param int     $uri_id       The uri id
+	 * @param int     $uid          The user id
 	 * @param boolean $conversation Show the conversation. If false show the single post.
 	 *
 	 * @return string DFRN feed entry
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function itemFeed($item_id, $conversation = false)
+	public static function itemFeed(int $uri_id, int $uid, bool $conversation = false)
 	{
 		if ($conversation) {
-			$condition = ['parent' => $item_id];
+			$condition = ['parent-uri-id' => $uri_id];
 		} else {
-			$condition = ['id' => $item_id];
+			$condition = ['uri-id' => $uri_id];
 		}
 
+		$condition['uid'] = $uid;
+
 		$items = Post::selectToArray(Item::DELIVER_FIELDLIST, $condition);
 		if (!DBA::isResult($items)) {
 			return '';
@@ -896,10 +899,10 @@ class DFRN
 			$entry->setAttribute("xmlns:statusnet", ActivityNamespace::STATUSNET);
 		}
 
+		$body = Post\Media::addAttachmentsToBody($item['uri-id'], $item['body']);
+
 		if ($item['private'] == Item::PRIVATE) {
-			$body = Item::fixPrivatePhotos($item['body'], $owner['uid'], $item, $cid);
-		} else {
-			$body = $item['body'];
+			$body = Item::fixPrivatePhotos($body, $owner['uid'], $item, $cid);
 		}
 
 		// Remove the abstract element. It is only locally important.
@@ -1963,8 +1966,8 @@ class DFRN
 				// send a notification
 				notification(
 					[
-					"type"     => Type::POKE,
-					"otype"    => Notify\ObjectType::PERSON,
+					"type"     => Notification\Type::POKE,
+					"otype"    => Notification\ObjectType::PERSON,
 					"activity" => $verb,
 					"verb"     => $item["verb"],
 					"uid"      => $importer["importer_uid"],
@@ -2192,6 +2195,12 @@ class DFRN
 
 		$item["title"] = XML::getFirstNodeValue($xpath, "atom:title/text()", $entry);
 
+		if (!empty($item["title"])) {
+			$item["post-type"] = Item::PT_ARTICLE;
+		} else {
+			$item["post-type"] = Item::PT_NOTE;
+		}
+
 		$item["created"] = XML::getFirstNodeValue($xpath, "atom:published/text()", $entry);
 
 		$item["body"] = XML::getFirstNodeValue($xpath, "dfrn:env/text()", $entry);
@@ -2236,6 +2245,8 @@ class DFRN
 
 		$item['uri-id'] = ItemURI::insert(['uri' => $item['uri'], 'guid' => $item['guid']]);
 
+		$item["body"] = Item::improveSharedDataInBody($item);
+
 		Tag::storeFromBody($item['uri-id'], $item["body"]);
 
 		// We store the data from "dfrn:diaspora_signature" in a different table, this is done in "Item::insert"
@@ -2331,7 +2342,7 @@ class DFRN
 				return 403;
 			}
 		}
-				
+
 		// Get the type of the item (Top level post, reply or remote reply)
 		$entrytype = self::getEntryType($importer, $item);
 
@@ -2423,8 +2434,8 @@ class DFRN
 
 		if (in_array($entrytype, [DFRN::REPLY, DFRN::REPLY_RC])) {
 			// Will be overwritten for sharing accounts in Item::insert
-			if (empty($item['post-type']) && ($entrytype == DFRN::REPLY)) {
-				$item['post-type'] = Item::PT_COMMENT;
+			if (empty($item['post-reason']) && ($entrytype == DFRN::REPLY)) {
+				$item['post-reason'] = Item::PR_COMMENT;
 			}
 
 			$posted_id = Item::insert($item);
@@ -2508,14 +2519,14 @@ class DFRN
 		}
 
 		$condition = ['uri' => $uri, 'uid' => $importer["importer_uid"]];
-		$item = Post::selectFirst(['id', 'parent', 'contact-id', 'file', 'deleted', 'gravity'], $condition);
+		$item = Post::selectFirst(['id', 'parent', 'contact-id', 'uri-id', 'deleted', 'gravity'], $condition);
 		if (!DBA::isResult($item)) {
 			Logger::log("Item with uri " . $uri . " for user " . $importer["importer_uid"] . " wasn't found.", Logger::DEBUG);
 			return;
 		}
 
-		if (strstr($item['file'], '[')) {
-			Logger::log("Item with uri " . $uri . " for user " . $importer["importer_uid"] . " is filed. So it won't be deleted.", Logger::DEBUG);
+		if (DBA::exists('post-category', ['uri-id' => $item['uri-id'], 'uid' => $importer['importer_uid'], 'type' => Post\Category::FILE])) {
+			Logger::notice("Item is filed. It won't be deleted.", ['uri' => $uri, 'uri-id' => $item['uri_id'], 'uid' => $importer["importer_uid"]]);
 			return;
 		}
 
@@ -2585,7 +2596,7 @@ class DFRN
 		$header["direction"] = $direction;
 
 		if ($direction === Conversation::RELAY) {
-			$header['post-type'] = Item::PT_RELAY;
+			$header['post-reason'] = Item::PR_RELAY;
 		}
 
 		// Update the contact table if the data has changed
@@ -2602,6 +2613,14 @@ class DFRN
 
 		Logger::log("Import DFRN message for user " . $importer["importer_uid"] . " from contact " . $importer["id"], Logger::DEBUG);
 
+		if (!empty($importer['gsid'])) {
+			if ($protocol == Conversation::PARCEL_DIASPORA_DFRN) {
+				GServer::setProtocol($importer['gsid'], Post\DeliveryData::DFRN);
+			} elseif ($protocol == Conversation::PARCEL_LEGACY_DFRN) {
+				GServer::setProtocol($importer['gsid'], Post\DeliveryData::LEGACY_DFRN);
+			}
+		}
+
 		// is it a public forum? Private forums aren't exposed with this method
 		$forum = intval(XML::getFirstNodeValue($xpath, "/atom:feed/dfrn:community/text()"));