aboutsummaryrefslogtreecommitdiff
path: root/p
diff options
context:
space:
mode:
Diffstat (limited to 'p')
-rw-r--r--p/api/fever.php8
-rw-r--r--p/api/greader.php32
-rw-r--r--p/scripts/main.js11
3 files changed, 37 insertions, 14 deletions
diff --git a/p/api/fever.php b/p/api/fever.php
index 92523db06..b3a2a074c 100644
--- a/p/api/fever.php
+++ b/p/api/fever.php
@@ -417,12 +417,12 @@ final class FeverAPI
}
private function getUnreadItemIds(): string {
- $entries = $this->entryDAO->listIdsWhere('a', 0, FreshRSS_Entry::STATE_NOT_READ, 'ASC', 0) ?? [];
+ $entries = $this->entryDAO->listIdsWhere('a', 0, FreshRSS_Entry::STATE_NOT_READ, order: 'ASC', limit: 0) ?? [];
return $this->entriesToIdList($entries);
}
private function getSavedItemIds(): string {
- $entries = $this->entryDAO->listIdsWhere('a', 0, FreshRSS_Entry::STATE_FAVORITE, 'ASC', 0) ?? [];
+ $entries = $this->entryDAO->listIdsWhere('a', 0, FreshRSS_Entry::STATE_FAVORITE, order: 'ASC', limit: 0) ?? [];
return $this->entriesToIdList($entries);
}
@@ -504,9 +504,9 @@ final class FeverAPI
Minz_ExtensionManager::init();
foreach ($entries as $item) {
- /** @var FreshRSS_Entry $entry */
+ /** @var FreshRSS_Entry|null $entry */
$entry = Minz_ExtensionManager::callHook('entry_before_display', $item);
- if ($entry == null) {
+ if ($entry === null) {
continue;
}
$items[] = [
diff --git a/p/api/greader.php b/p/api/greader.php
index 9769f66cb..bbe533c86 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -557,9 +557,9 @@ final class GReaderAPI {
$items = [];
foreach ($entries as $item) {
- /** @var FreshRSS_Entry $entry */
+ /** @var FreshRSS_Entry|null $entry */
$entry = Minz_ExtensionManager::callHook('entry_before_display', $item);
- if ($entry == null) {
+ if ($entry === null) {
continue;
}
@@ -643,6 +643,9 @@ final class GReaderAPI {
return [$type, $streamId, $state, $searches];
}
+ /**
+ * @param numeric-string $continuation
+ */
private static function streamContents(string $path, string $include_target, int $start_time, int $stop_time, int $count,
string $order, string $filter_target, string $exclude_target, string $continuation): never {
// https://code.google.com/archive/p/pyrfeed/wikis/GoogleReaderAPI.wiki
@@ -660,17 +663,20 @@ final class GReaderAPI {
[$type, $include_target, $state, $searches] =
self::streamContentsFilters($type, $include_target, $filter_target, $exclude_target, $start_time, $stop_time);
- if ($continuation != '') {
+ if ($continuation !== '0') {
$count++; //Shift by one element
}
$entryDAO = FreshRSS_Factory::createEntryDao();
- $entries = $entryDAO->listWhere($type, $include_target, $state, $order === 'o' ? 'ASC' : 'DESC', $count, 0, $continuation, $searches);
+ $entries = $entryDAO->listWhere($type, $include_target, $state, $searches,
+ order: $order === 'o' ? 'ASC' : 'DESC',
+ continuation_id: $continuation,
+ limit: $count);
$entries = array_values(iterator_to_array($entries)); //TODO: Improve
$items = self::entriesToArray($entries);
- if ($continuation != '') {
+ if ($continuation !== '0') {
array_shift($items); //Discard first element that was already sent in the previous response
$count--;
}
@@ -692,6 +698,9 @@ final class GReaderAPI {
exit();
}
+ /**
+ * @param numeric-string $continuation
+ */
private static function streamContentsItemsIds(string $streamId, int $start_time, int $stop_time, int $count,
string $order, string $filter_target, string $exclude_target, string $continuation): never {
// https://github.com/mihaip/google-reader-api/blob/master/wiki/ApiStreamItemsIds.wiki
@@ -712,17 +721,20 @@ final class GReaderAPI {
[$type, $id, $state, $searches] = self::streamContentsFilters($type, $streamId, $filter_target, $exclude_target, $start_time, $stop_time);
- if ($continuation != '') {
+ if ($continuation !== '0') {
$count++; //Shift by one element
}
$entryDAO = FreshRSS_Factory::createEntryDao();
- $ids = $entryDAO->listIdsWhere($type, $id, $state, $order === 'o' ? 'ASC' : 'DESC', $count, 0, $continuation, $searches);
+ $ids = $entryDAO->listIdsWhere($type, $id, $state, $searches,
+ order: $order === 'o' ? 'ASC' : 'DESC',
+ continuation_id: $continuation,
+ limit: $count);
if ($ids === null) {
self::internalServerError();
}
- if ($continuation != '') {
+ if ($continuation !== '0') {
array_shift($ids); //Discard first element that was already sent in the previous response
$count--;
}
@@ -766,7 +778,7 @@ final class GReaderAPI {
/** @var list<numeric-string> $e_ids */
$entryDAO = FreshRSS_Factory::createEntryDao();
- $entries = $entryDAO->listByIds($e_ids, $order === 'o' ? 'ASC' : 'DESC');
+ $entries = $entryDAO->listByIds($e_ids, order: $order === 'o' ? 'ASC' : 'DESC');
$entries = array_values(iterator_to_array($entries)); //TODO: Improve
$items = self::entriesToArray($entries);
@@ -1050,7 +1062,7 @@ final class GReaderAPI {
*/
$continuation = is_string($_GET['c'] ?? null) ? trim($_GET['c']) : '';
if (!ctype_digit($continuation)) {
- $continuation = '';
+ $continuation = '0';
}
if (isset($pathInfos[5]) && $pathInfos[5] === 'contents') {
if (!isset($pathInfos[6]) && is_string($_GET['s'] ?? null)) {
diff --git a/p/scripts/main.js b/p/scripts/main.js
index a1cf5d8ae..1dce5f9fc 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -1857,6 +1857,12 @@ let url_load_more = '';
let load_more = false;
let box_load_more = null;
+function remove_existing_posts() {
+ document.querySelectorAll('.flux, .day').forEach(function (div) {
+ div.remove();
+ });
+}
+
function load_more_posts() {
if (load_more || !url_load_more || !box_load_more) {
return;
@@ -1868,6 +1874,11 @@ function load_more_posts() {
req.open('GET', url_load_more, true);
req.responseType = 'document';
req.onload = function (e) {
+ if (context.sort === 'rand') {
+ document.scrollingElement.scrollTop = 0;
+ remove_existing_posts();
+ }
+
const html = this.response;
const streamFooter = document.getElementById('stream-footer');
generated by cgit v1.2.3 (git 2.39.1) at 2026-02-10 11:57:37 +0000