X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FDFRN.php;h=7cb9db1a136d2d4834bc8ad8ef24ea63011f75cf;hb=ab5a447bc2261522d0f5560f8933dd928a6fc6e3;hp=1329968126e43d6be6ba90502e16b5e9d28005ff;hpb=a5be6f927609913e96d91bcc0a12b6914cb47c5d;p=friendica.git

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 1329968126..7cb9db1a13 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -37,8 +37,9 @@ use Friendica\Model\FContact;
 use Friendica\Model\Item;
 use Friendica\Model\ItemURI;
 use Friendica\Model\Mail;
-use Friendica\Model\Notify\Type;
+use Friendica\Model\Notification;
 use Friendica\Model\PermissionSet;
+use Friendica\Model\Post;
 use Friendica\Model\Post\Category;
 use Friendica\Model\Profile;
 use Friendica\Model\Tag;
@@ -182,7 +183,7 @@ class DFRN
 
 		// default permissions - anonymous user
 
-		$sql_extra = sprintf(" AND `item`.`private` != %s ", Item::PRIVATE);
+		$sql_extra = sprintf(" AND `private` != %s ", Item::PRIVATE);
 
 		$owner = DBA::selectFirst('owner-view', [], ['nickname' => $owner_nick]);
 		if (!DBA::isResult($owner)) {
@@ -192,9 +193,7 @@ class DFRN
 
 		$owner_id = $owner['uid'];
 
-		$sql_post_table = "";
-
-		if (! $public_feed) {
+		if (!$public_feed) {
 			switch ($direction) {
 				case (-1):
 					$sql_extra = sprintf(" AND `issued-id` = '%s' ", DBA::escape($dfrn_id));
@@ -210,72 +209,41 @@ class DFRN
 					break; // NOTREACHED
 			}
 
-			$r = q(
-				"SELECT * FROM `contact` WHERE NOT `blocked` AND `contact`.`uid` = %d $sql_extra LIMIT 1",
-				intval($owner_id)
-			);
-
-			if (! DBA::isResult($r)) {
-				Logger::log(sprintf('No contact found for uid=%d', $owner_id), Logger::WARNING);
+			$contact = DBA::selectFirst('contact', [], ["NOT `blocked` AND `contact`.`uid` = ?" . $sql_extra, $owner_id]);
+			if (!DBA::isResult($contact)) {
+				Logger::notice('No contact found', ['uid' => $owner_id]);
 				exit();
 			}
 
-			$contact = $r[0];
-
 			$set = PermissionSet::get($owner_id, $contact['id']);
 
 			if (!empty($set)) {
-				$sql_extra = " AND `item`.`psid` IN (" . implode(',', $set) .")";
+				$sql_extra = " AND `psid` IN (" . implode(',', $set) .")";
 			} else {
-				$sql_extra = sprintf(" AND `item`.`private` != %s", Item::PRIVATE);
+				$sql_extra = sprintf(" AND `private` != %s", Item::PRIVATE);
 			}
 		}
 
-		if ($public_feed) {
-			$sort = 'DESC';
-		} else {
-			$sort = 'ASC';
-		}
-
-		if (! strlen($last_update)) {
+		if (!strlen($last_update)) {
 			$last_update = 'now -30 days';
 		}
 
 		if (isset($category)) {
-			$sql_post_table = sprintf("INNER JOIN (SELECT `uri-id` FROM `category-view` WHERE `name` = '%s' AND `type` = %d AND `uid` = %d ORDER BY `uri-id` DESC) AS `category` ON `item`.`uri-id` = `category`.`uri-id` ",
+			$sql_extra .= sprintf(" AND `uri-id` IN (SELECT `uri-id` FROM `category-view` WHERE `name` = '%s' AND `type` = %d AND `uid` = %d)",
 				DBA::escape(Strings::protectSprintf($category)), intval(Category::CATEGORY), intval($owner_id));
 		}
 
 		if ($public_feed && ! $converse) {
-			$sql_extra .= " AND `contact`.`self` = 1 ";
+			$sql_extra .= " AND `self` ";
 		}
 
 		$check_date = DateTimeFormat::utc($last_update);
 
-		$r = q(
-			"SELECT `item`.`id`
-			FROM `item` USE INDEX (`uid_wall_changed`) $sql_post_table
-			STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-			WHERE `item`.`uid` = %d AND `item`.`wall` AND `item`.`changed` > '%s'
-			AND `vid` != %d AND `item`.`visible` $sql_extra
-			ORDER BY `item`.`parent` ".$sort.", `item`.`received` ASC LIMIT 0, 300",
-			intval($owner_id),
-			DBA::escape($check_date),
-			Verb::getID(Activity::ANNOUNCE),
-			DBA::escape($sort)
-		);
-
-		$ids = [];
-		foreach ($r as $item) {
-			$ids[] = $item['id'];
-		}
+		$condition = ["`uid` = ? AND `wall` AND `changed` > ? AND `vid` != ? AND `visible`" . $sql_extra,
+			$owner_id, $check_date, Verb::getID(Activity::ANNOUNCE)];
 
-		if (!empty($ids)) {
-			$ret = Item::select(Item::DELIVER_FIELDLIST, ['id' => $ids]);
-			$items = Item::inArray($ret);
-		} else {
-			$items = [];
-		}
+		$params = ['sort' => ['parent' => $public_feed, 'received']];
+		$items = Post::selectToArray(Item::DELIVER_FIELDLIST, $condition, $params, ['limit' => 300]);
 
 		/*
 		 * Will check further below if this actually returned results.
@@ -342,25 +310,27 @@ 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];
 		}
 
-		$ret = Item::select(Item::DELIVER_FIELDLIST, $condition);
-		$items = Item::inArray($ret);
+		$condition['uid'] = $uid;
+
+		$items = Post::selectToArray(Item::DELIVER_FIELDLIST, $condition);
 		if (!DBA::isResult($items)) {
 			return '';
 		}
@@ -413,36 +383,36 @@ class DFRN
 	/**
 	 * Create XML text for DFRN mails
 	 *
-	 * @param array $item  message elements
+	 * @param array $mail  Mail record
 	 * @param array $owner Owner record
 	 *
 	 * @return string DFRN mail
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @todo  Find proper type-hints
 	 */
-	public static function mail($item, $owner)
+	public static function mail(array $mail, array $owner)
 	{
 		$doc = new DOMDocument('1.0', 'utf-8');
 		$doc->formatOutput = true;
 
 		$root = self::addHeader($doc, $owner, "dfrn:owner", "", false);
 
-		$mail = $doc->createElement("dfrn:mail");
-		$sender = $doc->createElement("dfrn:sender");
+		$mailElement = $doc->createElement("dfrn:mail");
+		$senderElement = $doc->createElement("dfrn:sender");
 
-		XML::addElement($doc, $sender, "dfrn:name", $owner['name']);
-		XML::addElement($doc, $sender, "dfrn:uri", $owner['url']);
-		XML::addElement($doc, $sender, "dfrn:avatar", $owner['thumb']);
+		XML::addElement($doc, $senderElement, "dfrn:name", $owner['name']);
+		XML::addElement($doc, $senderElement, "dfrn:uri", $owner['url']);
+		XML::addElement($doc, $senderElement, "dfrn:avatar", $owner['thumb']);
 
-		$mail->appendChild($sender);
+		$mailElement->appendChild($senderElement);
 
-		XML::addElement($doc, $mail, "dfrn:id", $item['uri']);
-		XML::addElement($doc, $mail, "dfrn:in-reply-to", $item['parent-uri']);
-		XML::addElement($doc, $mail, "dfrn:sentdate", DateTimeFormat::utc($item['created'] . '+00:00', DateTimeFormat::ATOM));
-		XML::addElement($doc, $mail, "dfrn:subject", $item['title']);
-		XML::addElement($doc, $mail, "dfrn:content", $item['body']);
+		XML::addElement($doc, $mailElement, "dfrn:id", $mail['uri']);
+		XML::addElement($doc, $mailElement, "dfrn:in-reply-to", $mail['parent-uri']);
+		XML::addElement($doc, $mailElement, "dfrn:sentdate", DateTimeFormat::utc($mail['created'] . '+00:00', DateTimeFormat::ATOM));
+		XML::addElement($doc, $mailElement, "dfrn:subject", $mail['title']);
+		XML::addElement($doc, $mailElement, "dfrn:content", $mail['body']);
 
-		$root->appendChild($mail);
+		$root->appendChild($mailElement);
 
 		return trim($doc->saveXML());
 	}
@@ -865,27 +835,19 @@ class DFRN
 	 */
 	private static function getAttachment($doc, $root, $item)
 	{
-		$arr = explode('[/attach],', $item['attach']);
-		if (count($arr)) {
-			foreach ($arr as $r) {
-				$matches = false;
-				$cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|', $r, $matches);
-				if ($cnt) {
-					$attributes = ["rel" => "enclosure",
-							"href" => $matches[1],
-							"type" => $matches[3]];
-
-					if (intval($matches[2])) {
-						$attributes["length"] = intval($matches[2]);
-					}
+		foreach (Post\Media::getByURIId($item['uri-id'], [Post\Media::DOCUMENT, Post\Media::TORRENT, Post\Media::UNKNOWN]) as $attachment) {
+			$attributes = ['rel' => 'enclosure',
+				'href' => $attachment['url'],
+				'type' => $attachment['mimetype']];
 
-					if (trim($matches[4]) != "") {
-						$attributes["title"] = trim($matches[4]);
-					}
-
-					XML::addElement($doc, $root, "link", "", $attributes);
-				}
+			if (!empty($attachment['size'])) {
+				$attributes['length'] = intval($attachment['size']);
 			}
+			if (!empty($attachment['description'])) {
+				$attributes['title'] = $attachment['description'];
+			}
+
+			XML::addElement($doc, $root, 'link', '', $attributes);
 		}
 	}
 
@@ -963,10 +925,9 @@ class DFRN
 		$entry->appendChild($dfrnowner);
 
 		if ($item['gravity'] != GRAVITY_PARENT) {
-			$parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
-			$parent = Item::selectFirst(['guid', 'plink'], ['uri' => $parent_item, 'uid' => $item['uid']]);
+			$parent = Post::selectFirst(['guid', 'plink'], ['uri' => $item['thr-parent'], 'uid' => $item['uid']]);
 			if (DBA::isResult($parent)) {
-				$attributes = ["ref" => $parent_item, "type" => "text/html",
+				$attributes = ["ref" => $item['thr-parent'], "type" => "text/html",
 					"href" => $parent['plink'],
 					"dfrn:diaspora_guid" => $parent['guid']];
 				XML::addElement($doc, $entry, "thr:in-reply-to", "", $attributes);
@@ -978,7 +939,7 @@ class DFRN
 		$conversation_uri = $conversation_href;
 
 		if (isset($parent_item)) {
-			$conversation = DBA::selectFirst('conversation', ['conversation-uri', 'conversation-href'], ['item-uri' => $item['parent-uri']]);
+			$conversation = DBA::selectFirst('conversation', ['conversation-uri', 'conversation-href'], ['item-uri' => $item['thr-parent']]);
 			if (DBA::isResult($conversation)) {
 				if ($conversation['conversation-uri'] != '') {
 					$conversation_uri = $conversation['conversation-uri'];
@@ -1499,21 +1460,25 @@ class DFRN
 
 		$fields = ['id', 'uid', 'url', 'network', 'avatar-date', 'avatar', 'name-date', 'uri-date', 'addr',
 			'name', 'nick', 'about', 'location', 'keywords', 'xmpp', 'bdyear', 'bd', 'hidden', 'contact-type'];
-		$condition = ["`uid` = ? AND `nurl` = ? AND `network` != ?",
+		$condition = ["`uid` = ? AND `nurl` = ? AND `network` != ? AND NOT `pending` AND NOT `blocked`",
 			$importer["importer_uid"], Strings::normaliseLink($author["link"]), Protocol::STATUSNET];
+
+		if ($importer['account-type'] != User::ACCOUNT_TYPE_COMMUNITY) {
+			$condition = DBA::mergeConditions($condition, ['rel' => [Contact::SHARING, Contact::FRIEND]]);
+		}
+
 		$contact_old = DBA::selectFirst('contact', $fields, $condition);
 
 		if (DBA::isResult($contact_old)) {
 			$author["contact-id"] = $contact_old["id"];
 			$author["network"] = $contact_old["network"];
 		} else {
-			if (!$onlyfetch) {
-				Logger::debug("Contact ".$author["link"]." wasn't found for user ".$importer["importer_uid"]." XML: ".$xml);
-			}
+			Logger::info('Contact not found', ['condition' => $condition]);
 
 			$author["contact-unknown"] = true;
-			$author["contact-id"] = $importer["id"];
-			$author["network"] = $importer["network"];
+			$contact = Contact::getByURL($author["link"], null, ["id", "network"]);
+			$author["contact-id"] = $contact["id"] ?? $importer["id"];
+			$author["network"] = $contact["network"] ?? $importer["network"];
 			$onlyfetch = true;
 		}
 
@@ -1766,15 +1731,15 @@ class DFRN
 
 		$msg = [];
 		$msg["uid"] = $importer["importer_uid"];
-		$msg["from-name"] = $xpath->query("dfrn:sender/dfrn:name/text()", $mail)->item(0)->nodeValue;
-		$msg["from-url"] = $xpath->query("dfrn:sender/dfrn:uri/text()", $mail)->item(0)->nodeValue;
-		$msg["from-photo"] = $xpath->query("dfrn:sender/dfrn:avatar/text()", $mail)->item(0)->nodeValue;
+		$msg["from-name"] = XML::getFirstValue($xpath, "dfrn:sender/dfrn:name/text()", $mail);
+		$msg["from-url"] = XML::getFirstValue($xpath, "dfrn:sender/dfrn:uri/text()", $mail);
+		$msg["from-photo"] = XML::getFirstValue($xpath, "dfrn:sender/dfrn:avatar/text()", $mail);
 		$msg["contact-id"] = $importer["id"];
-		$msg["uri"] = $xpath->query("dfrn:id/text()", $mail)->item(0)->nodeValue;
-		$msg["parent-uri"] = $xpath->query("dfrn:in-reply-to/text()", $mail)->item(0)->nodeValue;
-		$msg["created"] = DateTimeFormat::utc($xpath->query("dfrn:sentdate/text()", $mail)->item(0)->nodeValue);
-		$msg["title"] = $xpath->query("dfrn:subject/text()", $mail)->item(0)->nodeValue;
-		$msg["body"] = $xpath->query("dfrn:content/text()", $mail)->item(0)->nodeValue;
+		$msg["uri"] = XML::getFirstValue($xpath, "dfrn:id/text()", $mail);
+		$msg["parent-uri"] = XML::getFirstValue($xpath, "dfrn:in-reply-to/text()", $mail);
+		$msg["created"] = DateTimeFormat::utc(XML::getFirstValue($xpath, "dfrn:sentdate/text()", $mail));
+		$msg["title"] = XML::getFirstValue($xpath, "dfrn:subject/text()", $mail);
+		$msg["body"] = XML::getFirstValue($xpath, "dfrn:content/text()", $mail);
 
 		Mail::insert($msg);
 	}
@@ -1791,91 +1756,13 @@ class DFRN
 	 */
 	private static function processSuggestion($xpath, $suggestion, $importer)
 	{
-		Logger::log('Processing suggestions');
-
-		/// @TODO Rewrite this to one statement
-		$suggest = [];
-		$suggest['uid'] = $importer['importer_uid'];
-		$suggest['cid'] = $importer['id'];
-		$suggest['url'] = $xpath->query('dfrn:url/text()', $suggestion)->item(0)->nodeValue;
-		$suggest['name'] = $xpath->query('dfrn:name/text()', $suggestion)->item(0)->nodeValue;
-		$suggest['photo'] = $xpath->query('dfrn:photo/text()', $suggestion)->item(0)->nodeValue;
-		$suggest['request'] = $xpath->query('dfrn:request/text()', $suggestion)->item(0)->nodeValue;
-		$suggest['body'] = $xpath->query('dfrn:note/text()', $suggestion)->item(0)->nodeValue;
-
-		// Does our member already have a friend matching this description?
-
-		/*
-		 * The valid result means the friend we're about to send a friend
-		 * suggestion already has them in their contact, which means no further
-		 * action is required.
-		 *
-		 * @see https://github.com/friendica/friendica/pull/3254#discussion_r107315246
-		 */
-		$condition = ['nurl' => Strings::normaliseLink($suggest['url']), 'uid' => $suggest['uid']];
-		if (DBA::exists('contact', $condition)) {
-			return false;
-		}
-		// Do we already have an fcontact record for this person?
-
-		$fid = 0;
-		$fcontact = DBA::selectFirst('fcontact', ['id'], ['url' => $suggest['url']]);
-		if (DBA::isResult($fcontact)) {
-			$fid = $fcontact['id'];
-
-			// OK, we do. Do we already have an introduction for this person?
-			if (DBA::exists('intro', ['uid' => $suggest['uid'], 'fid' => $fid])) {
-				/*
-				 * The valid result means the friend we're about to send a friend
-				 * suggestion already has them in their contact, which means no further
-				 * action is required.
-				 *
-				 * @see https://github.com/friendica/friendica/pull/3254#discussion_r107315246
-				 */
-				return false;
-			}
-		}
+		Logger::notice('Processing suggestions');
 
-		if (!$fid) {
-			$fields = ['name' => $suggest['name'], 'url' => $suggest['url'],
-				'photo' => $suggest['photo'], 'request' => $suggest['request']];
-			DBA::insert('fcontact', $fields);
-			$fid = DBA::lastInsertId();
-		}
-
-		/*
-		 * If no record in fcontact is found, below INSERT statement will not
-		 * link an introduction to it.
-		 */
-		if (empty($fid)) {
-			// Database record did not get created. Quietly give up.
-			exit();
-		}
-
-		$hash = Strings::getRandomHex();
-
-		$fields = ['uid' => $suggest['uid'], 'fid' => $fid, 'contact-id' => $suggest['cid'],
-			'note' => $suggest['body'], 'hash' => $hash, 'datetime' => DateTimeFormat::utcNow(), 'blocked' => false];
-		DBA::insert('intro', $fields);
-
-		notification(
-			[
-				'type'         => Type::SUGGEST,
-				'notify_flags' => $importer['notify-flags'],
-				'language'     => $importer['language'],
-				'to_name'      => $importer['username'],
-				'to_email'     => $importer['email'],
-				'uid'          => $importer['importer_uid'],
-				'item'         => $suggest,
-				'link'         => DI::baseUrl().'/notifications/intros',
-				'source_name'  => $importer['name'],
-				'source_link'  => $importer['url'],
-				'source_photo' => $importer['photo'],
-				'verb'         => Activity::REQ_FRIEND,
-				'otype'        => 'intro']
-		);
+		$url = $xpath->evaluate('string(dfrn:url[1]/text())', $suggestion);
+		$cid = Contact::getIdForURL($url);
+		$note = $xpath->evaluate('string(dfrn:note[1]/text())', $suggestion);
 
-		return true;
+		return FContact::addSuggestion($importer['importer_uid'], $cid, $importer['id'], $note);
 	}
 
 	/**
@@ -1999,7 +1886,7 @@ class DFRN
 	 */
 	private static function getEntryType($importer, $item)
 	{
-		if ($item["parent-uri"] != $item["uri"]) {
+		if ($item["thr-parent"] != $item["uri"]) {
 			$community = false;
 
 			if ($importer["page-flags"] == User::PAGE_FLAGS_COMMUNITY || $importer["page-flags"] == User::PAGE_FLAGS_PRVGROUP) {
@@ -2007,32 +1894,15 @@ class DFRN
 				$community = true;
 				Logger::log("possible community action");
 			} else {
-				$sql_extra = " AND `contact`.`self` AND `item`.`wall` ";
+				$sql_extra = " AND `self` AND `wall`";
 			}
 
 			// was the top-level post for this action written by somebody on this site?
 			// Specifically, the recipient?
+			$parent = Post::selectFirst(['forum_mode', 'wall'],
+				["`uri` = ? AND `uid` = ?" . $sql_extra, $item["thr-parent"], $importer["importer_uid"]]);
 
-			$is_a_remote_action = false;
-
-			$parent = Item::selectFirst(['parent-uri'], ['uri' => $item["parent-uri"]]);
-			if (DBA::isResult($parent)) {
-				$r = q(
-					"SELECT `item`.`forum_mode`, `item`.`wall` FROM `item`
-					INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-					WHERE `item`.`uri` = '%s' AND (`item`.`parent-uri` = '%s' OR `item`.`thr-parent` = '%s')
-					AND `item`.`uid` = %d
-					$sql_extra
-					LIMIT 1",
-					DBA::escape($parent["parent-uri"]),
-					DBA::escape($parent["parent-uri"]),
-					DBA::escape($parent["parent-uri"]),
-					intval($importer["importer_uid"])
-				);
-				if (DBA::isResult($r)) {
-					$is_a_remote_action = true;
-				}
-			}
+			$is_a_remote_action = DBA::isResult($parent);
 
 			/*
 			 * Does this have the characteristics of a community or private group action?
@@ -2040,7 +1910,7 @@ class DFRN
 			 * valid community action. Also forum_mode makes it valid for sure.
 			 * If neither, it's not.
 			 */
-			if ($is_a_remote_action && $community && (!$r[0]["forum_mode"]) && (!$r[0]["wall"])) {
+			if ($is_a_remote_action && $community && (!$parent["forum_mode"]) && (!$parent["wall"])) {
 				$is_a_remote_action = false;
 				Logger::log("not a community action");
 			}
@@ -2087,29 +1957,23 @@ class DFRN
 			}
 
 			if ($Blink && Strings::compareLink($Blink, DI::baseUrl() . "/profile/" . $importer["nickname"])) {
-				$author = DBA::selectFirst('contact', ['name', 'thumb', 'url'], ['id' => $item['author-id']]);
+				$author = DBA::selectFirst('contact', ['id', 'name', 'thumb', 'url'], ['id' => $item['author-id']]);
 
-				$parent = Item::selectFirst(['id'], ['uri' => $item['parent-uri'], 'uid' => $importer["importer_uid"]]);
+				$parent = Post::selectFirst(['id'], ['uri' => $item['thr-parent'], 'uid' => $importer["importer_uid"]]);
 				$item['parent'] = $parent['id'];
 
 				// send a notification
 				notification(
 					[
-					"type"         => Type::POKE,
-					"notify_flags" => $importer["notify-flags"],
-					"language"     => $importer["language"],
-					"to_name"      => $importer["username"],
-					"to_email"     => $importer["email"],
-					"uid"          => $importer["importer_uid"],
-					"item"         => $item,
-					"link"         => DI::baseUrl()."/display/".urlencode($item['guid']),
-					"source_name"  => $author["name"],
-					"source_link"  => $author["url"],
-					"source_photo" => $author["thumb"],
-					"verb"         => $item["verb"],
-					"otype"        => "person",
-					"activity"     => $verb,
-					"parent"       => $item['parent']]
+					"type"     => Notification\Type::POKE,
+					"otype"    => Notification\ObjectType::PERSON,
+					"activity" => $verb,
+					"verb"     => $item["verb"],
+					"uid"      => $importer["importer_uid"],
+					"cid"      => $author["id"],
+					"item"     => $item,
+					"link"     => DI::baseUrl() . "/display/" . urlencode($item['guid']),
+					]
 				);
 			}
 		}
@@ -2171,16 +2035,16 @@ class DFRN
 				$is_like = true;
 				$item["gravity"] = GRAVITY_ACTIVITY;
 				// only one like or dislike per person
-				// splitted into two queries for performance issues
+				// split into two queries for performance issues
 				$condition = ['uid' => $item["uid"], 'author-id' => $item["author-id"], 'gravity' => GRAVITY_ACTIVITY,
-					'verb' => $item["verb"], 'parent-uri' => $item["parent-uri"]];
-				if (Item::exists($condition)) {
+					'verb' => $item['verb'], 'parent-uri' => $item['thr-parent']];
+				if (Post::exists($condition)) {
 					return false;
 				}
 
 				$condition = ['uid' => $item["uid"], 'author-id' => $item["author-id"], 'gravity' => GRAVITY_ACTIVITY,
-					'verb' => $item["verb"], 'thr-parent' => $item["parent-uri"]];
-				if (Item::exists($condition)) {
+					'verb' => $item['verb'], 'thr-parent' => $item['thr-parent']];
+				if (Post::exists($condition)) {
 					return false;
 				}
 
@@ -2198,7 +2062,7 @@ class DFRN
 				$xt = XML::parseString($item["target"]);
 
 				if ($xt->type == Activity\ObjectType::NOTE) {
-					$item_tag = Item::selectFirst(['id', 'uri-id', 'tag'], ['uri' => $xt->id, 'uid' => $importer["importer_uid"]]);
+					$item_tag = Post::selectFirst(['id', 'uri-id'], ['uri' => $xt->id, 'uid' => $importer["importer_uid"]]);
 
 					if (!DBA::isResult($item_tag)) {
 						Logger::log("Query failed to execute, no result returned in " . __FUNCTION__);
@@ -2227,9 +2091,9 @@ class DFRN
 	{
 		$rel = "";
 		$href = "";
-		$type = "";
-		$length = "0";
-		$title = "";
+		$type = null;
+		$length = null;
+		$title = null;
 		foreach ($links as $link) {
 			foreach ($link->attributes as $attributes) {
 				switch ($attributes->name) {
@@ -2246,19 +2110,33 @@ class DFRN
 						$item["plink"] = $href;
 						break;
 					case "enclosure":
-						if (!empty($item["attach"])) {
-							$item["attach"] .= ",";
-						} else {
-							$item["attach"] = "";
-						}
-
-						$item["attach"] .= '[attach]href="' . $href . '" length="' . $length . '" type="' . $type . '" title="' . $title . '"[/attach]';
+						Post\Media::insert(['uri-id' => $item['uri-id'], 'type' => Post\Media::DOCUMENT,
+							'url' => $href, 'mimetype' => $type, 'size' => $length, 'description' => $title]);
 						break;
 				}
 			}
 		}
 	}
 
+	/**
+	 * Checks if an incoming message is wanted
+	 *
+	 * @param array $item
+	 * @return boolean Is the message wanted?
+	 */
+	private static function isSolicitedMessage(array $item)
+	{
+		if (DBA::exists('contact', ["`nurl` = ? AND `uid` != ? AND `rel` IN (?, ?)",
+			Strings::normaliseLink($item["author-link"]), 0, Contact::FRIEND, Contact::SHARING])) {
+			Logger::info('Author has got followers - accepted', ['uri' => $item['uri'], 'author' => $item["author-link"]]);
+			return true;
+		}
+
+		$taglist = Tag::getByURIId($item['uri-id'], [Tag::HASHTAG]);
+		$tags = array_column($taglist, 'name');
+		return Relay::isSolicitedPost($tags, $item['body'], $item['author-id'], $item['uri'], Protocol::DFRN);
+	}
+
 	/**
 	 * Processes the entry elements which contain the items and comments
 	 *
@@ -2272,13 +2150,13 @@ class DFRN
 	 * @throws \ImagickException
 	 * @todo  Add type-hints
 	 */
-	private static function processEntry($header, $xpath, $entry, $importer, $xml)
+	private static function processEntry($header, $xpath, $entry, $importer, $xml, $protocol)
 	{
 		Logger::log("Processing entries");
 
 		$item = $header;
 
-		$item["protocol"] = Conversation::PARCEL_DFRN;
+		$item["protocol"] = $protocol;
 
 		$item["source"] = $xml;
 
@@ -2287,7 +2165,7 @@ class DFRN
 
 		$item["edited"] = XML::getFirstNodeValue($xpath, "atom:updated/text()", $entry);
 
-		$current = Item::selectFirst(['id', 'uid', 'edited', 'body'],
+		$current = Post::selectFirst(['id', 'uid', 'edited', 'body'],
 			['uri' => $item["uri"], 'uid' => $importer["importer_uid"]]
 		);
 		// Is there an existing item?
@@ -2437,17 +2315,25 @@ class DFRN
 		}
 
 		// Is it a reply or a top level posting?
-		$item["parent-uri"] = $item["uri"];
+		$item['thr-parent'] = $item['uri'];
 
 		$inreplyto = $xpath->query("thr:in-reply-to", $entry);
 		if (is_object($inreplyto->item(0))) {
 			foreach ($inreplyto->item(0)->attributes as $attributes) {
 				if ($attributes->name == "ref") {
-					$item["parent-uri"] = $attributes->textContent;
+					$item['thr-parent'] = $attributes->textContent;
 				}
 			}
 		}
 
+		// Check if the message is wanted
+		if (($importer['importer_uid'] == 0) && ($item['uri'] == $item['thr-parent'])) {
+			if (!self::isSolicitedMessage($item)) {
+				DBA::delete('item-uri', ['uri' => $item['uri']]);
+				return 403;
+			}
+		}
+				
 		// Get the type of the item (Top level post, reply or remote reply)
 		$entrytype = self::getEntryType($importer, $item);
 
@@ -2490,13 +2376,17 @@ class DFRN
 				$ev = Event::fromBBCode($item["body"]);
 				if ((!empty($ev['desc']) || !empty($ev['summary'])) && !empty($ev['start'])) {
 					Logger::log("Event in item ".$item["uri"]." was found.", Logger::DEBUG);
-					$ev["cid"]     = $importer["id"];
-					$ev["uid"]     = $importer["importer_uid"];
-					$ev["uri"]     = $item["uri"];
-					$ev["edited"]  = $item["edited"];
-					$ev["private"] = $item["private"];
-					$ev["guid"]    = $item["guid"];
-					$ev["plink"]   = $item["plink"];
+					$ev["cid"]       = $importer["id"];
+					$ev["uid"]       = $importer["importer_uid"];
+					$ev["uri"]       = $item["uri"];
+					$ev["edited"]    = $item["edited"];
+					$ev["private"]   = $item["private"];
+					$ev["guid"]      = $item["guid"];
+					$ev["plink"]     = $item["plink"];
+					$ev["network"]   = $item["network"];
+					$ev["protocol"]  = $item["protocol"];
+					$ev["direction"] = $item["direction"];
+					$ev["source"]    = $item["source"];
 
 					$condition = ['uri' => $item["uri"], 'uid' => $importer["importer_uid"]];
 					$event = DBA::selectFirst('event', ['id'], $condition);
@@ -2534,6 +2424,11 @@ 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;
+			}
+
 			$posted_id = Item::insert($item);
 			if ($posted_id) {
 				Logger::log("Reply from contact ".$item["contact-id"]." was stored with id ".$posted_id, Logger::DEBUG);
@@ -2615,14 +2510,14 @@ class DFRN
 		}
 
 		$condition = ['uri' => $uri, 'uid' => $importer["importer_uid"]];
-		$item = Item::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;
 		}
 
@@ -2635,7 +2530,7 @@ class DFRN
 		// Comments can be deleted by the thread owner or comment owner
 		if (($item['gravity'] != GRAVITY_PARENT) && ($item['contact-id'] != $importer["id"])) {
 			$condition = ['id' => $item['parent'], 'contact-id' => $importer["id"]];
-			if (!Item::exists($condition)) {
+			if (!Post::exists($condition)) {
 				Logger::log("Item with uri " . $uri . " wasn't found or mustn't be deleted by contact " . $importer["id"] . " - ignoring deletion.", Logger::DEBUG);
 				return;
 			}
@@ -2653,15 +2548,16 @@ class DFRN
 	/**
 	 * Imports a DFRN message
 	 *
-	 * @param string $xml          The DFRN message
-	 * @param array  $importer     Record of the importer user mixed with contact of the content
-	 * @param bool   $sort_by_date Is used when feeds are polled
+	 * @param string $xml       The DFRN message
+	 * @param array  $importer  Record of the importer user mixed with contact of the content
+	 * @param int    $protocol  Transport protocol
+	 * @param int    $direction Is the message pushed or pulled?
 	 * @return integer Import status
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 * @todo  set proper type-hints
 	 */
-	public static function import($xml, $importer, $sort_by_date = false)
+	public static function import($xml, $importer, $protocol, $direction)
 	{
 		if ($xml == "") {
 			return 400;
@@ -2688,6 +2584,11 @@ class DFRN
 		$header["wall"] = 0;
 		$header["origin"] = 0;
 		$header["contact-id"] = $importer["id"];
+		$header["direction"] = $direction;
+
+		if ($direction === Conversation::RELAY) {
+			$header['post-type'] = Item::PT_RELAY;
+		}
 
 		// Update the contact table if the data has changed
 
@@ -2765,30 +2666,21 @@ class DFRN
 		}
 
 		$deletions = $xpath->query("/atom:feed/at:deleted-entry");
-		foreach ($deletions as $deletion) {
-			self::processDeletion($xpath, $deletion, $importer);
-		}
-
-		if (!$sort_by_date) {
-			$entries = $xpath->query("/atom:feed/atom:entry");
-			foreach ($entries as $entry) {
-				self::processEntry($header, $xpath, $entry, $importer, $xml);
+		if (!empty($deletions)) {
+			foreach ($deletions as $deletion) {
+				self::processDeletion($xpath, $deletion, $importer);
 			}
-		} else {
-			$newentries = [];
-			$entries = $xpath->query("/atom:feed/atom:entry");
-			foreach ($entries as $entry) {
-				$created = XML::getFirstNodeValue($xpath, "atom:published/text()", $entry);
-				$newentries[strtotime($created)] = $entry;
+			if (count($deletions) > 0) {
+				Logger::notice('Deletions had been processed');
+				return 200;
 			}
+		}
 
-			// Now sort after the publishing date
-			ksort($newentries);
-
-			foreach ($newentries as $entry) {
-				self::processEntry($header, $xpath, $entry, $importer, $xml);
-			}
+		$entries = $xpath->query("/atom:feed/atom:entry");
+		foreach ($entries as $entry) {
+			self::processEntry($header, $xpath, $entry, $importer, $xml, $protocol);
 		}
+
 		Logger::log("Import done for user " . $importer["importer_uid"] . " from contact " . $importer["id"], Logger::DEBUG);
 		return 200;
 	}
@@ -2814,7 +2706,7 @@ class DFRN
 
 		// check that the message originated elsewhere and is a top-level post
 
-		if ($item['wall'] || $item['origin'] || ($item['uri'] != $item['parent-uri'])) {
+		if ($item['wall'] || $item['origin'] || ($item['uri'] != $item['thr-parent'])) {
 			return false;
 		}