X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fostatus.php;h=5c5016d0fce9ab8044c1d22c6dd560fdf108c3ff;hb=73f4c3c8da007cec58494cb1b09b31fe0b77b794;hp=cd0ba9bb0e9281c5ea94900c9022b3f8c40ed79f;hpb=02022b62a4201fdfd84fb989cc05084b335944d7;p=friendica.git

diff --git a/include/ostatus.php b/include/ostatus.php
index cd0ba9bb0e..5c5016d0fc 100644
--- a/include/ostatus.php
+++ b/include/ostatus.php
@@ -2,6 +2,7 @@
 require_once("include/Contact.php");
 require_once("include/threads.php");
 require_once("include/html2bbcode.php");
+require_once("include/bbcode.php");
 require_once("include/items.php");
 require_once("mod/share.php");
 require_once("include/enotify.php");
@@ -16,15 +17,6 @@ define('OSTATUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes
 define('OSTATUS_DEFAULT_POLL_TIMEFRAME', 1440); // given in minutes
 define('OSTATUS_DEFAULT_POLL_TIMEFRAME_MENTIONS', 14400); // given in minutes
 
-define("NS_ATOM", "http://www.w3.org/2005/Atom");
-define("NS_THR", "http://purl.org/syndication/thread/1.0");
-define("NS_GEORSS", "http://www.georss.org/georss");
-define("NS_ACTIVITY", "http://activitystrea.ms/spec/1.0/");
-define("NS_MEDIA", "http://purl.org/syndication/atommedia");
-define("NS_POCO", "http://portablecontacts.net/spec/1.0");
-define("NS_OSTATUS", "http://ostatus.org/schema/1.0");
-define("NS_STATUSNET", "http://status.net/schema/api/1/");
-
 function ostatus_check_follow_friends() {
 	$r = q("SELECT `uid`,`v` FROM `pconfig` WHERE `cat`='system' AND `k`='ostatus_legacy_contact' AND `v` != ''");
 
@@ -126,47 +118,55 @@ function ostatus_fetchauthor($xpath, $context, $importer, &$contact, $onlyfetch)
 	$author["owner-link"] = $author["author-link"];
 	$author["owner-avatar"] = $author["author-avatar"];
 
-	if ($r AND !$onlyfetch) {
+	// Only update the contacts if it is an OStatus contact
+	if ($r AND !$onlyfetch AND ($contact["network"] == NETWORK_OSTATUS)) {
 		// Update contact data
-		$update_contact = ($r[0]['name-date'] < datetime_convert('','','now -12 hours'));
-		if ($update_contact) {
-			logger("Update contact data for contact ".$contact["id"], LOGGER_DEBUG);
 
-			$value = $xpath->evaluate('atom:author/poco:displayName/text()', $context)->item(0)->nodeValue;
-			if ($value != "")
-				$contact["name"] = $value;
+		$value = $xpath->query("atom:link[@rel='salmon']", $context)->item(0)->nodeValue;
+		if ($value != "")
+			$contact["notify"] = $value;
 
-			$value = $xpath->evaluate('atom:author/poco:preferredUsername/text()', $context)->item(0)->nodeValue;
-			if ($value != "")
-				$contact["nick"] = $value;
+		$value = $xpath->evaluate('atom:author/uri/text()', $context)->item(0)->nodeValue;
+		if ($value != "")
+			$contact["alias"] = $value;
 
-			$value = $xpath->evaluate('atom:author/poco:note/text()', $context)->item(0)->nodeValue;
-			if ($value != "")
-				$contact["about"] = $value;
+		$value = $xpath->evaluate('atom:author/poco:displayName/text()', $context)->item(0)->nodeValue;
+		if ($value != "")
+			$contact["name"] = $value;
 
-			$value = $xpath->evaluate('atom:author/poco:address/poco:formatted/text()', $context)->item(0)->nodeValue;
-			if ($value != "")
-				$contact["location"] = $value;
+		$value = $xpath->evaluate('atom:author/poco:preferredUsername/text()', $context)->item(0)->nodeValue;
+		if ($value != "")
+			$contact["nick"] = $value;
 
-			q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `about` = '%s', `location` = '%s', `name-date` = '%s' WHERE `id` = %d AND `network` = '%s'",
+		$value = $xpath->evaluate('atom:author/poco:note/text()', $context)->item(0)->nodeValue;
+		if ($value != "")
+			$contact["about"] = html2bbcode($value);
+
+		$value = $xpath->evaluate('atom:author/poco:address/poco:formatted/text()', $context)->item(0)->nodeValue;
+		if ($value != "")
+			$contact["location"] = $value;
+
+		if (($contact["name"] != $r[0]["name"]) OR ($contact["nick"] != $r[0]["nick"]) OR ($contact["about"] != $r[0]["about"]) OR ($contact["location"] != $r[0]["location"])) {
+
+			logger("Update contact data for contact ".$contact["id"], LOGGER_DEBUG);
+
+			q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `about` = '%s', `location` = '%s', `name-date` = '%s' WHERE `id` = %d",
 				dbesc($contact["name"]), dbesc($contact["nick"]), dbesc($contact["about"]), dbesc($contact["location"]),
-				dbesc(datetime_convert()), intval($contact["id"]), dbesc(NETWORK_OSTATUS));
+				dbesc(datetime_convert()), intval($contact["id"]));
 
 			poco_check($contact["url"], $contact["name"], $contact["network"], $author["author-avatar"], $contact["about"], $contact["location"],
-					"", "", "", datetime_convert(), 2, $contact["id"], $contact["uid"]);
+						"", "", "", datetime_convert(), 2, $contact["id"], $contact["uid"]);
 		}
 
-		$update_photo = ($r[0]['avatar-date'] < datetime_convert('','','now -12 hours'));
-
-		if ($update_photo AND isset($author["author-avatar"])) {
+		if (isset($author["author-avatar"]) AND ($author["author-avatar"] != $r[0]['avatar'])) {
 			logger("Update profile picture for contact ".$contact["id"], LOGGER_DEBUG);
 
-			$photos = import_profile_photo($author["author-avatar"], $importer["uid"], $contact["id"]);
-
-			q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s', `avatar-date` = '%s' WHERE `id` = %d AND `network` = '%s'",
-				dbesc($photos[0]), dbesc($photos[1]), dbesc($photos[2]),
-				dbesc(datetime_convert()), intval($contact["id"]), dbesc(NETWORK_OSTATUS));
+			update_contact_avatar($author["author-avatar"], $importer["uid"], $contact["id"]);
 		}
+
+		$contact["generation"] = 2;
+		$contact["photo"] = $author["author-avatar"];
+		update_gcontact($contact);
 	}
 
 	return($author);
@@ -182,14 +182,14 @@ function ostatus_salmon_author($xml, $importer) {
 	@$doc->loadXML($xml);
 
 	$xpath = new DomXPath($doc);
-	$xpath->registerNamespace('atom', "http://www.w3.org/2005/Atom");
-	$xpath->registerNamespace('thr', "http://purl.org/syndication/thread/1.0");
-	$xpath->registerNamespace('georss', "http://www.georss.org/georss");
-	$xpath->registerNamespace('activity', "http://activitystrea.ms/spec/1.0/");
-	$xpath->registerNamespace('media', "http://purl.org/syndication/atommedia");
-	$xpath->registerNamespace('poco', "http://portablecontacts.net/spec/1.0");
-	$xpath->registerNamespace('ostatus', "http://ostatus.org/schema/1.0");
-	$xpath->registerNamespace('statusnet', "http://status.net/schema/api/1/");
+	$xpath->registerNamespace('atom', NAMESPACE_ATOM1);
+	$xpath->registerNamespace('thr', NAMESPACE_THREAD);
+	$xpath->registerNamespace('georss', NAMESPACE_GEORSS);
+	$xpath->registerNamespace('activity', NAMESPACE_ACTIVITY);
+	$xpath->registerNamespace('media', NAMESPACE_MEDIA);
+	$xpath->registerNamespace('poco', NAMESPACE_POCO);
+	$xpath->registerNamespace('ostatus', NAMESPACE_OSTATUS);
+	$xpath->registerNamespace('statusnet', NAMESPACE_STATUSNET);
 
 	$entries = $xpath->query('/atom:entry');
 
@@ -213,14 +213,14 @@ function ostatus_import($xml,$importer,&$contact, &$hub) {
 	@$doc->loadXML($xml);
 
 	$xpath = new DomXPath($doc);
-	$xpath->registerNamespace('atom', "http://www.w3.org/2005/Atom");
-	$xpath->registerNamespace('thr', "http://purl.org/syndication/thread/1.0");
-	$xpath->registerNamespace('georss', "http://www.georss.org/georss");
-	$xpath->registerNamespace('activity', "http://activitystrea.ms/spec/1.0/");
-	$xpath->registerNamespace('media', "http://purl.org/syndication/atommedia");
-	$xpath->registerNamespace('poco', "http://portablecontacts.net/spec/1.0");
-	$xpath->registerNamespace('ostatus', "http://ostatus.org/schema/1.0");
-	$xpath->registerNamespace('statusnet', "http://status.net/schema/api/1/");
+	$xpath->registerNamespace('atom', NAMESPACE_ATOM1);
+	$xpath->registerNamespace('thr', NAMESPACE_THREAD);
+	$xpath->registerNamespace('georss', NAMESPACE_GEORSS);
+	$xpath->registerNamespace('activity', NAMESPACE_ACTIVITY);
+	$xpath->registerNamespace('media', NAMESPACE_MEDIA);
+	$xpath->registerNamespace('poco', NAMESPACE_POCO);
+	$xpath->registerNamespace('ostatus', NAMESPACE_OSTATUS);
+	$xpath->registerNamespace('statusnet', NAMESPACE_STATUSNET);
 
 	$gub = "";
 	$hub_attributes = $xpath->query("/atom:feed/atom:link[@rel='hub']")->item(0)->attributes;
@@ -298,8 +298,8 @@ function ostatus_import($xml,$importer,&$contact, &$hub) {
 		$item["object"] = $xml;
 		$item["verb"] = $xpath->query('activity:verb/text()', $entry)->item(0)->nodeValue;
 
-		// To-Do:
-		// Delete a message
+		/// @TODO
+		/// Delete a message
 		if ($item["verb"] == "qvitter-delete-notice") {
 			// ignore "Delete" messages (by now)
 			logger("Ignore delete message ".print_r($item, true));
@@ -361,8 +361,8 @@ function ostatus_import($xml,$importer,&$contact, &$hub) {
 		if ($georsspoint)
 			$item["coord"] = $georsspoint->item(0)->nodeValue;
 
-		// To-Do
-		// $item["location"] =
+		/// @TODO
+		/// $item["location"] =
 
 		$categories = $xpath->query('atom:category', $entry);
 		if ($categories) {
@@ -545,29 +545,6 @@ function ostatus_import($xml,$importer,&$contact, &$hub) {
 		}
 
 		logger("Item was stored with id ".$item_id, LOGGER_DEBUG);
-		$item["id"] = $item_id;
-
-		if ($mention) {
-			$u = q("SELECT `notify-flags`, `language`, `username`, `email` FROM user WHERE uid = %d LIMIT 1", intval($item['uid']));
-			$r = q("SELECT `parent` FROM `item` WHERE `id` = %d", intval($item_id));
-
-			notification(array(
-				'type'         => NOTIFY_TAGSELF,
-				'notify_flags' => $u[0]["notify-flags"],
-				'language'     => $u[0]["language"],
-				'to_name'      => $u[0]["username"],
-				'to_email'     => $u[0]["email"],
-				'uid'          => $item["uid"],
-				'item'         => $item,
-				'link'         => $a->get_baseurl().'/display/'.urlencode(get_item_guid($item_id)),
-				'source_name'  => $item["author-name"],
-				'source_link'  => $item["author-link"],
-				'source_photo' => $item["author-avatar"],
-				'verb'         => ACTIVITY_TAG,
-				'otype'        => 'item',
-				'parent'       => $r[0]["parent"]
-			));
-		}
 	}
 }
 
@@ -647,6 +624,59 @@ function check_conversations($mentions = false, $override = false) {
 	set_config('system','ostatus_last_poll', time());
 }
 
+/**
+ * @brief Updates the gcontact table with actor data from the conversation
+ *
+ * @param object $actor The actor object that contains the contact data
+ */
+function ostatus_conv_fetch_actor($actor) {
+
+	// We set the generation to "3" since the data here is not as reliable as the data we get on other occasions
+	$contact = array("network" => NETWORK_OSTATUS, "generation" => 3);
+
+	if (isset($actor->url))
+		$contact["url"] = $actor->url;
+
+	if (isset($actor->displayName))
+		$contact["name"] = $actor->displayName;
+
+	if (isset($actor->portablecontacts_net->displayName))
+		$contact["name"] = $actor->portablecontacts_net->displayName;
+
+	if (isset($actor->portablecontacts_net->preferredUsername))
+		$contact["nick"] = $actor->portablecontacts_net->preferredUsername;
+
+	if (isset($actor->id))
+		$contact["alias"] = $actor->id;
+
+	if (isset($actor->summary))
+		$contact["about"] = $actor->summary;
+
+	if (isset($actor->portablecontacts_net->note))
+		$contact["about"] = $actor->portablecontacts_net->note;
+
+	if (isset($actor->portablecontacts_net->addresses->formatted))
+		$contact["location"] = $actor->portablecontacts_net->addresses->formatted;
+
+
+	if (isset($actor->image->url))
+		$contact["photo"] = $actor->image->url;
+
+	if (isset($actor->image->width))
+		$avatarwidth = $actor->image->width;
+
+	if (is_array($actor->status_net->avatarLinks))
+		foreach ($actor->status_net->avatarLinks AS $avatar) {
+			if ($avatarsize < $avatar->width) {
+				$contact["photo"] = $avatar->url;
+				$avatarsize = $avatar->width;
+			}
+		}
+
+	update_gcontact($contact);
+}
+
+
 function ostatus_completion($conversation_url, $uid, $item = array()) {
 
 	$a = get_app();
@@ -750,6 +780,9 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
 
 	foreach ($items as $single_conv) {
 
+		// Update the gcontact table
+		ostatus_conv_fetch_actor($single_conv->actor);
+
 		// Test - remove before flight
 		//$tempfile = tempnam(get_temppath(), "conversation");
 		//file_put_contents($tempfile, json_encode($single_conv));
@@ -833,7 +866,7 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
 				$existing_message = $message_exists[0];
 
 				// We improved the way we fetch OStatus messages, this shouldn't happen very often now
-				// To-Do: we have to change the shadow copies as well. This way here is really ugly.
+				/// @TODO We have to change the shadow copies as well. This way here is really ugly.
 				if ($existing_message["parent"] != $parent["id"]) {
 					logger('updating id '.$existing_message["id"].' with parent '.$existing_message["parent"].' to parent '.$parent["id"].' uri '.$parent["uri"].' thread '.$parent_uri, LOGGER_DEBUG);
 
@@ -886,7 +919,7 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
 			logger("No contact found for url ".$actor, LOGGER_DEBUG);
 
 			// Adding a global contact
-			// To-Do: Use this data for the post
+			/// @TODO Use this data for the post
 			$global_contact_id = get_contact($actor, 0);
 
 			logger("Global contact ".$global_contact_id." found for url ".$actor, LOGGER_DEBUG);
@@ -1012,28 +1045,6 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
 		// Add the conversation entry (but don't fetch the whole conversation)
 		ostatus_store_conversation($newitem, $conversation_url);
 
-		if ($mention) {
-			$u = q("SELECT `notify-flags`, `language`, `username`, `email` FROM user WHERE uid = %d LIMIT 1", intval($uid));
-			$r = q("SELECT `parent` FROM `item` WHERE `id` = %d", intval($newitem));
-
-			notification(array(
-				'type'         => NOTIFY_TAGSELF,
-				'notify_flags' => $u[0]["notify-flags"],
-				'language'     => $u[0]["language"],
-				'to_name'      => $u[0]["username"],
-				'to_email'     => $u[0]["email"],
-				'uid'          => $uid,
-				'item'         => $arr,
-				'link'         => $a->get_baseurl().'/display/'.urlencode(get_item_guid($newitem)),
-				'source_name'  => $arr["author-name"],
-				'source_link'  => $arr["author-link"],
-				'source_photo' => $arr["author-avatar"],
-				'verb'         => ACTIVITY_TAG,
-				'otype'        => 'item',
-				'parent'       => $r[0]["parent"]
-			));
-		}
-
 		// If the newly created item is the top item then change the parent settings of the thread
 		// This shouldn't happen anymore. This is supposed to be absolote.
 		if ($arr["uri"] == $first_id) {
@@ -1080,35 +1091,35 @@ function ostatus_store_conversation($itemid, $conversation_url) {
 }
 
 function get_reshared_guid($item) {
-        $body = trim($item["body"]);
+	$body = trim($item["body"]);
 
-        // Skip if it isn't a pure repeated messages
-        // Does it start with a share?
-        if (strpos($body, "[share") > 0)
-                return("");
+	// Skip if it isn't a pure repeated messages
+	// Does it start with a share?
+	if (strpos($body, "[share") > 0)
+		return("");
 
-        // Does it end with a share?
-        if (strlen($body) > (strrpos($body, "[/share]") + 8))
-                return("");
+	// Does it end with a share?
+	if (strlen($body) > (strrpos($body, "[/share]") + 8))
+		return("");
 
-        $attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body);
-        // Skip if there is no shared message in there
-        if ($body == $attributes)
-                return(false);
+	$attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body);
+	// Skip if there is no shared message in there
+	if ($body == $attributes)
+		return(false);
 
-        $guid = "";
-        preg_match("/guid='(.*?)'/ism", $attributes, $matches);
-        if ($matches[1] != "")
-                $guid = $matches[1];
+	$guid = "";
+	preg_match("/guid='(.*?)'/ism", $attributes, $matches);
+	if ($matches[1] != "")
+		$guid = $matches[1];
 
-        preg_match('/guid="(.*?)"/ism', $attributes, $matches);
-        if ($matches[1] != "")
-                $guid = $matches[1];
+	preg_match('/guid="(.*?)"/ism', $attributes, $matches);
+	if ($matches[1] != "")
+		$guid = $matches[1];
 
 	return $guid;
 }
 
-function xml_add_element($doc, $parent, $element, $value = "", $attributes = array()) {
+function xml_create_element($doc, $element, $value = "", $attributes = array()) {
 	$element = $doc->createElement($element, xmlify($value));
 
 	foreach ($attributes AS $key => $value) {
@@ -1116,7 +1127,11 @@ function xml_add_element($doc, $parent, $element, $value = "", $attributes = arr
 		$attribute->value = xmlify($value);
 		$element->appendChild($attribute);
 	}
+	return $element;
+}
 
+function xml_add_element($doc, $parent, $element, $value = "", $attributes = array()) {
+	$element = xml_create_element($doc, $element, $value, $attributes);
 	$parent->appendChild($element);
 }
 
@@ -1150,43 +1165,36 @@ function ostatus_format_picture_post($body) {
 function ostatus_add_header($doc, $owner) {
 	$a = get_app();
 
-	$r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`",
-		intval($owner["uid"]));
-	if (!$r)
-		return;
-
-	$profile = $r[0];
-
-	$root = $doc->createElementNS(NS_ATOM, 'feed');
+	$root = $doc->createElementNS(NAMESPACE_ATOM1, 'feed');
 	$doc->appendChild($root);
 
-	$root->setAttribute("xmlns:thr", NS_THR);
-	$root->setAttribute("xmlns:georss", NS_GEORSS);
-	$root->setAttribute("xmlns:activity", NS_ACTIVITY);
-	$root->setAttribute("xmlns:media", NS_MEDIA);
-	$root->setAttribute("xmlns:poco", NS_POCO);
-	$root->setAttribute("xmlns:ostatus", NS_OSTATUS);
-	$root->setAttribute("xmlns:statusnet", NS_STATUSNET);
+	$root->setAttribute("xmlns:thr", NAMESPACE_THREAD);
+	$root->setAttribute("xmlns:georss", NAMESPACE_GEORSS);
+	$root->setAttribute("xmlns:activity", NAMESPACE_ACTIVITY);
+	$root->setAttribute("xmlns:media", NAMESPACE_MEDIA);
+	$root->setAttribute("xmlns:poco", NAMESPACE_POCO);
+	$root->setAttribute("xmlns:ostatus", NAMESPACE_OSTATUS);
+	$root->setAttribute("xmlns:statusnet", NAMESPACE_STATUSNET);
 
 	$attributes = array("uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION."-".DB_UPDATE_VERSION);
 	xml_add_element($doc, $root, "generator", FRIENDICA_PLATFORM, $attributes);
 	xml_add_element($doc, $root, "id", $a->get_baseurl()."/profile/".$owner["nick"]);
-	xml_add_element($doc, $root, "title", sprintf("%s timeline", $profile["name"]));
-	xml_add_element($doc, $root, "subtitle", sprintf("Updates from %s on %s", $profile["name"], $a->config["sitename"]));
-	xml_add_element($doc, $root, "logo", $profile["photo"]);
+	xml_add_element($doc, $root, "title", sprintf("%s timeline", $owner["name"]));
+	xml_add_element($doc, $root, "subtitle", sprintf("Updates from %s on %s", $owner["name"], $a->config["sitename"]));
+	xml_add_element($doc, $root, "logo", $owner["photo"]);
 	xml_add_element($doc, $root, "updated", datetime_convert("UTC", "UTC", "now", ATOM_TIME));
 
-	$author = ostatus_add_author($doc, $owner, $profile);
+	$author = ostatus_add_author($doc, $owner);
 	$root->appendChild($author);
 
 	$attributes = array("href" => $owner["url"], "rel" => "alternate", "type" => "text/html");
 	xml_add_element($doc, $root, "link", "", $attributes);
 
-	// To-Do: We have to find out what this is
-	//$attributes = array("href" => $a->get_baseurl()."/sup",
-	//		"rel" => "http://api.friendfeed.com/2008/03#sup",
-	//		"type" => "application/json");
-	//xml_add_element($doc, $root, "link", "", $attributes);
+	/// @TODO We have to find out what this is
+	/// $attributes = array("href" => $a->get_baseurl()."/sup",
+	///		"rel" => "http://api.friendfeed.com/2008/03#sup",
+	///		"type" => "application/json");
+	/// xml_add_element($doc, $root, "link", "", $attributes);
 
 	ostatus_hublinks($doc, $root);
 
@@ -1289,9 +1297,13 @@ function ostatus_get_attachment($doc, $root, $item) {
 	}
 }
 
-function ostatus_add_author($doc, $owner, $profile = array()) {
+function ostatus_add_author($doc, $owner) {
 	$a = get_app();
 
+	$r = q("SELECT `homepage` FROM `profile` WHERE `uid` = %d AND `is-default` LIMIT 1", intval($owner["uid"]));
+	if ($r)
+		$profile = $r[0];
+
 	$author = $doc->createElement("author");
 	xml_add_element($doc, $author, "activity:object-type", ACTIVITY_OBJ_PERSON);
 	xml_add_element($doc, $author, "uri", $owner["url"]);
@@ -1344,17 +1356,20 @@ function ostatus_add_author($doc, $owner, $profile = array()) {
 	return $author;
 }
 
-/*
-To-Do: Picture attachments should look like this:
-
-<a href="https://status.pirati.ca/attachment/572819" title="https://status.pirati.ca/file/heluecht-20151202T222602-rd3u49p.gif"
-class="attachment thumbnail" id="attachment-572819" rel="nofollow external">https://status.pirati.ca/attachment/572819</a>
-
+/** 
+ * @TODO Picture attachments should look like this:
+ *	<a href="https://status.pirati.ca/attachment/572819" title="https://status.pirati.ca/file/heluecht-20151202T222602-rd3u49p.gif"
+ *	class="attachment thumbnail" id="attachment-572819" rel="nofollow external">https://status.pirati.ca/attachment/572819</a>
+ * 
 */
 
 function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false) {
 	$a = get_app();
 
+	if (($item["id"] != $item["parent"]) AND (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) {
+		logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG);
+	}
+
 	$is_repeat = false;
 
 /*	if (!$repeat) {
@@ -1377,27 +1392,17 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false)
 		$entry = $doc->createElement("activity:object");
 		$title = sprintf("New note by %s", $owner["nick"]);
 	} else {
-		$entry = $doc->createElementNS(NS_ATOM, "entry");
-
-		$entry->setAttribute("xmlns:thr", NS_THR);
-		$entry->setAttribute("xmlns:georss", NS_GEORSS);
-		$entry->setAttribute("xmlns:activity", NS_ACTIVITY);
-		$entry->setAttribute("xmlns:media", NS_MEDIA);
-		$entry->setAttribute("xmlns:poco", NS_POCO);
-		$entry->setAttribute("xmlns:ostatus", NS_OSTATUS);
-		$entry->setAttribute("xmlns:statusnet", NS_STATUSNET);
-
-		if (!$repeat) {
-			$r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`",
-				intval($owner["uid"]));
-			if (!$r)
-				return;
-
-			$profile = $r[0];
-		}
-			$profile = array();
+		$entry = $doc->createElementNS(NAMESPACE_ATOM1, "entry");
 
-		$author = ostatus_add_author($doc, $owner, $profile);
+		$entry->setAttribute("xmlns:thr", NAMESPACE_THREAD);
+		$entry->setAttribute("xmlns:georss", NAMESPACE_GEORSS);
+		$entry->setAttribute("xmlns:activity", NAMESPACE_ACTIVITY);
+		$entry->setAttribute("xmlns:media", NAMESPACE_MEDIA);
+		$entry->setAttribute("xmlns:poco", NAMESPACE_POCO);
+		$entry->setAttribute("xmlns:ostatus", NAMESPACE_OSTATUS);
+		$entry->setAttribute("xmlns:statusnet", NAMESPACE_STATUSNET);
+
+		$author = ostatus_add_author($doc, $owner);
 		$entry->appendChild($author);
 
 		$title = sprintf("New comment by %s", $owner["nick"]);
@@ -1460,9 +1465,12 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false)
 		$repeated_owner["about"] = "";
 		$repeated_owner["uid"] = 0;
 
-		$r =q("SELECT * FROM `unique_contacts` WHERE `url` = '%s'", normalise_link($repeated_item["author-link"]));
+		// Fetch the missing data from the global contacts
+		$r =q("SELECT * FROM `gcontact` WHERE `nurl` = '%s'", normalise_link($repeated_item["author-link"]));
 		if ($r) {
-			$repeated_owner["nick"] = $r[0]["nick"];
+			if ($r[0]["nick"] != "")
+				$repeated_owner["nick"] = $r[0]["nick"];
+
 			$repeated_owner["location"] = $r[0]["location"];
 			$repeated_owner["about"] = $r[0]["about"];
 		}
@@ -1501,7 +1509,7 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false)
 			$mentioned[$thrparent[0]["author-link"]] = $thrparent[0]["author-link"];
 			$mentioned[$thrparent[0]["owner-link"]] = $thrparent[0]["owner-link"];
 		}
-        }
+	}
 
 	xml_add_element($doc, $entry, "link", "", array("rel" => "ostatus:conversation",
 							"href" => $a->get_baseurl()."/display/".$owner["nick"]."/".$item["parent"]));
@@ -1514,6 +1522,14 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false)
 			if ($t[0] == "@")
 				$mentioned[$t[1]] = $t[1];
 
+	// Make sure that mentions are accepted (GNU Social has problems with mixing HTTP and HTTPS)
+	$newmentions = array();
+	foreach ($mentioned AS $mention) {
+		$newmentions[str_replace("http://", "https://", $mention)] = str_replace("http://", "https://", $mention);
+		$newmentions[str_replace("https://", "http://", $mention)] = str_replace("https://", "http://", $mention);
+	}
+	$mentioned = $newmentions;
+
 	foreach ($mentioned AS $mention) {
 		$r = q("SELECT `forum`, `prv` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'",
 			intval($owner["uid"]),
@@ -1540,8 +1556,8 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false)
 
 	ostatus_get_attachment($doc, $entry, $item);
 
-	// To-Do:
-	// The API call has yet to be implemented
+	/// @TODO
+	/// The API call has yet to be implemented
 	//$attributes = array("href" => $a->get_baseurl()."/api/statuses/show/".$item["id"].".atom",
 	//		"rel" => "self", "type" => "application/atom+xml");
 	//xml_add_element($doc, $entry, "link", "", $attributes);