clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11330 from annando/feed-stuff 

Some small improvements for importing feeds
This commit is contained in:
Hypolite Petovan 2022-03-13 11:47:49 -04:00 committed by GitHub
parent 4eba3c0126 ca086b880b
commit 7da13cf335
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/Protocol/Feed.php
View File

@ -197,7 +197,6 @@ class Feed
$author["author-link"] = XML::getFirstNodeValue($xpath, '/rss/channel/link/text()'); $author["author-link"] = XML::getFirstNodeValue($xpath, '/rss/channel/link/text()');
$author["author-name"] = XML::getFirstNodeValue($xpath, '/rss/channel/title/text()'); $author["author-name"] = XML::getFirstNodeValue($xpath, '/rss/channel/title/text()');
$author["author-avatar"] = XML::getFirstNodeValue($xpath, '/rss/channel/image/url/text()');
if (empty($author["author-name"])) { if (empty($author["author-name"])) {
$author["author-name"] = XML::getFirstNodeValue($xpath, '/rss/channel/copyright/text()'); $author["author-name"] = XML::getFirstNodeValue($xpath, '/rss/channel/copyright/text()');
@ -207,6 +206,25 @@ class Feed
$author["author-name"] = XML::getFirstNodeValue($xpath, '/rss/channel/description/text()'); $author["author-name"] = XML::getFirstNodeValue($xpath, '/rss/channel/description/text()');
} }
$author["author-avatar"] = XML::getFirstNodeValue($xpath, '/rss/channel/image/url/text()');
if (empty($author["author-avatar"])) {
$avatar = XML::getFirstAttributes($xpath, "/rss/channel/itunes:image");
if (is_object($avatar)) {
foreach ($avatar as $attribute) {
if ($attribute->name == "href") {
$author["author-avatar"] = $attribute->textContent;
}
}
}
}
$author["author-about"] = HTML::toBBCode(XML::getFirstNodeValue($xpath, '/rss/channel/description/text()'), $basepath);
if (empty($author["author-about"])) {
$author["author-about"] = XML::getFirstNodeValue($xpath, '/rss/channel/itunes:summary/text()');
}
$author["edited"] = $author["created"] = XML::getFirstNodeValue($xpath, '/rss/channel/pubDate/text()'); $author["edited"] = $author["created"] = XML::getFirstNodeValue($xpath, '/rss/channel/pubDate/text()');
$author["app"] = XML::getFirstNodeValue($xpath, '/rss/channel/generator/text()'); $author["app"] = XML::getFirstNodeValue($xpath, '/rss/channel/generator/text()');
@ -284,20 +302,21 @@ class Feed
$item["plink"] = XML::getFirstNodeValue($xpath, 'rss:link/text()', $entry); $item["plink"] = XML::getFirstNodeValue($xpath, 'rss:link/text()', $entry);
} }
// Add the base path if missing
$item["plink"] = Network::addBasePath($item["plink"], $basepath);
$item["uri"] = XML::getFirstNodeValue($xpath, 'atom:id/text()', $entry); $item["uri"] = XML::getFirstNodeValue($xpath, 'atom:id/text()', $entry);
if (empty($item["uri"])) { $guid = XML::getFirstNodeValue($xpath, 'guid/text()', $entry);
$item["uri"] = XML::getFirstNodeValue($xpath, 'guid/text()', $entry); if (!empty($guid)) {
$item["uri"] = $guid;
$item["guid"] = $guid;
} }
if (empty($item["uri"])) { if (empty($item["uri"])) {
$item["uri"] = $item["plink"]; $item["uri"] = $item["plink"];
} }
// Add the base path if missing
$item["uri"] = Network::addBasePath($item["uri"], $basepath);
$item["plink"] = Network::addBasePath($item["plink"], $basepath);
$orig_plink = $item["plink"]; $orig_plink = $item["plink"];
try { try {
@ -311,10 +330,15 @@ class Feed
if (empty($item["title"])) { if (empty($item["title"])) {
$item["title"] = XML::getFirstNodeValue($xpath, 'title/text()', $entry); $item["title"] = XML::getFirstNodeValue($xpath, 'title/text()', $entry);
} }
if (empty($item["title"])) { if (empty($item["title"])) {
$item["title"] = XML::getFirstNodeValue($xpath, 'rss:title/text()', $entry); $item["title"] = XML::getFirstNodeValue($xpath, 'rss:title/text()', $entry);
} }
if (empty($item["title"])) {
$item["title"] = XML::getFirstNodeValue($xpath, 'itunes:title/text()', $entry);
}
$item["title"] = html_entity_decode($item["title"], ENT_QUOTES, 'UTF-8'); $item["title"] = html_entity_decode($item["title"], ENT_QUOTES, 'UTF-8');
$published = XML::getFirstNodeValue($xpath, 'atom:published/text()', $entry); $published = XML::getFirstNodeValue($xpath, 'atom:published/text()', $entry);
@ -457,6 +481,7 @@ class Feed
} }
if ($dryRun) { if ($dryRun) {
$item['attachments'] = $attachments;
$items[] = $item; $items[] = $item;
break; break;
} elseif (!Item::isValid($item)) { } elseif (!Item::isValid($item)) {