X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FDiaspora.php;h=f8e4f35c18d62f5d05a3df011ed4280295488312;hb=26b335ef3d8b1ec4e1b4e22cd7d3c34e66d2549d;hp=67167ac930846c90c8278904a8d3cc5d5e9dc8a2;hpb=fb88d78862530566ec69615c71cdcad02769484c;p=friendica.git

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 67167ac930..f8e4f35c18 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -22,6 +22,7 @@ use Friendica\Model\Group;
 use Friendica\Model\Profile;
 use Friendica\Model\User;
 use Friendica\Network\Probe;
+use Friendica\Util\Crypto;
 use Friendica\Util\XML;
 
 use dba;
@@ -50,10 +51,10 @@ class Diaspora
 	{
 		$serverdata = Config::get("system", "relay_server");
 		if ($serverdata == "") {
-			return array();
+			return [];
 		}
 
-		$relay = array();
+		$relay = [];
 
 		$servers = explode(",", $serverdata);
 
@@ -98,6 +99,53 @@ class Diaspora
 		return $relay;
 	}
 
+	/**
+	 * @brief Return a list of participating contacts for a thread
+	 *
+	 * This is used for the participation feature.
+	 * One of the parameters is a contact array.
+	 * This is done to avoid duplicates.
+	 *
+	 * @param integer $thread   The id of the thread
+	 * @param array   $contacts The previously fetched contacts
+	 *
+	 * @return array of relay servers
+	 */
+	public static function participantsForThread($thread, $contacts)
+	{
+		$r = dba::p("SELECT `contact`.`batch`, `contact`.`id`, `contact`.`name`, `contact`.`network`,
+				`fcontact`.`batch` AS `fbatch`, `fcontact`.`network` AS `fnetwork` FROM `participation`
+				INNER JOIN `contact` ON `contact`.`id` = `participation`.`cid`
+				INNER JOIN `fcontact` ON `fcontact`.`id` = `participation`.`fid`
+				WHERE `participation`.`iid` = ?", $thread);
+
+		while ($contact = dba::fetch($r)) {
+			if (!empty($contact['fnetwork'])) {
+				$contact['network'] = $contact['fnetwork'];
+			}
+			unset($contact['fnetwork']);
+
+			if (empty($contact['batch']) && !empty($contact['fbatch'])) {
+				$contact['batch'] = $contact['fbatch'];
+			}
+			unset($contact['fbatch']);
+
+			$exists = false;
+			foreach ($contacts as $entry) {
+				if ($entry['batch'] == $contact['batch']) {
+					$exists = true;
+				}
+			}
+
+			if (!$exists) {
+				$contacts[] = $contact;
+			}
+		}
+		dba::close($r);
+
+		return $contacts;
+	}
+
 	/**
 	 * @brief repairs a signature that was double encoded
 	 *
@@ -167,13 +215,13 @@ class Diaspora
 		}
 
 		$b64url_data = base64url_encode($data);
-		$msg = str_replace(array("\n", "\r", " ", "\t"), array("", "", "", ""), $b64url_data);
+		$msg = str_replace(["\n", "\r", " ", "\t"], ["", "", "", ""], $b64url_data);
 
 		$signable_data = $msg.".".base64url_encode($type).".".base64url_encode($encoding).".".base64url_encode($alg);
 
 		$key = self::key($handle);
 
-		$verify = rsa_verify($signable_data, $sig, $key);
+		$verify = Crypto::rsaVerify($signable_data, $sig, $key);
 		if (!$verify) {
 			logger('Message did not verify. Discarding.');
 			return false;
@@ -257,7 +305,7 @@ class Diaspora
 		$base = $basedom->children(NAMESPACE_SALMON_ME);
 
 		// Not sure if this cleaning is needed
-		$data = str_replace(array(" ", "\t", "\r", "\n"), array("", "", "", ""), $base->data);
+		$data = str_replace([" ", "\t", "\r", "\n"], ["", "", "", ""], $base->data);
 
 		// Build the signed data
 		$type = $base->data[0]->attributes()->type[0];
@@ -273,15 +321,15 @@ class Diaspora
 		$author_addr = base64_decode($key_id);
 		$key = self::key($author_addr);
 
-		$verify = rsa_verify($signed_data, $signature, $key);
+		$verify = Crypto::rsaVerify($signed_data, $signature, $key);
 		if (!$verify) {
 			logger('Message did not verify. Discarding.');
 			http_status_exit(400);
 		}
 
-		return array('message' => (string)base64url_decode($base->data),
+		return ['message' => (string)base64url_decode($base->data),
 				'author' => unxmlify($author_addr),
-				'key' => (string)$key);
+				'key' => (string)$key];
 	}
 
 	/**
@@ -364,7 +412,7 @@ class Diaspora
 		// unpack the  data
 
 		// strip whitespace so our data element will return to one big base64 blob
-		$data = str_replace(array(" ", "\t", "\r", "\n"), array("", "", "", ""), $base->data);
+		$data = str_replace([" ", "\t", "\r", "\n"], ["", "", "", ""], $base->data);
 
 
 		// stash away some other stuff for later
@@ -406,7 +454,7 @@ class Diaspora
 			http_status_exit(400);
 		}
 
-		$verify = rsa_verify($signed_data, $signature, $key);
+		$verify = Crypto::rsaVerify($signed_data, $signature, $key);
 
 		if (!$verify) {
 			logger('Message did not verify. Discarding.');
@@ -415,9 +463,9 @@ class Diaspora
 
 		logger('Message verified.');
 
-		return array('message' => (string)$inner_decrypted,
+		return ['message' => (string)$inner_decrypted,
 				'author' => unxmlify($author_link),
-				'key' => (string)$key);
+				'key' => (string)$key];
 	}
 
 
@@ -456,11 +504,11 @@ class Diaspora
 
 		// Process item retractions. This has to be done separated from the other stuff,
 		// since retractions for comments could come even from non followers.
-		if (!empty($fields) && in_array($fields->getName(), array('retraction'))) {
+		if (!empty($fields) && in_array($fields->getName(), ['retraction'])) {
 			$target = notags(unxmlify($fields->target_type));
-			if (in_array($target, array("Comment", "Like", "Post", "Reshare", "StatusMessage"))) {
+			if (in_array($target, ["Comment", "Like", "Post", "Reshare", "StatusMessage"])) {
 				logger('processing retraction for '.$target, LOGGER_DEBUG);
-				$importer = array("uid" => 0, "page-flags" => PAGE_FREELOVE);
+				$importer = ["uid" => 0, "page-flags" => PAGE_FREELOVE];
 				$message_id = self::dispatch($importer, $msg, $fields);
 				return $message_id;
 			}
@@ -484,7 +532,7 @@ class Diaspora
 			logger("Unwanted message from ".$msg["author"]." send by ".$_SERVER["REMOTE_ADDR"]." with ".$_SERVER["HTTP_USER_AGENT"].": ".print_r($msg, true), LOGGER_DEBUG);
 		} else {
 			// Use a dummy importer to import the data for the public copy
-			$importer = array("uid" => 0, "page-flags" => PAGE_FREELOVE);
+			$importer = ["uid" => 0, "page-flags" => PAGE_FREELOVE];
 			$message_id = self::dispatch($importer, $msg, $fields);
 		}
 
@@ -541,7 +589,7 @@ class Diaspora
 			case "message":
 				return self::receiveMessage($importer, $fields);
 
-			case "participation": // Not implemented
+			case "participation":
 				return self::receiveParticipation($importer, $fields);
 
 			case "photo": // Not implemented
@@ -609,7 +657,7 @@ class Diaspora
 
 		// All retractions are handled identically from now on.
 		// In the new version there will only be "retraction".
-		if (in_array($type, array("signed_retraction", "relayable_retraction")))
+		if (in_array($type, ["signed_retraction", "relayable_retraction"]))
 			$type = "retraction";
 
 		if ($type == "request") {
@@ -629,7 +677,7 @@ class Diaspora
 				if ($fieldname == "participant_handles") {
 					$fieldname = "participants";
 				}
-				if (in_array($type, array("like", "participation"))) {
+				if (in_array($type, ["like", "participation"])) {
 					if ($fieldname == "target_type") {
 						$fieldname = "parent_type";
 					}
@@ -662,14 +710,14 @@ class Diaspora
 				$author_signature = base64_decode($entry);
 			} elseif (($fieldname == "parent_author_signature") && ($entry != "")) {
 				$parent_author_signature = base64_decode($entry);
-			} elseif (!in_array($fieldname, array("author_signature", "parent_author_signature", "target_author_signature"))) {
+			} elseif (!in_array($fieldname, ["author_signature", "parent_author_signature", "target_author_signature"])) {
 				if ($signed_data != "") {
 					$signed_data .= ";";
 				}
 
 				$signed_data .= $entry;
 			}
-			if (!in_array($fieldname, array("parent_author_signature", "target_author_signature"))
+			if (!in_array($fieldname, ["parent_author_signature", "target_author_signature"])
 				|| ($orig_type == "relayable_retraction")
 			) {
 				XML::copy($entry, $fields, $fieldname);
@@ -677,7 +725,7 @@ class Diaspora
 		}
 
 		// This is something that shouldn't happen at all.
-		if (in_array($type, array("status_message", "reshare", "profile"))) {
+		if (in_array($type, ["status_message", "reshare", "profile"])) {
 			if ($msg["author"] != $fields->author) {
 				logger("Message handle is not the same as envelope sender. Quitting this message.");
 				return false;
@@ -685,8 +733,8 @@ class Diaspora
 		}
 
 		// Only some message types have signatures. So we quit here for the other types.
-		if (!in_array($type, array("comment", "like"))) {
-			return array("fields" => $fields, "relayed" => false);
+		if (!in_array($type, ["comment", "like"])) {
+			return ["fields" => $fields, "relayed" => false];
 		}
 		// No author_signature? This is a must, so we quit.
 		if (!isset($author_signature)) {
@@ -699,7 +747,7 @@ class Diaspora
 
 			$key = self::key($msg["author"]);
 
-			if (!rsa_verify($signed_data, $parent_author_signature, $key, "sha256")) {
+			if (!Crypto::rsaVerify($signed_data, $parent_author_signature, $key, "sha256")) {
 				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;
 			}
@@ -709,11 +757,11 @@ class Diaspora
 
 		$key = self::key($fields->author);
 
-		if (!rsa_verify($signed_data, $author_signature, $key, "sha256")) {
+		if (!Crypto::rsaVerify($signed_data, $author_signature, $key, "sha256")) {
 			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 array("fields" => $fields, "relayed" => $relayed);
+			return ["fields" => $fields, "relayed" => $relayed];
 		}
 	}
 
@@ -1263,7 +1311,7 @@ class Diaspora
 			return false;
 		}
 
-		$msg = array("message" => $x, "author" => $author);
+		$msg = ["message" => $x, "author" => $author];
 
 		$msg["key"] = self::key($msg["author"]);
 
@@ -1348,7 +1396,7 @@ class Diaspora
 			$network = NETWORK_DIASPORA;
 		}
 
-		return array("cid" => $cid, "network" => $network);
+		return ["cid" => $cid, "network" => $network];
 	}
 
 	/**
@@ -1432,7 +1480,7 @@ class Diaspora
 		// Check signature
 		$signed_text = 'AccountMigration:'.$old_handle.':'.$new_handle;
 		$key = self::key($old_handle);
-		if (!rsa_verify($signed_text, $signature, $key, "sha256")) {
+		if (!Crypto::rsaVerify($signed_text, $signature, $key, "sha256")) {
 			logger('No valid signature for migration.');
 			return false;
 		}
@@ -1447,30 +1495,30 @@ class Diaspora
 			return false;
 		}
 
-		$fields = array('url' => $data['url'], 'nurl' => normalise_link($data['url']),
+		$fields = ['url' => $data['url'], 'nurl' => normalise_link($data['url']),
 				'name' => $data['name'], 'nick' => $data['nick'],
 				'addr' => $data['addr'], 'batch' => $data['batch'],
 				'notify' => $data['notify'], 'poll' => $data['poll'],
-				'network' => $data['network']);
+				'network' => $data['network']];
 
-		dba::update('contact', $fields, array('addr' => $old_handle));
+		dba::update('contact', $fields, ['addr' => $old_handle]);
 
-		$fields = array('url' => $data['url'], 'nurl' => normalise_link($data['url']),
+		$fields = ['url' => $data['url'], 'nurl' => normalise_link($data['url']),
 				'name' => $data['name'], 'nick' => $data['nick'],
 				'addr' => $data['addr'], 'connect' => $data['addr'],
 				'notify' => $data['notify'], 'photo' => $data['photo'],
-				'server_url' => $data['baseurl'], 'network' => $data['network']);
+				'server_url' => $data['baseurl'], 'network' => $data['network']];
 
-		dba::update('gcontact', $fields, array('addr' => $old_handle));
+		dba::update('gcontact', $fields, ['addr' => $old_handle]);
 
 		logger('Contacts are updated.');
 
 		// update items
 		/// @todo This is an extreme performance killer
-		$fields = array(
-			'owner-link' => array($contact["url"], $data["url"]),
-			'author-link' => array($contact["url"], $data["url"]),
-		);
+		$fields = [
+			'owner-link' => [$contact["url"], $data["url"]],
+			'author-link' => [$contact["url"], $data["url"]],
+		];
 		foreach ($fields as $n => $f) {
 			$r = q(
 				"SELECT `id` FROM `item` WHERE `%s` = '%s' AND `uid` = %d LIMIT 1",
@@ -1639,7 +1687,7 @@ class Diaspora
 		// Fetch the contact id - if we know this contact
 		$author_contact = self::authorContactByUrl($contact, $person, $importer["uid"]);
 
-		$datarray = array();
+		$datarray = [];
 
 		$datarray["uid"] = $importer["uid"];
 		$datarray["contact-id"] = $author_contact["cid"];
@@ -1695,7 +1743,7 @@ class Diaspora
 		if ($message_id && $parent_item["origin"]) {
 			// Formerly we stored the signed text, the signature and the author in different fields.
 			// We now store the raw data so that we are more flexible.
-			dba::insert('sign', array('iid' => $message_id, 'signed_text' => json_encode($data)));
+			dba::insert('sign', ['iid' => $message_id, 'signed_text' => json_encode($data)]);
 
 			// notify others
 			Worker::add(PRIORITY_HIGH, "Notifier", "comment-import", $message_id);
@@ -1780,22 +1828,22 @@ class Diaspora
 
 		dba::unlock();
 
-		dba::update('conv', array('updated' => datetime_convert()), array('id' => $conversation["id"]));
+		dba::update('conv', ['updated' => datetime_convert()], ['id' => $conversation["id"]]);
 
 		notification(
-			array(
+			[
 			"type" => NOTIFY_MAIL,
 			"notify_flags" => $importer["notify-flags"],
 			"language" => $importer["language"],
 			"to_name" => $importer["username"],
 			"to_email" => $importer["email"],
 			"uid" =>$importer["uid"],
-			"item" => array("subject" => $subject, "body" => $body),
+			"item" => ["subject" => $subject, "body" => $body],
 			"source_name" => $person["name"],
 			"source_link" => $person["url"],
 			"source_photo" => $person["thumb"],
 			"verb" => ACTIVITY_POST,
-			"otype" => "mail")
+			"otype" => "mail"]
 		);
 		return true;
 	}
@@ -1908,12 +1956,12 @@ class Diaspora
 		$link = '<link rel="alternate" type="text/html" href="'.System::baseUrl()."/display/".$importer["nickname"]."/".$parent_item["id"].'" />';
 		$parent_body = $parent_item["body"];
 
-		$xmldata = array("object" => array("type" => $objtype,
+		$xmldata = ["object" => ["type" => $objtype,
 						"local" => "1",
 						"id" => $parent_item["uri"],
 						"link" => $link,
 						"title" => "",
-						"content" => $parent_body));
+						"content" => $parent_body]];
 
 		return XML::fromArray($xmldata, $xml, true);
 	}
@@ -1937,7 +1985,7 @@ class Diaspora
 
 		// 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.
-		if (!in_array($parent_type, array("Post", "Comment"))) {
+		if (!in_array($parent_type, ["Post", "Comment"])) {
 			return false;
 		}
 
@@ -1973,7 +2021,7 @@ class Diaspora
 			$verb = ACTIVITY_DISLIKE;
 		}
 
-		$datarray = array();
+		$datarray = [];
 
 		$datarray["protocol"] = PROTOCOL_DIASPORA;
 
@@ -2014,7 +2062,7 @@ class Diaspora
 
 		// like on comments have the comment as parent. So we need to fetch the toplevel parent
 		if ($parent_item["id"] != $parent_item["parent"]) {
-			$toplevel = dba::select('item', array('origin'), array('id' => $parent_item["parent"]), array('limit' => 1));
+			$toplevel = dba::selectFirst('item', ['origin'], ['id' => $parent_item["parent"]]);
 			$origin = $toplevel["origin"];
 		} else {
 			$origin = $parent_item["origin"];
@@ -2024,7 +2072,7 @@ class Diaspora
 		if ($message_id && $origin) {
 			// Formerly we stored the signed text, the signature and the author in different fields.
 			// We now store the raw data so that we are more flexible.
-			dba::insert('sign', array('iid' => $message_id, 'signed_text' => json_encode($data)));
+			dba::insert('sign', ['iid' => $message_id, 'signed_text' => json_encode($data)]);
 
 			// notify others
 			Worker::add(PRIORITY_HIGH, "Notifier", "comment-import", $message_id);
@@ -2113,7 +2161,7 @@ class Diaspora
 
 		dba::unlock();
 
-		dba::update('conv', array('updated' => datetime_convert()), array('id' => $conversation["id"]));
+		dba::update('conv', ['updated' => datetime_convert()], ['id' => $conversation["id"]]);
 		return true;
 	}
 
@@ -2127,7 +2175,54 @@ class Diaspora
 	 */
 	private static function receiveParticipation($importer, $data)
 	{
-		// I'm not sure if we can fully support this message type
+		$author = strtolower(notags(unxmlify($data->author)));
+		$parent_guid = notags(unxmlify($data->parent_guid));
+
+		$contact_id = Contact::getIdForURL($author);
+		if (!$contact_id) {
+			logger('Contact not found: '.$author);
+			return false;
+		}
+
+		$person = self::personByHandle($author);
+		if (!is_array($person)) {
+			logger("Person not found: ".$author);
+			return false;
+		}
+
+		$item = dba::selectFirst('item', ['id'], ['guid' => $parent_guid, 'origin' => true, 'private' => false]);
+		if (!DBM::is_result($item)) {
+			logger('Item not found, no origin or private: '.$parent_guid);
+			return false;
+		}
+
+		$author_parts = explode('@', $author);
+		if (isset($author_parts[1])) {
+			$server = $author_parts[1];
+		} else {
+			// Should never happen
+			$server = $author;
+		}
+
+		logger('Received participation for ID: '.$item['id'].' - Contact: '.$contact_id.' - Server: '.$server, LOGGER_DEBUG);
+		dba::insert('participation', ['iid' => $item['id'], 'cid' => $contact_id, 'fid' => $person['id'], 'server' => $server]);
+
+		// Send all existing comments and likes to the requesting server
+		$comments = dba::p("SELECT `item`.`id`, `item`.`verb`, `contact`.`self`
+				FROM `item`
+				INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+				WHERE `item`.`parent` = ? AND `item`.`id` != `item`.`parent`", $item['id']);
+		while ($comment = dba::fetch($comments)) {
+			if ($comment['verb'] == ACTIVITY_POST) {
+				$cmd = $comment['self'] ? 'comment-new' : 'comment-import';
+			} else {
+				$cmd = $comment['self'] ? 'like' : 'comment-import';
+			}
+			logger("Send ".$cmd." for item ".$comment['id']." to contact ".$contact_id, LOGGER_DEBUG);
+			Worker::add(PRIORITY_HIGH, 'Delivery', $cmd, $comment['id'], $contact_id);
+		}
+		dba::close($comments);
+
 		return true;
 	}
 
@@ -2189,7 +2284,7 @@ class Diaspora
 
 		$tags = explode("#", $tags);
 
-		$keywords = array();
+		$keywords = [];
 		foreach ($tags as $tag) {
 			$tag = trim(strtolower($tag));
 			if ($tag != "") {
@@ -2243,11 +2338,11 @@ class Diaspora
 			intval($importer["uid"])
 		);
 
-		$gcontact = array("url" => $contact["url"], "network" => NETWORK_DIASPORA, "generation" => 2,
+		$gcontact = ["url" => $contact["url"], "network" => NETWORK_DIASPORA, "generation" => 2,
 					"photo" => $image_url, "name" => $name, "location" => $location,
 					"about" => $about, "birthday" => $birthday, "gender" => $gender,
 					"addr" => $author, "nick" => $nick, "keywords" => $keywords,
-					"hide" => !$searchable, "nsfw" => $nsfw);
+					"hide" => !$searchable, "nsfw" => $nsfw];
 
 		$gcid = GContact::update($gcontact);
 
@@ -2272,8 +2367,8 @@ class Diaspora
 		if ($contact["rel"] == CONTACT_IS_SHARING) {
 			dba::update(
 				'contact',
-				array('rel' => CONTACT_IS_FRIEND, 'writable' => true),
-				array('id' => $contact["id"], 'uid' => $importer["uid"])
+				['rel' => CONTACT_IS_FRIEND, 'writable' => true],
+				['id' => $contact["id"], 'uid' => $importer["uid"]]
 			);
 		}
 		// send notification
@@ -2292,7 +2387,7 @@ class Diaspora
 			// they are not CONTACT_IS_FOLLOWER anymore but that's what we have in the array
 
 			if ($self && $contact["rel"] == CONTACT_IS_FOLLOWER) {
-				$arr = array();
+				$arr = [];
 				$arr["protocol"] = PROTOCOL_DIASPORA;
 				$arr["uri"] = $arr["parent-uri"] = item_new_uri($a->get_hostname(), $importer["uid"]);
 				$arr["uid"] = $importer["uid"];
@@ -2316,7 +2411,7 @@ class Diaspora
 
 				$arr["last-child"] = 1;
 
-				$user = dba::select('user', ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid'], ['uid' => $importer["uid"]], ['limit' => 1]);
+				$user = dba::selectFirst('user', ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid'], ['uid' => $importer["uid"]]);
 
 				$arr["allow_cid"] = $user["allow_cid"];
 				$arr["allow_gid"] = $user["allow_gid"];
@@ -2344,10 +2439,10 @@ class Diaspora
 		$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,
+		$xmldata = ["object" => ["type" => $objtype,
 						"title" => $contact["name"],
 						"id" => $contact["url"]."/".$contact["name"],
-						"link" => $link));
+						"link" => $link]];
 
 		return XML::fromArray($xmldata, $xml, true);
 	}
@@ -2397,7 +2492,7 @@ class Diaspora
 
 				// If we are now friends, we are sending a share message.
 				// Normally we needn't to do so, but the first message could have been vanished.
-				if (in_array($contact["rel"], array(CONTACT_IS_FRIEND))) {
+				if (in_array($contact["rel"], [CONTACT_IS_FRIEND])) {
 					$u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer["uid"]));
 					if ($u) {
 						logger("Sending share message to author ".$author." - Contact: ".$contact["id"]." - User: ".$importer["uid"], LOGGER_DEBUG);
@@ -2412,7 +2507,7 @@ class Diaspora
 			}
 		}
 
-		if (!$following && $sharing && in_array($importer["page-flags"], array(PAGE_SOAPBOX, PAGE_NORMAL))) {
+		if (!$following && $sharing && in_array($importer["page-flags"], [PAGE_SOAPBOX, PAGE_NORMAL])) {
 			logger("Author ".$author." wants to share with us - but doesn't want to listen. Request is ignored.", LOGGER_DEBUG);
 			return false;
 		} elseif (!$following && !$sharing) {
@@ -2526,7 +2621,7 @@ class Diaspora
 				$ret = self::sendShare($u[0], $contact_record);
 
 				// Send the profile data, maybe it weren't transmitted before
-				self::sendProfile($importer["uid"], array($contact_record));
+				self::sendProfile($importer["uid"], [$contact_record]);
 			}
 		}
 
@@ -2559,7 +2654,7 @@ class Diaspora
 			// 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::isReshare($r[0]["body"], true)) {
-				$r = array();
+				$r = [];
 			} elseif (self::isReshare($r[0]["body"], false) || strstr($r[0]["body"], "[share")) {
 				$r[0]["body"] = diaspora2bb(bb2diaspora($r[0]["body"]));
 
@@ -2643,7 +2738,7 @@ class Diaspora
 
 		$orig_url = System::baseUrl()."/display/".$original_item["guid"];
 
-		$datarray = array();
+		$datarray = [];
 
 		$datarray["uid"] = $importer["uid"];
 		$datarray["contact-id"] = $contact["id"];
@@ -2688,6 +2783,8 @@ class Diaspora
 		self::fetchGuid($datarray);
 		$message_id = item_store($datarray);
 
+		self::sendParticipation($contact, $datarray);
+
 		if ($message_id) {
 			logger("Stored reshare ".$datarray["guid"]." with message id ".$message_id, LOGGER_DEBUG);
 			return true;
@@ -2722,13 +2819,13 @@ class Diaspora
 		}
 
 		// Fetch items that are about to be deleted
-		$fields = array('uid', 'id', 'parent', 'parent-uri', 'author-link');
+		$fields = ['uid', 'id', 'parent', 'parent-uri', 'author-link'];
 
 		// When we receive a public retraction, we delete every item that we find.
 		if ($importer['uid'] == 0) {
-			$condition = array("`guid` = ? AND NOT `file` LIKE '%%[%%' AND NOT `deleted`", $target_guid);
+			$condition = ["`guid` = ? AND NOT `file` LIKE '%%[%%' AND NOT `deleted`", $target_guid];
 		} else {
-			$condition = array("`guid` = ? AND `uid` = ? AND NOT `file` LIKE '%%[%%' AND NOT `deleted`", $target_guid, $importer['uid']);
+			$condition = ["`guid` = ? AND `uid` = ? AND NOT `file` LIKE '%%[%%' AND NOT `deleted`", $target_guid, $importer['uid']];
 		}
 		$r = dba::select('item', $fields, $condition);
 		if (!DBM::is_result($r)) {
@@ -2738,7 +2835,7 @@ class Diaspora
 
 		while ($item = dba::fetch($r)) {
 			// Fetch the parent item
-			$parent = dba::select('item', array('author-link', 'origin'), array('id' => $item["parent"]), array('limit' => 1));
+			$parent = dba::selectFirst('item', ['author-link', 'origin'], ['id' => $item["parent"]]);
 
 			// Only delete it if the parent author really fits
 			if (!link_compare($parent["author-link"], $contact["url"]) && !link_compare($item["author-link"], $contact["url"])) {
@@ -2750,13 +2847,13 @@ class Diaspora
 			// The function "item_drop" doesn't work for that case
 			dba::update(
 				'item',
-				array(
+				[
 					'deleted' => true,
 					'title' => '',
 					'body' => '',
 					'edited' => datetime_convert(),
-					'changed' => datetime_convert()),
-				array('id' => $item["id"])
+					'changed' => datetime_convert()],
+				['id' => $item["id"]]
 			);
 
 			// Delete the thread - if it is a starting post and not a comment
@@ -2790,7 +2887,7 @@ class Diaspora
 		$target_type = notags(unxmlify($data->target_type));
 
 		$contact = self::contactByHandle($importer["uid"], $sender);
-		if (!$contact && (in_array($target_type, array("Contact", "Person")))) {
+		if (!$contact && (in_array($target_type, ["Contact", "Person"]))) {
 			logger("cannot find contact for sender: ".$sender." and user ".$importer["uid"]);
 			return false;
 		}
@@ -2847,7 +2944,7 @@ class Diaspora
 			return true;
 		}
 
-		$address = array();
+		$address = [];
 		if ($data->location) {
 			foreach ($data->location->children() as $fieldname => $data) {
 				$address[$fieldname] = notags(unxmlify($data));
@@ -2856,7 +2953,7 @@ class Diaspora
 
 		$body = diaspora2bb($text);
 
-		$datarray = array();
+		$datarray = [];
 
 		// Attach embedded pictures to the body
 		if ($data->photo) {
@@ -2926,6 +3023,8 @@ class Diaspora
 		self::fetchGuid($datarray);
 		$message_id = item_store($datarray);
 
+		self::sendParticipation($contact, $datarray);
+
 		if ($message_id) {
 			logger("Stored item ".$datarray["guid"]." with message id ".$message_id, LOGGER_DEBUG);
 			return true;
@@ -2991,14 +3090,14 @@ class Diaspora
 
 		$ciphertext = self::aesEncrypt($aes_key, $iv, $msg);
 
-		$json = json_encode(array("iv" => $b_iv, "key" => $b_aes_key));
+		$json = json_encode(["iv" => $b_iv, "key" => $b_aes_key]);
 
 		$encrypted_key_bundle = "";
 		openssl_public_encrypt($json, $encrypted_key_bundle, $pubkey);
 
 		$json_object = json_encode(
-			array("aes_key" => base64_encode($encrypted_key_bundle),
-					"encrypted_magic_envelope" => base64_encode($ciphertext))
+			["aes_key" => base64_encode($encrypted_key_bundle),
+					"encrypted_magic_envelope" => base64_encode($ciphertext)]
 		);
 
 		return $json_object;
@@ -3015,7 +3114,7 @@ class Diaspora
 	public static function buildMagicEnvelope($msg, $user)
 	{
 		$b64url_data = base64url_encode($msg);
-		$data = str_replace(array("\n", "\r", " ", "\t"), array("", "", "", ""), $b64url_data);
+		$data = str_replace(["\n", "\r", " ", "\t"], ["", "", "", ""], $b64url_data);
 
 		$key_id = base64url_encode(self::myHandle($user));
 		$type = "application/xml";
@@ -3028,17 +3127,17 @@ class Diaspora
 			$user['uprvkey'] = $user['prvkey'];
 		}
 
-		$signature = rsa_sign($signable_data, $user["uprvkey"]);
+		$signature = Crypto::rsaSign($signable_data, $user["uprvkey"]);
 		$sig = base64url_encode($signature);
 
-		$xmldata = array("me:env" => array("me:data" => $data,
-							"@attributes" => array("type" => $type),
+		$xmldata = ["me:env" => ["me:data" => $data,
+							"@attributes" => ["type" => $type],
 							"me:encoding" => $encoding,
 							"me:alg" => $alg,
 							"me:sig" => $sig,
-							"@attributes2" => array("key_id" => $key_id)));
+							"@attributes2" => ["key_id" => $key_id]]];
 
-		$namespaces = array("me" => "http://salmon-protocol.org/ns/magic-env");
+		$namespaces = ["me" => "http://salmon-protocol.org/ns/magic-env"];
 
 		return XML::fromArray($xmldata, $xml, false, $namespaces);
 	}
@@ -3084,7 +3183,7 @@ class Diaspora
 
 		$signed_text = implode(";", $sigmsg);
 
-		return base64_encode(rsa_sign($signed_text, $owner["uprvkey"], "sha256"));
+		return base64_encode(Crypto::rsaSign($signed_text, $owner["uprvkey"], "sha256"));
 	}
 
 	/**
@@ -3109,7 +3208,15 @@ class Diaspora
 		}
 
 		$logid = random_string(4);
-		$dest_url = (($public_batch) ? $contact["batch"] : $contact["notify"]);
+		$dest_url = ($public_batch ? $contact["batch"] : $contact["notify"]);
+
+		// Fetch the fcontact entry when there is missing data
+		// Will possibly happen when data is transmitted to a DFRN contact
+		if (empty($dest_url) && !empty($contact['addr'])) {
+			$fcontact = self::personByHandle($contact['addr']);
+			$dest_url = ($public_batch ? $fcontact["batch"] : $fcontact["notify"]);
+		}
+
 		if (!$dest_url) {
 			logger("no url for contact: ".$contact["id"]." batch mode =".$public_batch);
 			return 0;
@@ -3123,7 +3230,7 @@ class Diaspora
 			if (!intval(Config::get("system", "diaspora_test"))) {
 				$content_type = (($public_batch) ? "application/magic-envelope+xml" : "application/json");
 
-				post_url($dest_url."/", $envelope, array("Content-Type: ".$content_type));
+				post_url($dest_url."/", $envelope, ["Content-Type: ".$content_type]);
 				$return_code = $a->get_curl_code();
 			} else {
 				logger("test_mode");
@@ -3171,7 +3278,7 @@ class Diaspora
 	 */
 	public static function buildPostXml($type, $message)
 	{
-		$data = array($type => $message);
+		$data = [$type => $message];
 
 		return XML::fromArray($data, $xml);
 	}
@@ -3215,6 +3322,54 @@ class Diaspora
 		return $return_code;
 	}
 
+	/**
+	 * @brief sends a participation (Used to get all further updates)
+	 *
+	 * @param array $contact Target of the communication
+	 * @param array $item	 Item array
+	 *
+	 * @return int The result of the transmission
+	 */
+	private static function sendParticipation($contact, $item)
+	{
+		// Don't send notifications for private postings
+		if ($item['private']) {
+			return;
+		}
+
+		$cachekey = "diaspora:sendParticipation:".$item['guid'];
+
+		$result = Cache::get($cachekey);
+		if (!is_null($result)) {
+			return;
+		}
+
+		// Fetch some user id to have a valid handle to transmit the participation.
+		// 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);
+			$owner = User::getOwnerDataById($first_user['uid']);
+		} else {
+			$owner = User::getOwnerDataById($item['uid']);
+		}
+
+		$author = self::myHandle($owner);
+
+		$message = ["author" => $author,
+				"guid" => get_guid(32),
+				"parent_type" => "Post",
+				"parent_guid" => $item["guid"]];
+
+		logger("Send participation for ".$item["guid"]." by ".$author, LOGGER_DEBUG);
+
+		// It doesn't matter what we store, we only want to avoid sending repeated notifications for the same item
+		Cache::set($cachekey, $item["guid"], CACHE_QUARTER_HOUR);
+
+		return self::buildAndTransmit($owner, $contact, "participation", $message);
+	}
+
 	/**
 	 * @brief sends an account migration
 	 *
@@ -3230,11 +3385,11 @@ class Diaspora
 		$profile = self::createProfileData($uid);
 
 		$signed_text = 'AccountMigration:'.$old_handle.':'.$profile['author'];
-		$signature = base64_encode(rsa_sign($signed_text, $owner["uprvkey"], "sha256"));
+		$signature = base64_encode(Crypto::rsaSign($signed_text, $owner["uprvkey"], "sha256"));
 
-		$message = array("author" => $old_handle,
+		$message = ["author" => $old_handle,
 				"profile" => $profile,
-				"signature" => $signature);
+				"signature" => $signature];
 
 		logger("Send account migration ".print_r($message, true), LOGGER_DEBUG);
 
@@ -3272,10 +3427,10 @@ class Diaspora
 		}
 		*/
 
-		$message = array("author" => self::myHandle($owner),
+		$message = ["author" => self::myHandle($owner),
 				"recipient" => $contact["addr"],
 				"following" => "true",
-				"sharing" => "true");
+				"sharing" => "true"];
 
 		logger("Send share ".print_r($message, true), LOGGER_DEBUG);
 
@@ -3292,10 +3447,10 @@ class Diaspora
 	 */
 	public static function sendUnshare($owner, $contact)
 	{
-		$message = array("author" => self::myHandle($owner),
+		$message = ["author" => self::myHandle($owner),
 				"recipient" => $contact["addr"],
 				"following" => "false",
-				"sharing" => "false");
+				"sharing" => "false"];
 
 		logger("Send unshare ".print_r($message, true), LOGGER_DEBUG);
 
@@ -3355,7 +3510,7 @@ class Diaspora
 				NETWORK_DIASPORA
 			);
 			if ($r) {
-				$ret= array();
+				$ret= [];
 				$ret["root_handle"] = self::handleFromContact($r[0]["contact-id"]);
 				$ret["root_guid"] = $guid;
 				return($ret);
@@ -3373,7 +3528,7 @@ class Diaspora
 			$profile = $matches[1];
 		}
 
-		$ret= array();
+		$ret= [];
 
 		$ret["root_handle"] = preg_replace("=https?://(.*)/u/(.*)=ism", "$2@$1", $profile);
 		if (($ret["root_handle"] == $profile) || ($ret["root_handle"] == "")) {
@@ -3410,23 +3565,23 @@ class Diaspora
 	{
 		$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();
+			return [];
 		}
 
 		$event = $r[0];
 
-		$eventdata = array();
+		$eventdata = [];
 
 		$r = q("SELECT `timezone` FROM `user` WHERE `uid` = %d", intval($event['uid']));
 		if (!DBM::is_result($r)) {
-			return array();
+			return [];
 		}
 
 		$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();
+			return [];
 		}
 
 		$owner = $r[0];
@@ -3463,7 +3618,7 @@ class Diaspora
 			$eventdata['description'] = html_entity_decode(bb2diaspora($event['desc']));
 		}
 		if ($event['location']) {
-			$location = array();
+			$location = [];
 			$location["address"] = html_entity_decode(bb2diaspora($event['location']));
 			$location["lat"] = 0;
 			$location["lng"] = 0;
@@ -3500,13 +3655,13 @@ class Diaspora
 
 		// Detect a share element and do a reshare
 		if (!$item['private'] && ($ret = self::isReshare($item["body"]))) {
-			$message = array("author" => $myaddr,
+			$message = ["author" => $myaddr,
 					"guid" => $item["guid"],
 					"created_at" => $created,
 					"root_author" => $ret["root_handle"],
 					"root_guid" => $ret["root_guid"],
 					"provider_display_name" => $item["app"],
-					"public" => $public);
+					"public" => $public];
 
 			$type = "reshare";
 		} else {
@@ -3531,7 +3686,7 @@ class Diaspora
 				}
 			}
 
-			$location = array();
+			$location = [];
 
 			if ($item["location"] != "")
 				$location["address"] = $item["location"];
@@ -3542,13 +3697,13 @@ class Diaspora
 				$location["lng"] = $coord[1];
 			}
 
-			$message = array("author" => $myaddr,
+			$message = ["author" => $myaddr,
 					"guid" => $item["guid"],
 					"created_at" => $created,
 					"public" => $public,
 					"text" => $body,
 					"provider_display_name" => $item["app"],
-					"location" => $location);
+					"location" => $location];
 
 			// Diaspora rejects messages when they contain a location without "lat" or "lng"
 			if (!isset($location["lat"]) || !isset($location["lng"])) {
@@ -3568,7 +3723,7 @@ class Diaspora
 			$type = "status_message";
 		}
 
-		$msg = array("type" => $type, "message" => $message);
+		$msg = ["type" => $type, "message" => $message];
 
 		Cache::set($cachekey, $msg, CACHE_QUARTER_HOUR);
 
@@ -3619,12 +3774,12 @@ class Diaspora
 			$positive = "false";
 		}
 
-		return(array("author" => self::myHandle($owner),
+		return(["author" => self::myHandle($owner),
 				"guid" => $item["guid"],
 				"parent_guid" => $parent["guid"],
 				"parent_type" => $target_type,
 				"positive" => $positive,
-				"author_signature" => ""));
+				"author_signature" => ""]);
 	}
 
 	/**
@@ -3662,11 +3817,11 @@ class Diaspora
 				return false;
 		}
 
-		return(array("author" => self::myHandle($owner),
+		return(["author" => self::myHandle($owner),
 				"guid" => $item["guid"],
 				"parent_guid" => $parent["guid"],
 				"status" => $attend_answer,
-				"author_signature" => ""));
+				"author_signature" => ""]);
 	}
 
 	/**
@@ -3701,12 +3856,12 @@ class Diaspora
 		$text = html_entity_decode(bb2diaspora($item["body"]));
 		$created = datetime_convert("UTC", "UTC", $item["created"], 'Y-m-d\TH:i:s\Z');
 
-		$comment = array("author" => self::myHandle($owner),
+		$comment = ["author" => self::myHandle($owner),
 				"guid" => $item["guid"],
 				"created_at" => $created,
 				"parent_guid" => $parent["guid"],
 				"text" => $text,
-				"author_signature" => "");
+				"author_signature" => ""];
 
 		// Send the thread parent guid only if it is a threaded comment
 		if ($item['thr-parent'] != $item['parent-uri']) {
@@ -3730,10 +3885,10 @@ class Diaspora
 	 */
 	public static function sendFollowup($item, $owner, $contact, $public_batch = false)
 	{
-		if (in_array($item['verb'], array(ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE))) {
+		if (in_array($item['verb'], [ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE])) {
 			$message = self::constructAttend($item, $owner);
 			$type = "event_participation";
-		} elseif (in_array($item["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) {
+		} elseif (in_array($item["verb"], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) {
 			$message = self::constructLike($item, $owner);
 			$type = "like";
 		} else {
@@ -3764,17 +3919,17 @@ class Diaspora
 		$signed_parts = explode(";", $signature['signed_text']);
 
 		if ($item["deleted"]) {
-			$message = array("author" => $signature['signer'],
+			$message = ["author" => $signature['signer'],
 					"target_guid" => $signed_parts[0],
-					"target_type" => $signed_parts[1]);
-		} elseif (in_array($item["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) {
-			$message = array("author" => $signed_parts[4],
+					"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" => $signature['signature'],
-					"parent_author_signature" => "");
+					"parent_author_signature" => ""];
 		} else {
 			// Remove the comment guid
 			$guid = array_shift($signed_parts);
@@ -3788,12 +3943,12 @@ class Diaspora
 			// Glue the parts together
 			$text = implode(";", $signed_parts);
 
-			$message = array("author" => $handle,
+			$message = ["author" => $handle,
 					"guid" => $guid,
 					"parent_guid" => $parent_guid,
 					"text" => implode(";", $signed_parts),
 					"author_signature" => $signature['signature'],
-					"parent_author_signature" => "");
+					"parent_author_signature" => ""];
 		}
 		return $message;
 	}
@@ -3812,7 +3967,7 @@ class Diaspora
 	{
 		if ($item["deleted"]) {
 			return self::sendRetraction($item, $owner, $contact, $public_batch, true);
-		} elseif (in_array($item["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) {
+		} elseif (in_array($item["verb"], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) {
 			$type = "like";
 		} else {
 			$type = "comment";
@@ -3841,7 +3996,7 @@ class Diaspora
 		} else {// New way
 			$msg = json_decode($signature['signed_text'], true);
 
-			$message = array();
+			$message = [];
 			if (is_array($msg)) {
 				foreach ($msg as $field => $data) {
 					if (!$item["deleted"]) {
@@ -3886,15 +4041,15 @@ class Diaspora
 
 		if ($item['id'] == $item['parent']) {
 			$target_type = "Post";
-		} elseif (in_array($item["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) {
+		} elseif (in_array($item["verb"], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) {
 			$target_type = "Like";
 		} else {
 			$target_type = "Comment";
 		}
 
-		$message = array("author" => $itemaddr,
+		$message = ["author" => $itemaddr,
 				"target_guid" => $item['guid'],
-				"target_type" => $target_type);
+				"target_type" => $target_type];
 
 		logger("Got message ".print_r($message, true), LOGGER_DEBUG);
 
@@ -3926,36 +4081,36 @@ class Diaspora
 		}
 		$cnv = $r[0];
 
-		$conv = array(
+		$conv = [
 			"author" => $cnv["creator"],
 			"guid" => $cnv["guid"],
 			"subject" => $cnv["subject"],
 			"created_at" => datetime_convert("UTC", "UTC", $cnv['created'], 'Y-m-d\TH:i:s\Z'),
 			"participants" => $cnv["recips"]
-		);
+		];
 
 		$body = bb2diaspora($item["body"]);
 		$created = datetime_convert("UTC", "UTC", $item["created"], 'Y-m-d\TH:i:s\Z');
 
-		$msg = array(
+		$msg = [
 			"author" => $myaddr,
 			"guid" => $item["guid"],
 			"conversation_guid" => $cnv["guid"],
 			"text" => $body,
 			"created_at" => $created,
-		);
+		];
 
 		if ($item["reply"]) {
 			$message = $msg;
 			$type = "message";
 		} else {
-			$message = array(
+			$message = [
 					"author" => $cnv["creator"],
 					"guid" => $cnv["guid"],
 					"subject" => $cnv["subject"],
 					"created_at" => datetime_convert("UTC", "UTC", $cnv['created'], 'Y-m-d\TH:i:s\Z'),
 					"participants" => $cnv["recips"],
-					"message" => $msg);
+					"message" => $msg];
 
 			$type = "conversation";
 		}
@@ -3970,7 +4125,7 @@ class Diaspora
 	 *
 	 * @return array The array with "first" and "last"
 	 */
-	private static function splitName($name) {
+	public static function splitName($name) {
 		$name = trim($name);
 
 		// Is the name longer than 64 characters? Then cut the rest of it.
@@ -4038,15 +4193,15 @@ class Diaspora
 		);
 
 		if (!$r) {
-			return array();
+			return [];
 		}
 
 		$profile = $r[0];
 		$handle = $profile["addr"];
 
-		$splitted_name = self::splitName($profile['name']);
-		$first = $splitted_name['first'];
-		$last = $splitted_name['last'];
+		$split_name = self::splitName($profile['name']);
+		$first = $split_name['first'];
+		$last = $split_name['last'];
 
 		$large = System::baseUrl().'/photo/custom/300/'.$profile['uid'].'.jpg';
 		$medium = System::baseUrl().'/photo/custom/100/'.$profile['uid'].'.jpg';
@@ -4080,7 +4235,7 @@ class Diaspora
 			$tags = trim($tags);
 		}
 
-		return array("author" => $handle,
+		return ["author" => $handle,
 				"first_name" => $first,
 				"last_name" => $last,
 				"image_url" => $large,
@@ -4092,7 +4247,7 @@ class Diaspora
 				"location" => $location,
 				"searchable" => $searchable,
 				"nsfw" => "false",
-				"tag_string" => $tags);
+				"tag_string" => $tags];
 	}
 
 	/**
@@ -4163,18 +4318,22 @@ class Diaspora
 			return false;
 		}
 
-		if (!in_array($r[0]["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) {
+		if (!in_array($r[0]["verb"], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) {
 			return false;
 		}
 
 		$message = self::constructLike($r[0], $contact);
+		if ($message === false) {
+			return false;
+		}
+
 		$message["author_signature"] = self::signature($contact, $message);
 
 		/*
 		 * Now store the signature more flexible to dynamically support new fields.
 		 * This will break Diaspora compatibility with Friendica versions prior to 3.5.
 		 */
-		dba::insert('sign', array('iid' => $post_id, 'signed_text' => json_encode($message)));
+		dba::insert('sign', ['iid' => $post_id, 'signed_text' => json_encode($message)]);
 
 		logger('Stored diaspora like signature');
 		return true;
@@ -4200,13 +4359,17 @@ class Diaspora
 		$contact["uprvkey"] = $uprvkey;
 
 		$message = self::constructComment($item, $contact);
+		if ($message === false) {
+			return false;
+		}
+
 		$message["author_signature"] = self::signature($contact, $message);
 
 		/*
 		 * Now store the signature more flexible to dynamically support new fields.
 		 * This will break Diaspora compatibility with Friendica versions prior to 3.5.
 		 */
-		dba::insert('sign', array('iid' => $message_id, 'signed_text' => json_encode($message)));
+		dba::insert('sign', ['iid' => $message_id, 'signed_text' => json_encode($message)]);
 
 		logger('Stored diaspora comment signature');
 		return true;