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

Remove duplicate curl call in Network\Probe::getFeedLink

Browse source 
- Add page body argument instead
- Expand method scope to allow tests
This commit is contained in:
Hypolite Petovan 2020-05-21 00:23:14 -04:00
parent 95da30f395
commit c2105f93d1
1 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/Network/Probe.php
View file

@ -1756,25 +1756,20 @@ class Probe
}
/**
* Check page for feed link
* Checks HTML page for RSS feed link
*
* @param string $url Page link
*
* @return string feed link
* @param string $body Page body string
* @return string|false Feed link or false if body was invalid HTML document
*/
private static function getFeedLink($url)
public static function getFeedLink(string $url, string $body)
{
$curlResult = Network::curl($url);
if (!$curlResult->isSuccess()) {
return false;
}
$doc = new DOMDocument();
if (!@$doc->loadHTML($curlResult->getBody())) {
if (!@$doc->loadHTML($body)) {
return false;
}
$xpath = new DomXPath($doc);
$xpath = new DOMXPath($doc);
//$feeds = $xpath->query("/html/head/link[@type='application/rss+xml']");
$feeds = $xpath->query("/html/head/link[@type='application/rss+xml' and @rel='alternate']");
@ -1826,7 +1821,7 @@ class Probe
return false;
}
$feed_url = self::getFeedLink($url);
$feed_url = self::getFeedLink($url, $feed);
if (!$feed_url) {
return false;