From 54aa8b527099edb409099335638382dbf754f36b Mon Sep 17 00:00:00 2001
From: Marco Nassabain <marco.nassabain@hotmail.com>
Date: Sun, 7 Feb 2021 21:04:40 +0100
Subject: =?UTF-8?q?=F0=9F=A9=B9=20Return=20starredCount=20in=20newItems=20?=
 =?UTF-8?q?response=20params=20-=20returning=20sharedCount=20everywhere=20?=
 =?UTF-8?q?where=20starredCount=20is=20returned?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
---
 lib/Controller/ItemController.php | 44 +++++++++++++--------------------------
 1 file changed, 14 insertions(+), 30 deletions(-)

(limited to 'lib/Controller')

diff --git a/lib/Controller/ItemController.php b/lib/Controller/ItemController.php
index 9c83b4dfc..757f2f115 100644
--- a/lib/Controller/ItemController.php
+++ b/lib/Controller/ItemController.php
@@ -204,36 +204,20 @@ class ItemController extends Controller
         $return = [];
 
         try {
-            switch ($type) {
-                case ListType::FEED:
-                    $items = $this->itemService->findAllInFeedAfter(
-                        $this->getUserId(),
-                        $id,
-                        $lastModified,
-                        !$showAll
-                    );
-                    break;
-                case ListType::FOLDER:
-                    $items = $this->itemService->findAllInFolderAfter(
-                        $this->getUserId(),
-                        $id,
-                        $lastModified,
-                        !$showAll
-                    );
-                    break;
-                default:
-                    $items = $this->itemService->findAllAfter(
-                        $this->getUserId(),
-                        $type,
-                        $lastModified
-                    );
-                    break;
-            }
-
-            $return['newestItemId'] = $this->itemService->newest($this->getUserId())->getId();
-            $return['feeds'] = $this->feedService->findAllForUser($this->getUserId());
-            $return['starred'] = count($this->itemService->starred($this->getUserId()));
-            $return['items'] = $items;
+            $params['newestItemId'] =
+                $this->itemService->getNewestItemId($this->userId);
+            $params['feeds'] = $this->feedService->findAllForUser($this->userId);
+            $params['starred'] =
+                $this->itemService->starredCount($this->userId);
+            $params['shared'] =
+                $this->itemService->sharedCount($this->userId);
+            $params['items'] = $this->itemService->findAllNew(
+                $id,
+                $type,
+                $lastModified,
+                $showAll,
+                $this->userId
+            );
 
             // this gets thrown if there are no items
             // in that case just return an empty array
-- 
cgit v1.2.3