Merge pull request #1630 from annando/1505-ostatus

OStatus communication improvements

include/bbcode.php

@@ -828,7 +828,6 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
 
 	$ev = bbtoevent($Text);
 
-
 	// Replace any html brackets with HTML Entities to prevent executing HTML or script
 	// Don't use strip_tags here because it breaks [url] search by replacing & with amp
 
@@ -885,8 +884,13 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
 	$MAILSearchString = $URLSearchString;
 
 	// Remove all hashtag addresses
-	if (!$tryoembed OR $simplehtml)
+	if ((!$tryoembed OR $simplehtml) AND ($simplehtml != 7))
 		$Text = preg_replace("/([#@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $Text);
+	elseif ($simplehtml == 7)
+		$Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
+			'$1<span class="vcard"><a href="$2" class="url" title="$3"><span class="fn nickname mention">$3</span></a></span>',
+			$Text);
+
 
 	// Bookmarks in red - will be converted to bookmarks in friendica
 	$Text = preg_replace("/#\^\[url\]([$URLSearchString]*)\[\/url\]/ism", '[bookmark=$1]$1[/bookmark]', $Text);

include/items.php

@@ -14,7 +14,7 @@ require_once('include/threads.php');
 require_once('include/socgraph.php');
 require_once('mod/share.php');
 
