X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FDiaspora.php;h=1daea43fd46aa1d67614469bd6d3c7d114903220;hb=eea355ae3b3d0c9a47fa6153f3a73b4b29cd81ac;hp=a9025c5a4c5dd36c85985f0a9cfd9fc1ebe24f2a;hpb=2987070d93a43114104aa01e19ff901cfb145816;p=friendica.git

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index a9025c5a4c..1daea43fd4 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.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
  *
@@ -22,7 +22,6 @@
 namespace Friendica\Protocol;
 
 use Friendica\Content\Feature;
-use Friendica\Content\PageInfo;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\Markdown;
 use Friendica\Core\Cache\Duration;
@@ -35,6 +34,7 @@ use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Conversation;
 use Friendica\Model\FContact;
+use Friendica\Model\GServer;
 use Friendica\Model\Item;
 use Friendica\Model\ItemURI;
 use Friendica\Model\Mail;
@@ -76,9 +76,9 @@ class Diaspora
 			return $contacts;
 		}
 
-		$items = Item::select(['author-id', 'author-link', 'parent-author-link', 'parent-guid', 'guid'],
+		$items = Post::select(['author-id', 'author-link', 'parent-author-link', 'parent-guid', 'guid'],
 			['parent' => $item['parent'], 'gravity' => [GRAVITY_COMMENT, GRAVITY_ACTIVITY]]);
-		while ($item = DBA::fetch($items)) {
+		while ($item = Post::fetch($items)) {
 			$contact = DBA::selectFirst('contact', ['id', 'url', 'name', 'protocol', 'batch', 'network'],
 				['id' => $item['author-id']]);
 			if (!DBA::isResult($contact) || empty($contact['batch']) ||
@@ -118,14 +118,14 @@ class Diaspora
 		$basedom = XML::parseString($envelope, true);
 
 		if (!is_object($basedom)) {
-			Logger::log("Envelope is no XML file");
+			Logger::notice("Envelope is no XML file");
 			return false;
 		}
 
 		$children = $basedom->children('http://salmon-protocol.org/ns/magic-env');
 
 		if (sizeof($children) == 0) {
-			Logger::log("XML has no children");
+			Logger::notice("XML has no children");
 			return false;
 		}
 
@@ -150,19 +150,19 @@ class Diaspora
 		$signable_data = $msg.".".Strings::base64UrlEncode($type).".".Strings::base64UrlEncode($encoding).".".Strings::base64UrlEncode($alg);
 
 		if ($handle == '') {
-			Logger::log('No author could be decoded. Discarding. Message: ' . $envelope);
+			Logger::notice('No author could be decoded. Discarding. Message: ' . $envelope);
 			return false;
 		}
 
 		$key = self::key($handle);
 		if ($key == '') {
-			Logger::log("Couldn't get a key for handle " . $handle . ". Discarding.");
+			Logger::notice("Couldn't get a key for handle " . $handle . ". Discarding.");
 			return false;
 		}
 
 		$verify = Crypto::rsaVerify($signable_data, $sig, $key);
 		if (!$verify) {
-			Logger::log('Message from ' . $handle . ' did not verify. Discarding.');
+			Logger::notice('Message from ' . $handle . ' did not verify. Discarding.');
 			return false;
 		}
 
@@ -225,7 +225,7 @@ class Diaspora
 			$j_outer_key_bundle = json_decode($outer_key_bundle);
 
 			if (!is_object($j_outer_key_bundle)) {
-				Logger::log('Outer Salmon did not verify. Discarding.');
+				Logger::notice('Outer Salmon did not verify. Discarding.');
 				if ($no_exit) {
 					return false;
 				} else {
@@ -244,7 +244,7 @@ class Diaspora
 		$basedom = XML::parseString($xml, true);
 
 		if (!is_object($basedom)) {
-			Logger::log('Received data does not seem to be an XML. Discarding. '.$xml);
+			Logger::notice('Received data does not seem to be an XML. Discarding. '.$xml);
 			if ($no_exit) {
 				return false;
 			} else {
@@ -270,7 +270,7 @@ class Diaspora
 		$key_id = $base->sig[0]->attributes()->key_id[0];
 		$author_addr = base64_decode($key_id);
 		if ($author_addr == '') {
-			Logger::log('No author could be decoded. Discarding. Message: ' . $xml);
+			Logger::notice('No author could be decoded. Discarding. Message: ' . $xml);
 			if ($no_exit) {
 				return false;
 			} else {
@@ -280,7 +280,7 @@ class Diaspora
 
 		$key = self::key($author_addr);
 		if ($key == '') {
-			Logger::log("Couldn't get a key for handle " . $author_addr . ". Discarding.");
+			Logger::notice("Couldn't get a key for handle " . $author_addr . ". Discarding.");
 			if ($no_exit) {
 				return false;
 			} else {
@@ -290,7 +290,7 @@ class Diaspora
 
 		$verify = Crypto::rsaVerify($signed_data, $signature, $key);
 		if (!$verify) {
-			Logger::log('Message did not verify. Discarding.');
+			Logger::notice('Message did not verify. Discarding.');
 			if ($no_exit) {
 				return false;
 			} else {
@@ -378,7 +378,7 @@ class Diaspora
 		}
 
 		if (!$base) {
-			Logger::log('unable to locate salmon data in xml');
+			Logger::notice('unable to locate salmon data in xml');
 			throw new \Friendica\Network\HTTPException\BadRequestException();
 		}
 
@@ -416,29 +416,29 @@ class Diaspora
 		}
 
 		if (!$author_link) {
-			Logger::log('Could not retrieve author URI.');
+			Logger::notice('Could not retrieve author URI.');
 			throw new \Friendica\Network\HTTPException\BadRequestException();
 		}
 		// Once we have the author URI, go to the web and try to find their public key
 		// (first this will look it up locally if it is in the fcontact cache)
 		// This will also convert diaspora public key from pkcs#1 to pkcs#8
 
-		Logger::log('Fetching key for '.$author_link);
+		Logger::notice('Fetching key for '.$author_link);
 		$key = self::key($author_link);
 
 		if (!$key) {
-			Logger::log('Could not retrieve author key.');
+			Logger::notice('Could not retrieve author key.');
 			throw new \Friendica\Network\HTTPException\BadRequestException();
 		}
 
 		$verify = Crypto::rsaVerify($signed_data, $signature, $key);
 
 		if (!$verify) {
-			Logger::log('Message did not verify. Discarding.');
+			Logger::notice('Message did not verify. Discarding.');
 			throw new \Friendica\Network\HTTPException\BadRequestException();
 		}
 
-		Logger::log('Message verified.');
+		Logger::notice('Message verified.');
 
 		return ['message' => (string)$inner_decrypted,
 				'author' => XML::unescape($author_link),
@@ -460,12 +460,12 @@ class Diaspora
 	{
 		$enabled = intval(DI::config()->get("system", "diaspora_enabled"));
 		if (!$enabled) {
-			Logger::log("diaspora is disabled");
+			Logger::notice("diaspora is disabled");
 			return false;
 		}
 
 		if (!($fields = self::validPosting($msg))) {
-			Logger::log("Invalid posting");
+			Logger::notice("Invalid posting");
 			return false;
 		}
 
@@ -497,7 +497,7 @@ class Diaspora
 		if (is_null($fields)) {
 			$private = true;
 			if (!($fields = self::validPosting($msg))) {
-				Logger::log("Invalid posting");
+				Logger::notice("Invalid posting");
 				return false;
 			}
 		} else {
@@ -511,7 +511,7 @@ class Diaspora
 		switch ($type) {
 			case "account_migration":
 				if (!$private) {
-					Logger::log('Message with type ' . $type . ' is not private, quitting.');
+					Logger::notice('Message with type ' . $type . ' is not private, quitting.');
 					return false;
 				}
 				return self::receiveAccountMigration($importer, $fields);
@@ -524,14 +524,14 @@ class Diaspora
 
 			case "contact":
 				if (!$private) {
-					Logger::log('Message with type ' . $type . ' is not private, quitting.');
+					Logger::notice('Message with type ' . $type . ' is not private, quitting.');
 					return false;
 				}
 				return self::receiveContactRequest($importer, $fields);
 
 			case "conversation":
 				if (!$private) {
-					Logger::log('Message with type ' . $type . ' is not private, quitting.');
+					Logger::notice('Message with type ' . $type . ' is not private, quitting.');
 					return false;
 				}
 				return self::receiveConversation($importer, $msg, $fields);
@@ -541,14 +541,14 @@ class Diaspora
 
 			case "message":
 				if (!$private) {
-					Logger::log('Message with type ' . $type . ' is not private, quitting.');
+					Logger::notice('Message with type ' . $type . ' is not private, quitting.');
 					return false;
 				}
 				return self::receiveMessage($importer, $fields);
 
 			case "participation":
 				if (!$private) {
-					Logger::log('Message with type ' . $type . ' is not private, quitting.');
+					Logger::notice('Message with type ' . $type . ' is not private, quitting.');
 					return false;
 				}
 				return self::receiveParticipation($importer, $fields, $fetched);
@@ -561,7 +561,7 @@ class Diaspora
 
 			case "profile":
 				if (!$private) {
-					Logger::log('Message with type ' . $type . ' is not private, quitting.');
+					Logger::notice('Message with type ' . $type . ' is not private, quitting.');
 					return false;
 				}
 				return self::receiveProfile($importer, $fields);
@@ -576,7 +576,7 @@ class Diaspora
 				return self::receiveStatusMessage($importer, $fields, $msg["message"], $fetched);
 
 			default:
-				Logger::log("Unknown message type ".$type);
+				Logger::notice("Unknown message type ".$type);
 				return false;
 		}
 	}
@@ -616,7 +616,7 @@ class Diaspora
 		$type = $element->getName();
 		$orig_type = $type;
 
-		Logger::log("Got message type ".$type.": ".$msg["message"], Logger::DATA);
+		Logger::debug("Got message type ".$type.": ".$msg["message"]);
 
 		// All retractions are handled identically from now on.
 		// In the new version there will only be "retraction".
@@ -692,7 +692,7 @@ class Diaspora
 		// This is something that shouldn't happen at all.
 		if (in_array($type, ["status_message", "reshare", "profile"])) {
 			if ($msg["author"] != $fields->author) {
-				Logger::log("Message handle is not the same as envelope sender. Quitting this message.");
+				Logger::notice("Message handle is not the same as envelope sender. Quitting this message.");
 				return false;
 			}
 		}
@@ -703,7 +703,7 @@ class Diaspora
 		}
 		// No author_signature? This is a must, so we quit.
 		if (!isset($author_signature)) {
-			Logger::log("No author signature for type ".$type." - Message: ".$msg["message"], Logger::DEBUG);
+			Logger::info("No author signature for type ".$type." - Message: ".$msg["message"]);
 			return false;
 		}
 
@@ -715,7 +715,7 @@ class Diaspora
 			}
 
 			if (!Crypto::rsaVerify($signed_data, $parent_author_signature, $key, "sha256")) {
-				Logger::log("No valid parent author signature for parent author ".$msg["author"]. " in type ".$type." - signed data: ".$signed_data." - Message: ".$msg["message"]." - Signature ".$parent_author_signature, Logger::DEBUG);
+				Logger::info("No valid parent author signature for parent author ".$msg["author"]. " in type ".$type." - signed data: ".$signed_data." - Message: ".$msg["message"]." - Signature ".$parent_author_signature);
 				return false;
 			}
 		}
@@ -727,7 +727,7 @@ class Diaspora
 		}
 
 		if (!Crypto::rsaVerify($signed_data, $author_signature, $key, "sha256")) {
-			Logger::log("No valid author signature for author ".$fields->author. " in type ".$type." - signed data: ".$signed_data." - Message: ".$msg["message"]." - Signature ".$author_signature, Logger::DEBUG);
+			Logger::info("No valid author signature for author ".$fields->author. " in type ".$type." - signed data: ".$signed_data." - Message: ".$msg["message"]." - Signature ".$author_signature);
 			return false;
 		} else {
 			return $fields;
@@ -747,7 +747,7 @@ class Diaspora
 	{
 		$handle = strval($handle);
 
-		Logger::log("Fetching diaspora key for: ".$handle);
+		Logger::notice("Fetching diaspora key for: ".$handle);
 
 		$r = FContact::getByURL($handle);
 		if ($r) {
@@ -768,36 +768,19 @@ class Diaspora
 	 */
 	private static function handleFromContact($contact_id, $pcontact_id = 0)
 	{
-		$handle = false;
-
-		Logger::log("contact id is ".$contact_id." - pcontact id is ".$pcontact_id, Logger::DEBUG);
+		$handle = '';
 
 		if ($pcontact_id != 0) {
-			$contact = DBA::selectFirst('contact', ['addr'], ['id' => $pcontact_id]);
-
-			if (DBA::isResult($contact) && !empty($contact["addr"])) {
-				return strtolower($contact["addr"]);
+			$contact = Contact::getById($pcontact_id, ['addr']);
+			if (DBA::isResult($contact)) {
+				$handle = $contact['addr'];
 			}
 		}
 
-		$r = q(
-			"SELECT `network`, `addr`, `self`, `url`, `nick` FROM `contact` WHERE `id` = %d",
-			intval($contact_id)
-		);
-
-		if (DBA::isResult($r)) {
-			$contact = $r[0];
-
-			Logger::log("contact 'self' = ".$contact['self']." 'url' = ".$contact['url'], Logger::DEBUG);
-
-			if ($contact['addr'] != "") {
+		if (empty($handle)) {
+			$contact = Contact::getById($contact_id, ['addr']);
+			if (DBA::isResult($contact)) {
 				$handle = $contact['addr'];
-			} else {
-				$baseurl_start = strpos($contact['url'], '://') + 3;
-				// allows installations in a subdirectory--not sure how Diaspora will handle
-				$baseurl_length = strpos($contact['url'], '/profile') - $baseurl_start;
-				$baseurl = substr($contact['url'], $baseurl_start, $baseurl_length);
-				$handle = $contact['nick'].'@'.$baseurl;
 			}
 		}
 
@@ -861,7 +844,7 @@ class Diaspora
 		//	);
 		//
 		//	$contact["rel"] = Contact::FRIEND;
-		//	Logger::log("defining user ".$contact["nick"]." as friend");
+		//	Logger::notice("defining user ".$contact["nick"]." as friend");
 		//}
 
 		// Contact server is blocked
@@ -902,7 +885,7 @@ class Diaspora
 	{
 		$contact = self::contactByHandle($importer["uid"], $handle);
 		if (!$contact) {
-			Logger::log("A Contact for handle ".$handle." and user ".$importer["uid"]." was not found");
+			Logger::notice("A Contact for handle ".$handle." and user ".$importer["uid"]." was not found");
 			// If a contact isn't found, we accept it anyway if it is a comment
 			if ($is_comment && ($importer["uid"] != 0)) {
 				return self::contactByHandle(0, $handle);
@@ -914,7 +897,7 @@ class Diaspora
 		}
 
 		if (!self::postAllow($importer, $contact, $is_comment)) {
-			Logger::log("The handle: ".$handle." is not allowed to post to user ".$importer["uid"]);
+			Logger::notice("The handle: ".$handle." is not allowed to post to user ".$importer["uid"]);
 			return false;
 		}
 		return $contact;
@@ -931,9 +914,9 @@ class Diaspora
 	 */
 	private static function messageExists($uid, $guid)
 	{
-		$item = Item::selectFirst(['id'], ['uid' => $uid, 'guid' => $guid]);
+		$item = Post::selectFirst(['id'], ['uid' => $uid, 'guid' => $guid]);
 		if (DBA::isResult($item)) {
-			Logger::log("message ".$guid." already exists for user ".$uid);
+			Logger::notice("message ".$guid." already exists for user ".$uid);
 			return $item["id"];
 		}
 
@@ -1039,7 +1022,7 @@ class Diaspora
 
 		$server = $serverparts["scheme"]."://".$serverparts["host"];
 
-		Logger::log("Trying to fetch item ".$guid." from ".$server, Logger::DEBUG);
+		Logger::info("Trying to fetch item ".$guid." from ".$server);
 
 		$msg = self::message($guid, $server);
 
@@ -1047,7 +1030,7 @@ class Diaspora
 			return false;
 		}
 
-		Logger::log("Successfully fetched item ".$guid." from ".$server, Logger::DEBUG);
+		Logger::info("Successfully fetched item ".$guid." from ".$server);
 
 		// Now call the dispatcher
 		return self::dispatchPublic($msg, true);
@@ -1066,7 +1049,7 @@ class Diaspora
 	 *      'key' => The public key of the author
 	 * @throws \Exception
 	 */
-	private static function message($guid, $server, $level = 0)
+	public static function message($guid, $server, $level = 0)
 	{
 		if ($level > 5) {
 			return false;
@@ -1075,16 +1058,16 @@ class Diaspora
 		// This will work for new Diaspora servers and Friendica servers from 3.5
 		$source_url = $server."/fetch/post/".urlencode($guid);
 
-		Logger::log("Fetch post from ".$source_url, Logger::DEBUG);
+		Logger::info("Fetch post from ".$source_url);
 
-		$envelope = DI::httpRequest()->fetch($source_url);
+		$envelope = DI::httpClient()->fetch($source_url);
 		if ($envelope) {
-			Logger::log("Envelope was fetched.", Logger::DEBUG);
+			Logger::info("Envelope was fetched.");
 			$x = self::verifyMagicEnvelope($envelope);
 			if (!$x) {
-				Logger::log("Envelope could not be verified.", Logger::DEBUG);
+				Logger::info("Envelope could not be verified.");
 			} else {
-				Logger::log("Envelope was verified.", Logger::DEBUG);
+				Logger::info("Envelope was verified.");
 			}
 		} else {
 			$x = false;
@@ -1102,11 +1085,11 @@ class Diaspora
 
 		if ($source_xml->post->reshare) {
 			// Reshare of a reshare - old Diaspora version
-			Logger::log("Message is a reshare", Logger::DEBUG);
+			Logger::info("Message is a reshare");
 			return self::message($source_xml->post->reshare->root_guid, $server, ++$level);
 		} elseif ($source_xml->getName() == "reshare") {
 			// Reshare of a reshare - new Diaspora version
-			Logger::log("Message is a new reshare", Logger::DEBUG);
+			Logger::info("Message is a new reshare");
 			return self::message($source_xml->root_guid, $server, ++$level);
 		}
 
@@ -1121,7 +1104,7 @@ class Diaspora
 
 		// If this isn't a "status_message" then quit
 		if (!$author) {
-			Logger::log("Message doesn't seem to be a status message", Logger::DEBUG);
+			Logger::info("Message doesn't seem to be a status message");
 			return false;
 		}
 
@@ -1151,7 +1134,7 @@ class Diaspora
 
 		$guid = urldecode($matches[2]);
 
-		$item = Item::selectFirst(['id'], ['guid' => $guid, 'uid' => $uid]);
+		$item = Post::selectFirst(['id'], ['guid' => $guid, 'uid' => $uid]);
 		if (DBA::isResult($item)) {
 			Logger::info('Found', ['id' => $item['id']]);
 			return $item['id'];
@@ -1161,7 +1144,7 @@ class Diaspora
 		$ret = self::storeByGuid($guid, $matches[1], $uid);
 		Logger::info('Result', ['ret' => $ret]);
 
-		$item = Item::selectFirst(['id'], ['guid' => $guid, 'uid' => $uid]);
+		$item = Post::selectFirst(['id'], ['guid' => $guid, 'uid' => $uid]);
 		if (DBA::isResult($item)) {
 			Logger::info('Found', ['id' => $item['id']]);
 			return $item['id'];
@@ -1188,7 +1171,7 @@ class Diaspora
 			'author-name', 'author-link', 'author-avatar', 'gravity',
 			'owner-name', 'owner-link', 'owner-avatar'];
 		$condition = ['uid' => $uid, 'guid' => $guid];
-		$item = Item::selectFirst($fields, $condition);
+		$item = Post::selectFirst($fields, $condition);
 
 		if (!DBA::isResult($item)) {
 			$person = FContact::getByURL($author);
@@ -1200,17 +1183,17 @@ class Diaspora
 			}
 
 			if ($result) {
-				Logger::log("Fetched missing item ".$guid." - result: ".$result, Logger::DEBUG);
+				Logger::info("Fetched missing item ".$guid." - result: ".$result);
 
-				$item = Item::selectFirst($fields, $condition);
+				$item = Post::selectFirst($fields, $condition);
 			}
 		}
 
 		if (!DBA::isResult($item)) {
-			Logger::log("parent item not found: parent: ".$guid." - user: ".$uid);
+			Logger::notice("parent item not found: parent: ".$guid." - user: ".$uid);
 			return false;
 		} else {
-			Logger::log("parent item found: parent: ".$guid." - user: ".$uid);
+			Logger::notice("parent item found: parent: ".$guid." - user: ".$uid);
 			return $item;
 		}
 	}
@@ -1265,7 +1248,7 @@ class Diaspora
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	private static function plink($addr, $guid, $parent_guid = '')
+	private static function plink(string $addr, string $guid, string $parent_guid = '')
 	{
 		$contact = Contact::getByURL($addr);
 		if (empty($contact)) {
@@ -1331,23 +1314,23 @@ class Diaspora
 	 */
 	private static function receiveAccountMigration(array $importer, $data)
 	{
-		$old_handle = Strings::escapeTags(XML::unescape($data->author));
-		$new_handle = Strings::escapeTags(XML::unescape($data->profile->author));
-		$signature = Strings::escapeTags(XML::unescape($data->signature));
+		$old_handle = XML::unescape($data->author);
+		$new_handle = XML::unescape($data->profile->author);
+		$signature = XML::unescape($data->signature);
 
 		$contact = self::contactByHandle($importer["uid"], $old_handle);
 		if (!$contact) {
-			Logger::log("cannot find contact for sender: ".$old_handle." and user ".$importer["uid"]);
+			Logger::notice("cannot find contact for sender: ".$old_handle." and user ".$importer["uid"]);
 			return false;
 		}
 
-		Logger::log("Got migration for ".$old_handle.", to ".$new_handle." with user ".$importer["uid"]);
+		Logger::notice("Got migration for ".$old_handle.", to ".$new_handle." with user ".$importer["uid"]);
 
 		// Check signature
 		$signed_text = 'AccountMigration:'.$old_handle.':'.$new_handle;
 		$key = self::key($old_handle);
 		if (!Crypto::rsaVerify($signed_text, $signature, $key, "sha256")) {
-			Logger::log('No valid signature for migration.');
+			Logger::notice('No valid signature for migration.');
 			return false;
 		}
 
@@ -1357,7 +1340,7 @@ class Diaspora
 		// change the technical stuff in contact
 		$data = Probe::uri($new_handle);
 		if ($data['network'] == Protocol::PHANTOM) {
-			Logger::log('Account for '.$new_handle." couldn't be probed.");
+			Logger::notice('Account for '.$new_handle." couldn't be probed.");
 			return false;
 		}
 
@@ -1367,9 +1350,9 @@ class Diaspora
 				'notify' => $data['notify'], 'poll' => $data['poll'],
 				'network' => $data['network']];
 
-		DBA::update('contact', $fields, ['addr' => $old_handle]);
+		Contact::update($fields, ['addr' => $old_handle]);
 
-		Logger::log('Contacts are updated.');
+		Logger::notice('Contacts are updated.');
 
 		return true;
 	}
@@ -1384,7 +1367,7 @@ class Diaspora
 	 */
 	private static function receiveAccountDeletion($data)
 	{
-		$author = Strings::escapeTags(XML::unescape($data->author));
+		$author = XML::unescape($data->author);
 
 		$contacts = DBA::select('contact', ['id'], ['addr' => $author]);
 		while ($contact = DBA::fetch($contacts)) {
@@ -1392,7 +1375,7 @@ class Diaspora
 		}
 		DBA::close($contacts);
 
-		Logger::log('Removed contacts for ' . $author);
+		Logger::notice('Removed contacts for ' . $author);
 
 		return true;
 	}
@@ -1410,7 +1393,7 @@ class Diaspora
 	 */
 	private static function getUriFromGuid($author, $guid, $onlyfound = false)
 	{
-		$item = Item::selectFirst(['uri'], ['guid' => $guid]);
+		$item = Post::selectFirst(['uri'], ['guid' => $guid]);
 		if (DBA::isResult($item)) {
 			return $item["uri"];
 		} elseif (!$onlyfound) {
@@ -1426,25 +1409,6 @@ class Diaspora
 		return "";
 	}
 
-	/**
-	 * Fetch the guid from our database with a given uri
-	 *
-	 * @param string $uri Message uri
-	 * @param string $uid Author handle
-	 *
-	 * @return string The post guid
-	 * @throws \Exception
-	 */
-	private static function getGuidFromUri($uri, $uid)
-	{
-		$item = Item::selectFirst(['guid'], ['uri' => $uri, 'uid' => $uid]);
-		if (DBA::isResult($item)) {
-			return $item["guid"];
-		} else {
-			return false;
-		}
-	}
-
 	/**
 	 * Store the mentions in the tag table
 	 *
@@ -1494,19 +1458,19 @@ class Diaspora
 	 */
 	private static function receiveComment(array $importer, $sender, $data, $xml, bool $fetched)
 	{
-		$author = Strings::escapeTags(XML::unescape($data->author));
-		$guid = Strings::escapeTags(XML::unescape($data->guid));
-		$parent_guid = Strings::escapeTags(XML::unescape($data->parent_guid));
+		$author = XML::unescape($data->author);
+		$guid = XML::unescape($data->guid);
+		$parent_guid = XML::unescape($data->parent_guid);
 		$text = XML::unescape($data->text);
 
 		if (isset($data->created_at)) {
-			$created_at = DateTimeFormat::utc(Strings::escapeTags(XML::unescape($data->created_at)));
+			$created_at = DateTimeFormat::utc(XML::unescape($data->created_at));
 		} else {
 			$created_at = DateTimeFormat::utcNow();
 		}
 
 		if (isset($data->thread_parent_guid)) {
-			$thread_parent_guid = Strings::escapeTags(XML::unescape($data->thread_parent_guid));
+			$thread_parent_guid = XML::unescape($data->thread_parent_guid);
 			$thr_parent = self::getUriFromGuid("", $thread_parent_guid, true);
 		} else {
 			$thr_parent = "";
@@ -1517,6 +1481,10 @@ class Diaspora
 			return false;
 		}
 
+		if (!empty($contact['gsid'])) {
+			GServer::setProtocol($contact['gsid'], Post\DeliveryData::DIASPORA);
+		}
+
 		$message_id = self::messageExists($importer["uid"], $guid);
 		if ($message_id) {
 			return true;
@@ -1529,7 +1497,7 @@ class Diaspora
 
 		$person = FContact::getByURL($author);
 		if (!is_array($person)) {
-			Logger::log("unable to find author details");
+			Logger::notice("unable to find author details");
 			return false;
 		}
 
@@ -1550,11 +1518,11 @@ class Diaspora
 
 		// Will be overwritten for sharing accounts in Item::insert
 		if ($fetched) {
-			$datarray["post-type"] = Item::PT_FETCHED;
+			$datarray["post-reason"] = Item::PR_FETCHED;
 		} elseif ($datarray["uid"] == 0) {
-			$datarray["post-type"] = Item::PT_GLOBAL;
+			$datarray["post-reason"] = Item::PR_GLOBAL;
 		} else {
-			$datarray["post-type"] = Item::PT_COMMENT;
+			$datarray["post-reason"] = Item::PR_COMMENT;
 		}
 
 		$datarray["guid"] = $guid;
@@ -1567,6 +1535,7 @@ class Diaspora
 		$datarray['thr-parent'] = $thr_parent ?: $toplevel_parent_item['uri'];
 
 		$datarray["object-type"] = Activity\ObjectType::COMMENT;
+		$datarray["post-type"] = Item::PT_NOTE;
 
 		$datarray["protocol"] = Conversation::PARCEL_DIASPORA;
 		$datarray["source"] = $xml;
@@ -1602,7 +1571,7 @@ class Diaspora
 		}
 
 		if ($message_id) {
-			Logger::log("Stored comment ".$datarray["guid"]." with message id ".$message_id, Logger::DEBUG);
+			Logger::info("Stored comment ".$datarray["guid"]." with message id ".$message_id);
 			if ($datarray['uid'] == 0) {
 				Item::distribute($message_id, json_encode($data));
 			}
@@ -1626,27 +1595,27 @@ class Diaspora
 	 */
 	private static function receiveConversationMessage(array $importer, array $contact, $data, $msg, $mesg, $conversation)
 	{
-		$author = Strings::escapeTags(XML::unescape($data->author));
-		$guid = Strings::escapeTags(XML::unescape($data->guid));
-		$subject = Strings::escapeTags(XML::unescape($data->subject));
+		$author = XML::unescape($data->author);
+		$guid = XML::unescape($data->guid);
+		$subject = XML::unescape($data->subject);
 
 		// "diaspora_handle" is the element name from the old version
 		// "author" is the element name from the new version
 		if ($mesg->author) {
-			$msg_author = Strings::escapeTags(XML::unescape($mesg->author));
+			$msg_author = XML::unescape($mesg->author);
 		} elseif ($mesg->diaspora_handle) {
-			$msg_author = Strings::escapeTags(XML::unescape($mesg->diaspora_handle));
+			$msg_author = XML::unescape($mesg->diaspora_handle);
 		} else {
 			return false;
 		}
 
-		$msg_guid = Strings::escapeTags(XML::unescape($mesg->guid));
-		$msg_conversation_guid = Strings::escapeTags(XML::unescape($mesg->conversation_guid));
+		$msg_guid = XML::unescape($mesg->guid);
+		$msg_conversation_guid = XML::unescape($mesg->conversation_guid);
 		$msg_text = XML::unescape($mesg->text);
-		$msg_created_at = DateTimeFormat::utc(Strings::escapeTags(XML::unescape($mesg->created_at)));
+		$msg_created_at = DateTimeFormat::utc(XML::unescape($mesg->created_at));
 
 		if ($msg_conversation_guid != $guid) {
-			Logger::log("message conversation guid does not belong to the current conversation.");
+			Logger::notice("message conversation guid does not belong to the current conversation.");
 			return false;
 		}
 
@@ -1683,16 +1652,16 @@ class Diaspora
 	 */
 	private static function receiveConversation(array $importer, $msg, $data)
 	{
-		$author = Strings::escapeTags(XML::unescape($data->author));
-		$guid = Strings::escapeTags(XML::unescape($data->guid));
-		$subject = Strings::escapeTags(XML::unescape($data->subject));
-		$created_at = DateTimeFormat::utc(Strings::escapeTags(XML::unescape($data->created_at)));
-		$participants = Strings::escapeTags(XML::unescape($data->participants));
+		$author = XML::unescape($data->author);
+		$guid = XML::unescape($data->guid);
+		$subject = XML::unescape($data->subject);
+		$created_at = DateTimeFormat::utc(XML::unescape($data->created_at));
+		$participants = XML::unescape($data->participants);
 
 		$messages = $data->message;
 
 		if (!count($messages)) {
-			Logger::log("empty conversation");
+			Logger::notice("empty conversation");
 			return false;
 		}
 
@@ -1701,25 +1670,26 @@ class Diaspora
 			return false;
 		}
 
+		if (!empty($contact['gsid'])) {
+			GServer::setProtocol($contact['gsid'], Post\DeliveryData::DIASPORA);
+		}
+
 		$conversation = DBA::selectFirst('conv', [], ['uid' => $importer["uid"], 'guid' => $guid]);
 		if (!DBA::isResult($conversation)) {
-			$r = q(
-				"INSERT INTO `conv` (`uid`, `guid`, `creator`, `created`, `updated`, `subject`, `recips`)
-				VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s')",
-				intval($importer["uid"]),
-				DBA::escape($guid),
-				DBA::escape($author),
-				DBA::escape($created_at),
-				DBA::escape(DateTimeFormat::utcNow()),
-				DBA::escape($subject),
-				DBA::escape($participants)
-			);
+			$r = DBA::insert('conv', [
+				'uid'     => $importer['uid'],
+				'guid'    => $guid,
+				'creator' => $author,
+				'created' => $created_at,
+				'updated' => DateTimeFormat::utcNow(),
+				'subject' => $subject,
+				'recips'  => $participants]);
 			if ($r) {
 				$conversation = DBA::selectFirst('conv', [], ['uid' => $importer["uid"], 'guid' => $guid]);
 			}
 		}
 		if (!$conversation) {
-			Logger::log("unable to create conversation.");
+			Logger::notice("unable to create conversation.");
 			return false;
 		}
 
@@ -1743,11 +1713,11 @@ class Diaspora
 	 */
 	private static function receiveLike(array $importer, $sender, $data, bool $fetched)
 	{
-		$author = Strings::escapeTags(XML::unescape($data->author));
-		$guid = Strings::escapeTags(XML::unescape($data->guid));
-		$parent_guid = Strings::escapeTags(XML::unescape($data->parent_guid));
-		$parent_type = Strings::escapeTags(XML::unescape($data->parent_type));
-		$positive = Strings::escapeTags(XML::unescape($data->positive));
+		$author = XML::unescape($data->author);
+		$guid = XML::unescape($data->guid);
+		$parent_guid = XML::unescape($data->parent_guid);
+		$parent_type = XML::unescape($data->parent_type);
+		$positive = XML::unescape($data->positive);
 
 		// likes on comments aren't supported by Diaspora - only on posts
 		// But maybe this will be supported in the future, so we will accept it.
@@ -1760,6 +1730,10 @@ class Diaspora
 			return false;
 		}
 
+		if (!empty($contact['gsid'])) {
+			GServer::setProtocol($contact['gsid'], Post\DeliveryData::DIASPORA);
+		}
+
 		$message_id = self::messageExists($importer["uid"], $guid);
 		if ($message_id) {
 			return true;
@@ -1772,7 +1746,7 @@ class Diaspora
 
 		$person = FContact::getByURL($author);
 		if (!is_array($person)) {
-			Logger::log("unable to find author details");
+			Logger::notice("unable to find author details");
 			return false;
 		}
 
@@ -1815,7 +1789,7 @@ class Diaspora
 
 		// like on comments have the comment as parent. So we need to fetch the toplevel parent
 		if ($toplevel_parent_item['gravity'] != GRAVITY_PARENT) {
-			$toplevel = Item::selectFirst(['origin'], ['id' => $toplevel_parent_item['parent']]);
+			$toplevel = Post::selectFirst(['origin'], ['id' => $toplevel_parent_item['parent']]);
 			$origin = $toplevel["origin"];
 		} else {
 			$origin = $toplevel_parent_item["origin"];
@@ -1839,7 +1813,7 @@ class Diaspora
 		}
 
 		if ($message_id) {
-			Logger::log("Stored like ".$datarray["guid"]." with message id ".$message_id, Logger::DEBUG);
+			Logger::info("Stored like ".$datarray["guid"]." with message id ".$message_id);
 			if ($datarray['uid'] == 0) {
 				Item::distribute($message_id, json_encode($data));
 			}
@@ -1859,24 +1833,28 @@ class Diaspora
 	 */
 	private static function receiveMessage(array $importer, $data)
 	{
-		$author = Strings::escapeTags(XML::unescape($data->author));
-		$guid = Strings::escapeTags(XML::unescape($data->guid));
-		$conversation_guid = Strings::escapeTags(XML::unescape($data->conversation_guid));
+		$author = XML::unescape($data->author);
+		$guid = XML::unescape($data->guid);
+		$conversation_guid = XML::unescape($data->conversation_guid);
 		$text = XML::unescape($data->text);
-		$created_at = DateTimeFormat::utc(Strings::escapeTags(XML::unescape($data->created_at)));
+		$created_at = DateTimeFormat::utc(XML::unescape($data->created_at));
 
 		$contact = self::allowedContactByHandle($importer, $author, true);
 		if (!$contact) {
 			return false;
 		}
 
+		if (!empty($contact['gsid'])) {
+			GServer::setProtocol($contact['gsid'], Post\DeliveryData::DIASPORA);
+		}
+
 		$conversation = null;
 
 		$condition = ['uid' => $importer["uid"], 'guid' => $conversation_guid];
 		$conversation = DBA::selectFirst('conv', [], $condition);
 
 		if (!DBA::isResult($conversation)) {
-			Logger::log("conversation not available.");
+			Logger::notice("conversation not available.");
 			return false;
 		}
 
@@ -1884,7 +1862,7 @@ class Diaspora
 
 		$person = FContact::getByURL($author);
 		if (!$person) {
-			Logger::log("unable to find author details");
+			Logger::notice("unable to find author details");
 			return false;
 		}
 
@@ -1921,15 +1899,19 @@ class Diaspora
 	 */
 	private static function receiveParticipation(array $importer, $data, bool $fetched)
 	{
-		$author = strtolower(Strings::escapeTags(XML::unescape($data->author)));
-		$guid = Strings::escapeTags(XML::unescape($data->guid));
-		$parent_guid = Strings::escapeTags(XML::unescape($data->parent_guid));
+		$author = strtolower(XML::unescape($data->author));
+		$guid = XML::unescape($data->guid);
+		$parent_guid = XML::unescape($data->parent_guid);
 
 		$contact = self::allowedContactByHandle($importer, $author, true);
 		if (!$contact) {
 			return false;
 		}
 
+		if (!empty($contact['gsid'])) {
+			GServer::setProtocol($contact['gsid'], Post\DeliveryData::DIASPORA);
+		}
+
 		if (self::messageExists($importer["uid"], $guid)) {
 			return true;
 		}
@@ -1950,7 +1932,7 @@ class Diaspora
 
 		$person = FContact::getByURL($author);
 		if (!is_array($person)) {
-			Logger::log("Person not found: ".$author);
+			Logger::notice("Person not found: ".$author);
 			return false;
 		}
 
@@ -1993,9 +1975,9 @@ class Diaspora
 		Logger::info('Participation stored', ['id' => $message_id, 'guid' => $guid, 'parent_guid' => $parent_guid, 'author' => $author]);
 
 		// Send all existing comments and likes to the requesting server
-		$comments = Item::select(['id', 'uri-id', 'parent-author-network', 'author-network', 'verb'],
+		$comments = Post::select(['id', 'uri-id', 'parent-author-network', 'author-network', 'verb'],
 			['parent' => $toplevel_parent_item['id'], 'gravity' => [GRAVITY_COMMENT, GRAVITY_ACTIVITY]]);
-		while ($comment = Item::fetch($comments)) {
+		while ($comment = Post::fetch($comments)) {
 			if (in_array($comment['verb'], [Activity::FOLLOW, Activity::TAG])) {
 				Logger::info('participation messages are not relayed', ['item' => $comment['id']]);
 				continue;
@@ -2062,7 +2044,7 @@ class Diaspora
 	 */
 	private static function receiveProfile(array $importer, $data)
 	{
-		$author = strtolower(Strings::escapeTags(XML::unescape($data->author)));
+		$author = strtolower(XML::unescape($data->author));
 
 		$contact = self::contactByHandle($importer["uid"], $author);
 		if (!$contact) {
@@ -2127,9 +2109,9 @@ class Diaspora
 			$fields['bd'] = $birthday;
 		}
 
-		DBA::update('contact', $fields, ['id' => $contact['id']]);
+		Contact::update($fields, ['id' => $contact['id']]);
 
-		Logger::log("Profile of contact ".$contact["id"]." stored for user ".$importer["uid"], Logger::DEBUG);
+		Logger::info("Profile of contact ".$contact["id"]." stored for user ".$importer["uid"]);
 
 		return true;
 	}
@@ -2191,7 +2173,7 @@ class Diaspora
 		// That makes us friends.
 		if ($contact) {
 			if ($following) {
-				Logger::log("Author ".$author." (Contact ".$contact["id"].") wants to follow us.", Logger::DEBUG);
+				Logger::info("Author ".$author." (Contact ".$contact["id"].") wants to follow us.");
 				self::receiveRequestMakeFriend($importer, $contact);
 
 				// refetch the contact array
@@ -2202,36 +2184,36 @@ class Diaspora
 				if (in_array($contact["rel"], [Contact::FRIEND])) {
 					$user = DBA::selectFirst('user', [], ['uid' => $importer["uid"]]);
 					if (DBA::isResult($user)) {
-						Logger::log("Sending share message to author ".$author." - Contact: ".$contact["id"]." - User: ".$importer["uid"], Logger::DEBUG);
+						Logger::info("Sending share message to author ".$author." - Contact: ".$contact["id"]." - User: ".$importer["uid"]);
 						self::sendShare($user, $contact);
 					}
 				}
 				return true;
 			} else {
-				Logger::log("Author ".$author." doesn't want to follow us anymore.", Logger::DEBUG);
-				Contact::removeFollower($importer, $contact);
+				Logger::info("Author ".$author." doesn't want to follow us anymore.");
+				Contact::removeFollower($contact);
 				return true;
 			}
 		}
 
 		if (!$following && $sharing && in_array($importer["page-flags"], [User::PAGE_FLAGS_SOAPBOX, User::PAGE_FLAGS_NORMAL])) {
-			Logger::log("Author ".$author." wants to share with us - but doesn't want to listen. Request is ignored.", Logger::DEBUG);
+			Logger::info("Author ".$author." wants to share with us - but doesn't want to listen. Request is ignored.");
 			return false;
 		} elseif (!$following && !$sharing) {
-			Logger::log("Author ".$author." doesn't want anything - and we don't know the author. Request is ignored.", Logger::DEBUG);
+			Logger::info("Author ".$author." doesn't want anything - and we don't know the author. Request is ignored.");
 			return false;
 		} elseif (!$following && $sharing) {
-			Logger::log("Author ".$author." wants to share with us.", Logger::DEBUG);
+			Logger::info("Author ".$author." wants to share with us.");
 		} elseif ($following && $sharing) {
-			Logger::log("Author ".$author." wants to have a bidirectional conection.", Logger::DEBUG);
+			Logger::info("Author ".$author." wants to have a bidirectional conection.");
 		} elseif ($following && !$sharing) {
-			Logger::log("Author ".$author." wants to listen to us.", Logger::DEBUG);
+			Logger::info("Author ".$author." wants to listen to us.");
 		}
 
 		$ret = FContact::getByURL($author);
 
 		if (!$ret || ($ret["network"] != Protocol::DIASPORA)) {
-			Logger::log("Cannot resolve diaspora handle ".$author." for ".$recipient);
+			Logger::notice("Cannot resolve diaspora handle ".$author." for ".$recipient);
 			return false;
 		}
 
@@ -2277,7 +2259,7 @@ class Diaspora
 	public static function originalItem($guid, $orig_author)
 	{
 		if (empty($guid)) {
-			Logger::log('Empty guid. Quitting.');
+			Logger::notice('Empty guid. Quitting.');
 			return false;
 		}
 
@@ -2285,10 +2267,10 @@ class Diaspora
 		$fields = ['body', 'title', 'app', 'created', 'object-type', 'uri', 'guid',
 			'author-name', 'author-link', 'author-avatar', 'plink', 'uri-id'];
 		$condition = ['guid' => $guid, 'visible' => true, 'deleted' => false, 'private' => [Item::PUBLIC, Item::UNLISTED]];
-		$item = Item::selectFirst($fields, $condition);
+		$item = Post::selectFirst($fields, $condition);
 
 		if (DBA::isResult($item)) {
-			Logger::log("reshared message ".$guid." already exists on system.");
+			Logger::notice("reshared message ".$guid." already exists on system.");
 
 			// Maybe it is already a reshared item?
 			// Then refetch the content, if it is a reshare from a reshare.
@@ -2300,9 +2282,6 @@ class Diaspora
 
 				$item["body"] = self::replacePeopleGuid($item["body"], $item["author-link"]);
 
-				// Add OEmbed and other information to the body
-				$item["body"] = PageInfo::searchAndAppendToBody($item["body"], false, true);
-
 				return $item;
 			} else {
 				return $item;
@@ -2311,17 +2290,17 @@ class Diaspora
 
 		if (!DBA::isResult($item)) {
 			if (empty($orig_author)) {
-				Logger::log('Empty author for guid ' . $guid . '. Quitting.');
+				Logger::notice('Empty author for guid ' . $guid . '. Quitting.');
 				return false;
 			}
 
 			$server = "https://".substr($orig_author, strpos($orig_author, "@") + 1);
-			Logger::log("1st try: reshared message ".$guid." will be fetched via SSL from the server ".$server);
+			Logger::notice("1st try: reshared message ".$guid." will be fetched via SSL from the server ".$server);
 			$stored = self::storeByGuid($guid, $server);
 
 			if (!$stored) {
 				$server = "http://".substr($orig_author, strpos($orig_author, "@") + 1);
-				Logger::log("2nd try: reshared message ".$guid." will be fetched without SSL from the server ".$server);
+				Logger::notice("2nd try: reshared message ".$guid." will be fetched without SSL from the server ".$server);
 				$stored = self::storeByGuid($guid, $server);
 			}
 
@@ -2329,7 +2308,7 @@ class Diaspora
 				$fields = ['body', 'title', 'app', 'created', 'object-type', 'uri', 'guid',
 					'author-name', 'author-link', 'author-avatar', 'plink', 'uri-id'];
 				$condition = ['guid' => $guid, 'visible' => true, 'deleted' => false, 'private' => [Item::PUBLIC, Item::UNLISTED]];
-				$item = Item::selectFirst($fields, $condition);
+				$item = Post::selectFirst($fields, $condition);
 
 				if (DBA::isResult($item)) {
 					// If it is a reshared post from another network then reformat to avoid display problems with two share elements
@@ -2355,7 +2334,7 @@ class Diaspora
 	 */
 	private static function addReshareActivity($item, $parent_message_id, $guid, $author)
 	{
-		$parent = Item::selectFirst(['uri', 'guid'], ['id' => $parent_message_id]);
+		$parent = Post::selectFirst(['uri', 'guid'], ['id' => $parent_message_id]);
 
 		$datarray = [];
 
@@ -2413,19 +2392,23 @@ class Diaspora
 	 */
 	private static function receiveReshare(array $importer, $data, $xml, bool $fetched)
 	{
-		$author = Strings::escapeTags(XML::unescape($data->author));
-		$guid = Strings::escapeTags(XML::unescape($data->guid));
-		$created_at = DateTimeFormat::utc(Strings::escapeTags(XML::unescape($data->created_at)));
-		$root_author = Strings::escapeTags(XML::unescape($data->root_author));
-		$root_guid = Strings::escapeTags(XML::unescape($data->root_guid));
+		$author = XML::unescape($data->author);
+		$guid = XML::unescape($data->guid);
+		$created_at = DateTimeFormat::utc(XML::unescape($data->created_at));
+		$root_author = XML::unescape($data->root_author);
+		$root_guid = XML::unescape($data->root_guid);
 		/// @todo handle unprocessed property "provider_display_name"
-		$public = Strings::escapeTags(XML::unescape($data->public));
+		$public = XML::unescape($data->public);
 
 		$contact = self::allowedContactByHandle($importer, $author, false);
 		if (!$contact) {
 			return false;
 		}
 
+		if (!empty($contact['gsid'])) {
+			GServer::setProtocol($contact['gsid'], Post\DeliveryData::DIASPORA);
+		}
+
 		$message_id = self::messageExists($importer["uid"], $guid);
 		if ($message_id) {
 			return true;
@@ -2436,6 +2419,10 @@ class Diaspora
 			return false;
 		}
 
+		if (empty($original_item['plink'])) {
+			$original_item['plink'] = self::plink($root_author, $root_guid);
+		}
+
 		$datarray = [];
 
 		$datarray["uid"] = $importer["uid"];
@@ -2478,7 +2465,6 @@ class Diaspora
 
 		Tag::storeFromBody($datarray['uri-id'], $datarray["body"]);
 
-		Post\Media::copy($original_item['uri-id'], $datarray['uri-id']);
 		$datarray["app"]  = $original_item["app"];
 
 		$datarray["plink"] = self::plink($author, $guid);
@@ -2504,7 +2490,7 @@ class Diaspora
 		}
 
 		if ($message_id) {
-			Logger::log("Stored reshare ".$datarray["guid"]." with message id ".$message_id, Logger::DEBUG);
+			Logger::info("Stored reshare ".$datarray["guid"]." with message id ".$message_id);
 			if ($datarray['uid'] == 0) {
 				Item::distribute($message_id);
 			}
@@ -2526,13 +2512,13 @@ class Diaspora
 	 */
 	private static function itemRetraction(array $importer, array $contact, $data)
 	{
-		$author = Strings::escapeTags(XML::unescape($data->author));
-		$target_guid = Strings::escapeTags(XML::unescape($data->target_guid));
-		$target_type = Strings::escapeTags(XML::unescape($data->target_type));
+		$author = XML::unescape($data->author);
+		$target_guid = XML::unescape($data->target_guid);
+		$target_type = XML::unescape($data->target_type);
 
 		$person = FContact::getByURL($author);
 		if (!is_array($person)) {
-			Logger::log("unable to find author detail for ".$author);
+			Logger::notice("unable to find author detail for ".$author);
 			return false;
 		}
 
@@ -2541,7 +2527,7 @@ class Diaspora
 		}
 
 		// Fetch items that are about to be deleted
-		$fields = ['uid', 'id', 'parent', 'author-link', 'file'];
+		$fields = ['uid', 'id', 'parent', 'author-link', 'uri-id'];
 
 		// When we receive a public retraction, we delete every item that we find.
 		if ($importer['uid'] == 0) {
@@ -2550,31 +2536,32 @@ class Diaspora
 			$condition = ['guid' => $target_guid, 'deleted' => false, 'uid' => $importer['uid']];
 		}
 
-		$r = Item::select($fields, $condition);
+		$r = Post::select($fields, $condition);
 		if (!DBA::isResult($r)) {
-			Logger::log("Target guid ".$target_guid." was not found on this system for user ".$importer['uid'].".");
+			Logger::notice("Target guid ".$target_guid." was not found on this system for user ".$importer['uid'].".");
 			return false;
 		}
 
-		while ($item = Item::fetch($r)) {
-			if (strstr($item['file'], '[')) {
-				Logger::log("Target guid " . $target_guid . " for user " . $item['uid'] . " is filed. So it won't be deleted.", Logger::DEBUG);
+		while ($item = Post::fetch($r)) {
+			if (DBA::exists('post-category', ['uri-id' => $item['uri-id'], 'uid' => $item['uid'], 'type' => Post\Category::FILE])) {
+				Logger::info("Target guid " . $target_guid . " for user " . $item['uid'] . " is filed. So it won't be deleted.");
 				continue;
 			}
 
 			// Fetch the parent item
-			$parent = Item::selectFirst(['author-link'], ['id' => $item['parent']]);
+			$parent = Post::selectFirst(['author-link'], ['id' => $item['parent']]);
 
 			// Only delete it if the parent author really fits
 			if (!Strings::compareLink($parent["author-link"], $contact["url"]) && !Strings::compareLink($item["author-link"], $contact["url"])) {
-				Logger::log("Thread author ".$parent["author-link"]." and item author ".$item["author-link"]." don't fit to expected contact ".$contact["url"], Logger::DEBUG);
+				Logger::info("Thread author ".$parent["author-link"]." and item author ".$item["author-link"]." don't fit to expected contact ".$contact["url"]);
 				continue;
 			}
 
 			Item::markForDeletion(['id' => $item['id']]);
 
-			Logger::log("Deleted target ".$target_guid." (".$item["id"].") from user ".$item["uid"]." parent: ".$item['parent'], Logger::DEBUG);
+			Logger::info("Deleted target ".$target_guid." (".$item["id"].") from user ".$item["uid"]." parent: ".$item['parent']);
 		}
+		DBA::close($r);
 
 		return true;
 	}
@@ -2591,11 +2578,11 @@ class Diaspora
 	 */
 	private static function receiveRetraction(array $importer, $sender, $data)
 	{
-		$target_type = Strings::escapeTags(XML::unescape($data->target_type));
+		$target_type = XML::unescape($data->target_type);
 
 		$contact = self::contactByHandle($importer["uid"], $sender);
 		if (!$contact && (in_array($target_type, ["Contact", "Person"]))) {
-			Logger::log("cannot find contact for sender: ".$sender." and user ".$importer["uid"]);
+			Logger::notice("cannot find contact for sender: ".$sender." and user ".$importer["uid"]);
 			return false;
 		}
 
@@ -2603,7 +2590,7 @@ class Diaspora
 			$contact = [];
 		}
 
-		Logger::log("Got retraction for ".$target_type.", sender ".$sender." and user ".$importer["uid"], Logger::DEBUG);
+		Logger::info("Got retraction for ".$target_type.", sender ".$sender." and user ".$importer["uid"]);
 
 		switch ($target_type) {
 			case "Comment":
@@ -2619,7 +2606,7 @@ class Diaspora
 				break;
 
 			default:
-				Logger::log("Unknown target type ".$target_type);
+				Logger::notice("Unknown target type ".$target_type);
 				return false;
 		}
 		return true;
@@ -2681,18 +2668,22 @@ class Diaspora
 	 */
 	private static function receiveStatusMessage(array $importer, SimpleXMLElement $data, $xml, bool $fetched)
 	{
-		$author = Strings::escapeTags(XML::unescape($data->author));
-		$guid = Strings::escapeTags(XML::unescape($data->guid));
-		$created_at = DateTimeFormat::utc(Strings::escapeTags(XML::unescape($data->created_at)));
-		$public = Strings::escapeTags(XML::unescape($data->public));
+		$author = XML::unescape($data->author);
+		$guid = XML::unescape($data->guid);
+		$created_at = DateTimeFormat::utc(XML::unescape($data->created_at));
+		$public = XML::unescape($data->public);
 		$text = XML::unescape($data->text);
-		$provider_display_name = Strings::escapeTags(XML::unescape($data->provider_display_name));
+		$provider_display_name = XML::unescape($data->provider_display_name);
 
 		$contact = self::allowedContactByHandle($importer, $author, false);
 		if (!$contact) {
 			return false;
 		}
 
+		if (!empty($contact['gsid'])) {
+			GServer::setProtocol($contact['gsid'], Post\DeliveryData::DIASPORA);
+		}
+
 		$message_id = self::messageExists($importer["uid"], $guid);
 		if ($message_id) {
 			return true;
@@ -2701,7 +2692,7 @@ class Diaspora
 		$address = [];
 		if ($data->location) {
 			foreach ($data->location->children() as $fieldname => $data) {
-				$address[$fieldname] = Strings::escapeTags(XML::unescape($data));
+				$address[$fieldname] = XML::unescape($data);
 			}
 		}
 
@@ -2717,18 +2708,13 @@ class Diaspora
 		if ($data->photo) {
 			foreach ($data->photo as $photo) {
 				self::storePhotoAsMedia($datarray['uri-id'], $photo);
-				$body = "[img]".XML::unescape($photo->remote_photo_path).
-					XML::unescape($photo->remote_photo_name)."[/img]\n".$body;
 			}
 
 			$datarray["object-type"] = Activity\ObjectType::IMAGE;
+			$datarray["post-type"] = Item::PT_IMAGE;
 		} else {
 			$datarray["object-type"] = Activity\ObjectType::NOTE;
-
-			// Add OEmbed and other information to the body
-			if (!self::isHubzilla($contact["url"])) {
-				$body = PageInfo::searchAndAppendToBody($body, false, true);
-			}
+			$datarray["post-type"] = Item::PT_NOTE;
 		}
 
 		/// @todo enable support for polls
@@ -2758,9 +2744,9 @@ class Diaspora
 		$datarray["direction"] = $fetched ? Conversation::PULL : Conversation::PUSH;
 
 		if ($fetched) {
-			$datarray["post-type"] = Item::PT_FETCHED;
+			$datarray["post-reason"] = Item::PR_FETCHED;
 		} elseif ($datarray["uid"] == 0) {
-			$datarray["post-type"] = Item::PT_GLOBAL;
+			$datarray["post-reason"] = Item::PR_GLOBAL;
 		}
 
 		$datarray["body"] = self::replacePeopleGuid($body, $contact["url"]);
@@ -2802,7 +2788,7 @@ class Diaspora
 		self::sendParticipation($contact, $datarray);
 
 		if ($message_id) {
-			Logger::log("Stored item ".$datarray["guid"]." with message id ".$message_id, Logger::DEBUG);
+			Logger::info("Stored item ".$datarray["guid"]." with message id ".$message_id);
 			if ($datarray['uid'] == 0) {
 				Item::distribute($message_id);
 			}
@@ -2856,17 +2842,17 @@ class Diaspora
 	 */
 	public static function encodePrivateData($msg, array $user, array $contact, $prvkey, $pubkey)
 	{
-		Logger::log("Message: ".$msg, Logger::DATA);
+		Logger::debug("Message: ".$msg);
 
 		// without a public key nothing will work
 		if (!$pubkey) {
-			Logger::log("pubkey missing: contact id: ".$contact["id"]);
+			Logger::notice("pubkey missing: contact id: ".$contact["id"]);
 			return false;
 		}
 
-		$aes_key = openssl_random_pseudo_bytes(32);
+		$aes_key = random_bytes(32);
 		$b_aes_key = base64_encode($aes_key);
-		$iv = openssl_random_pseudo_bytes(16);
+		$iv = random_bytes(16);
 		$b_iv = base64_encode($iv);
 
 		$ciphertext = self::aesEncrypt($aes_key, $iv, $msg);
@@ -3007,23 +2993,23 @@ class Diaspora
 		}
 
 		if (!$dest_url) {
-			Logger::log("no url for contact: ".$contact["id"]." batch mode =".$public_batch);
+			Logger::notice("no url for contact: ".$contact["id"]." batch mode =".$public_batch);
 			return 0;
 		}
 
-		Logger::log("transmit: ".$logid."-".$guid." ".$dest_url);
+		Logger::notice("transmit: ".$logid."-".$guid." ".$dest_url);
 
 		if (!intval(DI::config()->get("system", "diaspora_test"))) {
 			$content_type = (($public_batch) ? "application/magic-envelope+xml" : "application/json");
 
-			$postResult = DI::httpRequest()->post($dest_url . "/", $envelope, ["Content-Type: " . $content_type]);
+			$postResult = DI::httpClient()->post($dest_url . "/", $envelope, ['Content-Type' => $content_type]);
 			$return_code = $postResult->getReturnCode();
 		} else {
-			Logger::log("test_mode");
+			Logger::notice("test_mode");
 			return 200;
 		}
 
-		Logger::log("transmit: ".$logid."-".$guid." to ".$dest_url." returns: ".$return_code);
+		Logger::notice("transmit: ".$logid."-".$guid." to ".$dest_url." returns: ".$return_code);
 
 		return $return_code ? $return_code : -1;
 	}
@@ -3062,9 +3048,6 @@ class Diaspora
 	{
 		$msg = self::buildPostXml($type, $message);
 
-		Logger::log('message: '.$msg, Logger::DATA);
-		Logger::log('send guid '.$guid, Logger::DEBUG);
-
 		// Fallback if the private key wasn't transmitted in the expected field
 		if (empty($owner['uprvkey'])) {
 			$owner['uprvkey'] = $owner['prvkey'];
@@ -3079,13 +3062,18 @@ class Diaspora
 			if (!empty($fcontact)) {
 				$pubkey = $fcontact['pubkey'];
 			}
+		} else {
+			// The "addr" field should always be filled.
+			// If this isn't the case, it will raise a notice some lines later.
+			// And in the log we will see where it came from and we can handle it there.
+			Logger::notice('Empty addr', ['contact' => $contact ?? [], 'callstack' => System::callstack(20)]);
 		}
 
 		$envelope = self::buildMessage($msg, $owner, $contact, $owner['uprvkey'], $pubkey, $public_batch);
 
 		$return_code = self::transmit($owner, $contact, $envelope, $public_batch, $guid);
 
-		Logger::log("guid: ".$guid." result ".$return_code, Logger::DEBUG);
+		Logger::info('Transmitted message', ['owner' => $owner['uid'], 'target' => $contact['addr'], 'type' => $type, 'guid' => $guid, 'result' => $return_code]);
 
 		return $return_code;
 	}
@@ -3117,8 +3105,10 @@ class Diaspora
 		// In fact it doesn't matter which user sends this - but it is needed by the protocol.
 		// If the item belongs to a user, we take this user id.
 		if ($item['uid'] == 0) {
-			$condition = ['verified' => true, 'blocked' => false, 'account_removed' => false, 'account_expired' => false];
-			$first_user = DBA::selectFirst('user', ['uid'], $condition);
+			// @todo Possibly use an administrator account?
+			$condition = ['verified' => true, 'blocked' => false,
+				'account_removed' => false, 'account_expired' => false, 'account-type' => User::ACCOUNT_TYPE_PERSON];
+			$first_user = DBA::selectFirst('user', ['uid'], $condition, ['order' => ['uid']]);
 			$owner = User::getOwnerDataById($first_user['uid']);
 		} else {
 			$owner = User::getOwnerDataById($item['uid']);
@@ -3131,7 +3121,7 @@ class Diaspora
 				"parent_type" => "Post",
 				"parent_guid" => $item["guid"]];
 
-		Logger::log("Send participation for ".$item["guid"]." by ".$author, Logger::DEBUG);
+		Logger::info("Send participation for ".$item["guid"]." by ".$author);
 
 		// It doesn't matter what we store, we only want to avoid sending repeated notifications for the same item
 		DI::cache()->set($cachekey, $item["guid"], Duration::QUARTER_HOUR);
@@ -3259,7 +3249,7 @@ class Diaspora
 
 		if (!empty($reshared['guid']) && $complete) {
 			$condition = ['guid' => $reshared['guid'], 'network' => [Protocol::DFRN, Protocol::DIASPORA]];
-			$item = Item::selectFirst(['contact-id'], $condition);
+			$item = Post::selectFirst(['contact-id'], $condition);
 			if (DBA::isResult($item)) {
 				$ret = [];
 				$ret["root_handle"] = self::handleFromContact($item["contact-id"]);
@@ -3300,29 +3290,18 @@ class Diaspora
 	 */
 	private static function buildEvent($event_id)
 	{
-		$r = q("SELECT `guid`, `uid`, `start`, `finish`, `nofinish`, `summary`, `desc`, `location`, `adjust` FROM `event` WHERE `id` = %d", intval($event_id));
-		if (!DBA::isResult($r)) {
+		$event = DBA::selectFirst('event', [], ['id' => $event_id]);
+		if (!DBA::isResult($event)) {
 			return [];
 		}
 
-		$event = $r[0];
-
 		$eventdata = [];
 
-		$r = q("SELECT `timezone` FROM `user` WHERE `uid` = %d", intval($event['uid']));
-		if (!DBA::isResult($r)) {
-			return [];
-		}
-
-		$user = $r[0];
-
-		$r = q("SELECT `addr`, `nick` FROM `contact` WHERE `uid` = %d AND `self`", intval($event['uid']));
-		if (!DBA::isResult($r)) {
+		$owner = User::getOwnerDataById($event['uid']);
+		if (!$owner) {
 			return [];
 		}
 
-		$owner = $r[0];
-
 		$eventdata['author'] = self::myHandle($owner);
 
 		if ($event['guid']) {
@@ -3335,8 +3314,8 @@ class Diaspora
 		$eventdata["all_day"] = "false";
 
 		$eventdata['timezone'] = 'UTC';
-		if (!$event['adjust'] && $user['timezone']) {
-			$eventdata['timezone'] = $user['timezone'];
+		if (!$event['adjust'] && $owner['timezone']) {
+			$eventdata['timezone'] = $owner['timezone'];
 		}
 
 		if ($event['start']) {
@@ -3410,7 +3389,7 @@ class Diaspora
 			$type = "reshare";
 		} else {
 			$title = $item["title"];
-			$body = $item["body"];
+			$body = Post\Media::addAttachmentsToBody($item['uri-id'], $item['body']);
 
 			// Fetch the title from an attached link - if there is one
 			if (empty($item["title"]) && DI::pConfig()->get($owner['uid'], 'system', 'attach_link_title')) {
@@ -3536,7 +3515,7 @@ class Diaspora
 	 */
 	private static function constructLike(array $item, array $owner)
 	{
-		$parent = Item::selectFirst(['guid', 'uri', 'thr-parent'], ['uri' => $item["thr-parent"]]);
+		$parent = Post::selectFirst(['guid', 'uri', 'thr-parent'], ['uri' => $item["thr-parent"]]);
 		if (!DBA::isResult($parent)) {
 			return false;
 		}
@@ -3568,7 +3547,7 @@ class Diaspora
 	 */
 	private static function constructAttend(array $item, array $owner)
 	{
-		$parent = Item::selectFirst(['guid'], ['uri' => $item['thr-parent']]);
+		$parent = Post::selectFirst(['guid'], ['uri' => $item['thr-parent']]);
 		if (!DBA::isResult($parent)) {
 			return false;
 		}
@@ -3584,7 +3563,7 @@ class Diaspora
 				$attend_answer = 'tentative';
 				break;
 			default:
-				Logger::log('Unknown verb '.$item['verb'].' in item '.$item['guid']);
+				Logger::notice('Unknown verb '.$item['verb'].' in item '.$item['guid']);
 				return false;
 		}
 
@@ -3613,7 +3592,7 @@ class Diaspora
 			return $result;
 		}
 
-		$toplevel_item = Item::selectFirst(['guid', 'author-id', 'author-link'], ['id' => $item['parent'], 'parent' => $item['parent']]);
+		$toplevel_item = Post::selectFirst(['guid', 'author-id', 'author-link', 'gravity'], ['id' => $item['parent'], 'parent' => $item['parent']]);
 		if (!DBA::isResult($toplevel_item)) {
 			Logger::error('Missing parent conversation item', ['parent' => $item['parent']]);
 			return false;
@@ -3621,10 +3600,10 @@ class Diaspora
 
 		$thread_parent_item = $toplevel_item;
 		if ($item['thr-parent'] != $item['parent-uri']) {
-			$thread_parent_item = Item::selectFirst(['guid', 'author-id', 'author-link'], ['uri' => $item['thr-parent'], 'uid' => $item['uid']]);
+			$thread_parent_item = Post::selectFirst(['guid', 'author-id', 'author-link', 'gravity'], ['uri' => $item['thr-parent'], 'uid' => $item['uid']]);
 		}
 
-		$body = $item["body"];
+		$body = Post\Media::addAttachmentsToBody($item['uri-id'], $item['body']);
 
 		// The replied to autor mention is prepended for clarity if:
 		// - Item replied isn't yours
@@ -3632,6 +3611,7 @@ class Diaspora
 		// - Implicit mentions are enabled
 		if (
 			$item['author-id'] != $thread_parent_item['author-id']
+			&& ($thread_parent_item['gravity'] != GRAVITY_PARENT)
 			&& (empty($item['uid']) || !Feature::isEnabled($item['uid'], 'explicit_mentions'))
 			&& !DI::config()->get('system', 'disable_implicit_mentions')
 		) {
@@ -3696,51 +3676,6 @@ class Diaspora
 		return self::buildAndTransmit($owner, $contact, $type, $message, $public_batch, $item["guid"]);
 	}
 
-	/**
-	 * Creates a message from a signature record entry
-	 *
-	 * @param array $item The item that will be exported
-	 * @return array The message
-	 */
-	private static function messageFromSignature(array $item)
-	{
-		// Split the signed text
-		$signed_parts = explode(";", $item['signed_text']);
-
-		if ($item["deleted"]) {
-			$message = ["author" => $item['signer'],
-					"target_guid" => $signed_parts[0],
-					"target_type" => $signed_parts[1]];
-		} elseif (in_array($item["verb"], [Activity::LIKE, Activity::DISLIKE])) {
-			$message = ["author" => $signed_parts[4],
-					"guid" => $signed_parts[1],
-					"parent_guid" => $signed_parts[3],
-					"parent_type" => $signed_parts[2],
-					"positive" => $signed_parts[0],
-					"author_signature" => $item['signature'],
-					"parent_author_signature" => ""];
-		} else {
-			// Remove the comment guid
-			$guid = array_shift($signed_parts);
-
-			// Remove the parent guid
-			$parent_guid = array_shift($signed_parts);
-
-			// Remove the handle
-			$handle = array_pop($signed_parts);
-
-			$message = [
-				"author" => $handle,
-				"guid" => $guid,
-				"parent_guid" => $parent_guid,
-				"text" => implode(";", $signed_parts),
-				"author_signature" => $item['signature'],
-				"parent_author_signature" => ""
-			];
-		}
-		return $message;
-	}
-
 	/**
 	 * Relays messages (like, comment, retraction) to other servers if we are the thread owner
 	 *
@@ -3762,7 +3697,7 @@ class Diaspora
 			$type = "comment";
 		}
 
-		Logger::log("Got relayable data ".$type." for item ".$item["guid"]." (".$item["id"].")", Logger::DEBUG);
+		Logger::info("Got relayable data ".$type." for item ".$item["guid"]." (".$item["id"].")");
 
 		$msg = json_decode($item['signed_text'], true);
 
@@ -3781,7 +3716,7 @@ class Diaspora
 				$message[$field] = $data;
 			}
 		} else {
-			Logger::log("Signature text for item ".$item["guid"]." (".$item["id"].") couldn't be extracted: ".$item['signed_text'], Logger::DEBUG);
+			Logger::info("Signature text for item ".$item["guid"]." (".$item["id"].") couldn't be extracted: ".$item['signed_text']);
 		}
 
 		$message["parent_author_signature"] = self::signature($owner, $message);
@@ -3843,7 +3778,7 @@ class Diaspora
 
 		$cnv = DBA::selectFirst('conv', [], ['id' => $item["convid"], 'uid' => $item["uid"]]);
 		if (!DBA::isResult($cnv)) {
-			Logger::log("conversation not found.");
+			Logger::notice("conversation not found.");
 			return;
 		}
 
@@ -3967,7 +3902,7 @@ class Diaspora
 			$dob = '';
 
 			if ($profile['dob'] && ($profile['dob'] > '0000-00-00')) {
-				list($year, $month, $day) = sscanf($profile['dob'], '%4d-%2d-%2d');
+				[$year, $month, $day] = sscanf($profile['dob'], '%4d-%2d-%2d');
 				if ($year < 1004) {
 					$year = 1004;
 				}
@@ -4027,13 +3962,7 @@ class Diaspora
 		}
 
 		if (!$recips) {
-			$recips = q(
-				"SELECT `id`,`name`,`network`,`pubkey`,`notify` FROM `contact` WHERE `network` = '%s'
-				AND `uid` = %d AND `rel` != %d",
-				DBA::escape(Protocol::DIASPORA),
-				intval($uid),
-				intval(Contact::SHARING)
-			);
+			$recips = DBA::selectToArray('contact', [], ['network' => Protocol::DIASPORA, 'uid' => $uid, 'rel' => [Contact::FOLLOWER, Contact::FRIEND]]);
 		}
 
 		if (!$recips) {
@@ -4044,7 +3973,7 @@ class Diaspora
 
 		// @ToDo Split this into single worker jobs
 		foreach ($recips as $recip) {
-			Logger::log("Send updated profile data for user ".$uid." to contact ".$recip["id"], Logger::DEBUG);
+			Logger::info("Send updated profile data for user ".$uid." to contact ".$recip["id"]);
 			self::buildAndTransmit($owner, $recip, "profile", $message);
 		}
 	}
@@ -4083,27 +4012,41 @@ class Diaspora
 	/**
 	 * Creates the signature for Comments that are created on our system
 	 *
-	 * @param integer $uid  The user of that comment
 	 * @param array   $item Item array
 	 *
 	 * @return array Signed content
 	 * @throws \Exception
 	 */
-	public static function createCommentSignature($uid, array $item)
+	public static function createCommentSignature(array $item)
 	{
+		if (!empty($item['author-link'])) {
+			$url = $item['author-link'];
+		} else {
+			$contact = Contact::getById($item['author-id'], ['url']);
+			if (empty($contact['url'])) {
+				Logger::warning('Author Contact not found', ['author-id' => $item['author-id']]);
+				return false;
+			}
+			$url = $contact['url'];
+		}
+
+		$uid = User::getIdForURL($url);
+		if (empty($uid)) {
+			Logger::info('No owner post, so not storing signature', ['url' => $contact['url']]);
+			return false;
+		}
+
 		$owner = User::getOwnerDataById($uid);
 		if (empty($owner)) {
 			Logger::info('No owner post, so not storing signature');
 			return false;
 		}
 
-		$parent = Item::selectFirst(['parent-uri'], ['uri' => $item['thr-parent']]);
-		if (!DBA::isResult($parent)) {
-			return;
+		// This is only needed for the automated tests
+		if (empty($owner['uprvkey'])) {
+			return false;
 		}
 
-		$item['parent-uri'] = $parent['parent-uri'];
-
 		$message = self::constructComment($item, $owner);
 		if ($message === false) {
 			return false;