Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-09-19 22:05:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #14188 from annando/feed

Browse source 
Improved hostname handling with feeds
This commit is contained in:
Hypolite Petovan 2024-05-28 13:53:49 -04:00 committed by GitHub
commit b3c7e96b73
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 44 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/Protocol/Feed.php
View file

@ -373,19 +373,24 @@ class Feed
} }
$guid = XML::getFirstNodeValue($xpath, 'guid/text()', $entry); $guid = XML::getFirstNodeValue($xpath, 'guid/text()', $entry);
$host = self::getHostname($item, $guid, $basepath);
if (!empty($guid)) { if (!empty($guid)) {
if (empty($item['uri'])) { if (empty($item['uri'])) {
$item['uri'] = $guid; $item['uri'] = $guid;
} }
// Don't use the GUID value directly but instead use it as a basis for the GUID // Don't use the GUID value directly but instead use it as a basis for the GUID
$item['guid'] = Item::guidFromUri($guid, parse_url($item['plink'], PHP_URL_HOST)); $item['guid'] = Item::guidFromUri($guid, $host);
} }
if (empty($item['uri'])) { if (empty($item['uri'])) {
$item['uri'] = $item['plink']; $item['uri'] = $item['plink'];
} }
if (!parse_url($item['uri'], PHP_URL_HOST)) {
$item['uri'] = 'feed::' . $host . ':' . $item['uri'];
}
$orig_plink = $item['plink']; $orig_plink = $item['plink'];
if (!$dryRun) { if (!$dryRun) {
@ -566,7 +571,11 @@ class Feed
continue; continue;
} }
$fetch_further_information = $contact['fetch_further_information'] ?? LocalRelationship::FFI_NONE; if (!empty($item['plink'])) {
$fetch_further_information = $contact['fetch_further_information'] ?? LocalRelationship::FFI_NONE;
} else {
$fetch_further_information = LocalRelationship::FFI_NONE;
}
$preview = ''; $preview = '';
if (in_array($fetch_further_information, [LocalRelationship::FFI_INFORMATION, LocalRelationship::FFI_BOTH])) { if (in_array($fetch_further_information, [LocalRelationship::FFI_INFORMATION, LocalRelationship::FFI_BOTH])) {
@ -753,6 +762,38 @@ class Feed
return ['header' => $author, 'items' => $items]; return ['header' => $author, 'items' => $items];
} }
/**
* Return the hostname out of a variety of provided URL
*
* @param array $item
* @param string|null $guid
* @param string|null $basepath
* @return string
*/
private static function getHostname(array $item, string $guid = null, string $basepath = null): string
{
$host = parse_url($item['plink'], PHP_URL_HOST);
if (!empty($host)) {
return $host;
}
$host = parse_url($item['uri'], PHP_URL_HOST);
if (!empty($host)) {
return $host;
}
$host = parse_url($guid, PHP_URL_HOST);
if (!empty($host)) {
return $host;
}
$host = parse_url($item['author-link'], PHP_URL_HOST);
if (!empty($host)) {
return $host;
}
return parse_url($basepath, PHP_URL_HOST);
}
/** /**
* Automatically adjust the poll frequency according to the post frequency * Automatically adjust the poll frequency according to the post frequency
* *