X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fostatus.php;h=caaeec84f7dd974db3a9b5c079064f7f60e9cbf4;hb=d9b5d6d5f55bd01dff0f54a2e0d1f086b20851c7;hp=2c6480fd3281b2145faa51691fbe1077c8b32477;hpb=a9b2b48d082b5e97fd3bb1481d2b01e81d04735a;p=friendica.git

diff --git a/include/ostatus.php b/include/ostatus.php
index 2c6480fd32..caaeec84f7 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");
@@ -9,20 +10,13 @@ require_once("include/socgraph.php");
 require_once("include/Photo.php");
 require_once("include/Scrape.php");
 require_once("include/follow.php");
+require_once("include/api.php");
+require_once("mod/proxy.php");
 
 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` != ''");
 
@@ -124,47 +118,57 @@ 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/uri/text()', $context)->item(0)->nodeValue;
+		if ($value != "")
+			$contact["alias"] = $value;
+
+		$value = $xpath->evaluate('atom:author/poco:displayName/text()', $context)->item(0)->nodeValue;
+		if ($value != "")
+			$contact["name"] = $value;
+
+		$value = $xpath->evaluate('atom:author/poco:preferredUsername/text()', $context)->item(0)->nodeValue;
+		if ($value != "")
+			$contact["nick"] = $value;
 
-			$value = $xpath->evaluate('atom:author/poco:preferredUsername/text()', $context)->item(0)->nodeValue;
-			if ($value != "")
-				$contact["nick"] = $value;
+		$value = $xpath->evaluate('atom:author/poco:note/text()', $context)->item(0)->nodeValue;
+		if ($value != "")
+			$contact["about"] = html2bbcode($value);
 
-			$value = $xpath->evaluate('atom:author/poco:note/text()', $context)->item(0)->nodeValue;
-			if ($value != "")
-				$contact["about"] = $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: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"])) {
 
-			q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `about` = '%s', `location` = '%s', `name-date` = '%s' WHERE `id` = %d AND `network` = '%s'",
+			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"]);
 		}
+
+
+		/// @todo Add the "addr" field
+		$contact["generation"] = 2;
+		$contact["photo"] = $author["author-avatar"];
+		update_gcontact($contact);
 	}
 
 	return($author);
@@ -180,14 +184,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');
 
@@ -211,14 +215,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;
@@ -296,8 +300,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));
@@ -359,8 +363,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) {
@@ -543,29 +547,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"]
-			));
-		}
 	}
 }
 
@@ -831,7 +812,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);
 
@@ -884,7 +865,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);
@@ -1010,28 +991,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) {
@@ -1077,7 +1036,36 @@ function ostatus_store_conversation($itemid, $conversation_url) {
 	}
 }
 
-function xml_add_element($doc, $parent, $element, $value = "", $attributes = array()) {
+function get_reshared_guid($item) {
+	$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("");
+
+	// 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);
+
+	$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];
+
+	return $guid;
+}
+
+function xml_create_element($doc, $element, $value = "", $attributes = array()) {
 	$element = $doc->createElement($element, xmlify($value));
 
 	foreach ($attributes AS $key => $value) {
@@ -1085,50 +1073,74 @@ 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);
 }
 
-function ostatus_add_header($doc, $owner) {
-	$a = get_app();
+function ostatus_format_picture_post($body) {
+	$siteinfo = get_attached_data($body);
 
-	$r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`",
-		intval($owner["uid"]));
-	if (!$r)
-		return;
+	if (($siteinfo["type"] == "photo")) {
+		if (isset($siteinfo["preview"]))
+			$preview = $siteinfo["preview"];
+		else
+			$preview = $siteinfo["image"];
+
+		// Is it a remote picture? Then make a smaller preview here
+		$preview = proxy_url($preview, false, PROXY_SIZE_SMALL);
 
-	$profile = $r[0];
+		// Is it a local picture? Then make it smaller here
+		$preview = str_replace(array("-0.jpg", "-0.png"), array("-2.jpg", "-2.png"), $preview);
+		$preview = str_replace(array("-1.jpg", "-1.png"), array("-2.jpg", "-2.png"), $preview);
 
-	$root = $doc->createElementNS(NS_ATOM, 'feed');
+		if (isset($siteinfo["url"]))
+			$url = $siteinfo["url"];
+		else
+			$url = $siteinfo["image"];
+
+		$body = trim($siteinfo["text"])." [url]".$url."[/url]\n[img]".$preview."[/img]";
+	}
+
+	return $body;
+}
+
+function ostatus_add_header($doc, $owner) {
+	$a = get_app();
+
+	$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);
 
