Merge pull request #2978 from annando/issue-2518

[friendica.git] / include / feed.php

diff --git a/include/feed.php b/include/feed.php
index 992d10e22747380ae44b75852e0d7813a61ae7da..579ff7caae3652cce6c9fcb714720886bd32334f 100644 (file)
--- a/include/feed.php
+++ b/include/feed.php
@@ -59,8 +59,6 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
                                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"];
 
@@ -89,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;
 
@@ -131,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();
@@ -318,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);