Implement item search

The search result can only link to the feed.

Signed-off-by: Benjamin Brahmer <info@b-brahmer.de>

4 files changed, 117 insertions, 5 deletions

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 950d44383..bc5e1b476 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -23,6 +23,7 @@ use OCA\News\Config\FetcherConfig;
 use OCA\News\Hooks\UserDeleteHook;
 use OCA\News\Search\FeedSearchProvider;
 use OCA\News\Search\FolderSearchProvider;
+use OCA\News\Search\ItemSearchProvider;
 
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
@@ -82,6 +83,8 @@ class Application extends App implements IBootstrap
 
         $context->registerSearchProvider(FolderSearchProvider::class);
         $context->registerSearchProvider(FeedSearchProvider::class);
+        $context->registerSearchProvider(ItemSearchProvider::class);
+
 
         $context->registerEventListener(BeforeUserDeletedEvent::class, UserDeleteHook::class);
 
diff --git a/lib/Search/FeedSearchProvider.php b/lib/Search/FeedSearchProvider.php
index bbcd466e4..36b21eaba 100644
--- a/lib/Search/FeedSearchProvider.php
+++ b/lib/Search/FeedSearchProvider.php
@@ -4,7 +4,7 @@ declare(strict_types=1);
 namespace OCA\News\Search;
 
 use OCA\News\Service\FeedServiceV2;
-use OCA\News\Service\FolderServiceV2;
+use OCA\News\AppInfo\Application;
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\IUser;
@@ -48,7 +48,7 @@ class FeedSearchProvider implements IProvider
 
     public function getOrder(string $route, array $routeParameters): int
     {
-        if ($route === 'news.page.index') {
+        if (strpos($route, Application::NAME . '.') === 0) {
             // Active app, prefer my results
             return -1;
         }
@@ -67,7 +67,7 @@ class FeedSearchProvider implements IProvider
             }
 
             $list[] = new SearchResultEntry(
-                $this->urlGenerator->imagePath('core', 'filetypes/text.svg'),
+                $this->urlGenerator->imagePath('core', 'rss.svg'),
                 $feed->getTitle(),
                 $this->l10n->t('Unread articles') . ': ' . $feed->getUnreadCount(),
                 $this->urlGenerator->linkToRoute('news.page.index') . '#/items/feeds/' . $feed->getId()
diff --git a/lib/Search/FolderSearchProvider.php b/lib/Search/FolderSearchProvider.php
index 24439d73d..7f6783c68 100644
--- a/lib/Search/FolderSearchProvider.php
+++ b/lib/Search/FolderSearchProvider.php
@@ -49,9 +49,9 @@ class FolderSearchProvider implements IProvider
 
     public function getOrder(string $route, array $routeParameters): int
     {
-        if ($route === 'news.page.index') {
+        if (strpos($route, Application::NAME . '.') === 0) {
             // Active app, prefer my results
-            return -1;
+            return 0;
         }
 
         return 55;
diff --git a/lib/Search/ItemSearchProvider.php b/lib/Search/ItemSearchProvider.php
new file mode 100644
index 000000000..29b4bf209
--- /dev/null
+++ b/lib/Search/ItemSearchProvider.php
@@ -0,0 +1,109 @@
+<?php
+declare(strict_types=1);
+
+namespace OCA\News\Search;
+
+use OCA\News\Service\ItemServiceV2;
+use OCA\News\AppInfo\Application;
+use OCA\News\Db\ListType;
+use OCP\IL10N;
+use OCP\IURLGenerator;
+use OCP\IUser;
+use OCP\Search\IProvider;
+use OCP\Search\ISearchQuery;
+use OCP\Search\SearchResult;
+use OCP\Search\SearchResultEntry;
+
+/**
+ * Class ItemSearchProvider
+ *
+ * @package OCA\News\Search
+ */
+class ItemSearchProvider implements IProvider
+{
+    /** @var IL10N */
+    private $l10n;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /** @var ItemServiceV2 */
+    private $service;
+
+    public function __construct(IL10N $l10n, IURLGenerator $urlGenerator, ItemServiceV2 $service)
+    {
+        $this->l10n = $l10n;
+        $this->urlGenerator = $urlGenerator;
+        $this->service = $service;
+    }
+
+    public function getId(): string
+    {
+        return 'news_item';
+    }
+
+    public function getName(): string
+    {
+        return $this->l10n->t('News articles');
+    }
+
+    public function getOrder(string $route, array $routeParameters): int
+    {
+        if (strpos($route, Application::NAME . '.') === 0) {
+            // Active app, prefer my results
+            return 1;
+        }
+
+        return 65;
+    }
+
+    private function stripTruncate(string $string, int $length = 50): string
+    {
+        $string = strip_tags(trim($string));
+      
+        if (strlen($string) > $length) {
+            $string = wordwrap($string, $length);
+            $string = explode("\n", $string, 2);
+            $string = $string[0];
+        }
+      
+        return $string;
+    }
+
+    public function search(IUser $user, ISearchQuery $query): SearchResult
+    {
+        $list = [];
+        $offset = (int) ($query->getCursor() ?? 0);
+        $limit = $query->getLimit();
+
+        $search_result = $this->service->findAllWithFilters(
+            $user->getUID(),
+            ListType::ALL_ITEMS,
+            $limit,
+            $offset,
+            false,
+            [$query->getTerm()]
+        );
+
+        $last = end($search_result);
+        if ($last === false) {
+            return SearchResult::complete(
+                $this->l10n->t('News'),
+                []
+            );
+        }
+
+        $icon = $this->urlGenerator->imagePath('core', 'filetypes/text.svg');
+        
+        foreach ($search_result as $item) {
+            $list[] = new SearchResultEntry(
+                $icon,
+                $item->getTitle(),
+                $this->stripTruncate($item->getBody(), 50),
+                $this->urlGenerator->linkToRoute('news.page.index') . '#/items/feeds/' . $item->getFeedId()
+            );
+        }
+
+        return SearchResult::paginated($this->l10n->t('News'), $list, $last->getId());
+    }
+}