From 4a107b3d53c4fe651ac704251b99e04a53cd587f Mon Sep 17 00:00:00 2001
From: Sean Molenaar <sean@seanmolenaar.eu>
Date: Tue, 16 Feb 2021 21:17:10 +0100
Subject: General: Fix folder query

Signed-off-by: Sean Molenaar <sean@seanmolenaar.eu>
---
 lib/Controller/FeedController.php    |  8 ++++----
 lib/Controller/ItemApiController.php | 10 +++++-----
 lib/Controller/ItemController.php    | 10 +++++-----
 lib/Controller/PageController.php    |  4 ++--
 4 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'lib/Controller')

diff --git a/lib/Controller/FeedController.php b/lib/Controller/FeedController.php
index 681dda4bc..c80a5c327 100644
--- a/lib/Controller/FeedController.php
+++ b/lib/Controller/FeedController.php
@@ -24,7 +24,7 @@ use OCP\IRequest;
 use OCP\IConfig;
 use OCP\AppFramework\Http;
 
-use OCA\News\Db\FeedType;
+use OCA\News\Db\ListType;
 use OCP\IUserSession;
 
 class FeedController extends Controller
@@ -122,10 +122,10 @@ class FeedController extends Controller
 
             $feedType = intval($feedType);
             switch ($feedType) {
-                case FeedType::FOLDER:
+                case ListType::FOLDER:
                     $this->folderService->find($this->getUserId(), $feedId);
                     break;
-                case FeedType::FEED:
+                case ListType::FEED:
                     $this->feedService->find($this->getUserId(), $feedId);
                     break;
                 default:
@@ -133,7 +133,7 @@ class FeedController extends Controller
             }
         } catch (ServiceNotFoundException $ex) {
             $feedId = 0;
-            $feedType = FeedType::SUBSCRIPTIONS;
+            $feedType = ListType::ALL_ITEMS;
         }
 
         return [
diff --git a/lib/Controller/ItemApiController.php b/lib/Controller/ItemApiController.php
index 003c61fa2..5f9da73a6 100644
--- a/lib/Controller/ItemApiController.php
+++ b/lib/Controller/ItemApiController.php
@@ -15,7 +15,7 @@
 
 namespace OCA\News\Controller;
 
-use OCA\News\Db\FeedType;
+use OCA\News\Db\ListType;
 use OCA\News\Service\Exceptions\ServiceConflictException;
 use OCA\News\Service\Exceptions\ServiceValidationException;
 use OCA\News\Service\ItemServiceV2;
@@ -73,7 +73,7 @@ class ItemApiController extends ApiController
         bool $oldestFirst = false
     ): array {
         switch ($type) {
-            case FeedType::FEED:
+            case ListType::FEED:
                 $items = $this->itemService->findAllInFeedWithFilters(
                     $this->getUserId(),
                     $id,
@@ -83,7 +83,7 @@ class ItemApiController extends ApiController
                     $oldestFirst
                 );
                 break;
-            case FeedType::FOLDER:
+            case ListType::FOLDER:
                 $items = $this->itemService->findAllInFolderWithFilters(
                     $this->getUserId(),
                     $id,
@@ -130,10 +130,10 @@ class ItemApiController extends ApiController
         }
 
         switch ($type) {
-            case FeedType::FEED:
+            case ListType::FEED:
                 $items = $this->itemService->findAllInFeedAfter($this->getUserId(), $id, $paddedLastModified, false);
                 break;
-            case FeedType::FOLDER:
+            case ListType::FOLDER:
                 $items = $this->itemService->findAllInFolderAfter($this->getUserId(), $id, $paddedLastModified, false);
                 break;
             default:
diff --git a/lib/Controller/ItemController.php b/lib/Controller/ItemController.php
index 02a308d87..85f67ef7a 100644
--- a/lib/Controller/ItemController.php
+++ b/lib/Controller/ItemController.php
@@ -13,7 +13,7 @@
 
 namespace OCA\News\Controller;
 
-use OCA\News\Db\FeedType;
+use OCA\News\Db\ListType;
 use OCA\News\Service\Exceptions\ServiceConflictException;
 use OCA\News\Service\FeedServiceV2;
 use OCP\AppFramework\Http\JSONResponse;
@@ -136,7 +136,7 @@ class ItemController extends Controller
             }
 
             switch ($type) {
-                case FeedType::FEED:
+                case ListType::FEED:
                     $items = $this->itemService->findAllInFeedWithFilters(
                         $this->getUserId(),
                         $id,
@@ -147,7 +147,7 @@ class ItemController extends Controller
                         $search_items
                     );
                     break;
-                case FeedType::FOLDER:
+                case ListType::FOLDER:
                     $items = $this->itemService->findAllInFolderWithFilters(
                         $this->getUserId(),
                         $id,
@@ -201,7 +201,7 @@ class ItemController extends Controller
 
         try {
             switch ($type) {
-                case FeedType::FEED:
+                case ListType::FEED:
                     $items = $this->itemService->findAllInFeedAfter(
                         $this->getUserId(),
                         $id,
@@ -209,7 +209,7 @@ class ItemController extends Controller
                         !$showAll
                     );
                     break;
-                case FeedType::FOLDER:
+                case ListType::FOLDER:
                     $items = $this->itemService->findAllInFolderAfter(
                         $this->getUserId(),
                         $id,
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index 87ed91c73..9f17f5690 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -25,7 +25,7 @@ use OCP\AppFramework\Http\ContentSecurityPolicy;
 
 use OCA\News\Service\StatusService;
 use OCA\News\Explore\RecommendedSites;
-use OCA\News\Db\FeedType;
+use OCA\News\Db\ListType;
 use OCP\IUserSession;
 
 class PageController extends Controller
@@ -204,7 +204,7 @@ class PageController extends Controller
             $this->getUserId(),
             $this->appName,
             'lastViewedFeedType',
-            FeedType::EXPLORE
+            ListType::EXPLORE
         );
 
         try {
-- 
cgit v1.2.3