Merge pull request #1758 from annando/1507-salmon

OStatus Salmon improvements (Follow, Unfollow works)

include/items.php

@@ -4159,9 +4159,12 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
 	$name = notags(trim($datarray['author-name']));
 	$photo = notags(trim($datarray['author-avatar']));
 
+	if (is_object($item)) {
 		$rawtag = $item->get_item_tags(NAMESPACE_ACTIVITY,'actor');
 		if($rawtag && $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data'])
 			$nick = $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data'];
+	} else
+		$nick = $item;
 
 	if(is_array($contact)) {
 		if(($contact['network'] == NETWORK_OSTATUS && $contact['rel'] == CONTACT_IS_SHARING)

include/ostatus.php

@@ -12,7 +12,7 @@ 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_fetchauthor($xpath, $context, $importer, &$contact, $onlyfetch) {
 
 	$author = array();
 	$author["author-link"] = $xpath->evaluate('atom:author/atom:uri/text()', $context)->item(0)->nodeValue;
@@ -63,7 +63,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) {
@@ -109,6 +109,34 @@ function ostatus_fetchauthor($xpath, $context, $importer, &$contact) {
 	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();
@@ -173,9 +201,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);
+			$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
+			$nickname = $author["author-name"];
 
 		$item = array_merge($header, $author);
 
@@ -214,7 +248,12 @@ function ostatus_import($xml,$importer,&$contact, &$hub) {
 		}
 
 		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;
 		}
 
@@ -366,7 +405,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);

mod/salmon.php

@@ -1,12 +1,10 @@
 <?php
 
-
-// There is a lot of debug stuff in here because this is quite a
-// complicated process to try and sort out. 
-
 require_once('include/salmon.php');
+require_once('include/ostatus.php');
 require_once('include/crypto.php');
-require_once('library/simplepie/simplepie.inc');
+require_once('include/items.php');
+require_once('include/follow.php');
 
 function salmon_return($val) {
 
@@ -86,35 +84,8 @@ function salmon_post(&$a) {
 	// decode the data
 	$data = base64url_decode($data);
 
-	// Remove the xml declaration
+	$author = ostatus_salmon_author($data,$importer);
-	$data = preg_replace('/\<\?xml[^\?].*\?\>/','',$data);
+	$author_link = $author["author-link"];
-
-	// Create a fake feed wrapper so simplepie doesn't choke
-
-	$tpl = get_markup_template('fake_feed.tpl');
-
-	$base = substr($data,strpos($data,'<entry'));
-
-	$feedxml = $tpl . $base . '</feed>';
-
-	logger('mod-salmon: Processed feed: ' . $feedxml);
-
-	// Now parse it like a normal atom feed to scrape out the author URI
-
-    $feed = new SimplePie();
-    $feed->set_raw_data($feedxml);
-    $feed->enable_order_by_date(false);
-    $feed->init();
-
-	logger('mod-salmon: Feed parsed.');
-
-	if($feed->get_item_quantity()) {
-		foreach($feed->get_items() as $item) {
-			$author = $item->get_author();
-			$author_link = unxmlify($author->get_link());
-			break;
-		}
-	}
 
 	if(! $author_link) {
 		logger('mod-salmon: Could not retrieve author URI.');
@@ -125,7 +96,6 @@ function salmon_post(&$a) {
 
 	logger('mod-salmon: Fetching key for ' . $author_link);
 
-
 	$key = get_salmon_key($author_link,$keyhash);
 
 	if(! $key) {
@@ -170,17 +140,19 @@ function salmon_post(&$a) {
 	*
 	*/
 
-	$r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s' ) 
+	$r = q("SELECT * FROM `contact` WHERE `network` IN ('%s', '%s')
+						AND (`nurl` = '%s' OR `alias` = '%s' OR `alias` = '%s')
 						AND `uid` = %d LIMIT 1",
 		dbesc(NETWORK_OSTATUS),
+		dbesc(NETWORK_DFRN),
+		dbesc(normalise_link($author_link)),
 		dbesc($author_link),
-		dbesc($author_link),
+		dbesc(normalise_link($author_link)),
 		intval($importer['uid'])
 	);
 	if(! count($r)) {
 		logger('mod-salmon: Author unknown to us.');
 		if(get_pconfig($importer['uid'],'system','ostatus_autofriend')) {
-			require_once('include/follow.php');
 			$result = new_contact($importer['uid'],$author_link);
 			if($result['success']) {
 				$r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s') 
@@ -194,32 +166,22 @@ function salmon_post(&$a) {
 		}
 	}
 
-	// is this a follower? Or have we ignored the person?
+	// Have we ignored the person?
 	// If so we can not accept this post.
 
-	if((count($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) {
+	//if((count($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) {
+	if(count($r) && $r[0]['blocked']) {
 		logger('mod-salmon: Ignoring this author.');
 		http_status_exit(202);
 		// NOTREACHED
 	}
 
-	require_once('include/items.php');
+	// Placeholder for hub discovery.
-
-	// Placeholder for hub discovery. We shouldn't find any hubs
-	// since we supplied the fake feed header - and it doesn't have any.
-
 	$hub = '';
 
-	/**
-	 *
-	 * anti-spam measure: consume_feed will accept a follow activity from 
-	 * this person (and nothing else) if there is no existing contact record.
-	 *
-	 */
-
 	$contact_rec = ((count($r)) ? $r[0] : null);
 
-	consume_feed($feedxml,$importer,$contact_rec,$hub);
+	ostatus_import($data,$importer,$contact_rec, $hub);
 
 	http_status_exit(200);
 }

view/templates/fake_feed.tpl

@@ -1,14 +0,0 @@
-
-<?xml version="1.0" encoding="utf-8" ?>
-<feed xmlns="http://www.w3.org/2005/Atom" >
-
-  <id>fake feed</id>
-  <title>fake title</title>
-
-  <updated>1970-01-01T00:00:00Z</updated>
-
-  <author>
-    <name>Fake Name</name>
-    <uri>http://example.com</uri>
-  </author>
-