xle/tt-rss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Show some HTML content as a hover tip when the 'feed URL' returned HTML without feeds.

Browse Source 
Also tweak the 'Feeds::_subscribe()' documentation a bit.
This commit is contained in:
wn_
2025-06-17 17:52:06 +00:00
parent 4e47a39c2a
commit ef1f3cbcef
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
classes/Feeds.php
View File

@@ -985,19 +985,23 @@ class Feeds extends Handler_Protected {
}
/**
* @return array<string, mixed> (code => Status code, message => error message if available)
* @return array{code: int, message?: string}|array{code: int, feeds: array<string>}|array{code: int, feed_id: int}
* code - status code (see below)
* message - optional error message
* feeds - list of discovered feed URLs
* feed_id - ID of the existing or added feed
*
* 0 - OK, Feed already exists
* 1 - OK, Feed added
* 2 - Invalid URL
* 3 - URL content is HTML, no feeds available
* 4 - URL content is HTML which contains multiple feeds.
* Here you should call extractfeedurls in rpc-backend
* to get all possible feeds.
* 5 - Couldn't download the URL content.
* 6 - Content is an invalid XML.
* 7 - Error while creating feed database entry.
* 8 - Permission denied (ACCESS_LEVEL_READONLY).
* 0 - OK, Feed already exists
* 1 - OK, Feed added
* 2 - Invalid URL
* 3 - URL content is HTML, no feeds available
* 4 - URL content is HTML which contains multiple feeds.
* Here you should call extractfeedurls in rpc-backend
* to get all possible feeds.
* 5 - Couldn't download the URL content.
* 6 - Content is an invalid XML.
* 7 - Error while creating feed database entry.
* 8 - Permission denied (ACCESS_LEVEL_READONLY).
*/
static function _subscribe(string $url, int $cat_id = 0, string $auth_login = '', string $auth_pass = '', int $update_interval = 0): array {
@@ -1038,7 +1042,7 @@ class Feeds extends Handler_Protected {
$feedUrls = self::_get_feeds_from_html($url, $contents);
if (count($feedUrls) == 0) {
return array("code" => 3);
return array("code" => 3, "message" => truncate_string($contents, 1000, '…'));
} else if (count($feedUrls) > 1) {
return array("code" => 4, "feeds" => $feedUrls);
}

4
js/CommonDialogs.js
View File

@@ -168,7 +168,9 @@ const CommonDialogs = {
dialog.show_error(__("Specified URL seems to be invalid."));
break;
case 3:
dialog.show_error(__("Specified URL doesn't seem to contain any feeds."));
dialog.show_error(`<span title="${App.escapeHtml(rc['message'])}" style="text-decoration: underline dotted">
${__("Specified URL doesn't seem to contain any feeds.")}
</span>`);
break;
case 4:
{