@@ -1231,13 +1243,17 @@ function ostatus_get_attachment($doc, $root, $item) {
 	}
 }
 
-function ostatus_add_author($doc, $owner, $profile) {
+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"]);
-	xml_add_element($doc, $author, "name", $owner["nick"]);
+	xml_add_element($doc, $author, "name", $owner["name"]);
 
 	$attributes = array("rel" => "alternate", "type" => "text/html", "href" => $owner["url"]);
 	xml_add_element($doc, $author, "link", "", $attributes);
@@ -1247,20 +1263,22 @@ function ostatus_add_author($doc, $owner, $profile) {
 			"type" => "image/jpeg", // To-Do?
 			"media:width" => 175,
 			"media:height" => 175,
-			"href" => $profile["photo"]);
+			"href" => $owner["photo"]);
 	xml_add_element($doc, $author, "link", "", $attributes);
 
-	$attributes = array(
-			"rel" => "avatar",
-			"type" => "image/jpeg", // To-Do?
-			"media:width" => 80,
-			"media:height" => 80,
-			"href" => $profile["thumb"]);
-	xml_add_element($doc, $author, "link", "", $attributes);
+	if (isset($owner["thumb"])) {
+		$attributes = array(
+				"rel" => "avatar",
+				"type" => "image/jpeg", // To-Do?
+				"media:width" => 80,
+				"media:height" => 80,
+				"href" => $owner["thumb"]);
+		xml_add_element($doc, $author, "link", "", $attributes);
+	}
 
 	xml_add_element($doc, $author, "poco:preferredUsername", $owner["nick"]);
-	xml_add_element($doc, $author, "poco:displayName", $profile["name"]);
-	xml_add_element($doc, $author, "poco:note", $profile["about"]);
+	xml_add_element($doc, $author, "poco:displayName", $owner["name"]);
+	xml_add_element($doc, $author, "poco:note", $owner["about"]);
 
 	if (trim($owner["location"]) != "") {
 		$element = $doc->createElement("poco:address");
@@ -1276,37 +1294,57 @@ function ostatus_add_author($doc, $owner, $profile) {
 		$author->appendChild($urls);
 	}
 
-	xml_add_element($doc, $author, "followers", "", array("url" => $a->get_baseurl()."/viewcontacts/".$owner["nick"]));
-	xml_add_element($doc, $author, "statusnet:profile_info", "", array("local_id" => $owner["uid"]));
+	if (count($profile)) {
+		xml_add_element($doc, $author, "followers", "", array("url" => $a->get_baseurl()."/viewcontacts/".$owner["nick"]));
+		xml_add_element($doc, $author, "statusnet:profile_info", "", array("local_id" => $owner["uid"]));
+	}
 
 	return $author;
 }
 
