X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FProtocol%2FDiaspora.php;h=7e85117110e5ff64c77f3d6b2fa7913207227ac4;hb=01bb05b502ab528ba777eefc85b5edc236d66b9b;hp=fb851e335603f0d4d1e4115864e16c2ef41b7094;hpb=5abc22f6c536b4fea7a5becd53561959ba0e7512;p=friendica.git

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index fb851e3356..7e85117110 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -10,6 +10,7 @@
 
 namespace Friendica\Protocol;
 
+use Friendica\Content\Feature;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\Markdown;
 use Friendica\Core\Cache;
@@ -53,6 +54,7 @@ class Diaspora
 	 * @param array   $contacts The previously fetched contacts
 	 *
 	 * @return array of relay servers
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function relayList($item_id, array $contacts = [])
 	{
@@ -138,6 +140,7 @@ class Diaspora
 	 *
 	 * @param string $server_url The url of the server
 	 * @return array with the contact
+	 * @throws \Exception
 	 */
 	private static function getRelayContact($server_url)
 	{
@@ -145,7 +148,7 @@ class Diaspora
 
 		// Fetch the relay contact
 		$condition = ['uid' => 0, 'nurl' => Strings::normaliseLink($server_url),
-			'contact-type' => Contact::ACCOUNT_TYPE_RELAY];
+			'contact-type' => Contact::TYPE_RELAY];
 		$contact = DBA::selectFirst('contact', $fields, $condition);
 
 		if (DBA::isResult($contact)) {
@@ -169,8 +172,9 @@ class Diaspora
 	/**
 	 * @brief Update or insert a relay contact
 	 *
-	 * @param string $server_url The url of the server
-	 * @param array $network_fields Optional network specific fields
+	 * @param string $server_url     The url of the server
+	 * @param array  $network_fields Optional network specific fields
+	 * @throws \Exception
 	 */
 	public static function setRelayContact($server_url, array $network_fields = [])
 	{
@@ -184,7 +188,7 @@ class Diaspora
 		$fields = array_merge($fields, $network_fields);
 
 		$condition = ['uid' => 0, 'nurl' => Strings::normaliseLink($server_url),
-			'contact-type' => Contact::ACCOUNT_TYPE_RELAY];
+			'contact-type' => Contact::TYPE_RELAY];
 
 		if (DBA::exists('contact', $condition)) {
 			unset($fields['created']);
@@ -204,6 +208,7 @@ class Diaspora
 	 * @param array   $contacts The previously fetched contacts
 	 *
 	 * @return array of relay servers
+	 * @throws \Exception
 	 */
 	public static function participantsForThread($thread, array $contacts)
 	{
@@ -250,6 +255,7 @@ class Diaspora
 	 * @param integer $level     This value is only set inside this function to avoid endless loops
 	 *
 	 * @return string the repaired signature
+	 * @throws \Exception
 	 */
 	private static function repairSignature($signature, $handle = "", $level = 1)
 	{
@@ -276,6 +282,8 @@ class Diaspora
 	 * @param string $envelope The magic envelope
 	 *
 	 * @return string verified data
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function verifyMagicEnvelope($envelope)
 	{
@@ -372,6 +380,8 @@ class Diaspora
 	 * 'message' -> decoded Diaspora XML message
 	 * 'author' -> author diaspora handle
 	 * 'key' -> author public key (converted to pkcs#8)
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function decodeRaw(array $importer, $raw, $no_exit = false)
 	{
@@ -475,6 +485,8 @@ class Diaspora
 	 * 'message' -> decoded Diaspora XML message
 	 * 'author' -> author diaspora handle
 	 * 'key' -> author public key (converted to pkcs#8)
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function decode(array $importer, $xml)
 	{
@@ -612,6 +624,8 @@ class Diaspora
 	 * @param array $msg The post that will be dispatched
 	 *
 	 * @return int The message id of the generated message, "true" or "false" if there was an error
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function dispatchPublic($msg)
 	{
@@ -626,7 +640,7 @@ class Diaspora
 			return false;
 		}
 
-		$importer = ["uid" => 0, "page-flags" => Contact::PAGE_FREELOVE];
+		$importer = ["uid" => 0, "page-flags" => User::PAGE_FLAGS_FREELOVE];
 		$success = self::dispatch($importer, $msg, $fields);
 
 		return $success;
@@ -635,13 +649,15 @@ class Diaspora
 	/**
 	 * @brief Dispatches the different message types to the different functions
 	 *
-	 * @param array  $importer Array of the importer user
-	 * @param array  $msg      The post that will be dispatched
-	 * @param object $fields   SimpleXML object that contains the message
+	 * @param array            $importer Array of the importer user
+	 * @param array            $msg      The post that will be dispatched
+	 * @param SimpleXMLElement $fields   SimpleXML object that contains the message
 	 *
 	 * @return int The message id of the generated message, "true" or "false" if there was an error
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
-	public static function dispatch(array $importer, $msg, $fields = null)
+	public static function dispatch(array $importer, $msg, SimpleXMLElement $fields = null)
 	{
 		// The sender is the handle of the contact that sent the message.
 		// This will often be different with relayed messages (for example "like" and "comment")
@@ -733,8 +749,6 @@ class Diaspora
 				Logger::log("Unknown message type ".$type);
 				return false;
 		}
-
-		return true;
 	}
 
 	/**
@@ -745,7 +759,9 @@ class Diaspora
 	 *
 	 * @param array $msg Array with the XML, the sender handle and the sender signature
 	 *
-	 * @return bool|array If the posting is valid then an array with an SimpleXML object is returned
+	 * @return bool|SimpleXMLElement If the posting is valid then an array with an SimpleXML object is returned
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function validPosting($msg)
 	{
@@ -894,6 +910,8 @@ class Diaspora
 	 * @param string $handle The handle
 	 *
 	 * @return string The public key
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function key($handle)
 	{
@@ -915,6 +933,8 @@ class Diaspora
 	 * @param string $handle The handle
 	 *
 	 * @return array the queried data
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function personByHandle($handle)
 	{
@@ -922,7 +942,7 @@ class Diaspora
 
 		$person = DBA::selectFirst('fcontact', [], ['network' => Protocol::DIASPORA, 'addr' => $handle]);
 		if (DBA::isResult($person)) {
-			Logger::log("In cache " . print_r($person, true), Logger::DEBUG);
+			Logger::debug("In cache " . print_r($person, true));
 
 			// update record occasionally so it doesn't get stale
 			$d = strtotime($person["updated"]." +00:00");
@@ -960,6 +980,7 @@ class Diaspora
 	 * @brief Updates the fcontact table
 	 *
 	 * @param array $arr The fcontact data
+	 * @throws \Exception
 	 */
 	private static function updateFContact($arr)
 	{
@@ -983,6 +1004,7 @@ class Diaspora
 	 * @param int $pcontact_id The id in the contact table (Used for the public contact)
 	 *
 	 * @return string the handle
+	 * @throws \Exception
 	 */
 	private static function handleFromContact($contact_id, $pcontact_id = 0)
 	{
@@ -1029,6 +1051,7 @@ class Diaspora
 	 * @param mixed $fcontact_guid Hexadecimal string guid
 	 *
 	 * @return string the contact url or null
+	 * @throws \Exception
 	 */
 	public static function urlFromContactGuid($fcontact_guid)
 	{
@@ -1050,12 +1073,14 @@ class Diaspora
 	/**
 	 * @brief Get a contact id for a given handle
 	 *
-	 * @todo Move to Friendica\Model\Contact
+	 * @todo  Move to Friendica\Model\Contact
 	 *
 	 * @param int    $uid    The user id
 	 * @param string $handle The handle in the format user@domain.tld
 	 *
-	 * @return int Contact id
+	 * @return array Contact data
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function contactByHandle($uid, $handle)
 	{
@@ -1099,7 +1124,7 @@ class Diaspora
 		 */
 		// It is deactivated by now, due to side effects. See issue https://github.com/friendica/friendica/pull/4033
 		// It is not removed by now. Possibly the code is needed?
-		//if (!$is_comment && $contact["rel"] == Contact::FOLLOWER && in_array($importer["page-flags"], array(Contact::PAGE_FREELOVE))) {
+		//if (!$is_comment && $contact["rel"] == Contact::FOLLOWER && in_array($importer["page-flags"], array(User::PAGE_FLAGS_FREELOVE))) {
 		//	DBA::update(
 		//		'contact',
 		//		array('rel' => Contact::FRIEND, 'writable' => true),
@@ -1110,8 +1135,11 @@ class Diaspora
 		//	Logger::log("defining user ".$contact["nick"]." as friend");
 		//}
 
-		// We don't seem to like that person
-		if ($contact["blocked"]) {
+		// Contact server is blocked
+		if (Network::isUrlBlocked($contact['url'])) {
+			return false;
+			// We don't seem to like that person
+		} elseif ($contact["blocked"]) {
 			// Maybe blocked, don't accept.
 			return false;
 			// We are following this person?
@@ -1119,7 +1147,7 @@ class Diaspora
 			// Yes, then it is fine.
 			return true;
 			// Is it a post to a community?
-		} elseif (($contact["rel"] == Contact::FOLLOWER) && in_array($importer["page-flags"], [Contact::PAGE_COMMUNITY, Contact::PAGE_PRVGROUP])) {
+		} elseif (($contact["rel"] == Contact::FOLLOWER) && in_array($importer["page-flags"], [User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_PRVGROUP])) {
 			// That's good
 			return true;
 			// Is the message a global user or a comment?
@@ -1139,6 +1167,7 @@ class Diaspora
 	 * @param bool   $is_comment Is the check for a comment?
 	 *
 	 * @return array The contact data
+	 * @throws \Exception
 	 */
 	private static function allowedContactByHandle(array $importer, $handle, $is_comment = false)
 	{
@@ -1169,6 +1198,7 @@ class Diaspora
 	 * @param string $guid The guid of the message
 	 *
 	 * @return int|bool message id if the message already was stored into the system - or false.
+	 * @throws \Exception
 	 */
 	private static function messageExists($uid, $guid)
 	{
@@ -1249,6 +1279,8 @@ class Diaspora
 	 * @param array $match array containing a link that has to be checked for a message link
 	 * @param array $item  The item array
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function fetchGuidSub($match, $item)
 	{
@@ -1265,6 +1297,8 @@ class Diaspora
 	 * @param int    $uid    The user id of the user
 	 *
 	 * @return int the message id of the stored message or false
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function storeByGuid($guid, $server, $uid = 0)
 	{
@@ -1301,6 +1335,7 @@ class Diaspora
 	 *      'message' => The message XML
 	 *      'author' => The author handle
 	 *      'key' => The public key of the author
+	 * @throws \Exception
 	 */
 	private static function message($guid, $server, $level = 0)
 	{
@@ -1326,15 +1361,8 @@ class Diaspora
 			$x = false;
 		}
 
-		// This will work for older Diaspora and Friendica servers
 		if (!$x) {
-			$source_url = $server."/p/".urlencode($guid).".xml";
-			Logger::log("Fetch post from ".$source_url, Logger::DEBUG);
-
-			$x = Network::fetchUrl($source_url);
-			if (!$x) {
-				return false;
-			}
+			return false;
 		}
 
 		$source_xml = XML::parseString($x);
@@ -1384,6 +1412,7 @@ class Diaspora
 	 * @param array  $contact The contact of the item owner
 	 *
 	 * @return array the item record
+	 * @throws \Exception
 	 */
 	private static function parentItem($uid, $guid, $author, array $contact)
 	{
@@ -1428,6 +1457,7 @@ class Diaspora
 	 * @return array
 	 *      'cid' => contact id
 	 *      'network' => network type
+	 * @throws \Exception
 	 */
 	private static function authorContactByUrl($def_contact, $person, $uid)
 	{
@@ -1464,6 +1494,8 @@ class Diaspora
 	 * @param string $parent_guid optional parent guid
 	 *
 	 * @return string the post link
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function plink($addr, $guid, $parent_guid = '')
 	{
@@ -1500,6 +1532,8 @@ class Diaspora
 	 * @param object $data     The message object
 	 *
 	 * @return bool Success
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function receiveAccountMigration(array $importer, $data)
 	{
@@ -1557,9 +1591,10 @@ class Diaspora
 	/**
 	 * @brief Processes an account deletion
 	 *
-	 * @param object $data     The message object
+	 * @param object $data The message object
 	 *
 	 * @return bool Success
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function receiveAccountDeletion($data)
 	{
@@ -1585,6 +1620,8 @@ class Diaspora
 	 * @param boolean $onlyfound Only return uri when found in the database
 	 *
 	 * @return string The constructed uri or the one from our database
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function getUriFromGuid($author, $guid, $onlyfound = false)
 	{
@@ -1611,6 +1648,7 @@ class Diaspora
 	 * @param string $uid Author handle
 	 *
 	 * @return string The post guid
+	 * @throws \Exception
 	 */
 	private static function getGuidFromUri($uri, $uid)
 	{
@@ -1628,6 +1666,7 @@ class Diaspora
 	 * @param string $guid The guid of the item
 	 *
 	 * @return array|boolean the origin owner of that post - or false
+	 * @throws \Exception
 	 */
 	private static function importerForGuid($guid)
 	{
@@ -1651,6 +1690,8 @@ class Diaspora
 	 * @param string $xml      The original XML of the message
 	 *
 	 * @return int The message id of the generated comment or "false" if there was an error
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function receiveComment(array $importer, $sender, $data, $xml)
 	{
@@ -1768,6 +1809,7 @@ class Diaspora
 	 * @param array  $conversation The conversation record to which this message belongs
 	 *
 	 * @return bool "true" if it was successful
+	 * @throws \Exception
 	 */
 	private static function receiveConversationMessage(array $importer, array $contact, $data, $msg, $mesg, $conversation)
 	{
@@ -1824,6 +1866,8 @@ class Diaspora
 			'created'    => $msg_created_at
 		]);
 
+		$message_id = DBA::lastInsertId();
+
 		DBA::unlock();
 
 		DBA::update('conv', ['updated' => DateTimeFormat::utcNow()], ['id' => $conversation["id"]]);
@@ -1834,8 +1878,9 @@ class Diaspora
 			"language" => $importer["language"],
 			"to_name" => $importer["username"],
 			"to_email" => $importer["email"],
-			"uid" =>$importer["uid"],
-			"item" => ["id" => $conversation["id"], "title" => $subject, "subject" => $subject, "body" => $body],
+			"uid" => $importer["uid"],
+			"item" => ["id" => $message_id, "title" => $subject, "subject" => $subject, "body" => $body],
+			"parent" => $conversation["id"],
 			"source_name" => $person["name"],
 			"source_link" => $person["url"],
 			"source_photo" => $person["photo"],
@@ -1854,6 +1899,7 @@ class Diaspora
 	 * @param object $data     The message object
 	 *
 	 * @return bool Success
+	 * @throws \Exception
 	 */
 	private static function receiveConversation(array $importer, $msg, $data)
 	{
@@ -1912,6 +1958,8 @@ class Diaspora
 	 * @param object $data     The message object
 	 *
 	 * @return int The message id of the generated like or "false" if there was an error
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function receiveLike(array $importer, $sender, $data)
 	{
@@ -2021,6 +2069,7 @@ class Diaspora
 	 * @param object $data     The message object
 	 *
 	 * @return bool Success?
+	 * @throws \Exception
 	 */
 	private static function receiveMessage(array $importer, $data)
 	{
@@ -2081,9 +2130,28 @@ class Diaspora
 			'created'    => $created_at
 		]);
 
+		$message_id = DBA::lastInsertId();
+
 		DBA::unlock();
 
 		DBA::update('conv', ['updated' => DateTimeFormat::utcNow()], ['id' => $conversation["id"]]);
+
+		notification([
+			"type" => NOTIFY_MAIL,
+			"notify_flags" => $importer["notify-flags"],
+			"language" => $importer["language"],
+			"to_name" => $importer["username"],
+			"to_email" => $importer["email"],
+			"uid" => $importer["uid"],
+			"item" => ["id" => $message_id, "title" => $conversation["subject"], "subject" => $conversation["subject"], "body" => $body],
+			"parent" => $conversation["id"],
+			"source_name" => $person["name"],
+			"source_link" => $person["url"],
+			"source_photo" => $person["photo"],
+			"verb" => ACTIVITY_POST,
+			"otype" => "mail"
+		]);
+
 		return true;
 	}
 
@@ -2094,6 +2162,8 @@ class Diaspora
 	 * @param object $data     The message object
 	 *
 	 * @return bool always true
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function receiveParticipation(array $importer, $data)
 	{
@@ -2187,6 +2257,8 @@ class Diaspora
 	 * @param object $data     The message object
 	 *
 	 * @return bool Success
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function receiveProfile(array $importer, $data)
 	{
@@ -2280,11 +2352,10 @@ class Diaspora
 	 * @param array $importer Array of the importer user
 	 * @param array $contact  The contact that send the request
 	 * @return void
+	 * @throws \Exception
 	 */
 	private static function receiveRequestMakeFriend(array $importer, array $contact)
 	{
-		$a = get_app();
-
 		if ($contact["rel"] == Contact::SHARING) {
 			DBA::update(
 				'contact',
@@ -2301,6 +2372,7 @@ class Diaspora
 	 * @param object $data     The message object
 	 *
 	 * @return bool Success
+	 * @throws \Exception
 	 */
 	private static function receiveContactRequest(array $importer, $data)
 	{
@@ -2343,7 +2415,7 @@ class Diaspora
 					$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);
-						$ret = self::sendShare($user, $contact);
+						self::sendShare($user, $contact);
 					}
 				}
 				return true;
@@ -2354,7 +2426,7 @@ class Diaspora
 			}
 		}
 
-		if (!$following && $sharing && in_array($importer["page-flags"], [Contact::PAGE_SOAPBOX, Contact::PAGE_NORMAL])) {
+		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);
 			return false;
 		} elseif (!$following && !$sharing) {
@@ -2377,7 +2449,7 @@ class Diaspora
 
 		$batch = (($ret["batch"]) ? $ret["batch"] : implode("/", array_slice(explode("/", $ret["url"]), 0, 3))."/receive/public");
 
-		$r = q(
+		q(
 			"INSERT INTO `contact` (`uid`, `network`,`addr`,`created`,`url`,`nurl`,`batch`,`name`,`nick`,`photo`,`pubkey`,`notify`,`poll`,`blocked`,`priority`)
 			VALUES (%d, '%s', '%s', '%s', '%s','%s','%s','%s','%s','%s','%s','%s','%s',%d,%d)",
 			intval($importer["uid"]),
@@ -2412,12 +2484,12 @@ class Diaspora
 
 		Contact::updateAvatar($ret["photo"], $importer['uid'], $contact_record["id"], true);
 
-		if (in_array($importer["page-flags"], [Contact::PAGE_NORMAL, Contact::PAGE_PRVGROUP])) {
+		if (in_array($importer["page-flags"], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP])) {
 			Logger::log("Sending intra message for author ".$author.".", Logger::DEBUG);
 
 			$hash = Strings::getRandomHex().(string)time();   // Generate a confirm_key
 
-			$ret = q(
+			q(
 				"INSERT INTO `intro` (`uid`, `contact-id`, `blocked`, `knowyou`, `note`, `hash`, `datetime`)
 				VALUES (%d, %d, %d, %d, '%s', '%s', '%s')",
 				intval($importer["uid"]),
@@ -2440,15 +2512,15 @@ class Diaspora
 			 * but if our page-type is Profile::PAGE_COMMUNITY or Profile::PAGE_SOAPBOX
 			 * we are going to change the relationship and make them a follower.
 			 */
-			if (($importer["page-flags"] == Contact::PAGE_FREELOVE) && $sharing && $following) {
+			if (($importer["page-flags"] == User::PAGE_FLAGS_FREELOVE) && $sharing && $following) {
 				$new_relation = Contact::FRIEND;
-			} elseif (($importer["page-flags"] == Contact::PAGE_FREELOVE) && $sharing) {
+			} elseif (($importer["page-flags"] == User::PAGE_FLAGS_FREELOVE) && $sharing) {
 				$new_relation = Contact::SHARING;
 			} else {
 				$new_relation = Contact::FOLLOWER;
 			}
 
-			$r = q(
+			q(
 				"UPDATE `contact` SET `rel` = %d,
 				`name-date` = '%s',
 				`uri-date` = '%s',
@@ -2466,7 +2538,7 @@ class Diaspora
 			$user = DBA::selectFirst('user', [], ['uid' => $importer["uid"]]);
 			if (DBA::isResult($user)) {
 				Logger::log("Sending share message (Relation: ".$new_relation.") to author ".$author." - Contact: ".$contact_record["id"]." - User: ".$importer["uid"], Logger::DEBUG);
-				$ret = self::sendShare($user, $contact_record);
+				self::sendShare($user, $contact_record);
 
 				// Send the profile data, maybe it weren't transmitted before
 				self::sendProfile($importer["uid"], [$contact_record]);
@@ -2481,9 +2553,9 @@ class Diaspora
 	 *
 	 * @param string $guid        message guid
 	 * @param string $orig_author handle of the original post
-	 * @param string $author      handle of the sharer
-	 *
 	 * @return array The fetched item
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function originalItem($guid, $orig_author)
 	{
@@ -2556,6 +2628,54 @@ class Diaspora
 		return false;
 	}
 
+	/**
+	 * @brief Stores a reshare activity
+	 *
+	 * @param array   $item              Array of reshare post
+	 * @param integer $parent_message_id Id of the parent post
+	 * @param string  $guid              GUID string of reshare action
+	 * @param string  $author            Author handle
+	 */
+	private static function addReshareActivity($item, $parent_message_id, $guid, $author)
+	{
+		$parent = Item::selectFirst(['uri', 'guid'], ['id' => $parent_message_id]);
+
+		$datarray = [];
+
+		$datarray['uid'] = $item['uid'];
+		$datarray['contact-id'] = $item['contact-id'];
+		$datarray['network'] = $item['network'];
+
+		$datarray['author-link'] = $item['author-link'];
+		$datarray['author-id'] = $item['author-id'];
+
+		$datarray['owner-link'] = $datarray['author-link'];
+		$datarray['owner-id'] = $datarray['author-id'];
+
+		$datarray['guid'] = $parent['guid'] . '-' . $guid;
+		$datarray['uri'] = self::getUriFromGuid($author, $datarray['guid']);
+		$datarray['parent-uri'] = $parent['uri'];
+
+		$datarray['verb'] = $datarray['body'] = ACTIVITY2_ANNOUNCE;
+		$datarray['gravity'] = GRAVITY_ACTIVITY;
+		$datarray['object-type'] = ACTIVITY_OBJ_NOTE;
+
+		$datarray['protocol'] = $item['protocol'];
+
+		$datarray['plink'] = self::plink($author, $datarray['guid']);
+		$datarray['private'] = $item['private'];
+		$datarray['changed'] = $datarray['created'] = $datarray['edited'] = $item['created'];
+
+		$message_id = Item::insert($datarray);
+
+		if ($message_id) {
+			Logger::info('Stored reshare activity.', ['guid' => $guid, 'id' => $message_id]);
+			if ($datarray['uid'] == 0) {
+				Item::distribute($message_id);
+			}
+		}
+	}
+
 	/**
 	 * @brief Processes a reshare message
 	 *
@@ -2564,6 +2684,8 @@ class Diaspora
 	 * @param string $xml      The original XML of the message
 	 *
 	 * @return int the message id
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function receiveReshare(array $importer, $data, $xml)
 	{
@@ -2637,6 +2759,11 @@ class Diaspora
 
 		self::sendParticipation($contact, $datarray);
 
+		$root_message_id = self::messageExists($importer["uid"], $root_guid);
+		if ($root_message_id) {
+			self::addReshareActivity($datarray, $root_message_id, $guid, $author);
+		}
+
 		if ($message_id) {
 			Logger::log("Stored reshare ".$datarray["guid"]." with message id ".$message_id, Logger::DEBUG);
 			if ($datarray['uid'] == 0) {
@@ -2656,6 +2783,7 @@ class Diaspora
 	 * @param object $data     The message object
 	 *
 	 * @return bool success
+	 * @throws \Exception
 	 */
 	private static function itemRetraction(array $importer, array $contact, $data)
 	{
@@ -2720,6 +2848,7 @@ class Diaspora
 	 * @param object $data     The message object
 	 *
 	 * @return bool Success
+	 * @throws \Exception
 	 */
 	private static function receiveRetraction(array $importer, $sender, $data)
 	{
@@ -2760,11 +2889,13 @@ class Diaspora
 	/**
 	 * @brief Receives status messages
 	 *
-	 * @param array  $importer Array of the importer user
-	 * @param object $data     The message object
-	 * @param string $xml      The original XML of the message
+	 * @param array            $importer Array of the importer user
+	 * @param SimpleXMLElement $data     The message object
+	 * @param string           $xml      The original XML of the message
 	 *
 	 * @return int The message id of the newly created item
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function receiveStatusMessage(array $importer, SimpleXMLElement $data, $xml)
 	{
@@ -2885,6 +3016,7 @@ class Diaspora
 	 * @param array $contact contact array
 	 *
 	 * @return string the handle in the format user@domain.tld
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function myHandle(array $contact)
 	{
@@ -2914,6 +3046,7 @@ class Diaspora
 	 * @param string $pubkey  The public key of the receiver
 	 *
 	 * @return string The encrypted data
+	 * @throws \Exception
 	 */
 	public static function encodePrivateData($msg, array $user, array $contact, $prvkey, $pubkey)
 	{
@@ -2952,6 +3085,7 @@ class Diaspora
 	 * @param array  $user The record of the sender
 	 *
 	 * @return string The envelope
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function buildMagicEnvelope($msg, array $user)
 	{
@@ -2995,6 +3129,7 @@ class Diaspora
 	 * @param bool   $public  Is the message public?
 	 *
 	 * @return string The message that will be transmitted to other servers
+	 * @throws \Exception
 	 */
 	public static function buildMessage($msg, array $user, array $contact, $prvkey, $pubkey, $public = false)
 	{
@@ -3037,13 +3172,14 @@ class Diaspora
 	 * @param bool   $public_batch Is it a public post?
 	 * @param bool   $queue_run    Is the transmission called from the queue?
 	 * @param string $guid         message guid
+	 * @param bool   $no_queue
 	 *
 	 * @return int Result of the transmission
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function transmit(array $owner, array $contact, $envelope, $public_batch, $queue_run = false, $guid = "", $no_queue = false)
 	{
-		$a = get_app();
-
 		$enabled = intval(Config::get("system", "diaspora_enabled"));
 		if (!$enabled) {
 			return 200;
@@ -3086,10 +3222,10 @@ class Diaspora
 		Logger::log("transmit: ".$logid."-".$guid." to ".$dest_url." returns: ".$return_code);
 
 		if (!$return_code || (($return_code == 503) && (stristr($postResult->getHeader(), "retry-after")))) {
-			if (!$no_queue && !empty($contact['contact-type']) && ($contact['contact-type'] != Contact::ACCOUNT_TYPE_RELAY)) {
-				Logger::log("queue message");
-				// queue message for redelivery
-				Queue::add($contact["id"], Protocol::DIASPORA, $envelope, $public_batch, $guid);
+			if (!$no_queue && !empty($contact['contact-type']) && ($contact['contact-type'] != Contact::TYPE_RELAY)) {
+				Logger::info('defer message', ['log' => $logid, 'guid' => $guid, 'destination' => $dest_url]);
+				// defer message for redelivery
+				Worker::defer();
 			}
 
 			// The message could not be delivered. We mark the contact as "dead"
@@ -3127,11 +3263,13 @@ class Diaspora
 	 * @param array  $message      The message data
 	 * @param bool   $public_batch Is it a public post?
 	 * @param string $guid         message guid
-	 * @param bool   $spool        Should the transmission be spooled or transmitted?
+	 * @param bool   $no_queue
 	 *
 	 * @return int Result of the transmission
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
-	private static function buildAndTransmit(array $owner, array $contact, $type, $message, $public_batch = false, $guid = "", $spool = false)
+	private static function buildAndTransmit(array $owner, array $contact, $type, $message, $public_batch = false, $guid = "", $no_queue = false)
 	{
 		$msg = self::buildPostXml($type, $message);
 
@@ -3145,12 +3283,7 @@ class Diaspora
 
 		$envelope = self::buildMessage($msg, $owner, $contact, $owner['uprvkey'], $contact['pubkey'], $public_batch);
 
-		if ($spool) {
-			Queue::add($contact['id'], Protocol::DIASPORA, $envelope, $public_batch, $guid);
-			return true;
-		} else {
-			$return_code = self::transmit($owner, $contact, $envelope, $public_batch, false, $guid);
-		}
+		$return_code = self::transmit($owner, $contact, $envelope, $public_batch, false, $guid, $no_queue);
 
 		Logger::log("guid: ".$guid." result ".$return_code, Logger::DEBUG);
 
@@ -3161,9 +3294,10 @@ class Diaspora
 	 * @brief sends a participation (Used to get all further updates)
 	 *
 	 * @param array $contact Target of the communication
-	 * @param array $item	 Item array
+	 * @param array $item    Item array
 	 *
 	 * @return int The result of the transmission
+	 * @throws \Exception
 	 */
 	private static function sendParticipation(array $contact, array $item)
 	{
@@ -3210,9 +3344,11 @@ class Diaspora
 	 *
 	 * @param array $owner   the array of the item owner
 	 * @param array $contact Target of the communication
-	 * @param int 	$uid     User ID
+	 * @param int   $uid     User ID
 	 *
 	 * @return int The result of the transmission
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function sendAccountMigration(array $owner, array $contact, $uid)
 	{
@@ -3238,6 +3374,7 @@ class Diaspora
 	 * @param array $contact Target of the communication
 	 *
 	 * @return int The result of the transmission
+	 * @throws \Exception
 	 */
 	public static function sendShare(array $owner, array $contact)
 	{
@@ -3281,6 +3418,7 @@ class Diaspora
 	 * @param array $contact Target of the communication
 	 *
 	 * @return int The result of the transmission
+	 * @throws \Exception
 	 */
 	public static function sendUnshare(array $owner, array $contact)
 	{
@@ -3301,6 +3439,8 @@ class Diaspora
 	 * @param bool   $complete Should it be a complete check or a simple check?
 	 *
 	 * @return array|bool Reshare details or "false" if no reshare
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function isReshare($body, $complete = true)
 	{
@@ -3388,6 +3528,7 @@ class Diaspora
 	 * @param integer $event_id The id of the event
 	 *
 	 * @return array with event data
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function buildEvent($event_id)
 	{
@@ -3470,6 +3611,8 @@ class Diaspora
 	 * @return array
 	 * 'type' -> Message type ("status_message" or "reshare")
 	 * 'message' -> Array of XML elements of the status
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function buildStatus(array $item, array $owner)
 	{
@@ -3575,6 +3718,20 @@ class Diaspora
 		return $msg;
 	}
 
+	private static function prependParentAuthorMention($body, $profile_url)
+	{
+		$profile = Contact::getDetailsByURL($profile_url);
+		if (!empty($profile['addr'])
+			&& $profile['contact-type'] != Contact::TYPE_COMMUNITY
+			&& !strstr($body, $profile['addr'])
+			&& !strstr($body, $profile_url)
+		) {
+			$body = '@[url=' . $profile_url . ']' . $profile['name'] . '[/url] ' . $body;
+		}
+
+		return $body;
+	}
+
 	/**
 	 * @brief Sends a post
 	 *
@@ -3584,6 +3741,8 @@ class Diaspora
 	 * @param bool  $public_batch Is it a public post?
 	 *
 	 * @return int The result of the transmission
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function sendStatus(array $item, array $owner, array $contact, $public_batch = false)
 	{
@@ -3599,6 +3758,7 @@ class Diaspora
 	 * @param array $owner the array of the item owner
 	 *
 	 * @return array The data for a "like"
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function constructLike(array $item, array $owner)
 	{
@@ -3630,6 +3790,7 @@ class Diaspora
 	 * @param array $owner the array of the item owner
 	 *
 	 * @return array The data for an "EventParticipation"
+	 * @throws \Exception
 	 */
 	private static function constructAttend(array $item, array $owner)
 	{
@@ -3666,7 +3827,8 @@ class Diaspora
 	 * @param array $item  The item that will be exported
 	 * @param array $owner the array of the item owner
 	 *
-	 * @return array The data for a comment
+	 * @return array|false The data for a comment
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function constructComment(array $item, array $owner)
 	{
@@ -3677,24 +3839,40 @@ class Diaspora
 			return $result;
 		}
 
-		$parent = Item::selectFirst(['guid'], ['id' => $item["parent"], 'parent' => $item["parent"]]);
-		if (!DBA::isResult($parent)) {
+		$toplevel_item = Item::selectFirst(['guid', 'author-link'], ['id' => $item["parent"], 'parent' => $item["parent"]]);
+		if (!DBA::isResult($toplevel_item)) {
+			Logger::error('Missing parent conversation item', ['parent' => $item["parent"]]);
 			return false;
 		}
 
-		$text = html_entity_decode(BBCode::toMarkdown($item["body"]));
+		$thread_parent_item = $toplevel_item;
+		if ($item['thr-parent'] != $item['parent-uri']) {
+			$thread_parent_item = Item::selectFirst(['guid', 'author-link'], ['uri' => $item['thr-parent'], 'uid' => $item['uid']]);
+		}
+
+		$body = $item["body"];
+
+		if ((empty($item['uid']) || !Feature::isEnabled($item['uid'], 'explicit_mentions'))
+			&& !Config::get('system', 'disable_implicit_mentions')
+		) {
+			$body = self::prependParentAuthorMention($body, $thread_parent_item['author-link']);
+		}
+
+		$text = html_entity_decode(BBCode::toMarkdown($body));
 		$created = DateTimeFormat::utc($item["created"], DateTimeFormat::ATOM);
 
-		$comment = ["author" => self::myHandle($owner),
-				"guid" => $item["guid"],
-				"created_at" => $created,
-				"parent_guid" => $parent["guid"],
-				"text" => $text,
-				"author_signature" => ""];
+		$comment = [
+			"author"      => self::myHandle($owner),
+			"guid"        => $item["guid"],
+			"created_at"  => $created,
+			"parent_guid" => $toplevel_item["guid"],
+			"text"        => $text,
+			"author_signature" => ""
+		];
 
 		// Send the thread parent guid only if it is a threaded comment
 		if ($item['thr-parent'] != $item['parent-uri']) {
-			$comment['thread_parent_guid'] = self::getGuidFromUri($item['thr-parent'], $item['uid']);
+			$comment['thread_parent_guid'] = $thread_parent_item['guid'];
 		}
 
 		Cache::set($cachekey, $comment, Cache::QUARTER_HOUR);
@@ -3711,6 +3889,8 @@ class Diaspora
 	 * @param bool  $public_batch Is it a public post?
 	 *
 	 * @return int The result of the transmission
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function sendFollowup(array $item, array $owner, array $contact, $public_batch = false)
 	{
@@ -3737,10 +3917,8 @@ class Diaspora
 	/**
 	 * @brief Creates a message from a signature record entry
 	 *
-	 * @param array $item      The item that will be exported
-	 * @param array $signature The entry of the "sign" record
-	 *
-	 * @return string The message
+	 * @param array $item The item that will be exported
+	 * @return array The message
 	 */
 	private static function messageFromSignature(array $item)
 	{
@@ -3769,15 +3947,14 @@ class Diaspora
 			// Remove the handle
 			$handle = array_pop($signed_parts);
 
-			// Glue the parts together
-			$text = implode(";", $signed_parts);
-
-			$message = ["author" => $handle,
-					"guid" => $guid,
-					"parent_guid" => $parent_guid,
-					"text" => implode(";", $signed_parts),
-					"author_signature" => $item['signature'],
-					"parent_author_signature" => ""];
+			$message = [
+				"author" => $handle,
+				"guid" => $guid,
+				"parent_guid" => $parent_guid,
+				"text" => implode(";", $signed_parts),
+				"author_signature" => $item['signature'],
+				"parent_author_signature" => ""
+			];
 		}
 		return $message;
 	}
@@ -3791,6 +3968,7 @@ class Diaspora
 	 * @param bool  $public_batch Is it a public post?
 	 *
 	 * @return int The result of the transmission
+	 * @throws \Exception
 	 */
 	public static function sendRelay(array $item, array $owner, array $contact, $public_batch = false)
 	{
@@ -3847,6 +4025,7 @@ class Diaspora
 	 * @param bool  $relay        Is the retraction transmitted from a relay?
 	 *
 	 * @return int The result of the transmission
+	 * @throws \Exception
 	 */
 	public static function sendRetraction(array $item, array $owner, array $contact, $public_batch = false, $relay = false)
 	{
@@ -3879,6 +4058,8 @@ class Diaspora
 	 * @param array $contact Target of the communication
 	 *
 	 * @return int The result of the transmission
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function sendMail(array $item, array $owner, array $contact)
 	{
@@ -3890,14 +4071,6 @@ class Diaspora
 			return;
 		}
 
-		$conv = [
-			"author" => $cnv["creator"],
-			"guid" => $cnv["guid"],
-			"subject" => $cnv["subject"],
-			"created_at" => DateTimeFormat::utc($cnv['created'], DateTimeFormat::ATOM),
-			"participants" => $cnv["recips"]
-		];
-
 		$body = BBCode::toMarkdown($item["body"]);
 		$created = DateTimeFormat::utc($item["created"], DateTimeFormat::ATOM);
 
@@ -3914,12 +4087,13 @@ class Diaspora
 			$type = "message";
 		} else {
 			$message = [
-					"author" => $cnv["creator"],
-					"guid" => $cnv["guid"],
-					"subject" => $cnv["subject"],
-					"created_at" => DateTimeFormat::utc($cnv['created'], DateTimeFormat::ATOM),
-					"participants" => $cnv["recips"],
-					"message" => $msg];
+				"author" => $cnv["creator"],
+				"guid" => $cnv["guid"],
+				"subject" => $cnv["subject"],
+				"created_at" => DateTimeFormat::utc($cnv['created'], DateTimeFormat::ATOM),
+				"participants" => $cnv["recips"],
+				"message" => $msg
+			];
 
 			$type = "conversation";
 		}
@@ -3989,6 +4163,7 @@ class Diaspora
 	 * @param int $uid The user id
 	 *
 	 * @return array The profile data
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function createProfileData($uid)
 	{
@@ -4040,7 +4215,7 @@ class Diaspora
 			if ($profile['pub_keywords']) {
 				$kw = str_replace(',', ' ', $profile['pub_keywords']);
 				$kw = str_replace('  ', ' ', $kw);
-				$arr = explode(' ', $profile['pub_keywords']);
+				$arr = explode(' ', $kw);
 				if (count($arr)) {
 					for ($x = 0; $x < 5; $x ++) {
 						if (!empty($arr[$x])) {
@@ -4073,6 +4248,7 @@ class Diaspora
 	 * @param int  $uid    The user id
 	 * @param bool $recips optional, default false
 	 * @return void
+	 * @throws \Exception
 	 */
 	public static function sendProfile($uid, $recips = false)
 	{
@@ -4103,7 +4279,7 @@ class Diaspora
 
 		foreach ($recips as $recip) {
 			Logger::log("Send updated profile data for user ".$uid." to contact ".$recip["id"], Logger::DEBUG);
-			self::buildAndTransmit($owner, $recip, "profile", $message, false, "", false);
+			self::buildAndTransmit($owner, $recip, "profile", $message, false, '', true);
 		}
 	}
 
@@ -4114,6 +4290,7 @@ class Diaspora
 	 * @param array   $item Item array
 	 *
 	 * @return array Signed content
+	 * @throws \Exception
 	 */
 	public static function createLikeSignature($uid, array $item)
 	{
@@ -4144,6 +4321,7 @@ class Diaspora
 	 * @param array   $item Item array
 	 *
 	 * @return array Signed content
+	 * @throws \Exception
 	 */
 	public static function createCommentSignature($uid, array $item)
 	{