mirror/Arsse
1
1
Fork 0
mirror of https://code.mensbeam.com/MensBeam/Arsse.git synced 2025-01-03 14:32:40 +00:00
Code Issues Activity

Controller fixes for PDO databases; fixes #72

Browse source
This commit is contained in:
J. King 2017-12-31 17:24:40 -05:00
parent 029c23d0cf
commit 77793f95cb
5 changed files with 78 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/REST/NextCloudNews/V1_2.php
View file

@ -353,7 +353,7 @@ class V1_2 extends \JKingWeb\Arsse\REST\AbstractHandler {
$out = []; $out = [];
foreach ($feeds as $feed) { foreach ($feeds as $feed) {
// since in our implementation feeds don't belong the users, the 'userId' field will always be an empty string // since in our implementation feeds don't belong the users, the 'userId' field will always be an empty string
$out[] = ['id' => $feed, 'userId' => ""]; $out[] = ['id' => (int) $feed, 'userId' => ""];
} }
return new Response(200, ['feeds' => $out]); return new Response(200, ['feeds' => $out]);
} }
@ -419,7 +419,7 @@ class V1_2 extends \JKingWeb\Arsse\REST\AbstractHandler {
$out[] = $this->feedTranslate($sub); $out[] = $this->feedTranslate($sub);
} }
$out = ['feeds' => $out]; $out = ['feeds' => $out];
$out['starredCount'] = Arsse::$db->articleStarred(Arsse::$user->id)['total']; $out['starredCount'] = (int) Arsse::$db->articleStarred(Arsse::$user->id)['total'];
$newest = Arsse::$db->editionLatest(Arsse::$user->id); $newest = Arsse::$db->editionLatest(Arsse::$user->id);
if ($newest) { if ($newest) {
$out['newestItemId'] = $newest; $out['newestItemId'] = $newest;

50
lib/REST/TinyTinyRSS/API.php
View file

@ -231,7 +231,7 @@ class API extends \JKingWeb\Arsse\REST\AbstractHandler {
// prepare data for each subscription; we also add unread counts for their host categories // prepare data for each subscription; we also add unread counts for their host categories
foreach (Arsse::$db->subscriptionList($user) as $f) { foreach (Arsse::$db->subscriptionList($user) as $f) {
// add the feed to the list of feeds // add the feed to the list of feeds
$feeds[] = ['id' => (string) $f['id'], 'updated' => Date::transform($f['updated'], "iso8601", "sql"),'counter' => $f['unread'], 'has_img' => (int) (strlen((string) $f['favicon']) > 0)]; // ID is cast to string for consistency with TTRSS $feeds[] = ['id' => (string) $f['id'], 'updated' => Date::transform($f['updated'], "iso8601", "sql"),'counter' => (int) $f['unread'], 'has_img' => (int) (strlen((string) $f['favicon']) > 0)]; // ID is cast to string for consistency with TTRSS
// add the feed's unread count to the global unread count // add the feed's unread count to the global unread count
$countAll += $f['unread']; $countAll += $f['unread'];
// add the feed's unread count to its category unread count // add the feed's unread count to its category unread count
@ -242,7 +242,7 @@ class API extends \JKingWeb\Arsse\REST\AbstractHandler {
// prepare data for each non-empty label // prepare data for each non-empty label
foreach (Arsse::$db->labelList($user, false) as $l) { foreach (Arsse::$db->labelList($user, false) as $l) {
$unread = $l['articles'] - $l['read']; $unread = $l['articles'] - $l['read'];
$labels[] = ['id' => $this->labelOut($l['id']), 'counter' => $unread, 'auxcounter' => $l['articles']]; $labels[] = ['id' => $this->labelOut($l['id']), 'counter' => $unread, 'auxcounter' => (int) $l['articles']];
$categories[$catmap[self::CAT_LABELS]]['counter'] += $unread; $categories[$catmap[self::CAT_LABELS]]['counter'] += $unread;
} }
// do a second pass on categories, summing descendant unread counts for ancestors // do a second pass on categories, summing descendant unread counts for ancestors
@ -266,14 +266,14 @@ class API extends \JKingWeb\Arsse\REST\AbstractHandler {
} }
// do a third pass on categories, building a final category list; this is done so that the original sort order is retained // do a third pass on categories, building a final category list; this is done so that the original sort order is retained
foreach ($categories as $c) { foreach ($categories as $c) {
$cats[] = ['id' => $c['id'], 'kind' => "cat", 'counter' => $catCounts[$c['id']]]; $cats[] = ['id' => (int) $c['id'], 'kind' => "cat", 'counter' => $catCounts[$c['id']]];
} }
// prepare data for the virtual feeds and other counters // prepare data for the virtual feeds and other counters
$special = [ $special = [
['id' => "global-unread", 'counter' => $countAll], //this should not count archived articles, but we do not have an archive ['id' => "global-unread", 'counter' => $countAll], //this should not count archived articles, but we do not have an archive
['id' => "subscribed-feeds", 'counter' => $countSubs], ['id' => "subscribed-feeds", 'counter' => $countSubs],
['id' => self::FEED_ARCHIVED, 'counter' => 0, 'auxcounter' => 0], // Archived articles ['id' => self::FEED_ARCHIVED, 'counter' => 0, 'auxcounter' => 0], // Archived articles
['id' => self::FEED_STARRED, 'counter' => $starred['unread'], 'auxcounter' => $starred['total']], // Starred articles ['id' => self::FEED_STARRED, 'counter' => (int) $starred['unread'], 'auxcounter' => (int) $starred['total']], // Starred articles
['id' => self::FEED_PUBLISHED, 'counter' => 0, 'auxcounter' => 0], // Published articles ['id' => self::FEED_PUBLISHED, 'counter' => 0, 'auxcounter' => 0], // Published articles
['id' => self::FEED_FRESH, 'counter' => $fresh, 'auxcounter' => 0], // Fresh articles ['id' => self::FEED_FRESH, 'counter' => $fresh, 'auxcounter' => 0], // Fresh articles
['id' => self::FEED_ALL, 'counter' => $countAll, 'auxcounter' => 0], // All articles ['id' => self::FEED_ALL, 'counter' => $countAll, 'auxcounter' => 0], // All articles
@ -323,7 +323,7 @@ class API extends \JKingWeb\Arsse\REST\AbstractHandler {
'id' => "FEED:".self::FEED_STARRED, 'id' => "FEED:".self::FEED_STARRED,
'bare_id' => self::FEED_STARRED, 'bare_id' => self::FEED_STARRED,
'icon' => "images/star.png", 'icon' => "images/star.png",
'unread' => Arsse::$db->articleStarred($user)['unread'], 'unread' => (int) Arsse::$db->articleStarred($user)['unread'],
], $tSpecial), ], $tSpecial),
array_merge([ // Published articles array_merge([ // Published articles
'name' => Arsse::$lang->msg("API.TTRSS.Feed.Published"), 'name' => Arsse::$lang->msg("API.TTRSS.Feed.Published"),
@ -406,7 +406,7 @@ class API extends \JKingWeb\Arsse\REST\AbstractHandler {
return ['categories' => ['identifier' => "id", 'label' => "name", 'items' => $out]]; return ['categories' => ['identifier' => "id", 'label' => "name", 'items' => $out]];
} }
protected function enumerateFeeds(array $subs, int $parent = null): array { protected function enumerateFeeds(array $subs, $parent = null): array {
$out = []; $out = [];
foreach ($subs as $s) { foreach ($subs as $s) {
if ($s['folder'] != $parent) { if ($s['folder'] != $parent) {
@ -415,7 +415,7 @@ class API extends \JKingWeb\Arsse\REST\AbstractHandler {
$out[] = [ $out[] = [
'name' => $s['title'], 'name' => $s['title'],
'id' => "FEED:".$s['id'], 'id' => "FEED:".$s['id'],
'bare_id' => $s['id'], 'bare_id' => (int) $s['id'],
'icon' => $s['favicon'] ? "feed-icons/".$s['id'].".ico" : false, 'icon' => $s['favicon'] ? "feed-icons/".$s['id'].".ico" : false,
'error' => (string) $s['err_msg'], 'error' => (string) $s['err_msg'],
'param' => Date::transform($s['updated'], "iso8601", "sql"), 'param' => Date::transform($s['updated'], "iso8601", "sql"),
@ -428,7 +428,7 @@ class API extends \JKingWeb\Arsse\REST\AbstractHandler {
return $out; return $out;
} }
protected function enumerateCategories(array $cats, array $subs, int $parent = null, bool $all = false): array { protected function enumerateCategories(array $cats, array $subs, $parent = null, bool $all = false): array {
$out = []; $out = [];
$feedTotal = 0; $feedTotal = 0;
foreach ($cats as $c) { foreach ($cats as $c) {
@ -442,8 +442,8 @@ class API extends \JKingWeb\Arsse\REST\AbstractHandler {
$out[] = [ $out[] = [
'name' => $c['name'], 'name' => $c['name'],
'id' => "CAT:".$c['id'], 'id' => "CAT:".$c['id'],
'bare_id' => $c['id'], 'bare_id' => (int) $c['id'],
'parent_id' => $c['parent'], // top-level categories are not supposed to have this property; we deviated and have the property set to null because it's simpler that way 'parent_id' => (int) $c['parent'] ?: null, // top-level categories are not supposed to have this property; we deviated and have the property set to null because it's simpler that way
'type' => "category", 'type' => "category",
'auxcounter' => 0, 'auxcounter' => 0,
'unread' => 0, 'unread' => 0,
@ -714,13 +714,13 @@ class API extends \JKingWeb\Arsse\REST\AbstractHandler {
// NOTE: the list is a flat one: it includes children, but not other descendents // NOTE: the list is a flat one: it includes children, but not other descendents
foreach (Arsse::$db->folderList($user, $cat, false) as $c) { foreach (Arsse::$db->folderList($user, $cat, false) as $c) {
// get the number of unread for the category and its descendents; those with zero unread are excluded in "unread-only" mode // get the number of unread for the category and its descendents; those with zero unread are excluded in "unread-only" mode
$count = Arsse::$db->articleCount($user, (new Context)->unread(true)->folder($c['id'])); $count = Arsse::$db->articleCount($user, (new Context)->unread(true)->folder((int) $c['id']));
if (!$unread || $count) { if (!$unread || $count) {
$out[] = [ $out[] = [
'id' => $c['id'], 'id' => (int) $c['id'],
'title' => $c['name'], 'title' => $c['name'],
'unread' => $count, 'unread' => (int) $count,
'is_cat' => true, 'is_cat' => true,
'order_id' => ++$order, 'order_id' => ++$order,
]; ];
} }
@ -764,9 +764,9 @@ class API extends \JKingWeb\Arsse\REST\AbstractHandler {
} }
// otherwise, append the subscription // otherwise, append the subscription
$out[] = [ $out[] = [
'id' => $s['id'], 'id' => (int) $s['id'],
'title' => $s['title'], 'title' => $s['title'],
'unread' => $s['unread'], 'unread' => (int) $s['unread'],
'cat_id' => (int) $s['folder'], 'cat_id' => (int) $s['folder'],
'feed_url' => $s['url'], 'feed_url' => $s['url'],
'has_icon' => (bool) $s['favicon'], 'has_icon' => (bool) $s['favicon'],
@ -920,8 +920,8 @@ class API extends \JKingWeb\Arsse\REST\AbstractHandler {
return (abs($id) - self::LABEL_OFFSET); return (abs($id) - self::LABEL_OFFSET);
} }
protected function labelOut(int $id): int { protected function labelOut($id): int {
return ($id * -1 - self::LABEL_OFFSET); return ((int) $id * -1 - self::LABEL_OFFSET);
} }
public function opGetLabels(array $data): array { public function opGetLabels(array $data): array {
@ -1194,12 +1194,12 @@ class API extends \JKingWeb\Arsse\REST\AbstractHandler {
return $out; return $out;
} }
protected function articleLabelList(array $labels, int $id): array { protected function articleLabelList(array $labels, $id): array {
$out = []; $out = [];
if (!$labels) { if (!$labels) {
return $out; return $out;
} }
foreach (Arsse::$db->articleLabelsGet(Arsse::$user->id, $id) as $label) { foreach (Arsse::$db->articleLabelsGet(Arsse::$user->id, (int) $id) as $label) {
$out[] = [ $out[] = [
$this->labelOut($label), // ID $this->labelOut($label), // ID
$labels[$label], // name $labels[$label], // name
@ -1224,7 +1224,7 @@ class API extends \JKingWeb\Arsse\REST\AbstractHandler {
$out = []; $out = [];
try { try {
foreach ($this->fetchArticles($data, Database::LIST_MINIMAL) as $row) { foreach ($this->fetchArticles($data, Database::LIST_MINIMAL) as $row) {
$out[] = ['id' => $row['id']]; $out[] = ['id' => (int) $row['id']];
} }
} catch (ExceptionInput $e) { } catch (ExceptionInput $e) {
// ignore database errors (feeds/categories that don't exist) // ignore database errors (feeds/categories that don't exist)
@ -1246,7 +1246,7 @@ class API extends \JKingWeb\Arsse\REST\AbstractHandler {
try { try {
foreach ($this->fetchArticles($data, Database::LIST_FULL) as $article) { foreach ($this->fetchArticles($data, Database::LIST_FULL) as $article) {
$row = [ $row = [
'id' => $article['id'], 'id' => (int) $article['id'],
'guid' => $article['guid'] ? "SHA256:".$article['guid'] : "", 'guid' => $article['guid'] ? "SHA256:".$article['guid'] : "",
'title' => $article['title'], 'title' => $article['title'],
'link' => $article['url'], 'link' => $article['url'],
@ -1313,9 +1313,9 @@ class API extends \JKingWeb\Arsse\REST\AbstractHandler {
// wrap the output with (but after) the header // wrap the output with (but after) the header
$out = [ $out = [
[ [
'id' => $data['feed_id'], 'id' => (int) $data['feed_id'],
'is_cat' => $data['is_cat'] ?? false, 'is_cat' => $data['is_cat'] ?? false,
'first_id' => $firstID, 'first_id' => (int) $firstID,
], ],
$out, $out,
]; ];

24
tests/cases/REST/NextCloudNews/PDO/TestV1_2.php Normal file
View file

@ -0,0 +1,24 @@
<?php
/** @license MIT
* Copyright 2017 J. King, Dustin Wilson et al.
* See LICENSE and AUTHORS files for details */
declare(strict_types=1);
namespace JKingWeb\Arsse\TestCase\REST\NextCloudNews\PDO;
/** @covers \JKingWeb\Arsse\REST\NextCloudNews\V1_2<extended> */
class TestV1_2 extends \JKingWeb\Arsse\TestCase\REST\NextCloudNews\TestV1_2 {
protected function v($value) {
if (!is_array($value)) {
return $value;
}
foreach($value as $k => $v) {
if (is_array($v)) {
$value[$k] = $this->v($v);
} elseif (is_int($v) || is_float($v)) {
$value[$k] = (string) $v;
}
}
return $value;
}
}

25
tests/cases/REST/TinyTinyRSS/PDO/TestAPI.php Normal file
View file

@ -0,0 +1,25 @@
<?php
/** @license MIT
* Copyright 2017 J. King, Dustin Wilson et al.
* See LICENSE and AUTHORS files for details */
declare(strict_types=1);
namespace JKingWeb\Arsse\TestCase\REST\TinyTinyRSS\PDO;
/** @covers \JKingWeb\Arsse\REST\TinyTinyRSS\API<extended>
* @covers \JKingWeb\Arsse\REST\TinyTinyRSS\Exception */
class TestAPI extends \JKingWeb\Arsse\TestCase\REST\TinyTinyRSS\TestAPI {
protected function v($value) {
if (!is_array($value)) {
return $value;
}
foreach($value as $k => $v) {
if (is_array($v)) {
$value[$k] = $this->v($v);
} elseif (is_int($v) || is_float($v)) {
$value[$k] = (string) $v;
}
}
return $value;
}
}

2
tests/phpunit.xml
View file

@ -85,10 +85,12 @@
<testsuite name="NCNv1"> <testsuite name="NCNv1">
<file>cases/REST/NextCloudNews/TestVersions.php</file> <file>cases/REST/NextCloudNews/TestVersions.php</file>
<file>cases/REST/NextCloudNews/TestV1_2.php</file> <file>cases/REST/NextCloudNews/TestV1_2.php</file>
<file>cases/REST/NextCloudNews/PDO/TestV1_2.php</file>
</testsuite> </testsuite>
<testsuite name="TTRSS"> <testsuite name="TTRSS">
<file>cases/REST/TinyTinyRSS/TestAPI.php</file> <file>cases/REST/TinyTinyRSS/TestAPI.php</file>
<file>cases/REST/TinyTinyRSS/TestIcon.php</file> <file>cases/REST/TinyTinyRSS/TestIcon.php</file>
<file>cases/REST/TinyTinyRSS/PDO/TestAPI.php</file>
</testsuite> </testsuite>
</testsuite> </testsuite>
<testsuite name="Refresh service"> <testsuite name="Refresh service">