-function ostatus_entry($doc, $item, $owner, $toplevel = false) {
+/** 
+ * @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 (!$toplevel) {
+	$is_repeat = false;
+
+/*	if (!$repeat) {
+		$repeated_guid = get_reshared_guid($item);
+
+		if ($repeated_guid != "") {
+			$r = q("SELECT * FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
+				intval($owner["uid"]), dbesc($repeated_guid));
+			if ($r) {
+				$repeated_item = $r[0];
+				$is_repeat = true;
+			}
+		}
+	}
+*/
+	if (!$toplevel AND !$repeat) {
 		$entry = $doc->createElement("entry");
 		$title = sprintf("New note by %s", $owner["nick"]);
+	} elseif (!$toplevel AND $repeat) {
+		$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);
-
-		$r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`",
-			intval($owner["uid"]));
-		if (!$r)
-			return;
+		$entry = $doc->createElementNS(NAMESPACE_ATOM1, "entry");
 
-		$profile = $r[0];
+		$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, $profile);
+		$author = ostatus_add_author($doc, $owner);
 		$entry->appendChild($author);
 
 		$title = sprintf("New comment by %s", $owner["nick"]);
@@ -1323,7 +1361,11 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false) {
 	// But: it seems as if it doesn't federate well between the GS servers
 	// So we just set it to "note" to be sure that it reaches their target systems
 
-	xml_add_element($doc, $entry, "activity:object-type", ACTIVITY_OBJ_NOTE);
+	if (!$repeat)
+		xml_add_element($doc, $entry, "activity:object-type", ACTIVITY_OBJ_NOTE);
+	else
+		xml_add_element($doc, $entry, "activity:object-type", NAMESPACE_ACTIVITY_SCHEMA.'activity');
+
 	xml_add_element($doc, $entry, "id", $item["uri"]);
 	xml_add_element($doc, $entry, "title", $title);
 
@@ -1332,10 +1374,12 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false) {
 	else
 		$body = $item['body'];
 
+	$body = ostatus_format_picture_post($body);
+
 	if ($item['title'] != "")
 		$body = "[b]".$item['title']."[/b]\n\n".$body;
 
-	$body = bb_remove_share_information($body);
+	//$body = bb_remove_share_information($body);
 	$body = bbcode($body, false, false, 7);
 
 	xml_add_element($doc, $entry, "content", $body, array("type" => "html"));
@@ -1344,12 +1388,46 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false) {
 							"href" => $a->get_baseurl()."/display/".$item["guid"]));
 
 	xml_add_element($doc, $entry, "status_net", "", array("notice_id" => $item["id"]));
-	xml_add_element($doc, $entry, "activity:verb", construct_verb($item));
+
+	if (!$is_repeat)
+		xml_add_element($doc, $entry, "activity:verb", construct_verb($item));
+	else
+		xml_add_element($doc, $entry, "activity:verb", ACTIVITY_SHARE);
+
 	xml_add_element($doc, $entry, "published", datetime_convert("UTC","UTC",$item["created"]."+00:00",ATOM_TIME));
 	xml_add_element($doc, $entry, "updated", datetime_convert("UTC","UTC",$item["edited"]."+00:00",ATOM_TIME));
 
+	if ($is_repeat) {
+		$repeated_owner = array();
+		$repeated_owner["name"] = $repeated_item["author-name"];
+		$repeated_owner["url"] = $repeated_item["author-link"];
+		$repeated_owner["photo"] = $repeated_item["author-avatar"];
+		$repeated_owner["nick"] = $repeated_owner["name"];
+		$repeated_owner["location"] = "";
+		$repeated_owner["about"] = "";
+		$repeated_owner["uid"] = 0;
+
+		// Fetch the missing data from the global contacts
+		$r =q("SELECT * FROM `gcontact` WHERE `nurl` = '%s'", normalise_link($repeated_item["author-link"]));
+		if ($r) {
+			if ($r[0]["nick"] != "")
+				$repeated_owner["nick"] = $r[0]["nick"];
+
+			$repeated_owner["location"] = $r[0]["location"];
+			$repeated_owner["about"] = $r[0]["about"];
+		}
+
+		$entry_repeat = ostatus_entry($doc, $repeated_item, $repeated_owner, false, true);
+		$entry->appendChild($entry_repeat);
+	} elseif ($repeat) {
+		$author = ostatus_add_author($doc, $owner);
+		$entry->appendChild($author);
+	}
+
+	$mentioned = array();
+
 	if (($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) {
-		$parent = q("SELECT `guid` FROM `item` WHERE `id` = %d", intval($item["parent"]));
+		$parent = q("SELECT `guid`, `author-link`, `owner-link` FROM `item` WHERE `id` = %d", intval($item["parent"]));
 		$parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
 
 		$attributes = array(
@@ -1362,7 +1440,18 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false) {
 				"rel" => "related",
 				"href" => $a->get_baseurl()."/display/".$parent[0]["guid"]);
 		xml_add_element($doc, $entry, "link", "", $attributes);
-        }
+
+		$mentioned[$parent[0]["author-link"]] = $parent[0]["author-link"];
+		$mentioned[$parent[0]["owner-link"]] = $parent[0]["owner-link"];
+
+		$thrparent = q("SELECT `guid`, `author-link`, `owner-link` FROM `item` WHERE `uid` = %d AND `uri` = '%s'",
+				intval($owner["uid"]),
+				dbesc($parent_item));
+		if ($thrparent) {
+			$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"]));
@@ -1373,9 +1462,29 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false) {
 	if(count($tags))
 		foreach($tags as $t)
 			if ($t[0] == "@")
-				xml_add_element($doc, $entry, "link", "", array("rel" => "mentioned",
+				$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"]),
+			dbesc(normalise_link($mention)));
+		if ($r[0]["forum"] OR $r[0]["prv"])
+			xml_add_element($doc, $entry, "link", "", array("rel" => "mentioned",
+										"ostatus:object-type" => ACTIVITY_OBJ_GROUP,
+										"href" => $mention));
+		else
+			xml_add_element($doc, $entry, "link", "", array("rel" => "mentioned",
 										"ostatus:object-type" => ACTIVITY_OBJ_PERSON,
-										"href" => $t[1]));
+										"href" => $mention));
+	}
 
 	if (!$item["private"])
 		xml_add_element($doc, $entry, "link", "", array("rel" => "mentioned",
@@ -1389,8 +1498,8 @@ function ostatus_entry($doc, $item, $owner, $toplevel = 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);
@@ -1403,7 +1512,12 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false) {
 	if ($app == "")
 		$app = "web";
 
-	xml_add_element($doc, $entry, "statusnet:notice_info", "", array("local_id" => $item["id"], "source" => $app));
+
+	$attributes = array("local_id" => $item["id"], "source" => $app);
+	if ($is_repeat)
+		$attributes["repeat_of"] = $repeated_item["id"];
+
+	xml_add_element($doc, $entry, "statusnet:notice_info", "", $attributes);
 
 	return $entry;
 }
@@ -1430,12 +1544,17 @@ function ostatus_feed(&$a, $owner_nick, $last_update) {
 			WHERE `item`.`uid` = %d AND `item`.`received` > '%s' AND NOT `item`.`private` AND NOT `item`.`deleted`
 				AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
 				AND ((`item`.`wall` AND (`item`.`parent` = `item`.`id`))
-					OR (`item`.`network` = '%s' AND ((`thread`.`network`='%s') OR (`thritem`.`network` = '%s'))) AND `thread`.`mention`)
-				AND (`item`.`owner-link` IN ('%s', '%s'))
+					OR (`item`.`network` = '%s' AND ((`thread`.`network` IN ('%s', '%s')) OR (`thritem`.`network` IN ('%s', '%s')))) AND `thread`.`mention`)
+				AND ((`item`.`owner-link` IN ('%s', '%s') AND (`item`.`parent` = `item`.`id`))
+					OR (`item`.`author-link` IN ('%s', '%s')))
 			ORDER BY `item`.`received` DESC
 			LIMIT 0, 300",
-			intval($owner["uid"]), dbesc($check_date),
-			dbesc(NETWORK_DFRN), dbesc(NETWORK_OSTATUS), dbesc(NETWORK_OSTATUS),
+			intval($owner["uid"]), dbesc($check_date), dbesc(NETWORK_DFRN),
+			//dbesc(NETWORK_OSTATUS), dbesc(NETWORK_OSTATUS),
+			//dbesc(NETWORK_OSTATUS), dbesc(NETWORK_OSTATUS),
+			dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN),
+			dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN),
+			dbesc($owner["nurl"]), dbesc(str_replace("http://", "https://", $owner["nurl"])),
 			dbesc($owner["nurl"]), dbesc(str_replace("http://", "https://", $owner["nurl"]))
 		);