Without only the worker queue we don't need the deliverq anymore.

[friendica.git] / include / feed.php

diff --git a/include/feed.php b/include/feed.php
index 293de3cc965ed6b892599db7edd17c5aad6e12d4..e0fef50dbbc6f7ed832e11451bf6bed47df3c9f6 100644 (file)
--- a/include/feed.php
+++ b/include/feed.php
@@ -17,10 +17,15 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 
        $a = get_app();
 
-       logger("Import Atom/RSS feed", LOGGER_DEBUG);
+       if (!$simulate)
+               logger("Import Atom/RSS feed '".$contact["name"]."' (Contact ".$contact["id"].") for user ".$importer["uid"], LOGGER_DEBUG);
+       else
+               logger("Test Atom/RSS feed", LOGGER_DEBUG);
 
-       if ($xml == "")
+       if ($xml == "") {
+               logger('XML is empty.', LOGGER_DEBUG);
                return;
+       }
 
        $doc = new DOMDocument();
        @$doc->loadXML($xml);
@@ -47,15 +52,13 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
        }
 
        // Is it Atom?
-       if ($xpath->query('/atom:feed/atom:entry')->length > 0) {
+       if ($xpath->query('/atom:feed')->length > 0) {
                $alternate = $xpath->query("atom:link[@rel='alternate']")->item(0)->attributes;
                if (is_object($alternate))
                        foreach($alternate AS $attributes)
                                if ($attributes->name == "href")
                                        $author["author-link"] = $attributes->textContent;
 
-               $author["author-id"] = $xpath->evaluate('/atom:feed/atom:author/atom:uri/text()')->item(0)->nodeValue;
-
                if ($author["author-link"] == "")
                        $author["author-link"] = $author["author-id"];
 
@@ -84,9 +87,22 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
                if ($value != "")
                        $author["author-name"] = $value;
 
-               $value = $xpath->evaluate('atom:author/poco:preferredUsername/text()')->item(0)->nodeValue;
-               if ($value != "")
-                       $author["author-nick"] = $value;
+               if ($simulate) {
+                       $author["author-id"] = $xpath->evaluate('/atom:feed/atom:author/atom:uri/text()')->item(0)->nodeValue;
+
+                       $value = $xpath->evaluate('atom:author/poco:preferredUsername/text()')->item(0)->nodeValue;
+                       if ($value != "")
+                               $author["author-nick"] = $value;
+
+                       $value = $xpath->evaluate('atom:author/poco:address/poco:formatted/text()', $context)->item(0)->nodeValue;
+                       if ($value != "")
+                               $author["author-location"] = $value;
+
+                       $value = $xpath->evaluate('atom:author/poco:note/text()')->item(0)->nodeValue;
+                       if ($value != "")
+                               $author["author-about"] = $value;
+
+               }
 
                $author["edited"] = $author["created"] = $xpath->query('/atom:feed/atom:updated/text()')->item(0)->nodeValue;
 
@@ -126,10 +142,6 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
                $author["owner-link"] = $contact["url"];
                $author["owner-name"] = $contact["name"];
                $author["owner-avatar"] = $contact["thumb"];
-
-               // This is no field in the item table. So we have to unset it.
-               unset($author["author-nick"]);
-               unset($author["author-id"]);
        }
 
        $header = array();
@@ -150,8 +162,10 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
                $header["last-child"] = 0;
        }
 
-       if (!is_object($entries))
+       if (!is_object($entries)) {
+               logger("There are no entries in this feed.", LOGGER_DEBUG);
                return;
+       }
 
        $items = array();
 
@@ -163,18 +177,6 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
        foreach (array_reverse($entrylist) AS $entry) {
                $item = array_merge($header, $author);
 
-               $item["title"] = $xpath->evaluate('atom:title/text()', $entry)->item(0)->nodeValue;
-
-               if ($item["title"] == "")
-                       $item["title"] = $xpath->evaluate('title/text()', $entry)->item(0)->nodeValue;
-
-               if ($item["title"] == "")
-                       $item["title"] = $xpath->evaluate('rss:title/text()', $entry)->item(0)->nodeValue;
-
-               $alternate = $xpath->query("atom:link[@rel='alternate']", $entry)->item(0)->attributes;
-               if (!is_object($alternate))
-                       $alternate = $xpath->query("atom:link", $entry)->item(0)->attributes;
-
                if (is_object($alternate))
                        foreach($alternate AS $attributes)
                                if ($attributes->name == "href")
@@ -198,6 +200,27 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 
                $item["parent-uri"] = $item["uri"];
 
+               if (!$simulate) {
+                       $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `network` IN ('%s', '%s')",
+                               intval($importer["uid"]), dbesc($item["uri"]), dbesc(NETWORK_FEED), dbesc(NETWORK_DFRN));
+                       if ($r) {
+                               logger("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already existed under id ".$r[0]["id"], LOGGER_DEBUG);
+                               continue;
+                       }
+               }
+
+               $item["title"] = $xpath->evaluate('atom:title/text()', $entry)->item(0)->nodeValue;
+
+               if ($item["title"] == "")
+                       $item["title"] = $xpath->evaluate('title/text()', $entry)->item(0)->nodeValue;
+
+               if ($item["title"] == "")
+                       $item["title"] = $xpath->evaluate('rss:title/text()', $entry)->item(0)->nodeValue;
+
+               $alternate = $xpath->query("atom:link[@rel='alternate']", $entry)->item(0)->attributes;
+               if (!is_object($alternate))
+                       $alternate = $xpath->query("atom:link", $entry)->item(0)->attributes;
+
                $published = $xpath->query('atom:published/text()', $entry)->item(0)->nodeValue;
 
                if ($published == "")
@@ -236,15 +259,6 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
                if ($creator != "")
                        $item["author-name"] = $creator;
 
-               if (!$simulate) {
-                       $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `network` IN ('%s', '%s')",
-                               intval($importer["uid"]), dbesc($item["uri"]), dbesc(NETWORK_FEED), dbesc(NETWORK_DFRN));
-                       if ($r) {
-                               logger("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already existed under id ".$r[0]["id"], LOGGER_DEBUG);
-                               continue;
-                       }
-               }
-
                /// @TODO ?
                // <category>Ausland</category>
                // <media:thumbnail width="152" height="76" url="http://www.taz.de/picture/667875/192/14388767.jpg"/>
@@ -311,6 +325,14 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
                        logger("Stored feed: ".print_r($item, true), LOGGER_DEBUG);
 
                        $notify = item_is_remote_self($contact, $item);
+
+                       // Distributed items should have a well formatted URI.
+                       // Additionally we have to avoid conflicts with identical URI between imported feeds and these items.
+                       if ($notify) {
+                               unset($item['uri']);
+                               unset($item['parent-uri']);
+                       }
+
                        $id = item_store($item, false, $notify);
 
                        logger("Feed for contact ".$contact["url"]." stored under id ".$id);