Reworked salmon import

include/ostatus.php

@@ -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);
+		return $author;
+	}
+}
+
 function ostatus_import($xml,$importer,&$contact, &$hub) {
 
 	$a = get_app();
@@ -218,6 +246,11 @@ function ostatus_import($xml,$importer,&$contact, &$hub) {
 			continue;
 		}
 
+		if ($item["verb"] == NAMESPACE_OSTATUS."/unfollow") {
+			// ignore "Unfollow" messages
+			continue;
+		}
+
 		if ($item["verb"] == ACTIVITY_FAVORITE) {
 			// ignore "Favorite" messages
 			continue;

mod/salmon.php

@@ -5,8 +5,8 @@
 // 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');
 
 function salmon_return($val) {
 
@@ -86,35 +86,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.');
@@ -170,11 +143,14 @@ 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)) {
@@ -219,7 +195,8 @@ function salmon_post(&$a) {
 
 	$contact_rec = ((count($r)) ? $r[0] : null);
 
-	consume_feed($feedxml,$importer,$contact_rec,$hub);
+	//consume_feed($feedxml,$importer,$contact_rec,$hub);
+	ostatus_import($data,$importer,$contact_rec, $hub);
 
 	http_status_exit(200);
 }