-function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0) {
+function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0, $forpubsub = false) {
 
 
 	$sitefeed    = ((strlen($owner_nick)) ? false : true); // not yet implemented, need to rewrite huge chunks of following logic
@@ -55,6 +55,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
 	$birthday = feed_birthday($owner_id,$owner['timezone']);
 
 	$sql_post_table = "";
+	$visibility = "";
 
 	if(! $public_feed) {
 
@@ -114,6 +115,17 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
 	else
 		$sort = 'ASC';
 
+	// Include answers to status.net posts in pubsub feeds
+	if($forpubsub) {
+		$sql_post_table = "INNER JOIN `thread` ON `thread`.`iid` = `item`.`parent` ";
+		$visibility = "OR (`item`.`network` = 'dfrn' AND `thread`.`network`='stat')";
+		$date_field = "`received`";
+		$sql_order = "`item`.`received` DESC";
+	} else {
+		$date_field = "`changed`";
+		$sql_order = "`item`.`parent` ".$sort.", `item`.`created` ASC";
+	}
+
 	if(! strlen($last_update))
 		$last_update = 'now -30 days';
 
@@ -133,7 +145,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
 	//	AND ( `item`.`edited` > '%s' OR `item`.`changed` > '%s' )
 	//	dbesc($check_date),
 
-	$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
+	$r = q("SELECT STRAIGHT_JOIN `item`.*, `item`.`id` AS `item_id`,
 		`contact`.`name`, `contact`.`network`, `contact`.`photo`, `contact`.`url`,
 		`contact`.`name-date`, `contact`.`uri-date`, `contact`.`avatar-date`,
 		`contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
@@ -144,9 +156,9 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
 		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
 		LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id`
 		WHERE `item`.`uid` = %d AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`parent` != 0
-		AND `item`.`wall` = 1 AND `item`.`changed` > '%s'
+		AND ((`item`.`wall` = 1) $visibility) AND `item`.$date_field > '%s'
 		$sql_extra
-		ORDER BY `parent` %s, `created` ASC LIMIT 0, 300",
+		ORDER BY $sql_order LIMIT 0, 300",
 		intval($owner_id),
 		dbesc($check_date),
 		dbesc($sort)

include/notifier.php

@@ -221,6 +221,9 @@ function notifier_run(&$argv, &$argc){
 	// If this is a public conversation, notify the feed hub
 	$public_message = true;
 
+	// Do a PuSH
+	$push_notify = false;
+
 	// fill this in with a single salmon slap if applicable
 	$slap = '';
 
@@ -284,8 +287,6 @@ function notifier_run(&$argv, &$argc){
 		if($parent['origin'])
 			$relay_to_owner = false;
 
-
-
 		if($relay_to_owner) {
 			logger('notifier: followup', LOGGER_DEBUG);
 			// local followup to remote post
@@ -295,8 +296,12 @@ function notifier_run(&$argv, &$argc){
 			$recipients = array($parent['contact-id']);
 
 			if ($parent['network'] == NETWORK_OSTATUS) {
+				logger('Parent is OStatus', LOGGER_DEBUG);
 
-				// Check if the recipient isn't in your contact list
+				$push_notify = true;
+
+				// Check if the recipient isn't in your contact list, try to slap it
+				// This doesn't seem to work correctly by now
 				$r = q("SELECT `url` FROM `contact` WHERE `id` = %d", $parent['contact-id']);
 				if (count($r)) {
 					$url_recipients = array();
@@ -608,6 +613,8 @@ function notifier_run(&$argv, &$argc){
 			if($contact['self'])
 				continue;
 
+			logger("Deliver to ".$contact['url'], LOGGER_DEBUG);
+
 			// potentially more than one recipient. Start a new process and space them out a bit.
 			// we will deliver single recipient types of message and email recipients here.
 
@@ -713,7 +720,7 @@ function notifier_run(&$argv, &$argc){
 						break;
 
 					if($followup && $contact['notify']) {
-						logger('notifier: slapdelivery: ' . $contact['name']);
+						logger('slapdelivery followup item '.$item_id.' to ' . $contact['name']);
 						$deliver_status = slapper($owner,$contact['notify'],$slap);
 
 						if($deliver_status == (-1)) {
@@ -726,7 +733,7 @@ function notifier_run(&$argv, &$argc){
 						// a public hub, it's ok to send a salmon
 
 						if((count($slaps)) && ($public_message) && (! $expire)) {
-							logger('notifier: slapdelivery: ' . $contact['name']);
+							logger('slapdelivery item '.$item_id.' to ' . $contact['name']);
 							foreach($slaps as $slappy) {
 								if($contact['notify']) {
 									$deliver_status = slapper($owner,$contact['notify'],$slappy);
@@ -966,32 +973,40 @@ function notifier_run(&$argv, &$argc){
 			}
 		}
 
+		$push_notify = true;
 
-		if(strlen($hub)) {
+	}
-			$hubs = explode(',', $hub);
-			if(count($hubs)) {
-				foreach($hubs as $h) {
-					$h = trim($h);
-					if(! strlen($h))
-						continue;
 
-					if ($h === '[internal]') {
-						// Set push flag for PuSH subscribers to this topic,
-						// they will be notified in queue.php
-						q("UPDATE `push_subscriber` SET `push` = 1 " .
-						  "WHERE `nickname` = '%s'", dbesc($owner['nickname']));
-					} else {
 
-						$params = 'hub.mode=publish&hub.url=' . urlencode( $a->get_baseurl() . '/dfrn_poll/' . $owner['nickname'] );
+	if($push_notify AND strlen($hub)) {
-						post_url($h,$params);
+		$hubs = explode(',', $hub);
-						logger('pubsub: publish: ' . $h . ' ' . $params . ' returned ' . $a->get_curl_code());
+		if(count($hubs)) {
-					}
+			foreach($hubs as $h) {
-					if(count($hubs) > 1)
+				$h = trim($h);
-						sleep(7);				// try and avoid multiple hubs responding at precisely the same time
+				if(! strlen($h))
+					continue;
+
+				if ($h === '[internal]') {
+					// Set push flag for PuSH subscribers to this topic,
+					// they will be notified in queue.php
+					q("UPDATE `push_subscriber` SET `push` = 1 " .
+					  "WHERE `nickname` = '%s'", dbesc($owner['nickname']));
+
+					logger('Activating internal PuSH for item '.$item_id, LOGGER_DEBUG);
+
+				} else {
+
+					$params = 'hub.mode=publish&hub.url=' . urlencode( $a->get_baseurl() . '/dfrn_poll/' . $owner['nickname'] );
+					post_url($h,$params);
+					logger('publish for item '.$item_id.' ' . $h . ' ' . $params . ' returned ' . $a->get_curl_code());
 				}
+				if(count($hubs) > 1)
+					sleep(7);				// try and avoid multiple hubs responding at precisely the same time
 			}
 		}
 
+		// Handling the pubsubhubbub requests
+		proc_run('php','include/pubsubpublish.php');
 	}
 
 	// If the item was deleted, clean up the `sign` table

include/pubsubpublish.php

@@ -0,0 +1,113 @@
+<?php
+require_once("boot.php");
+
+function handle_pubsubhubbub() {
+	global $a, $db;
+
+	logger('start');
+
+	// We'll push to each subscriber that has push > 0,
+	// i.e. there has been an update (set in notifier.php).
+
+	$r = q("SELECT * FROM `push_subscriber` WHERE `push` > 0");
+
+	foreach($r as $rr) {
+		$params = get_feed_for($a, '', $rr['nickname'], $rr['last_update'], 0, true);
+		$hmac_sig = hash_hmac("sha1", $params, $rr['secret']);
+
+		$headers = array("Content-type: application/atom+xml",
+						sprintf("Link: <%s>;rel=hub," .
+								"<%s>;rel=self",
+								$a->get_baseurl() . '/pubsubhubbub',
+								$rr['topic']),
+						"X-Hub-Signature: sha1=" . $hmac_sig);
+
+		logger('POST '. print_r($headers, true)."\n".$params, LOGGER_DEBUG);
+
+		post_url($rr['callback_url'], $params, $headers);
+		$ret = $a->get_curl_code();
+
+		if ($ret >= 200 && $ret <= 299) {
+			logger('successfully pushed to '.$rr['callback_url']);
+
+			// set last_update to "now", and reset push=0
+			$date_now = datetime_convert('UTC','UTC','now','Y-m-d H:i:s');
+			q("UPDATE `push_subscriber` SET `push` = 0, last_update = '%s' WHERE id = %d",
+				dbesc($date_now),
+				intval($rr['id']));
+
+		} else {
+			logger('error when pushing to '.$rr['callback_url'].' HTTP: '.$ret);
+
+			// we use the push variable also as a counter, if we failed we
+			// increment this until some upper limit where we give up
+			$new_push = intval($rr['push']) + 1;
+
+			if ($new_push > 30) // OK, let's give up
+				$new_push = 0;
+
+			q("UPDATE `push_subscriber` SET `push` = %d WHERE id = %d",
+				$new_push,
+				intval($rr['id']));
+		}
+	}
+
+	logger('done');
+}
+
+
+function pubsubpublish_run(&$argv, &$argc){
+	global $a, $db;
+
+	if(is_null($a)){
+		$a = new App;
+	}
+
+	if(is_null($db)){
+		@include(".htconfig.php");
+		require_once("include/dba.php");
+		$db = new dba($db_host, $db_user, $db_pass, $db_data);
+		unset($db_host, $db_user, $db_pass, $db_data);
+	};
+
+	require_once('include/items.php');
+	require_once('include/pidfile.php');
+
+	load_config('config');
+	load_config('system');
+
+	$lockpath = get_lockpath();
+	if ($lockpath != '') {
+		$pidfile = new pidfile($lockpath, 'pubsubpublish');
+		if($pidfile->is_already_running()) {
+			logger("Already running");
+			if ($pidfile->running_time() > 9*60) {
+				$pidfile->kill();
+				logger("killed stale process");
+				// Calling a new instance
+				proc_run('php',"include/pubsubpublish.php");
+			}
+			return;
+		}
+	}
+
+	$a->set_baseurl(get_config('system','url'));
+
+	load_hooks();
+
+	if($argc > 1)
+		$pubsubpublish_id = intval($argv[1]);
+	else
+		$pubsubpublish_id = 0;
+
+	handle_pubsubhubbub();
+
+	return;
+
+}
+
+if (array_search(__file__,get_included_files())===0){
+  pubsubpublish_run($_SERVER["argv"],$_SERVER["argc"]);
+  killme();
+}
+

include/queue.php

@@ -2,64 +2,6 @@
 require_once("boot.php");
 require_once('include/queue_fn.php');
 
-function handle_pubsubhubbub() {
-	global $a, $db;
-
-	logger('queue [pubsubhubbub]: start');
-
-	// We'll push to each subscriber that has push > 0,
-	// i.e. there has been an update (set in notifier.php).
-
-	$r = q("SELECT * FROM `push_subscriber` WHERE `push` > 0");
-
-	foreach($r as $rr) {
-		$params = get_feed_for($a, '', $rr['nickname'], $rr['last_update']);
-		$hmac_sig = hash_hmac("sha1", $params, $rr['secret']);
-
-		$headers = array("Content-type: application/atom+xml",
-						 sprintf("Link: <%s>;rel=hub," .
-								 "<%s>;rel=self",
-								 $a->get_baseurl() . '/pubsubhubbub',
-								 $rr['topic']),
-						 "X-Hub-Signature: sha1=" . $hmac_sig);
-
-		logger('queue [pubsubhubbub]: POST', $headers);
-
-		post_url($rr['callback_url'], $params, $headers);
-		$ret = $a->get_curl_code();
-
-		if ($ret >= 200 && $ret <= 299) {
-			logger('queue [pubsubhubbub]: successfully pushed to ' .
-				   $rr['callback_url']);
-
-			// set last_update to "now", and reset push=0
-			$date_now = datetime_convert('UTC','UTC','now','Y-m-d H:i:s');
-			q("UPDATE `push_subscriber` SET `push` = 0, last_update = '%s' " .
-			  "WHERE id = %d",
-			  dbesc($date_now),
-			  intval($rr['id']));
-
-		} else {
-			logger('queue [pubsubhubbub]: error when pushing to ' .
-				   $rr['callback_url'] . 'HTTP: ', $ret);
-
-			// we use the push variable also as a counter, if we failed we
-			// increment this until some upper limit where we give up
-			$new_push = intval($rr['push']) + 1;
-
-			if ($new_push > 30) // OK, let's give up
-				$new_push = 0;
-
-			q("UPDATE `push_subscriber` SET `push` = %d, last_update = '%s' " .
-			  "WHERE id = %d",
-			  $new_push,
-			  dbesc($date_now),
-			  intval($rr['id']));
-		}
-	}
-}
-
-
 function queue_run(&$argv, &$argc){
 	global $a, $db;
 
@@ -112,7 +54,8 @@ function queue_run(&$argv, &$argc){
 
 	logger('queue: start');
 
-	handle_pubsubhubbub();
+	// Handling the pubsubhubbub requests
+	proc_run('php','include/pubsubpublish.php');
 
 	$interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval')));
 

include/text.php

@@ -835,10 +835,16 @@ function get_mentions($item) {
 	foreach($arr as $x) {
 		$matches = null;
 		if(preg_match('/@\[url=([^\]]*)\]/',$x,$matches)) {
-			$o .= "\t\t" . '<link rel="mentioned" href="' . $matches[1] . '" />' . "\r\n";
 			$o .= "\t\t" . '<link rel="ostatus:attention" href="' . $matches[1] . '" />' . "\r\n";
+			$o .= "\t\t" . '<link rel="mentioned" href="' . $matches[1] . '" />' . "\r\n";
 		}
 	}
+
+	if (!$item['private']) {
+			$o .= "\t\t".'<link rel="ostatus:attention" href="http://activityschema.org/collection/public"/>'."\r\n";
+			$o .= "\t\t".'<link rel="mentioned" href="http://activityschema.org/collection/public"/>'."\r\n";
+	}
+
 	return $o;
 }}
 

mod/item.php

@@ -144,6 +144,7 @@ function item_post(&$a) {
 						$parent_contact["nurl"] = normalise_link($probed_contact["url"]);
 						$parent_contact["thumb"] = $probed_contact["photo"];
 						$parent_contact["micro"] = $probed_contact["photo"];
+						$parent_contact["addr"] = $probed_contact["addr"];
 					}
 					logger('parent contact: '.print_r($parent_contact, true), LOGGER_DEBUG);
 				} else
@@ -569,10 +570,32 @@ function item_post(&$a) {
 	 * and we are replying, and there isn't one already
 	 */
 
-	if(($parent_contact) && ($parent_contact['network'] === NETWORK_OSTATUS)
+	if ($parent_contact['id'] != "")
-		&& ($parent_contact['nick']) && (! in_array('@' . $parent_contact['nick'],$tags))) {
+		$contact = '@'.$parent_contact['nick'].'+'.$parent_contact['id'];
-		$body = '@' . $parent_contact['nick'] . ' ' . $body;
+	//elseif ($parent_contact['addr'] != "")
-		$tags[] = '@' . $parent_contact['nick'];
+	//	$contact = '@'.$parent_contact['addr'];
+	else
+		$contact = '@[url='.$parent_contact['url'].']'.$parent_contact['nick'].'[/url]';
+
+	if ($parent_contact && ($parent_contact['network'] === NETWORK_OSTATUS)) {
+		if (($parent_contact['nick']) && (!in_array($contact,$tags))) {
+			$body = $contact.' '.$body;
+			$tags[] = $contact;
+		}
+
+		$toplevel_contact = "";
+		$toplevel_parent = q("SELECT `contact`.* FROM `contact` INNER JOIN `item` ON `item`.`contact-id` = `contact`.`id`
+					WHERE `item`.`id` = `item`.`parent` AND `item`.`parent` = %d", intval($parent));
+		if ($toplevel_parent)
+			$toplevel_contact = '@'.$toplevel_parent[0]['nick'].'+'.$toplevel_parent[0]['id'];
+		else {
+			$toplevel_parent = q("SELECT `author-link`, `author-name` FROM `item` WHERE `id` = `parent` AND `parent` = %d", intval($parent));
+			$toplevel_contact = '@[url='.$toplevel_parent[0]['author-link'].']'.$toplevel_parent[0]['author-name'].'[/url]';
+		}
+
+		if ($toplevel_contact != "")
+			if (!in_array($toplevel_contact,$tags))
+				$tags[] = $toplevel_contact;
 	}
 
 	$tagged = array();