X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fostatus.php;h=523ccfe510e55144255fb0052dd693db7425c976;hb=84ec36d52c5fdf85fb61fc4a8ee73546629020d8;hp=80a67f201c1617d2fa8dd1a53a2c6e344f311445;hpb=846edd5bbb7adb965303c9dfd1912c006b2c6668;p=friendica.git

diff --git a/include/ostatus.php b/include/ostatus.php
index 80a67f201c..523ccfe510 100644
--- a/include/ostatus.php
+++ b/include/ostatus.php
@@ -7,11 +7,64 @@ require_once("mod/share.php");
 require_once("include/enotify.php");
 require_once("include/socgraph.php");
 require_once("include/Photo.php");
+require_once("include/Scrape.php");
+require_once("include/follow.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
 
-function ostatus_fetchauthor($xpath, $context, $importer, &$contact) {
+function ostatus_check_follow_friends() {
+	$r = q("SELECT `uid`,`v` FROM `pconfig` WHERE `cat`='system' AND `k`='ostatus_legacy_contact' AND `v` != ''");
+
+	if (!$r)
+		return;
+
+	foreach ($r AS $contact) {
+		ostatus_follow_friends($contact["uid"], $contact["v"]);
+		set_pconfig($contact["uid"], "system", "ostatus_legacy_contact", "");
+	}
+}
+
+// This function doesn't work reliable by now.
+function ostatus_follow_friends($uid, $url) {
+	$contact = probe_url($url);
+
+	if (!$contact)
+		return;
+
+	$api = $contact["baseurl"]."/api/";
+
+	// Fetching friends
+	$data = z_fetch_url($api."statuses/friends.json?screen_name=".$contact["nick"]);
+
+	if (!$data["success"])
+		return;
+
+	$friends = json_decode($data["body"]);
+
+	foreach ($friends AS $friend) {
+		$url = $friend->statusnet_profile_url;
+		$r = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND
+			(`nurl` = '%s' OR `alias` = '%s' OR `alias` = '%s') AND
+			`network` != '%s' LIMIT 1",
+			intval($uid), dbesc(normalise_link($url)),
+			dbesc(normalise_link($url)), dbesc($url), dbesc(NETWORK_STATUSNET));
+		if (!$r) {
+			$data = probe_url($friend->statusnet_profile_url);
+			if ($data["network"] == NETWORK_OSTATUS) {
+				$result = new_contact($uid,$friend->statusnet_profile_url);
+				if ($result["success"])
+					logger($friend->name." ".$url." - success", LOGGER_DEBUG);
+				else
+					logger($friend->name." ".$url." - failed", LOGGER_DEBUG);
+			} else
+				logger($friend->name." ".$url." - not OStatus", LOGGER_DEBUG);
+		}
+	}
+}
+
+function ostatus_fetchauthor($xpath, $context, $importer, &$contact, $onlyfetch) {
 
 	$author = array();
 	$author["author-link"] = $xpath->evaluate('atom:author/atom:uri/text()', $context)->item(0)->nodeValue;
@@ -62,7 +115,7 @@ function ostatus_fetchauthor($xpath, $context, $importer, &$contact) {
 	$author["owner-link"] = $author["author-link"];
 	$author["owner-avatar"] = $author["author-avatar"];
 
-	if ($r) {
+	if ($r AND !$onlyfetch) {
 		// Update contact data
 		$update_contact = ($r[0]['name-date'] < datetime_convert('','','now -12 hours'));
 		if ($update_contact) {
@@ -84,9 +137,9 @@ function ostatus_fetchauthor($xpath, $context, $importer, &$contact) {
 			if ($value != "")
 				$contact["location"] = $value;
 
-			q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `about` = '%s', `location` = '%s', `name-date` = '%s' WHERE `id` = %d",
+			q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `about` = '%s', `location` = '%s', `name-date` = '%s' WHERE `id` = %d AND `network` = '%s'",
 				dbesc($contact["name"]), dbesc($contact["nick"]), dbesc($contact["about"]), dbesc($contact["location"]),
-				dbesc(datetime_convert()), intval($contact["id"]));
+				dbesc(datetime_convert()), intval($contact["id"]), dbesc(NETWORK_OSTATUS));
 
 			poco_check($contact["url"], $contact["name"], $contact["network"], $author["author-avatar"], $contact["about"], $contact["location"],
 					"", "", "", datetime_convert(), 2, $contact["id"], $contact["uid"]);
@@ -99,15 +152,43 @@ function ostatus_fetchauthor($xpath, $context, $importer, &$contact) {
 
 			$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",
+			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(datetime_convert()), intval($contact["id"]), dbesc(NETWORK_OSTATUS));
 		}
 	}
 
 	return($author);
 }
 
+function ostatus_salmon_author($xml, $importer) {
+	$a = get_app();
+
+	if ($xml == "")
+		return;
+
+	$doc = new DOMDocument();
+	@$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/");
+
+	$entries = $xpath->query('/atom:entry');
+
+	foreach ($entries AS $entry) {
+		// fetch the author
+		$author = ostatus_fetchauthor($xpath, $entry, $importer, $contact, true);
+		return $author;
+	}
+}
+
 function ostatus_import($xml,$importer,&$contact, &$hub) {
 
 	$a = get_app();
@@ -172,9 +253,15 @@ function ostatus_import($xml,$importer,&$contact, &$hub) {
 
 		// fetch the author
 		if ($first_child == "feed")
-			$author = ostatus_fetchauthor($xpath, $doc->firstChild, $importer, $contact);
+			$author = ostatus_fetchauthor($xpath, $doc->firstChild, $importer, $contact, false);
+		else
+			$author = ostatus_fetchauthor($xpath, $entry, $importer, $contact, false);
+
+		$value = $xpath->evaluate('atom:author/poco:preferredUsername/text()', $context)->item(0)->nodeValue;
+		if ($value != "")
+			$nickname = $value;
 		else
-			$author = ostatus_fetchauthor($xpath, $entry, $importer, $contact);
+			$nickname = $author["author-name"];
 
 		$item = array_merge($header, $author);
 
@@ -190,24 +277,59 @@ function ostatus_import($xml,$importer,&$contact, &$hub) {
 
 		$item["body"] = add_page_info_to_body(html2bbcode($xpath->query('atom:content/text()', $entry)->item(0)->nodeValue));
 		$item["object-type"] = $xpath->query('activity:object-type/text()', $entry)->item(0)->nodeValue;
+
+		if (($item["object-type"] == ACTIVITY_OBJ_BOOKMARK) OR ($item["object-type"] == ACTIVITY_OBJ_EVENT)) {
+			$item["title"] = $xpath->query('atom:title/text()', $entry)->item(0)->nodeValue;
+			$item["body"] = $xpath->query('atom:summary/text()', $entry)->item(0)->nodeValue;
+		} elseif ($item["object-type"] == ACTIVITY_OBJ_QUESTION)
+			$item["title"] = $xpath->query('atom:title/text()', $entry)->item(0)->nodeValue;
+
 		$item["object"] = $xml;
 		$item["verb"] = $xpath->query('activity:verb/text()', $entry)->item(0)->nodeValue;
 
+		// To-Do:
+		// Delete a message
+		if ($item["verb"] == "qvitter-delete-notice") {
+			// ignore "Delete" messages (by now)
+			logger("Ignore delete message ".print_r($item, true));
+			continue;
+		}
+
 		if ($item["verb"] == ACTIVITY_JOIN) {
 			// ignore "Join" messages
+			logger("Ignore join message ".print_r($item, true));
 			continue;
 		}
 
 		if ($item["verb"] == ACTIVITY_FOLLOW) {
-			// ignore "Follow" messages
+			new_follower($importer, $contact, $item, $nickname);
+			continue;
+		}
+
+		if ($item["verb"] == NAMESPACE_OSTATUS."/unfollow") {
+			lose_follower($importer, $contact, $item, $dummy);
 			continue;
 		}
 
 		if ($item["verb"] == ACTIVITY_FAVORITE) {
-			// ignore "Favorite" messages
+			$orig_uri = $xpath->query("activity:object/atom:id", $entry)->item(0)->nodeValue;
+			logger("Favorite ".$orig_uri." ".print_r($item, true));
+
+			$item["verb"] = ACTIVITY_LIKE;
+			$item["parent-uri"] = $orig_uri;
+			$item["gravity"] = GRAVITY_LIKE;
+		}
+
+		if ($item["verb"] == NAMESPACE_OSTATUS."/unfavorite") {
+			// Ignore "Unfavorite" message
+			logger("Ignore unfavorite message ".print_r($item, true));
 			continue;
 		}
 
+		// http://activitystrea.ms/schema/1.0/rsvp-yes
+		if (!in_array($item["verb"], array(ACTIVITY_POST, ACTIVITY_LIKE, ACTIVITY_SHARE)))
+			logger("Unhandled verb ".$item["verb"]." ".print_r($item, true));
+
 		$item["created"] = $xpath->query('atom:published/text()', $entry)->item(0)->nodeValue;
 		$item["edited"] = $xpath->query('atom:updated/text()', $entry)->item(0)->nodeValue;
 		$conversation = $xpath->query('ostatus:conversation/text()', $entry)->item(0)->nodeValue;
@@ -271,6 +393,9 @@ function ostatus_import($xml,$importer,&$contact, &$hub) {
 					switch($rel) {
 						case "alternate":
 							$item["plink"] = $href;
+							if (($item["object-type"] == ACTIVITY_OBJ_QUESTION) OR
+								($item["object-type"] == ACTIVITY_OBJ_EVENT))
+								$item["body"] .= add_page_info($href);
 							break;
 						case "ostatus:conversation":
 							$conversation = $href;
@@ -283,11 +408,14 @@ function ostatus_import($xml,$importer,&$contact, &$hub) {
 							$item["attach"] .= '[attach]href="'.$href.'" length="'.$length.'" type="'.$type.'" title="'.$title.'"[/attach]';
 							break;
 						case "related":
-							if (!isset($item["parent-uri"]))
-								$item["parent-uri"] = $href;
-
-							if ($related == "")
-								$related = $href;
+							if ($item["object-type"] != ACTIVITY_OBJ_BOOKMARK) {
+								if (!isset($item["parent-uri"]))
+									$item["parent-uri"] = $href;
+
+								if ($related == "")
+									$related = $href;
+							} else
+								$item["body"] .= add_page_info($href);
 							break;
 						case "self":
 							$self = $href;
@@ -345,7 +473,7 @@ function ostatus_import($xml,$importer,&$contact, &$hub) {
 				$orig_created = $xpath->query('atom:published/text()', $activityobjects)->item(0)->nodeValue;
 
 				$orig_contact = $contact;
-				$orig_author = ostatus_fetchauthor($xpath, $activityobjects, $importer, $orig_contact);
+				$orig_author = ostatus_fetchauthor($xpath, $activityobjects, $importer, $orig_contact, false);
 
 				//if (!intval(get_config('system','wall-to-wall_share'))) {
 				//	$prefix = share_header($orig_author['author-name'], $orig_author['author-link'], $orig_author['author-avatar'], "", $orig_created, $orig_link);
@@ -400,31 +528,17 @@ function ostatus_import($xml,$importer,&$contact, &$hub) {
 
 		$item_id = ostatus_completion($conversation, $importer["uid"], $item);
 
-		if ($item_id <= 0) {
-			$reason = $item_id;
-			$item["app"] .= $item_id;
-			$item_id = item_store($item, true);
-			if ($item_id) {
-				logger("Uri ".$item["uri"]." wasn't found in conversation ".$conversation, LOGGER_DEBUG);
-				ostatus_store_conversation($item_id, $conversation_url);
-			}
-		}
-		//echo $xml;
-		//print_r($item);
-
 		if (!$item_id) {
-			logger("Error storing item ".print_r($item, true), LOGGER_DEBUG);
+			logger("Error storing item", LOGGER_DEBUG);
 			continue;
 		}
 
 		logger("Item was stored with id ".$item_id, LOGGER_DEBUG);
 		$item["id"] = $item_id;
 
-		if (!isset($item["parent"]) OR ($item["parent"] == 0))
-			$item["parent"] = $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,
@@ -434,13 +548,13 @@ function ostatus_import($xml,$importer,&$contact, &$hub) {
 				'to_email'     => $u[0]["email"],
 				'uid'          => $item["uid"],
 				'item'         => $item,
-				'link'         => $a->get_baseurl().'/display/'.urlencode(get_item_guid($item["id"])),
+				'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'       => $item["parent"]
+				'parent'       => $r[0]["parent"]
 			));
 		}
 	}
@@ -469,7 +583,7 @@ function ostatus_convert_href($href) {
 	return $href;
 }
 
-function check_conversations($override = false) {
+function check_conversations($mentions = false, $override = false) {
 	$last = get_config('system','ostatus_last_poll');
 
 	$poll_interval = intval(get_config('system','ostatus_poll_interval'));
@@ -480,9 +594,16 @@ function check_conversations($override = false) {
 	if (($poll_interval < 0) AND !$override)
 		return;
 
-	$poll_timeframe = intval(get_config('system','ostatus_poll_timeframe'));
-	if (!$poll_timeframe)
-		$poll_timeframe = OSTATUS_DEFAULT_POLL_TIMEFRAME;
+	if (!$mentions) {
+		$poll_timeframe = intval(get_config('system','ostatus_poll_timeframe'));
+		if (!$poll_timeframe)
+			$poll_timeframe = OSTATUS_DEFAULT_POLL_TIMEFRAME;
+	} else {
+		$poll_timeframe = intval(get_config('system','ostatus_poll_timeframe'));
+		if (!$poll_timeframe)
+			$poll_timeframe = OSTATUS_DEFAULT_POLL_TIMEFRAME_MENTIONS;
+	}
+
 
 	if ($last AND !$override) {
 		$next = $last + ($poll_interval * 60);
@@ -495,8 +616,16 @@ function check_conversations($override = false) {
 	logger('cron_start');
 
 	$start = date("Y-m-d H:i:s", time() - ($poll_timeframe * 60));
-	$conversations = q("SELECT `oid`, `url`, `uid` FROM `term` WHERE `type` = 7 AND `term` > '%s' GROUP BY `url`, `uid` ORDER BY `term` DESC",
-				dbesc($start));
+
+	if ($mentions)
+		$conversations = q("SELECT `term`.`oid`, `term`.`url`, `term`.`uid` FROM `term`
+					STRAIGHT_JOIN `thread` ON `thread`.`iid` = `term`.`oid` AND `thread`.`uid` = `term`.`uid`
+					WHERE `term`.`type` = 7 AND `term`.`term` > '%s' AND `thread`.`mention`
+					GROUP BY `term`.`url`, `term`.`uid` ORDER BY `term`.`term` DESC", dbesc($start));
+	else
+		$conversations = q("SELECT `oid`, `url`, `uid` FROM `term`
+					WHERE `type` = 7 AND `term` > '%s'
+					GROUP BY `url`, `uid` ORDER BY `term` DESC", dbesc($start));
 
 	foreach ($conversations AS $conversation) {
 		ostatus_completion($conversation['url'], $conversation['uid']);
@@ -509,12 +638,15 @@ function check_conversations($override = false) {
 
 function ostatus_completion($conversation_url, $uid, $item = array()) {
 
-	$item_stored = -3;
+	$a = get_app();
+
+	$item_stored = -1;
 
 	$conversation_url = ostatus_convert_href($conversation_url);
 
 	// If the thread shouldn't be completed then store the item and go away
 	if ((intval(get_config('system','ostatus_poll_interval')) == -2) AND (count($item) > 0)) {
+		//$arr["app"] .= " (OStatus-NoCompletion)";
 		$item_stored = item_store($item, true);
 		return($item_stored);
 	}
@@ -536,7 +668,7 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
 		// Preset the parent
 		$r = q("SELECT `id` FROM `contact` WHERE `self` AND `uid`=%d", $uid);
 		if (!$r)
-			return(-1);
+			return(-2);
 
 		$parent = array();
 		$parent["id"] = 0;
@@ -570,9 +702,13 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
 		$conv_as = str_replace(',"statusnet:notice_info":', ',"statusnet_notice_info":', $conv_as);
 		$conv_as = json_decode($conv_as);
 
+		$no_of_items = sizeof($items);
+
 		if (@is_array($conv_as->items))
-			$items = array_merge($items, $conv_as->items);
-		else
+			foreach ($conv_as->items AS $single_item)
+				$items[$single_item->id] = $single_item;
+
+		if ($no_of_items == sizeof($items))
 			break;
 
 		$pageno++;
@@ -583,25 +719,31 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
 
 	if (!sizeof($items)) {
 		if (count($item) > 0) {
+			//$arr["app"] .= " (OStatus-NoConvFetched)";
 			$item_stored = item_store($item, true);
-			logger("Conversation ".$conversation_url." couldn't be fetched. Item uri ".$item["uri"]." stored: ".$item_stored, LOGGER_DEBUG);
 
-			if ($item_stored)
+			if ($item_stored) {
+				logger("Conversation ".$conversation_url." couldn't be fetched. Item uri ".$item["uri"]." stored: ".$item_stored, LOGGER_DEBUG);
 				ostatus_store_conversation($item_id, $conversation_url);
+			}
 
 			return($item_stored);
 		} else
-			return(-2);
+			return(-3);
 	}
 
 	$items = array_reverse($items);
 
+	$r = q("SELECT `nurl` FROM `contact` WHERE `uid` = %d AND `self`", intval($uid));
+	$importer = $r[0];
+
 	foreach ($items as $single_conv) {
 
 		// Test - remove before flight
 		//$tempfile = tempnam(get_temppath(), "conversation");
 		//file_put_contents($tempfile, json_encode($single_conv));
 
+		$mention = false;
 
 		if (isset($single_conv->object->id))
 			$single_conv->id = $single_conv->object->id;
@@ -652,17 +794,23 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
 			}
 		}
 
+		$parent_uri = $parent["uri"];
+
+		// "context" only seems to exist on older servers
 		if (isset($single_conv->context->inReplyTo->id)) {
-			$parent_uri = $single_conv->context->inReplyTo->id;
+			$parent_exists = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `network` IN ('%s','%s') LIMIT 1",
+						intval($uid), dbesc($single_conv->context->inReplyTo->id), dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN));
+			if ($parent_exists)
+				$parent_uri = $single_conv->context->inReplyTo->id;
+		}
 
+		// This is the current way
+		if (isset($single_conv->object->inReplyTo->id)) {
 			$parent_exists = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `network` IN ('%s','%s') LIMIT 1",
-						intval($uid), dbesc($parent_uri), dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN));
-			if (!$parent_exists) {
-				logger("Parent ".$parent_uri." wasn't found here", LOGGER_DEBUG);
-				$parent_uri = $parent["uri"];
-			}
-		} else
-			$parent_uri = $parent["uri"];
+						intval($uid), dbesc($single_conv->object->inReplyTo->id), dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN));
+			if ($parent_exists)
+				$parent_uri = $single_conv->object->inReplyTo->id;
+		}
 
 		$message_exists = q("SELECT `id`, `parent`, `uri` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `network` IN ('%s','%s') LIMIT 1",
 						intval($uid), dbesc($single_conv->id),
@@ -708,6 +856,11 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
 			continue;
 		}
 
+		if (is_array($single_conv->to))
+			foreach($single_conv->to AS $to)
+				if ($importer["nurl"] == normalise_link($to->id))
+					$mention = true;
+
 		$actor = $single_conv->actor->id;
 		if (isset($single_conv->actor->url))
 			$actor = $single_conv->actor->url;
@@ -763,7 +916,7 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
 		else
 			$arr["app"] = "OStatus";
 
-		$arr["app"] .= " (Conversation)";
+		//$arr["app"] .= " (Conversation)";
 
 		$arr["object"] = json_encode($single_conv);
 		$arr["verb"] = $parent["verb"];
@@ -821,15 +974,15 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
 			unset($arr["coord"]);
 
 		// Copy fields from given item array
-		if (isset($item["uri"]) AND ($item["uri"] == $arr["uri"])) {
+		if (isset($item["uri"]) AND (($item["uri"] == $arr["uri"]) OR ($item["uri"] ==  $single_conv->id))) {
 			$copy_fields = array("owner-name", "owner-link", "owner-avatar", "author-name", "author-link", "author-avatar",
-						"gravity", "body", "object-type", "verb", "created", "edited", "coord", "tag",
-						"attach", "app", "type", "location", "contact-id");
+						"gravity", "body", "object-type", "object", "verb", "created", "edited", "coord", "tag",
+						"title", "attach", "app", "type", "location", "contact-id", "uri");
 			foreach ($copy_fields AS $field)
 				if (isset($item[$field]))
 					$arr[$field] = $item[$field];
 
-			$arr["app"] .= " (OStatus)";
+			//$arr["app"] .= " (OStatus)";
 		}
 
 		$newitem = item_store($arr);
@@ -848,6 +1001,28 @@ 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) {
@@ -859,6 +1034,15 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
 		}
 	}
 
+	if (($item_stored < 0) AND (count($item) > 0)) {
+		//$arr["app"] .= " (OStatus-NoConvFound)";
+		$item_stored = item_store($item, true);
+		if ($item_stored) {
+			logger("Uri ".$item["uri"]." wasn't found in conversation ".$conversation_url, LOGGER_DEBUG);
+			ostatus_store_conversation($item_stored, $conversation_url);
+		}
+	}
+
 	return($item_stored);
 }