X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdiaspora.php;h=fde086e200fab5b7ba8d75f2e39c9e6199d0f975;hb=84b733e1bf25bdd1074483f19113add7800a6c38;hp=10f1be93d24823b8849dcc0190adf69348e7a1e0;hpb=fa7f0cac71b9b528f5dfd82b7381e8693b9b418c;p=friendica.git

diff --git a/include/diaspora.php b/include/diaspora.php
index 10f1be93d2..fde086e200 100644
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -18,12 +18,13 @@ require_once("include/group.php");
 require_once("include/xml.php");
 require_once("include/datetime.php");
 require_once("include/queue_fn.php");
+require_once("include/cache.php");
 
 /**
  * @brief This class contain functions to create and send Diaspora XML files
  *
  */
-class diaspora {
+class Diaspora {
 
 	/**
 	 * @brief Return a list of relay servers
@@ -87,7 +88,7 @@ class diaspora {
 	 *
 	 * @return string the repaired signature
 	 */
-	private function repair_signature($signature, $handle = "", $level = 1) {
+	private static function repair_signature($signature, $handle = "", $level = 1) {
 
 		if ($signature == "")
 			return ($signature);
@@ -111,7 +112,7 @@ class diaspora {
 	 *
 	 * @return string verified data
 	 */
-	private function verify_magic_envelope($envelope) {
+	private static function verify_magic_envelope($envelope) {
 
 		$basedom = parse_xml_string($envelope, false);
 
@@ -319,8 +320,8 @@ class diaspora {
 			dbesc(NETWORK_DIASPORA),
 			dbesc($msg["author"])
 		);
-		if($r) {
-			foreach($r as $rr) {
+		if ($r) {
+			foreach ($r as $rr) {
 				logger("delivering to: ".$rr["username"]);
 				self::dispatch($rr,$msg);
 			}
@@ -344,7 +345,7 @@ class diaspora {
 		// This will often be different with relayed messages (for example "like" and "comment")
 		$sender = $msg["author"];
 
-		if (!diaspora::valid_posting($msg, $fields)) {
+		if (!self::valid_posting($msg, $fields)) {
 			logger("Invalid posting");
 			return false;
 		}
@@ -412,7 +413,7 @@ class diaspora {
 	 *
 	 * @return bool Is the posting valid?
 	 */
-	private function valid_posting($msg, &$fields) {
+	private static function valid_posting($msg, &$fields) {
 
 		$data = parse_xml_string($msg["message"], false);
 
@@ -520,7 +521,7 @@ class diaspora {
 			$key = self::key($msg["author"]);
 
 			if (!rsa_verify($signed_data, $parent_author_signature, $key, "sha256")) {
-				logger("No valid parent author signature for author ".$msg["author"]. " in type ".$type." - signed data: ".$signed_data." - Message: ".$msg["message"]." - Signature ".$parent_author_signature, LOGGER_DEBUG);
+				logger("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);
 				return false;
 			}
 		}
@@ -528,7 +529,7 @@ class diaspora {
 		$key = self::key($fields->author);
 
 		if (!rsa_verify($signed_data, $author_signature, $key, "sha256")) {
-			logger("No valid author signature for author ".$msg["author"]. " in type ".$type." - signed data: ".$signed_data." - Message: ".$msg["message"]." - Signature ".$author_signature, LOGGER_DEBUG);
+			logger("No valid author signature for author ".$fields->author. " in type ".$type." - signed data: ".$signed_data." - Message: ".$msg["message"]." - Signature ".$author_signature, LOGGER_DEBUG);
 			return false;
 		} else
 			return true;
@@ -541,7 +542,7 @@ class diaspora {
 	 *
 	 * @return string The public key
 	 */
-	private function key($handle) {
+	private static function key($handle) {
 		$handle = strval($handle);
 
 		logger("Fetching diaspora key for: ".$handle);
@@ -560,7 +561,7 @@ class diaspora {
 	 *
 	 * @return array the queried data
 	 */
-	private function person_by_handle($handle) {
+	private static function person_by_handle($handle) {
 
 		$r = q("SELECT * FROM `fcontact` WHERE `network` = '%s' AND `addr` = '%s' LIMIT 1",
 			dbesc(NETWORK_DIASPORA),
@@ -601,7 +602,7 @@ class diaspora {
 	 *
 	 * @return string The id of the fcontact entry
 	 */
-	private function add_fcontact($arr, $update = false) {
+	private static function add_fcontact($arr, $update = false) {
 
 		if($update) {
 			$r = q("UPDATE `fcontact` SET
@@ -669,27 +670,30 @@ class diaspora {
 	 * @return string the handle
 	 */
 	public static function handle_from_contact($contact_id, $gcontact_id = 0) {
-		$handle = False;
+		$handle = false;
 
 		logger("contact id is ".$contact_id." - gcontact id is ".$gcontact_id, LOGGER_DEBUG);
 
 		if ($gcontact_id != 0) {
 			$r = q("SELECT `addr` FROM `gcontact` WHERE `id` = %d AND `addr` != ''",
 				intval($gcontact_id));
-			if ($r)
+
+			if (dbm::is_result($r)) {
 				return strtolower($r[0]["addr"]);
+			}
 		}
 
 		$r = q("SELECT `network`, `addr`, `self`, `url`, `nick` FROM `contact` WHERE `id` = %d",
 			intval($contact_id));
-		if ($r) {
+
+		if (dbm::is_result($r)) {
 			$contact = $r[0];
 
 			logger("contact 'self' = ".$contact['self']." 'url' = ".$contact['url'], LOGGER_DEBUG);
 
-			if($contact['addr'] != "")
+			if ($contact['addr'] != "") {
 				$handle = $contact['addr'];
-			else {
+			} else {
 				$baseurl_start = strpos($contact['url'],'://') + 3;
 				$baseurl_length = strpos($contact['url'],'/profile') - $baseurl_start; // allows installations in a subdirectory--not sure how Diaspora will handle
 				$baseurl = substr($contact['url'], $baseurl_start, $baseurl_length);
@@ -700,6 +704,29 @@ class diaspora {
 		return strtolower($handle);
 	}
 
+	/**
+	 * @brief get a url (scheme://domain.tld/u/user) from a given Diaspora*
+	 * fcontact guid
+	 *
+	 * @param mixed $fcontact_guid Hexadecimal string guid
+	 *
+	 * @return string the contact url or null
+	 */
+	public static function url_from_contact_guid($fcontact_guid) {
+		logger("fcontact guid is ".$fcontact_guid, LOGGER_DEBUG);
+
+		$r = q("SELECT `url` FROM `fcontact` WHERE `url` != '' AND `network` = '%s' AND `guid` = '%s'",
+			dbesc(NETWORK_DIASPORA),
+			dbesc($fcontact_guid)
+		);
+
+		if (dbm::is_result($r)) {
+			return $r[0]['url'];
+		}
+
+		return null;
+	}
+
 	/**
 	 * @brief Get a contact id for a given handle
 	 *
@@ -708,14 +735,29 @@ class diaspora {
 	 *
 	 * @return The contact id
 	 */
-	private function contact_by_handle($uid, $handle) {
+	private static function contact_by_handle($uid, $handle) {
+
+		// First do a direct search on the contact table
 		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `addr` = '%s' LIMIT 1",
 			intval($uid),
 			dbesc($handle)
 		);
 
-		if ($r)
+		if (dbm::is_result($r)) {
 			return $r[0];
+		} else {
+			// We haven't found it?
+			// We use another function for it that will possibly create a contact entry
+			$cid = get_contact($handle, $uid);
+
+			if ($cid > 0) {
+				$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", intval($cid));
+
+				if (dbm::is_result($r)) {
+					return $r[0];
+				}
+			}
+		}
 
 		$handle_parts = explode("@", $handle);
 		$nurl_sql = "%%://".$handle_parts[1]."%%/profile/".$handle_parts[0];
@@ -724,9 +766,11 @@ class diaspora {
 			intval($uid),
 			dbesc($nurl_sql)
 		);
-		if($r)
+		if (dbm::is_result($r)) {
 			return $r[0];
+		}
 
+		logger("Haven't found contact for user ".$uid." and handle ".$handle, LOGGER_DEBUG);
 		return false;
 	}
 
@@ -739,7 +783,7 @@ class diaspora {
 	 *
 	 * @return bool is the contact allowed to post?
 	 */
-	private function post_allow($importer, $contact, $is_comment = false) {
+	private static function post_allow($importer, $contact, $is_comment = false) {
 
 		// perhaps we were already sharing with this person. Now they're sharing with us.
 		// That makes us friends.
@@ -778,7 +822,7 @@ class diaspora {
 	 *
 	 * @return array The contact data
 	 */
-	private function allowed_contact_by_handle($importer, $handle, $is_comment = false) {
+	private static function allowed_contact_by_handle($importer, $handle, $is_comment = false) {
 		$contact = self::contact_by_handle($importer["uid"], $handle);
 		if (!$contact) {
 			logger("A Contact for handle ".$handle." and user ".$importer["uid"]." was not found");
@@ -800,13 +844,13 @@ class diaspora {
 	 *
 	 * @return int|bool message id if the message already was stored into the system - or false.
 	 */
-	private function message_exists($uid, $guid) {
+	private static function message_exists($uid, $guid) {
 		$r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
 			intval($uid),
 			dbesc($guid)
 		);
 
-		if($r) {
+		if (dbm::is_result($r)) {
 			logger("message ".$guid." already exists for user ".$uid);
 			return $r[0]["id"];
 		}
@@ -819,20 +863,52 @@ class diaspora {
 	 *
 	 * @param array $item The item array
 	 */
-	private function fetch_guid($item) {
+	private static function fetch_guid($item) {
 		preg_replace_callback("&\[url=/posts/([^\[\]]*)\](.*)\[\/url\]&Usi",
 			function ($match) use ($item){
 				return(self::fetch_guid_sub($match, $item));
 			},$item["body"]);
 	}
 
+	/**
+	 * @brief Checks for relative /people/* links in an item body to match local
+	 * contacts or prepends the remote host taken from the author link.
+	 *
+	 * @param string $body The item body to replace links from
+	 * @param string $author_link The author link for missing local contact fallback
+	 *
+	 * @return the replaced string
+	 */
+	public function replace_people_guid($body, $author_link) {
+		$return = preg_replace_callback("&\[url=/people/([^\[\]]*)\](.*)\[\/url\]&Usi",
+			function ($match) use ($author_link) {
+				// $match
+				// 0 => '[url=/people/0123456789abcdef]Foo Bar[/url]'
+				// 1 => '0123456789abcdef'
+				// 2 => 'Foo Bar'
+				$handle = self::url_from_contact_guid($match[1]);
+
+				if ($handle) {
+					$return = '@[url='.$handle.']'.$match[2].'[/url]';
+				} else {
+					// No local match, restoring absolute remote URL from author scheme and host
+					$author_url = parse_url($author_link);
+					$return = '[url='.$author_url['scheme'].'://'.$author_url['host'].'/people/'.$match[1].']'.$match[2].'[/url]';
+				}
+
+				return $return;
+			}, $body);
+
+		return $return;
+	}
+
 	/**
 	 * @brief sub function of "fetch_guid" which checks for links in messages
 	 *
 	 * @param array $match array containing a link that has to be checked for a message link
 	 * @param array $item The item array
 	 */
-	private function fetch_guid_sub($match, $item) {
+	private static function fetch_guid_sub($match, $item) {
 		if (!self::store_by_guid($match[1], $item["author-link"]))
 			self::store_by_guid($match[1], $item["owner-link"]);
 	}
@@ -846,7 +922,7 @@ class diaspora {
 	 *
 	 * @return int the message id of the stored message or false
 	 */
-	private function store_by_guid($guid, $server, $uid = 0) {
+	private static function store_by_guid($guid, $server, $uid = 0) {
 		$serverparts = parse_url($server);
 		$server = $serverparts["scheme"]."://".$serverparts["host"];
 
@@ -875,7 +951,7 @@ class diaspora {
 	 *      'author' => The author handle
 	 *      'key' => The public key of the author
 	 */
-	private function message($guid, $server, $level = 0) {
+	private static function message($guid, $server, $level = 0) {
 
 		if ($level > 5)
 			return false;
@@ -951,7 +1027,7 @@ class diaspora {
 	 *
 	 * @return array the item record
 	 */
-	private function parent_item($uid, $guid, $author, $contact) {
+	private static function parent_item($uid, $guid, $author, $contact) {
 		$r = q("SELECT `id`, `body`, `wall`, `uri`, `private`, `origin`,
 				`author-name`, `author-link`, `author-avatar`,
 				`owner-name`, `owner-link`, `owner-avatar`
@@ -997,19 +1073,23 @@ class diaspora {
 	 *      'cid' => contact id
 	 *      'network' => network type
 	 */
-	private function author_contact_by_url($contact, $person, $uid) {
+	private static function author_contact_by_url($contact, $person, $uid) {
 
-		$r = q("SELECT `id`, `network` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
+		$r = q("SELECT `id`, `network`, `url` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
 			dbesc(normalise_link($person["url"])), intval($uid));
 		if ($r) {
 			$cid = $r[0]["id"];
 			$network = $r[0]["network"];
+
+			// We are receiving content from a user that is about to be terminated
+			// This means the user is vital, so we remove a possible termination date.
+			unmark_for_death($contact);
 		} else {
 			$cid = $contact["id"];
 			$network = NETWORK_DIASPORA;
 		}
 
-		return (array("cid" => $cid, "network" => $network));
+		return array("cid" => $cid, "network" => $network);
 	}
 
 	/**
@@ -1031,7 +1111,7 @@ class diaspora {
 	 *
 	 * @return string the post link
 	 */
-	private function plink($addr, $guid) {
+	private static function plink($addr, $guid) {
 		$r = q("SELECT `url`, `nick`, `network` FROM `fcontact` WHERE `addr`='%s' LIMIT 1", dbesc($addr));
 
 		// Fallback
@@ -1061,7 +1141,7 @@ class diaspora {
 	 *
 	 * @return bool Success
 	 */
-	private function receive_account_deletion($importer, $data) {
+	private static function receive_account_deletion($importer, $data) {
 
 		/// @todo Account deletion should remove the contact from the global contacts as well
 
@@ -1083,16 +1163,38 @@ class diaspora {
 	 *
 	 * @param string $author Author handle
 	 * @param string $guid Message guid
+	 * @param boolean $onlyfound Only return uri when found in the database
 	 *
 	 * @return string The constructed uri or the one from our database
 	 */
-	private function get_uri_from_guid($author, $guid) {
+	private static function get_uri_from_guid($author, $guid, $onlyfound = false) {
 
 		$r = q("SELECT `uri` FROM `item` WHERE `guid` = '%s' LIMIT 1", dbesc($guid));
-		if ($r)
+		if (dbm::is_result($r)) {
 			return $r[0]["uri"];
-		else
+		} elseif (!$onlyfound) {
 			return $author.":".$guid;
+		}
+
+		return "";
+	}
+
+	/**
+	 * @brief Fetch the guid from our database with a given uri
+	 *
+	 * @param string $author Author handle
+	 * @param string $uri Message uri
+	 *
+	 * @return string The post guid
+	 */
+	private static function get_guid_from_uri($uri, $uid) {
+
+		$r = q("SELECT `guid` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($uri), intval($uid));
+		if (dbm::is_result($r)) {
+			return $r[0]["guid"];
+		} else {
+			return false;
+		}
 	}
 
 	/**
@@ -1105,28 +1207,39 @@ class diaspora {
 	 *
 	 * @return int The message id of the generated comment or "false" if there was an error
 	 */
-	private function receive_comment($importer, $sender, $data, $xml) {
+	private static function receive_comment($importer, $sender, $data, $xml) {
 		$guid = notags(unxmlify($data->guid));
 		$parent_guid = notags(unxmlify($data->parent_guid));
 		$text = unxmlify($data->text);
 		$author = notags(unxmlify($data->author));
 
-		if (isset($data->created_at))
+		if (isset($data->created_at)) {
 			$created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
-		else
+		} else {
 			$created_at = datetime_convert();
+		}
+
+		if (isset($data->thread_parent_guid)) {
+			$thread_parent_guid = notags(unxmlify($data->thread_parent_guid));
+			$thr_uri = self::get_uri_from_guid("", $thread_parent_guid, true);
+		} else {
+			$thr_uri = "";
+		}
 
 		$contact = self::allowed_contact_by_handle($importer, $sender, true);
-		if (!$contact)
+		if (!$contact) {
 			return false;
+		}
 
 		$message_id = self::message_exists($importer["uid"], $guid);
-		if ($message_id)
+		if ($message_id) {
 			return $message_id;
+		}
 
 		$parent_item = self::parent_item($importer["uid"], $parent_guid, $author, $contact);
-		if (!$parent_item)
+		if (!$parent_item) {
 			return false;
+		}
 
 		$person = self::person_by_handle($author);
 		if (!is_array($person)) {
@@ -1157,21 +1270,29 @@ class diaspora {
 		$datarray["type"] = "remote-comment";
 		$datarray["verb"] = ACTIVITY_POST;
 		$datarray["gravity"] = GRAVITY_COMMENT;
-		$datarray["parent-uri"] = $parent_item["uri"];
+
+		if ($thr_uri != "") {
+			$datarray["parent-uri"] = $thr_uri;
+		} else {
+			$datarray["parent-uri"] = $parent_item["uri"];
+		}
 
 		$datarray["object-type"] = ACTIVITY_OBJ_COMMENT;
 		$datarray["object"] = $xml;
 
 		$datarray["changed"] = $datarray["created"] = $datarray["edited"] = $created_at;
 
-		$datarray["body"] = diaspora2bb($text);
+		$body = diaspora2bb($text);
+
+		$datarray["body"] = self::replace_people_guid($body, $person["url"]);
 
 		self::fetch_guid($datarray);
 
 		$message_id = item_store($datarray);
 
-		if ($message_id)
+		if ($message_id) {
 			logger("Stored comment ".$datarray["guid"]." with message id ".$message_id, LOGGER_DEBUG);
+		}
 
 		// If we are the origin of the parent we store the original data and notify our followers
 		if($message_id AND $parent_item["origin"]) {
@@ -1202,13 +1323,11 @@ class diaspora {
 	 *
 	 * @return bool "true" if it was successful
 	 */
-	private function receive_conversation_message($importer, $contact, $data, $msg, $mesg, $conversation) {
+	private static function receive_conversation_message($importer, $contact, $data, $msg, $mesg, $conversation) {
 		$guid = notags(unxmlify($data->guid));
 		$subject = notags(unxmlify($data->subject));
 		$author = notags(unxmlify($data->author));
 
-		$reply = 0;
-
 		$msg_guid = notags(unxmlify($mesg->guid));
 		$msg_parent_guid = notags(unxmlify($mesg->parent_guid));
 		$msg_parent_author_signature = notags(unxmlify($mesg->parent_author_signature));
@@ -1218,16 +1337,17 @@ class diaspora {
 
 		// "diaspora_handle" is the element name from the old version
 		// "author" is the element name from the new version
-		if ($mesg->author)
+		if ($mesg->author) {
 			$msg_author = notags(unxmlify($mesg->author));
-		elseif ($mesg->diaspora_handle)
+		} elseif ($mesg->diaspora_handle) {
 			$msg_author = notags(unxmlify($mesg->diaspora_handle));
-		else
+		} else {
 			return false;
+		}
 
 		$msg_conversation_guid = notags(unxmlify($mesg->conversation_guid));
 
-		if($msg_conversation_guid != $guid) {
+		if ($msg_conversation_guid != $guid) {
 			logger("message conversation guid does not belong to the current conversation.");
 			return false;
 		}
@@ -1239,15 +1359,15 @@ class diaspora {
 
 		$author_signature = base64_decode($msg_author_signature);
 
-		if(strcasecmp($msg_author,$msg["author"]) == 0) {
+		if (strcasecmp($msg_author,$msg["author"]) == 0) {
 			$person = $contact;
 			$key = $msg["key"];
 		} else {
 			$person = self::person_by_handle($msg_author);
 
-			if (is_array($person) && x($person, "pubkey"))
+			if (is_array($person) && x($person, "pubkey")) {
 				$key = $person["pubkey"];
-			else {
+			} else {
 				logger("unable to find author details");
 					return false;
 			}
@@ -1258,7 +1378,7 @@ class diaspora {
 			return false;
 		}
 
-		if($msg_parent_author_signature) {
+		if ($msg_parent_author_signature) {
 			$owner_signed_data = $msg_guid.";".$msg_parent_guid.";".$msg_text.";".unxmlify($mesg->created_at).";".$msg_author.";".$msg_conversation_guid;
 
 			$parent_author_signature = base64_decode($msg_parent_author_signature);
@@ -1274,7 +1394,7 @@ class diaspora {
 		$r = q("SELECT `id` FROM `mail` WHERE `uri` = '%s' LIMIT 1",
 			dbesc($message_uri)
 		);
-		if($r) {
+		if (dbm::is_result($r)) {
 			logger("duplicate message already delivered.", LOGGER_DEBUG);
 			return false;
 		}
@@ -1328,7 +1448,7 @@ class diaspora {
 	 *
 	 * @return bool Success
 	 */
-	private function receive_conversation($importer, $msg, $data) {
+	private static function receive_conversation($importer, $msg, $data) {
 		$guid = notags(unxmlify($data->guid));
 		$subject = notags(unxmlify($data->subject));
 		$created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
@@ -1394,7 +1514,7 @@ class diaspora {
 	 *
 	 * @return string the body
 	 */
-	private function construct_like_body($contact, $parent_item, $guid) {
+	private static function construct_like_body($contact, $parent_item, $guid) {
 		$bodyverb = t('%1$s likes %2$s\'s %3$s');
 
 		$ulink = "[url=".$contact["url"]."]".$contact["name"]."[/url]";
@@ -1412,7 +1532,7 @@ class diaspora {
 	 *
 	 * @return string The XML
 	 */
-	private function construct_like_object($importer, $parent_item) {
+	private static function construct_like_object($importer, $parent_item) {
 		$objtype = ACTIVITY_OBJ_NOTE;
 		$link = '<link rel="alternate" type="text/html" href="'.App::get_baseurl()."/display/".$importer["nickname"]."/".$parent_item["id"].'" />';
 		$parent_body = $parent_item["body"];
@@ -1436,7 +1556,7 @@ class diaspora {
 	 *
 	 * @return int The message id of the generated like or "false" if there was an error
 	 */
-	private function receive_like($importer, $sender, $data) {
+	private static function receive_like($importer, $sender, $data) {
 		$positive = notags(unxmlify($data->positive));
 		$guid = notags(unxmlify($data->guid));
 		$parent_type = notags(unxmlify($data->parent_type));
@@ -1533,7 +1653,7 @@ class diaspora {
 	 *
 	 * @return bool Success?
 	 */
-	private function receive_message($importer, $data) {
+	private static function receive_message($importer, $data) {
 		$guid = notags(unxmlify($data->guid));
 		$parent_guid = notags(unxmlify($data->parent_guid));
 		$text = unxmlify($data->text);
@@ -1542,8 +1662,9 @@ class diaspora {
 		$conversation_guid = notags(unxmlify($data->conversation_guid));
 
 		$contact = self::allowed_contact_by_handle($importer, $author, true);
-		if (!$contact)
+		if (!$contact) {
 			return false;
+		}
 
 		$conversation = null;
 
@@ -1551,16 +1672,13 @@ class diaspora {
 			intval($importer["uid"]),
 			dbesc($conversation_guid)
 		);
-		if($c)
+		if ($c) {
 			$conversation = $c[0];
-		else {
+		} else {
 			logger("conversation not available.");
 			return false;
 		}
 
-		$reply = 0;
-
-		$body = diaspora2bb($text);
 		$message_uri = $author.":".$guid;
 
 		$person = self::person_by_handle($author);
@@ -1573,11 +1691,15 @@ class diaspora {
 			dbesc($message_uri),
 			intval($importer["uid"])
 		);
-		if($r) {
+		if (dbm::is_result($r)) {
 			logger("duplicate message already delivered.", LOGGER_DEBUG);
 			return false;
 		}
 
+		$body = diaspora2bb($text);
+
+		$body = self::replace_people_guid($body, $person["url"]);
+
 		q("INSERT INTO `mail` (`uid`, `guid`, `convid`, `from-name`,`from-photo`,`from-url`,`contact-id`,`title`,`body`,`seen`,`reply`,`uri`,`parent-uri`,`created`)
 				VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, '%s','%s','%s')",
 			intval($importer["uid"]),
@@ -1612,7 +1734,7 @@ class diaspora {
 	 *
 	 * @return bool always true
 	 */
-	private function receive_participation($importer, $data) {
+	private static function receive_participation($importer, $data) {
 		// I'm not sure if we can fully support this message type
 		return true;
 	}
@@ -1625,7 +1747,7 @@ class diaspora {
 	 *
 	 * @return bool always true
 	 */
-	private function receive_photo($importer, $data) {
+	private static function receive_photo($importer, $data) {
 		// There doesn't seem to be a reason for this function, since the photo data is transmitted in the status message as well
 		return true;
 	}
@@ -1638,7 +1760,7 @@ class diaspora {
 	 *
 	 * @return bool always true
 	 */
-	private function receive_poll_participation($importer, $data) {
+	private static function receive_poll_participation($importer, $data) {
 		// We don't support polls by now
 		return true;
 	}
@@ -1651,7 +1773,7 @@ class diaspora {
 	 *
 	 * @return bool Success
 	 */
-	private function receive_profile($importer, $data) {
+	private static function receive_profile($importer, $data) {
 		$author = strtolower(notags(unxmlify($data->author)));
 
 		$contact = self::contact_by_handle($importer["uid"], $author);
@@ -1742,7 +1864,7 @@ class diaspora {
 	 * @param array $importer Array of the importer user
 	 * @param array $contact The contact that send the request
 	 */
-	private function receive_request_make_friend($importer, $contact) {
+	private static function receive_request_make_friend($importer, $contact) {
 
 		$a = get_app();
 
@@ -1811,18 +1933,18 @@ class diaspora {
 	 *
 	 * @return string The XML
 	 */
-        private function construct_new_friend_object($contact) {
-                $objtype = ACTIVITY_OBJ_PERSON;
-                $link = '<link rel="alternate" type="text/html" href="'.$contact["url"].'" />'."\n".
-                        '<link rel="photo" type="image/jpeg" href="'.$contact["thumb"].'" />'."\n";
+	private static function construct_new_friend_object($contact) {
+		$objtype = ACTIVITY_OBJ_PERSON;
+		$link = '<link rel="alternate" type="text/html" href="'.$contact["url"].'" />'."\n".
+			'<link rel="photo" type="image/jpeg" href="'.$contact["thumb"].'" />'."\n";
 
-                $xmldata = array("object" => array("type" => $objtype,
-                                                "title" => $contact["name"],
-                                                "id" => $contact["url"]."/".$contact["name"],
-                                                "link" => $link));
+		$xmldata = array("object" => array("type" => $objtype,
+						"title" => $contact["name"],
+						"id" => $contact["url"]."/".$contact["name"],
+						"link" => $link));
 
-                return xml::from_array($xmldata, $xml, true);
-        }
+		return xml::from_array($xmldata, $xml, true);
+	}
 
 	/**
 	 * @brief Processes incoming sharing notification
@@ -1832,24 +1954,27 @@ class diaspora {
 	 *
 	 * @return bool Success
 	 */
-	private function receive_contact_request($importer, $data) {
+	private static function receive_contact_request($importer, $data) {
 		$author = unxmlify($data->author);
 		$recipient = unxmlify($data->recipient);
 
-		if (!$author || !$recipient)
+		if (!$author || !$recipient) {
 			return false;
+		}
 
 		// the current protocol version doesn't know these fields
 		// That means that we will assume their existance
-		if (isset($data->following))
+		if (isset($data->following)) {
 			$following = (unxmlify($data->following) == "true");
-		else
+		} else {
 			$following = true;
+		}
 
-		if (isset($data->sharing))
+		if (isset($data->sharing)) {
 			$sharing = (unxmlify($data->sharing) == "true");
-		else
+		} else {
 			$sharing = true;
+		}
 
 		$contact = self::contact_by_handle($importer["uid"],$author);
 
@@ -1867,7 +1992,7 @@ class diaspora {
 				// Normally we needn't to do so, but the first message could have been vanished.
 				if (in_array($contact["rel"], array(CONTACT_IS_FRIEND, CONTACT_IS_FOLLOWER))) {
 					$u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer["uid"]));
-					if($u) {
+					if ($u) {
 						logger("Sending share message to author ".$author." - Contact: ".$contact["id"]." - User: ".$importer["uid"], LOGGER_DEBUG);
 						$ret = self::send_share($u[0], $contact);
 					}
@@ -2010,7 +2135,7 @@ class diaspora {
 	 *
 	 * @return array The fetched item
 	 */
-	private function original_item($guid, $orig_author, $author) {
+	private static function original_item($guid, $orig_author, $author) {
 
 		// Do we already have this item?
 		$r = q("SELECT `body`, `tag`, `app`, `created`, `object-type`, `uri`, `guid`,
@@ -2018,26 +2143,29 @@ class diaspora {
 				FROM `item` WHERE `guid` = '%s' AND `visible` AND NOT `deleted` AND `body` != '' LIMIT 1",
 			dbesc($guid));
 
-		if($r) {
+		if (dbm::is_result($r)) {
 			logger("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.
 			// If it is a reshared post from another network then reformat to avoid display problems with two share elements
-			if (self::is_reshare($r[0]["body"], true))
+			if (self::is_reshare($r[0]["body"], true)) {
 				$r = array();
-			elseif (self::is_reshare($r[0]["body"], false)) {
+			} elseif (self::is_reshare($r[0]["body"], false)) {
 				$r[0]["body"] = diaspora2bb(bb2diaspora($r[0]["body"]));
 
+				$r[0]["body"] = self::replace_people_guid($r[0]["body"], $r[0]["author-link"]);
+
 				// Add OEmbed and other information to the body
 				$r[0]["body"] = add_page_info_to_body($r[0]["body"], false, true);
 
 				return $r[0];
-			} else
+			} else {
 				return $r[0];
+			}
 		}
 
-		if (!$r) {
+		if (!dbm::is_result($r)) {
 			$server = "https://".substr($orig_author, strpos($orig_author, "@") + 1);
 			logger("1st try: reshared message ".$guid." will be fetched via SSL from the server ".$server);
 			$item_id = self::store_by_guid($guid, $server);
@@ -2054,10 +2182,12 @@ class diaspora {
 					FROM `item` WHERE `id` = %d AND `visible` AND NOT `deleted` AND `body` != '' LIMIT 1",
 					intval($item_id));
 
-				if ($r) {
+				if (dbm::is_result($r)) {
 					// If it is a reshared post from another network then reformat to avoid display problems with two share elements
-					if (self::is_reshare($r[0]["body"], false))
+					if (self::is_reshare($r[0]["body"], false)) {
 						$r[0]["body"] = diaspora2bb(bb2diaspora($r[0]["body"]));
+						$r[0]["body"] = self::replace_people_guid($r[0]["body"], $r[0]["author-link"]);
+					}
 
 					return $r[0];
 				}
@@ -2076,7 +2206,7 @@ class diaspora {
 	 *
 	 * @return int the message id
 	 */
-	private function receive_reshare($importer, $data, $xml) {
+	private static function receive_reshare($importer, $data, $xml) {
 		$root_author = notags(unxmlify($data->root_author));
 		$root_guid = notags(unxmlify($data->root_guid));
 		$guid = notags(unxmlify($data->guid));
@@ -2085,16 +2215,19 @@ class diaspora {
 		$created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
 
 		$contact = self::allowed_contact_by_handle($importer, $author, false);
-		if (!$contact)
+		if (!$contact) {
 			return false;
+		}
 
 		$message_id = self::message_exists($importer["uid"], $guid);
-		if ($message_id)
+		if ($message_id) {
 			return $message_id;
+		}
 
 		$original_item = self::original_item($root_guid, $root_author, $author);
-		if (!$original_item)
+		if (!$original_item) {
 			return false;
+		}
 
 		$orig_url = App::get_baseurl()."/display/".$original_item["guid"];
 
@@ -2136,8 +2269,9 @@ class diaspora {
 		self::fetch_guid($datarray);
 		$message_id = item_store($datarray);
 
-		if ($message_id)
+		if ($message_id) {
 			logger("Stored reshare ".$datarray["guid"]." with message id ".$message_id, LOGGER_DEBUG);
+		}
 
 		return $message_id;
 	}
@@ -2151,7 +2285,7 @@ class diaspora {
 	 *
 	 * @return bool success
 	 */
-	private function item_retraction($importer, $contact, $data) {
+	private static function item_retraction($importer, $contact, $data) {
 		$target_type = notags(unxmlify($data->target_type));
 		$target_guid = notags(unxmlify($data->target_guid));
 		$author = notags(unxmlify($data->author));
@@ -2166,8 +2300,9 @@ class diaspora {
 			dbesc($target_guid),
 			intval($importer["uid"])
 		);
-		if (!$r)
+		if (!$r) {
 			return false;
+		}
 
 		// Check if the sender is the thread owner
 		$p = q("SELECT `id`, `author-link`, `origin` FROM `item` WHERE `id` = %d",
@@ -2190,7 +2325,7 @@ class diaspora {
 		logger("Deleted target ".$target_guid." (".$r[0]["id"].") from user ".$importer["uid"]." parent: ".$p[0]["id"], LOGGER_DEBUG);
 
 		// Now check if the retraction needs to be relayed by us
-		if($p[0]["origin"]) {
+		if ($p[0]["origin"]) {
 			// notify others
 			proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $r[0]["id"]);
 		}
@@ -2207,7 +2342,7 @@ class diaspora {
 	 *
 	 * @return bool Success
 	 */
-	private function receive_retraction($importer, $sender, $data) {
+	private static function receive_retraction($importer, $sender, $data) {
 		$target_type = notags(unxmlify($data->target_type));
 
 		$contact = self::contact_by_handle($importer["uid"], $sender);
@@ -2249,7 +2384,7 @@ class diaspora {
 	 *
 	 * @return int The message id of the newly created item
 	 */
-	private function receive_status_message($importer, $data, $xml) {
+	private static function receive_status_message($importer, $data, $xml) {
 		$raw_message = unxmlify($data->raw_message);
 		$guid = notags(unxmlify($data->guid));
 		$author = notags(unxmlify($data->author));
@@ -2264,17 +2399,21 @@ class diaspora {
 		//	die("poll!\n");
 		//}
 		$contact = self::allowed_contact_by_handle($importer, $author, false);
-		if (!$contact)
+		if (!$contact) {
 			return false;
+		}
 
 		$message_id = self::message_exists($importer["uid"], $guid);
-		if ($message_id)
+		if ($message_id) {
 			return $message_id;
+		}
 
 		$address = array();
-		if ($data->location)
-			foreach ($data->location->children() AS $fieldname => $data)
+		if ($data->location) {
+			foreach ($data->location->children() AS $fieldname => $data) {
 				$address[$fieldname] = notags(unxmlify($data));
+			}
+		}
 
 		$body = diaspora2bb($raw_message);
 
@@ -2282,17 +2421,19 @@ class diaspora {
 
 		// Attach embedded pictures to the body
 		if ($data->photo) {
-			foreach ($data->photo AS $photo)
+			foreach ($data->photo AS $photo) {
 				$body = "[img]".unxmlify($photo->remote_photo_path).
 					unxmlify($photo->remote_photo_name)."[/img]\n".$body;
+			}
 
-			$datarray["object-type"] = ACTIVITY_OBJ_PHOTO;
+			$datarray["object-type"] = ACTIVITY_OBJ_IMAGE;
 		} else {
 			$datarray["object-type"] = ACTIVITY_OBJ_NOTE;
 
 			// Add OEmbed and other information to the body
-			if (!self::is_redmatrix($contact["url"]))
+			if (!self::is_redmatrix($contact["url"])) {
 				$body = add_page_info_to_body($body, false, true);
+			}
 		}
 
 		$datarray["uid"] = $importer["uid"];
@@ -2315,26 +2456,30 @@ class diaspora {
 
 		$datarray["object"] = $xml;
 
-		$datarray["body"] = $body;
+		$datarray["body"] = self::replace_people_guid($body, $contact["url"]);
 
-		if ($provider_display_name != "")
+		if ($provider_display_name != "") {
 			$datarray["app"] = $provider_display_name;
+		}
 
 		$datarray["plink"] = self::plink($author, $guid);
 		$datarray["private"] = (($public == "false") ? 1 : 0);
 		$datarray["changed"] = $datarray["created"] = $datarray["edited"] = $created_at;
 
-		if (isset($address["address"]))
+		if (isset($address["address"])) {
 			$datarray["location"] = $address["address"];
+		}
 
-		if (isset($address["lat"]) AND isset($address["lng"]))
+		if (isset($address["lat"]) AND isset($address["lng"])) {
 			$datarray["coord"] = $address["lat"]." ".$address["lng"];
+		}
 
 		self::fetch_guid($datarray);
 		$message_id = item_store($datarray);
 
-		if ($message_id)
+		if ($message_id) {
 			logger("Stored item ".$datarray["guid"]." with message id ".$message_id, LOGGER_DEBUG);
+		}
 
 		return $message_id;
 	}
@@ -2350,16 +2495,18 @@ class diaspora {
 	 *
 	 * @return string the handle in the format user@domain.tld
 	 */
-	private function my_handle($contact) {
-		if ($contact["addr"] != "")
+	private static function my_handle($contact) {
+		if ($contact["addr"] != "") {
 			return $contact["addr"];
+		}
 
 		// Normally we should have a filled "addr" field - but in the past this wasn't the case
 		// So - just in case - we build the the address here.
-		if ($contact["nickname"] != "")
+		if ($contact["nickname"] != "") {
 			$nick = $contact["nickname"];
-		else
+		} else {
 			$nick = $contact["nick"];
+		}
 
 		return $nick."@".substr(App::get_baseurl(), strpos(App::get_baseurl(),"://") + 3);
 	}
@@ -2378,7 +2525,7 @@ class diaspora {
 		$b64url_data = base64url_encode($msg);
 		$data = str_replace(array("\n", "\r", " ", "\t"), array("", "", "", ""), $b64url_data);
 
-		$key_id = base64url_encode(diaspora::my_handle($user));
+		$key_id = base64url_encode(self::my_handle($user));
 		$type = "application/xml";
 		$encoding = "base64url";
 		$alg = "RSA-SHA256";
@@ -2409,7 +2556,7 @@ class diaspora {
 	 *
 	 * @return string The envelope
 	 */
-	private function build_public_message($msg, $user, $contact, $prvkey, $pubkey) {
+	private static function build_public_message($msg, $user, $contact, $prvkey, $pubkey) {
 
 		logger("Message: ".$msg, LOGGER_DATA);
 
@@ -2455,7 +2602,7 @@ class diaspora {
 	 *
 	 * @return string The envelope
 	 */
-	private function build_private_message($msg, $user, $contact, $prvkey, $pubkey) {
+	private static function build_private_message($msg, $user, $contact, $prvkey, $pubkey) {
 
 		logger("Message: ".$msg, LOGGER_DATA);
 
@@ -2546,7 +2693,7 @@ class diaspora {
 	 *
 	 * @return string The message that will be transmitted to other servers
 	 */
-	private function build_message($msg, $user, $contact, $prvkey, $pubkey, $public = false) {
+	private static function build_message($msg, $user, $contact, $prvkey, $pubkey, $public = false) {
 
 		if ($public)
 			$magic_env =  self::build_public_message($msg,$user,$contact,$prvkey,$pubkey);
@@ -2566,7 +2713,7 @@ class diaspora {
 	 *
 	 * @return string The signature
 	 */
-	private function signature($owner, $message) {
+	private static function signature($owner, $message) {
 		$sigmsg = $message;
 		unset($sigmsg["author_signature"]);
 		unset($sigmsg["parent_author_signature"]);
@@ -2619,7 +2766,7 @@ class diaspora {
 
 		logger("transmit: ".$logid."-".$guid." returns: ".$return_code);
 
-		if(!$return_code || (($return_code == 503) && (stristr($a->get_curl_headers(), "retry-after")))) {
+		if (!$return_code || (($return_code == 503) && (stristr($a->get_curl_headers(), "retry-after")))) {
 			logger("queue message");
 
 			$r = q("SELECT `id` FROM `queue` WHERE `cid` = %d AND `network` = '%s' AND `content` = '%s' AND `batch` = %d LIMIT 1",
@@ -2628,12 +2775,18 @@ class diaspora {
 				dbesc($slap),
 				intval($public_batch)
 			);
-			if($r) {
+			if ($r) {
 				logger("add_to_queue ignored - identical item already in queue");
 			} else {
 				// queue message for redelivery
 				add_to_queue($contact["id"], NETWORK_DIASPORA, $slap, $public_batch);
+
+				// The message could not be delivered. We mark the contact as "dead"
+				mark_for_death($contact);
 			}
+		} elseif (($return_code >= 200) AND ($return_code <= 299)) {
+			// We successfully delivered a message, the contact is alive
+			unmark_for_death($contact);
 		}
 
 		return(($return_code) ? $return_code : (-1));
@@ -2667,7 +2820,7 @@ class diaspora {
 	 *
 	 * @return int Result of the transmission
 	 */
-	private function build_and_transmit($owner, $contact, $type, $message, $public_batch = false, $guid = "", $spool = false) {
+	private static function build_and_transmit($owner, $contact, $type, $message, $public_batch = false, $guid = "", $spool = false) {
 
 		$msg = self::build_post_xml($type, $message);
 
@@ -2808,6 +2961,80 @@ class diaspora {
 		return($ret);
 	}
 
+	/**
+	 * @brief Create an event array
+	 *
+	 * @param integer $event_id The id of the event
+	 *
+	 * @return array with event data
+	 */
+	private static function build_event($event_id) {
+
+		$r = q("SELECT `guid`, `uid`, `start`, `finish`, `nofinish`, `summary`, `desc`, `location`, `adjust` FROM `event` WHERE `id` = %d", intval($event_id));
+		if (!dbm::is_result($r)) {
+			return array();
+		}
+
+		$event = $r[0];
+
+		$eventdata = array();
+
+		$r = q("SELECT `timezone` FROM `user` WHERE `uid` = %d", intval($event['uid']));
+		if (!dbm::is_result($r)) {
+			return array();
+		}
+
+		$user = $r[0];
+
+		$r = q("SELECT `addr`, `nick` FROM `contact` WHERE `uid` = %d AND `self`", intval($event['uid']));
+		if (!dbm::is_result($r)) {
+			return array();
+		}
+
+		$owner = $r[0];
+
+		$eventdata['author'] = self::my_handle($owner);
+
+		if ($event['guid']) {
+			$eventdata['guid'] = $event['guid'];
+		}
+
+		$mask = 'Y-m-d\TH:i:s\Z';
+
+		/// @todo - establish "all day" events in Friendica
+		$eventdata["all_day"] = "false";
+
+		if (!$event['adjust']) {
+			$eventdata['timezone'] = $user['timezone'];
+
+			if ($eventdata['timezone'] == "") {
+				$eventdata['timezone'] = 'UTC';
+			}
+		}
+
+		if ($event['start']) {
+			$eventdata['start'] = datetime_convert($eventdata['timezone'], "UTC", $event['start'], $mask);
+		}
+		if ($event['finish'] AND !$event['nofinish']) {
+			$eventdata['end'] = datetime_convert($eventdata['timezone'], "UTC", $event['finish'], $mask);
+		}
+		if ($event['summary']) {
+			$eventdata['summary'] = html_entity_decode(bb2diaspora($event['summary']));
+		}
+		if ($event['desc']) {
+			$eventdata['description'] = html_entity_decode(bb2diaspora($event['desc']));
+		}
+		if ($event['location']) {
+			$location = array();
+			$location["address"] = html_entity_decode(bb2diaspora($event['location']));
+			$location["lat"] = 0;
+			$location["lng"] = 0;
+			$eventdata['location'] = $location;
+		}
+
+		return $eventdata;
+	}
+
 	/**
 	 * @brief Create a post (status message or reshare)
 	 *
@@ -2820,11 +3047,18 @@ class diaspora {
 	 */
 	public static function build_status($item, $owner) {
 
+		$cachekey = "diaspora:build_status:".$item['guid'];
+
+		$result = Cache::get($cachekey);
+		if (!is_null($result)) {
+			return $result;
+		}
+
 		$myaddr = self::my_handle($owner);
 
 		$public = (($item["private"]) ? "false" : "true");
 
-		$created = datetime_convert("UTC", "UTC", $item["created"], 'Y-m-d H:i:s \U\T\C');
+		$created = datetime_convert("UTC", "UTC", $item["created"], 'Y-m-d\TH:i:s\Z');
 
 		// Detect a share element and do a reshare
 		if (!$item['private'] AND ($ret = self::is_reshare($item["body"]))) {
@@ -2881,9 +3115,24 @@ class diaspora {
 				unset($message["location"]);
 			}
 
+			if ($item['event-id'] > 0) {
+				$event = self::build_event($item['event-id']);
+				if (count($event)) {
+					$message['event'] = $event;
+
+					/// @todo Once Diaspora supports it, we will remove the body
+					// $message['raw_message'] = '';
+				}
+			}
+
 			$type = "status_message";
 		}
-		return array("type" => $type, "message" => $message);
+
+		$msg = array("type" => $type, "message" => $message);
+
+		Cache::set($cachekey, $msg, CACHE_QUARTER_HOUR);
+
+		return $msg;
 	}
 
 	/**
@@ -2898,7 +3147,7 @@ class diaspora {
 	 */
 	public static function send_status($item, $owner, $contact, $public_batch = false) {
 
-		$status = diaspora::build_status($item, $owner);
+		$status = self::build_status($item, $owner);
 
 		return self::build_and_transmit($owner, $contact, $status["type"], $status["message"], $public_batch, $item["guid"]);
 	}
@@ -2911,17 +3160,21 @@ class diaspora {
 	 *
 	 * @return array The data for a "like"
 	 */
-	private function construct_like($item, $owner) {
+	private static function construct_like($item, $owner) {
 
 		$p = q("SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1",
 			dbesc($item["thr-parent"]));
-		if(!$p)
+		if (!dbm::is_result($p))
 			return false;
 
 		$parent = $p[0];
 
 		$target_type = ($parent["uri"] === $parent["parent-uri"] ? "Post" : "Comment");
-		$positive = "true";
+		if ($item['verb'] === ACTIVITY_LIKE) {
+			$positive = "true";
+		} elseif ($item['verb'] === ACTIVITY_DISLIKE) {
+			$positive = "false";
+		}
 
 		return(array("positive" => $positive,
 				"guid" => $item["guid"],
@@ -2931,6 +3184,45 @@ class diaspora {
 				"diaspora_handle" => self::my_handle($owner)));
 	}
 
+	/**
+	 * @brief Creates an "EventParticipation" object
+	 *
+	 * @param array $item The item that will be exported
+	 * @param array $owner the array of the item owner
+	 *
+	 * @return array The data for an "EventParticipation"
+	 */
+	private static function construct_attend($item, $owner) {
+
+		$p = q("SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1",
+			dbesc($item["thr-parent"]));
+		if (!dbm::is_result($p))
+			return false;
+
+		$parent = $p[0];
+
+		switch ($item['verb']) {
+			case ACTIVITY_ATTEND:
+				$attend_answer = 'accepted';
+				break;
+			case ACTIVITY_ATTENDNO:
+				$attend_answer = 'declined';
+				break;
+			case ACTIVITY_ATTENDMAYBE:
+				$attend_answer = 'tentative';
+				break;
+			default:
+				logger('Unknown verb '.$item['verb'].' in item '.$item['guid']);
+				return false;
+		}
+
+		return(array("author" => self::my_handle($owner),
+				"guid" => $item["guid"],
+				"parent_guid" => $parent["guid"],
+				"status" => $attend_answer,
+				"author_signature" => ""));
+	}
+
 	/**
 	 * @brief Creates the object for a comment
 	 *
@@ -2939,25 +3231,43 @@ class diaspora {
 	 *
 	 * @return array The data for a comment
 	 */
-	private function construct_comment($item, $owner) {
+	private static function construct_comment($item, $owner) {
+
+		$cachekey = "diaspora:construct_comment:".$item['guid'];
+
+		$result = Cache::get($cachekey);
+		if (!is_null($result)) {
+			return $result;
+		}
 
 		$p = q("SELECT `guid` FROM `item` WHERE `parent` = %d AND `id` = %d LIMIT 1",
 			intval($item["parent"]),
 			intval($item["parent"])
 		);
 
-		if (!$p)
+		if (!dbm::is_result($p))
 			return false;
 
 		$parent = $p[0];
 
 		$text = html_entity_decode(bb2diaspora($item["body"]));
+		$created = datetime_convert("UTC", "UTC", $item["created"], 'Y-m-d\TH:i:s\Z');
 
-		return(array("guid" => $item["guid"],
+		$comment = array("guid" => $item["guid"],
 				"parent_guid" => $parent["guid"],
 				"author_signature" => "",
 				"text" => $text,
-				"diaspora_handle" => self::my_handle($owner)));
+				/// @todo Currently disabled until Diaspora supports it: "created_at" => $created,
+				"diaspora_handle" => self::my_handle($owner));
+
+		// Send the thread parent guid only if it is a threaded comment
+		if ($item['thr-parent'] != $item['parent-uri']) {
+			$comment['thread_parent_guid'] = self::get_guid_from_uri($item['thr-parent'], $item['uid']);
+		}
+
+		Cache::set($cachekey, $comment, CACHE_QUARTER_HOUR);
+
+		return($comment);
 	}
 
 	/**
@@ -2972,7 +3282,10 @@ class diaspora {
 	 */
 	public static function send_followup($item,$owner,$contact,$public_batch = false) {
 
-		if($item['verb'] === ACTIVITY_LIKE) {
+		if (in_array($item['verb'], array(ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE))) {
+			$message = self::construct_attend($item, $owner);
+			$type = "event_participation";
+		} elseif (in_array($item["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) {
 			$message = self::construct_like($item, $owner);
 			$type = "like";
 		} else {
@@ -2996,7 +3309,7 @@ class diaspora {
 	 *
 	 * @return string The message
 	 */
-	private function message_from_signature($item, $signature) {
+	private static function message_from_signature($item, $signature) {
 
 		// Split the signed text
 		$signed_parts = explode(";", $signature['signed_text']);
@@ -3160,7 +3473,7 @@ class diaspora {
 			intval($item["uid"])
 		);
 
-		if (!$r) {
+		if (!dbm::is_result($r)) {
 			logger("conversation not found.");
 			return;
 		}
@@ -3169,13 +3482,13 @@ class diaspora {
 		$conv = array(
 			"guid" => $cnv["guid"],
 			"subject" => $cnv["subject"],
-			"created_at" => datetime_convert("UTC", "UTC", $cnv['created'], 'Y-m-d H:i:s \U\T\C'),
+			"created_at" => datetime_convert("UTC", "UTC", $cnv['created'], 'Y-m-d\TH:i:s\Z'),
 			"diaspora_handle" => $cnv["creator"],
 			"participant_handles" => $cnv["recips"]
 		);
 
 		$body = bb2diaspora($item["body"]);
-		$created = datetime_convert("UTC", "UTC", $item["created"], 'Y-m-d H:i:s \U\T\C');
+		$created = datetime_convert("UTC", "UTC", $item["created"], 'Y-m-d\TH:i:s\Z');
 
 		$signed_text = $item["guid"].";".$cnv["guid"].";".$body.";".$created.";".$myaddr.";".$cnv['guid'];
 		$sig = base64_encode(rsa_sign($signed_text, $owner["uprvkey"], "sha256"));
@@ -3197,7 +3510,7 @@ class diaspora {
 		} else {
 			$message = array("guid" => $cnv["guid"],
 					"subject" => $cnv["subject"],
-					"created_at" => datetime_convert("UTC", "UTC", $cnv['created'], 'Y-m-d H:i:s \U\T\C'),
+					"created_at" => datetime_convert("UTC", "UTC", $cnv['created'], 'Y-m-d\TH:i:s\Z'),
 					"message" => $msg,
 					"diaspora_handle" => $cnv["creator"],
 					"participant_handles" => $cnv["recips"]);
@@ -3326,26 +3639,13 @@ class diaspora {
 		$message = self::construct_like($r[0], $contact);
 		$message["author_signature"] = self::signature($contact, $message);
 
-		// In the future we will store the signature more flexible to support new fields.
-		// Right now we cannot change this since old Friendica versions (prior to 3.5) can only handle this format.
-		// (We are transmitting this data here via DFRN)
-
-		$signed_text = $message["positive"].";".$message["guid"].";".$message["target_type"].";".
-				$message["parent_guid"].";".$message["diaspora_handle"];
-
-		q("INSERT INTO `sign` (`iid`,`signed_text`,`signature`,`signer`) VALUES (%d,'%s','%s','%s')",
-			intval($post_id),
-			dbesc($signed_text),
-			dbesc($message["author_signature"]),
-			dbesc($message["diaspora_handle"])
+		// We now store the signature more flexible to dynamically support new fields.
+		// This will break Diaspora compatibility with Friendica versions prior to 3.5.
+		q("INSERT INTO `sign` (`iid`,`signed_text`) VALUES (%d,'%s')",
+			intval($message_id),
+			dbesc(json_encode($message))
 		);
 
-		// This here will replace the lines above, once Diaspora changed its protocol
-		//q("INSERT INTO `sign` (`iid`,`signed_text`) VALUES (%d,'%s')",
-		//	intval($message_id),
-		//	dbesc(json_encode($message))
-		//);
-
 		logger('Stored diaspora like signature');
 		return true;
 	}
@@ -3372,25 +3672,13 @@ class diaspora {
 		$message = self::construct_comment($item, $contact);
 		$message["author_signature"] = self::signature($contact, $message);
 
-		// In the future we will store the signature more flexible to support new fields.
-		// Right now we cannot change this since old Friendica versions (prior to 3.5) can only handle this format.
-		// (We are transmitting this data here via DFRN)
-		$signed_text = $message["guid"].";".$message["parent_guid"].";".
-				$message["text"].";".$message["diaspora_handle"];
-
-		q("INSERT INTO `sign` (`iid`,`signed_text`,`signature`,`signer`) VALUES (%d,'%s','%s','%s')",
+		// We now store the signature more flexible to dynamically support new fields.
+		// This will break Diaspora compatibility with Friendica versions prior to 3.5.
+		q("INSERT INTO `sign` (`iid`,`signed_text`) VALUES (%d,'%s')",
 			intval($message_id),
-			dbesc($signed_text),
-			dbesc($message["author_signature"]),
-			dbesc($message["diaspora_handle"])
+			dbesc(json_encode($message))
 		);
 
-		// This here will replace the lines above, once Diaspora changed its protocol
-		//q("INSERT INTO `sign` (`iid`,`signed_text`) VALUES (%d,'%s')",
-		//	intval($message_id),
-		//	dbesc(json_encode($message))
-		//);
-
 		logger('Stored diaspora comment signature');
 		return true;
 	}