bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Fix formatting in Feed::import

Browse source
This commit is contained in:
Hypolite Petovan 2020-01-03 09:09:03 -05:00
parent 7420d07699
commit 38fe3b8994
1 changed files with 36 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/Protocol/Feed.php
View file

@ -14,8 +14,8 @@ use Friendica\Core\Protocol;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Item;
use Friendica\Util\ParseUrl;
use Friendica\Util\Network;
use Friendica\Util\ParseUrl;
use Friendica\Util\XML;
/**
@ -35,8 +35,8 @@ class Feed {
* @return array In simulation mode it returns the header and the first item
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
public static function import($xml, $importer, &$contact, &$hub, $simulate = false) {
public static function import($xml, $importer, &$contact, &$hub, $simulate = false)
{
$a = \get_app();
if (!$simulate) {
@ -44,6 +44,7 @@ class Feed {
} else {
Logger::log("Test Atom/RSS feed", Logger::DEBUG);
}
if (empty($xml)) {
Logger::log('XML is empty.', Logger::DEBUG);
return;
@ -114,13 +115,16 @@ class Feed {
if (empty($author["author-name"])) {
$author["author-name"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:subtitle/text()');
}
if (empty($author["author-name"])) {
$author["author-name"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:author/atom:name/text()');
}
$value = XML::getFirstNodeValue($xpath, 'atom:author/poco:displayName/text()');
if ($value != "") {
$author["author-name"] = $value;
}
if ($simulate) {
$author["author-id"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:author/atom:id/text()');
@ -134,14 +138,17 @@ class Feed {
if ($value != "") {
$author["author-nick"] = $value;
}
$value = XML::getFirstNodeValue($xpath, 'atom:author/poco:address/poco:formatted/text()');
if ($value != "") {
$author["author-location"] = $value;
}
$value = XML::getFirstNodeValue($xpath, 'atom:author/poco:note/text()');
if ($value != "") {
$author["author-about"] = $value;
}
$avatar = XML::getFirstAttributes($xpath, "atom:author/atom:link[@rel='avatar']");
if (is_object($avatar)) {
foreach ($avatar AS $attribute) {
@ -169,9 +176,11 @@ class Feed {
if (empty($author["author-name"])) {
$author["author-name"] = XML::getFirstNodeValue($xpath, '/rss/channel/copyright/text()');
}
if (empty($author["author-name"])) {
$author["author-name"] = XML::getFirstNodeValue($xpath, '/rss/channel/description/text()');
}
$author["edited"] = $author["created"] = XML::getFirstNodeValue($xpath, '/rss/channel/pubDate/text()');
$author["app"] = XML::getFirstNodeValue($xpath, '/rss/channel/generator/text()');
@ -185,6 +194,7 @@ class Feed {
if (empty($author["author-name"])) {
$author["author-name"] = $contact["name"];
}
$author["author-avatar"] = $contact["thumb"];
$author["owner-link"] = $contact["url"];
@ -227,9 +237,11 @@ class Feed {
}
}
}
if (empty($item["plink"])) {
$item["plink"] = XML::getFirstNodeValue($xpath, 'link/text()', $entry);
}
if (empty($item["plink"])) {
$item["plink"] = XML::getFirstNodeValue($xpath, 'rss:link/text()', $entry);
}
@ -239,6 +251,7 @@ class Feed {
if (empty($item["uri"])) {
$item["uri"] = XML::getFirstNodeValue($xpath, 'guid/text()', $entry);
}
if (empty($item["uri"])) {
$item["uri"] = $item["plink"];
}
@ -275,9 +288,11 @@ class Feed {
if (empty($published)) {
$published = XML::getFirstNodeValue($xpath, 'pubDate/text()', $entry);
}
if (empty($published)) {
$published = XML::getFirstNodeValue($xpath, 'dc:date/text()', $entry);
}
$updated = XML::getFirstNodeValue($xpath, 'atom:updated/text()', $entry);
if (empty($updated) && !empty($published)) {
@ -291,20 +306,25 @@ class Feed {
if ($published != "") {
$item["created"] = $published;
}
if ($updated != "") {
$item["edited"] = $updated;
}
$creator = XML::getFirstNodeValue($xpath, 'author/text()', $entry);
if (empty($creator)) {
$creator = XML::getFirstNodeValue($xpath, 'atom:author/atom:name/text()', $entry);
}
if (empty($creator)) {
$creator = XML::getFirstNodeValue($xpath, 'dc:creator/text()', $entry);
}
if ($creator != "") {
$item["author-name"] = $creator;
}
$creator = XML::getFirstNodeValue($xpath, 'dc:creator/text()', $entry);
if ($creator != "") {
@ -332,6 +352,7 @@ class Feed {
$type = $attribute->textContent;
}
}
if (!empty($item["attach"])) {
$item["attach"] .= ',';
} else {
@ -450,6 +471,7 @@ class Feed {
}
$item["body"] .= "\n" . $item['tag'];
}
// Add the link to the original feed entry if not present in feed
if (($item['plink'] != '') && !strstr($item["body"], $item['plink'])) {
$item["body"] .= "[hr][url]" . $item['plink'] . "[/url]";
@ -478,6 +500,7 @@ class Feed {
} else {
$items[] = $item;
}
if ($simulate) {
break;
}