mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-04-22 23:37:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

API fix add feed with title (#5868)

Browse Source 
fix https://github.com/FreshRSS/FreshRSS/issues/5866
This commit is contained in:
Alexandre Alapetite
2023-11-14 12:58:57 +01:00
committed by GitHub
parent b1d568697a
commit 9eba8726ac
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Models/Feed.php
View File

@@ -400,12 +400,17 @@ class FreshRSS_Feed extends Minz_Model {
// si on a utilisé l’auto-discover, notre url va avoir changé
$subscribe_url = $simplePie->subscribe_url(false);
//HTML to HTML-PRE //ENT_COMPAT except '&'
$title = strtr(html_only_entity_decode($simplePie->get_title()), ['<' => '&lt;', '>' => '&gt;', '"' => '&quot;']);
$this->_name($title == '' ? $this->url : $title);
$this->_website(html_only_entity_decode($simplePie->get_link()));
$this->_description(html_only_entity_decode($simplePie->get_description()));
if ($this->name(true) === '') {
//HTML to HTML-PRE //ENT_COMPAT except '&'
$title = strtr(html_only_entity_decode($simplePie->get_title()), ['<' => '&lt;', '>' => '&gt;', '"' => '&quot;']);
$this->_name($title == '' ? $this->url : $title);
}
if ($this->website() === '') {
$this->_website(html_only_entity_decode($simplePie->get_link()));
}
if ($this->description() === '') {
$this->_description(html_only_entity_decode($simplePie->get_description()));
}
} else {
//The case of HTTP 301 Moved Permanently
$subscribe_url = $simplePie->subscribe_url(true);

2
p/api/greader.php
View File

@@ -581,7 +581,7 @@ final class GReaderAPI {
/**
* @param 'A'|'c'|'f'|'s' $type
* @param string|int $streamId
* @return array{'A'|'c'|'f'|'s'|'t',int,int,FreshRSS_BooleanSearch}
* @phpstan-return array{'A'|'c'|'f'|'s'|'t',int,int,FreshRSS_BooleanSearch}
*/
private static function streamContentsFilters(string $type, $streamId,
string $filter_target, string $exclude_target, int $start_time, int $stop_time): array {