Reworked salmon import

diff --git a/include/ostatus.php b/include/ostatus.php
index 7825418474cc5385ec959443ba45b4c43960a644..7b657577ac67385e7721f9b6489e73de665631f3 100644 (file)
--- a/include/ostatus.php
+++ b/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;

diff --git a/mod/salmon.php b/mod/salmon.php
index 11e42d94364a36cc4eb6f155d4ccd49815e6dc87..f04a2e22879d52868ac746c75b672a5fc5f9f160 100644 (file)
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -2,11 +2,11 @@
 
 
 // There is a lot of debug stuff in here because this is quite a
-// complicated process to try and sort out. 
+// 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
-       $data = preg_replace('/\<\?xml[^\?].*\?\>/','',$data);
-
-       // 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;
-               }
-       }
+       $author = ostatus_salmon_author($data,$importer);
+       $author_link = $author["author-link"];
 
        if(! $author_link) {
                logger('mod-salmon: Could not retrieve author URI.');
@@ -144,17 +117,17 @@ function salmon_post(&$a) {
 
        // We should have everything we need now. Let's see if it verifies.
 
-    $verify = rsa_verify($compliant_format,$signature,$pubkey);
+       $verify = rsa_verify($compliant_format,$signature,$pubkey);
 
        if(! $verify) {
                logger('mod-salmon: message did not verify using protocol. Trying padding hack.');
            $verify = rsa_verify($signed_data,$signature,$pubkey);
-    }
+       }
 
        if(! $verify) {
                logger('mod-salmon: message did not verify using padding. Trying old statusnet hack.');
            $verify = rsa_verify($stnet_signed_data,$signature,$pubkey);
-    }
+       }
 
        if(! $verify) {
                logger('mod-salmon: Message did not verify. Discarding.');
@@ -170,11 +143,14 @@ function salmon_post(&$a) {
        *
        */
 
-       $r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s' ) 
-               AND `uid` = %d LIMIT 1",
+       $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);
 }