Bump version to 1.4.6

Signed-off-by: Julius Härtl <jus@bitgrid.net>

.github/workflows/app-code-check.yml

@@ -1,55 +0,0 @@
-name: Nextcloud app code check
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - stable*
-
-env:
-  APP_NAME: deck
-
-jobs:
-  unit-tests:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        php-versions: ['7.4']
-        server-versions: ['master', 'stable18', 'stable19', 'stable20']
-
-    name: AppCode check php${{ matrix.php-versions }}-${{ matrix.server-versions }}
-    steps:
-      - name: Checkout server
-        uses: actions/checkout@v2
-        with:
-          repository: nextcloud/server
-          ref: ${{ matrix.server-versions }}
-
-      - name: Checkout submodules
-        shell: bash
-        run: |
-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-          git submodule sync --recursive
-          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
-
-      - name: Checkout app
-        uses: actions/checkout@v2
-        with:
-          path: apps/${{ env.APP_NAME }}
-
-      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@v1
-        with:
-          php-version: ${{ matrix.php-versions }}
-          tools: phpunit
-          extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite
-
-      - name: Checkout app
-        uses: actions/checkout@v2
-        with:
-          path: apps/${{ env.APP_NAME }}
-
-      - name: App code check
-        run: php occ app:check-code ${{ env.APP_NAME }}

.github/workflows/integration.yml

@@ -34,7 +34,7 @@ jobs:
           POSTGRES_DB: nextcloud
         options: --health-cmd pg_isready --health-interval 5s --health-timeout 2s --health-retries 5
       mysql:
-        image: mariadb
+        image: mariadb:10.5
         ports:
           - 4444:3306/tcp
         env:

.github/workflows/phpunit.yml

@@ -19,16 +19,12 @@ jobs:
       fail-fast: false
       matrix:
         php-versions: ['7.3', '7.4']
-        databases: ['sqlite', 'mysql', 'pgsql', 'oci']
+        databases: ['sqlite', 'mysql', 'pgsql']
         server-versions: ['master']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 
     services:
-      oracle:
-        image: deepdiver/docker-oracle-xe-11g # "wnameless/oracle-xe-11g-r2"
-        ports:
-          - "1521:1521"
       postgres:
         image: postgres
         ports:
@@ -39,7 +35,7 @@ jobs:
           POSTGRES_DB: nextcloud
         options: --health-cmd pg_isready --health-interval 5s --health-timeout 2s --health-retries 5
       mysql:
-        image: mariadb
+        image: mariadb:10.5
         ports:
           - 4444:3306/tcp
         env:
@@ -70,7 +66,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-versions }}
           tools: phpunit
-          extensions: zip, gd, mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, mysql, pdo_mysql, pgsql, pdo_pgsql, oci8
+          extensions: zip, gd, mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, mysql, pdo_mysql, pgsql, pdo_pgsql
           coverage: none
 
       - name: Set up PHPUnit
@@ -85,12 +81,7 @@ jobs:
             export DB_PORT=4445
           fi
           mkdir data
-
-          if [ "${{ matrix.databases }}" = "oci" ]; then
-            ./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=XE --database-host=127.0.0.1 --database-port=1521 --database-user=autotest --database-pass=owncloud --admin-user admin --admin-pass admin
-          else
-            ./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin
-          fi
+          ./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin
           ./occ app:enable --force ${{ env.APP_NAME }}
           php -S localhost:8080 &
 

CHANGELOG.md

@@ -1,7 +1,78 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## 1.3.0 - unreleased
+## 1.4.6
+
+### Fixed
+
+- #3379 Fix menu button position in card modal
+- #3360 Improve combined search @eneiluj
+- #3367 Fix optional parameter order
+- #3393 Use displayname instead of uid for mentions
+- #3359 Rich object string parameters for notifications @juliushaertl
+- #3385 Extend drag-and-drop zone in card sidebar @Artem4590
+- #3408 Keep exceptions http response generic
+
+
+## 1.4.5
+
+### Fixed
+
+- #3318 Additional check for stacks
+
+
+## 1.4.4
+
+### Fixed
+
+- #3301 Fix print style issues
+- #3307 Return false instead of throwing when getting calendar setting
+- #3227 Additional circle level check
+- #3304 Delete file shares through attachments API
+
+## 1.4.3 - 2021-07-09
+
+### Fixed
+
+* [#3143](https://github.com/nextcloud/deck/pull/3143) Always pass user id in share provider
+* [#3153](https://github.com/nextcloud/deck/pull/3153) Only offer stack creation in emptycontent with proper permissions
+* [#3164](https://github.com/nextcloud/deck/pull/3164) Always log generic exceptions
+* [#3169](https://github.com/nextcloud/deck/pull/3169) Reduce duplicate queries when fetching user boards an permissions
+
+
+## 1.4.2 - 2021-05-03
+
+### Fixed
+
+* [#3030](https://github.com/nextcloud/deck/pull/3030) Proper error handling when fetching comments fails
+* [#3031](https://github.com/nextcloud/deck/pull/3031) Allow searching for filters without a query to match all that have a given filter set
+* [#3039](https://github.com/nextcloud/deck/pull/3039) Catch any error during circle detail fetching
+* [#3040](https://github.com/nextcloud/deck/pull/3040) Get attachment from the user node instead of the share source
+
+## 1.4.1 - 2021-04-20
+
+### Fixed
+
+* [#2984](https://github.com/nextcloud/deck/pull/2984) Fix codemirror description width
+* [#2990](https://github.com/nextcloud/deck/pull/2990) Fix unified comments search with postgres
+* [#2994](https://github.com/nextcloud/deck/pull/2994) Remove notification on unshare and add type hints
+* [#3006](https://github.com/nextcloud/deck/pull/3006) Only import debounce
+* [#3008](https://github.com/nextcloud/deck/pull/3008) Do not query the lookupserver when looking for sharees
+
+
+## 1.4.0 - 2021-04-13
+
+### Added
+
+* [#2934](https://github.com/nextcloud/deck/pull/2934) Advanced search queries (see [documentation](https://deck.readthedocs.io/en/latest/User_documentation_en/#search) for more details)
+* [#2933](https://github.com/nextcloud/deck/pull/2933) Move full text search to proper events
+
+### Fixed
+* [#2964](https://github.com/nextcloud/deck/pull/2964) Fix navigating to board details
+
+* Dependency updates
+
+## 1.3.0
 
 ### Added
 * [#2638](https://github.com/nextcloud/deck/pull/2638) Sharing files to cards

appinfo/info.xml

@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
-<info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance"
-      xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
+<?xml version="1.0" encoding="utf-8"?>
+<info xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
     <id>deck</id>
     <name>Deck</name>
     <summary>Personal planning and team project organization</summary>
@@ -17,12 +16,12 @@
 - 🚀 Get your project organized
 
 </description>
-    <version>1.4.0-alpha1</version>
+    <version>1.4.6</version>
     <licence>agpl</licence>
     <author>Julius Härtl</author>
     <namespace>Deck</namespace>
     <types>
-        <dav />
+        <dav/>
     </types>
     <category>organization</category>
     <category>office</category>
@@ -32,7 +31,11 @@
     <screenshot>https://download.bitgrid.net/nextcloud/deck/screenshots/1.0/Deck-1.png</screenshot>
     <screenshot>https://download.bitgrid.net/nextcloud/deck/screenshots/1.0/Deck-2.png</screenshot>
     <dependencies>
-        <nextcloud min-version="21" max-version="22" />
+        <php min-version="7.3"/>
+        <database min-version="9.4">pgsql</database>
+        <database>sqlite</database>
+        <database min-version="5.5">mysql</database>
+        <nextcloud min-version="21" max-version="21"/>
     </dependencies>
     <background-jobs>
         <job>OCA\Deck\Cron\DeleteCron</job>

appinfo/routes.php

@@ -141,5 +141,7 @@ return [
 		['name' => 'comments_api#delete', 'url' => '/api/v{apiVersion}/cards/{cardId}/comments/{commentId}', 'verb' => 'DELETE'],
 
 		['name' => 'overview_api#upcomingCards', 'url' => '/api/v{apiVersion}/overview/upcoming', 'verb' => 'GET'],
+
+		['name' => 'search#search', 'url' => '/api/v{apiVersion}/search', 'verb' => 'GET'],
 	]
 ];

composer.json

@@ -1,34 +1,40 @@
 {
-    "name": "nextcloud/deck",
-    "type": "project",
-    "license": "AGPLv3",
-    "authors": [
-        {
-            "name": "Julius Härtl",
-            "email": "jus@bitgrid.net"
-        }
-    ],
-    "require": {
-        "cogpowered/finediff": "0.3.*"
-    },
-    "require-dev": {
-        "roave/security-advisories": "dev-master",
-        "christophwurst/nextcloud": "^21@dev",
-        "phpunit/phpunit": "^8",
-        "nextcloud/coding-standard": "^0.5.0",
-        "symfony/event-dispatcher": "^4.0",
-        "vimeo/psalm": "^4.3",
-        "php-parallel-lint/php-parallel-lint": "^1.2"
-    },
-    "config": {
-        "optimize-autoloader": true,
-        "classmap-authoritative": true
-    },
-    "scripts": {
-        "lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l",
-        "cs:check": "php-cs-fixer fix --dry-run --diff",
-        "cs:fix": "php-cs-fixer fix",
+	"name": "nextcloud/deck",
+	"type": "project",
+	"license": "AGPLv3",
+	"authors": [
+		{
+			"name": "Julius Härtl",
+			"email": "jus@bitgrid.net"
+		}
+	],
+	"require": {
+		"cogpowered/finediff": "0.3.*"
+	},
+	"require-dev": {
+		"roave/security-advisories": "dev-master",
+		"christophwurst/nextcloud": "^21@dev",
+		"phpunit/phpunit": "^8",
+		"nextcloud/coding-standard": "^0.5.0",
+		"symfony/event-dispatcher": "^4.0",
+		"vimeo/psalm": "^4.3",
+		"php-parallel-lint/php-parallel-lint": "^1.2"
+	},
+	"config": {
+		"optimize-autoloader": true,
+		"classmap-authoritative": true
+	},
+	"scripts": {
+		"lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l",
+		"cs:check": "php-cs-fixer fix --dry-run --diff",
+		"cs:fix": "php-cs-fixer fix",
 		"psalm": "psalm",
-		"psalm:fix": "psalm --alter --issues=InvalidReturnType,InvalidNullableReturnType,MismatchingDocblockParamType,MismatchingDocblockReturnType,MissingParamType,InvalidFalsableReturnType"
-    }
+		"psalm:fix": "psalm --alter --issues=InvalidReturnType,InvalidNullableReturnType,MismatchingDocblockParamType,MismatchingDocblockReturnType,MissingParamType,InvalidFalsableReturnType",
+		"test": [
+			"@test:unit",
+			"@test:integration"
+		],
+		"test:unit": "phpunit -c tests/phpunit.xml",
+		"test:integration": "phpunit -c tests/phpunit.integration.xml && cd tests/integration && ./run.sh"
+	}
 }

css/icons.scss

@@ -22,7 +22,9 @@
 .icon-activity {
 	@include icon-color('activity-dark', 'activity', $color-black);
 }
-
+.icon-comment--unread {
+	@include icon-color('comment', 'actions', $color-primary, 1, true);
+}
 
 .avatardiv.circles {
 	background: var(--color-primary);

css/print.scss

@@ -2,21 +2,26 @@
 	/* hide stuff */
 	#body-user {
 		#header,
-		div#app-navigation,
-		div.board-header-controls,
+		.app-navigation,
+		.app-sidebar,
+		.board-header-controls,
+		.board-actions,
 		#app-navigation-toggle,
 		#app-navigation-toggle-custom,
 		div#controls.ng-scope div.crumb:not(.title),
 		div#controls.ng-scope div.crumb a.bullet,
 		a.ng-binding + a,
 		div.card.create,
+		.stack__header .action-item,
 		button.card-options {
 			display: none !important;
 		}
+
 		#content {
 			margin: 0;
 			padding: 0;
 		}
+
 		#app-content {
 			margin: 0 !important;
 		}
@@ -75,6 +80,11 @@
 		margin: 2cm;
 	}
 
+	.board {
+		max-height: none !important;
+		overflow: visible !important;
+	}
+
 	div#innerBoard {
 		display:flex;
 		flex-wrap: wrap;

docs/API.md

@@ -959,6 +959,7 @@ For now only `deck_file` is supported as an attachment type.
 
 ### DELETE /boards/{boardId}/stacks/{stackId}/cards/{cardId}/attachments/{attachmentId} - Delete an attachment
 
+    
 #### Request parameters
 
 | Parameter    | Type    | Description                                   |

docs/User_documentation_en.md

@@ -69,3 +69,25 @@ The **sharing tab** allows you to add users or even groups to your boards.
 **Deleted objects** allows you to return previously deleted stacks or cards.  
 The **Timeline** allows you to see everything that happened in your boards. Everything!
 
+## Search
+
+Deck provides a global search either through the unified search in the Nextcloud header or with the inline search next to the board controls.
+This search allows advanced filtering of cards across all board of the logged in user.
+
+For example the search `project tag:ToDo assigned:alice assigned:bob` will return all cards where the card title or description contains project **and** the tag ToDo is set **and** the user alice is assigned **and** the user bob is assigned.
+
+### Supported search filters
+
+| Filter      | Operators         | Query                                                        |
+| ----------- | ----------------- | ------------------------------------------------------------ |
+| title       | `:`               | text token used for a case-insentitive search on the cards title |
+| description | `:`               | text token used for a case-insentitive search on the cards description |
+| list        | `:`               | text token used for a case-insentitive search on the cards list name |
+| tag         | `:`               | text token used for a case-insentitive search on the assigned tags |
+| date        | `:`               | 'overdue', 'today', 'week', 'month', 'none'                  |
+|             | `>` `<` `>=` `<=` | Compare the card due date to the passed date (see [supported date formats](https://www.php.net/manual/de/datetime.formats.php)) Card due dates are always considered UTC for comparison |
+| assigned    | `:`               | id or displayname of a user or group for a search on the assigned users or groups |
+
+Other text tokens will be used to perform a case-insensitive search on the card title and description
+
+In addition wuotes can be used to pass a query with spaces, e.g. `"Exact match with spaces"` or `title:"My card"`.

lib/AppInfo/Application.php

@@ -23,11 +23,191 @@
 
 namespace OCA\Deck\AppInfo;
 
-$version = \OCP\Util::getVersion()[0];
-if ($version >= 20) {
-	class Application extends Application20 {
+use Closure;
+use Exception;
+use OC\EventDispatcher\SymfonyAdapter;
+use OCA\Deck\Activity\CommentEventHandler;
+use OCA\Deck\Capabilities;
+use OCA\Deck\Collaboration\Resources\ResourceProvider;
+use OCA\Deck\Collaboration\Resources\ResourceProviderCard;
+use OCA\Deck\Dashboard\DeckWidget;
+use OCA\Deck\Db\Acl;
+use OCA\Deck\Db\AclMapper;
+use OCA\Deck\Db\AssignmentMapper;
+use OCA\Deck\Db\BoardMapper;
+use OCA\Deck\Db\CardMapper;
+use OCA\Deck\Event\AclCreatedEvent;
+use OCA\Deck\Event\AclDeletedEvent;
+use OCA\Deck\Event\AclUpdatedEvent;
+use OCA\Deck\Event\CardCreatedEvent;
+use OCA\Deck\Event\CardDeletedEvent;
+use OCA\Deck\Event\CardUpdatedEvent;
+use OCA\Deck\Listeners\BeforeTemplateRenderedListener;
+use OCA\Deck\Listeners\FullTextSearchEventListener;
+use OCA\Deck\Middleware\DefaultBoardMiddleware;
+use OCA\Deck\Middleware\ExceptionMiddleware;
+use OCA\Deck\Notification\Notifier;
+use OCA\Deck\Search\CardCommentProvider;
+use OCA\Deck\Search\DeckProvider;
+use OCA\Deck\Service\PermissionService;
+use OCA\Deck\Sharing\DeckShareProvider;
+use OCA\Deck\Sharing\Listener;
+use OCP\AppFramework\App;
+use OCP\AppFramework\Bootstrap\IBootContext;
+use OCP\AppFramework\Bootstrap\IBootstrap;
+use OCP\AppFramework\Bootstrap\IRegistrationContext;
+use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
+use OCP\Collaboration\Resources\IProviderManager;
+use OCP\Comments\CommentsEntityEvent;
+use OCP\Comments\ICommentsManager;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventDispatcher;
+use OCP\IConfig;
+use OCP\IDBConnection;
+use OCP\IGroup;
+use OCP\IGroupManager;
+use OCP\IServerContainer;
+use OCP\IUser;
+use OCP\IUserManager;
+use OCP\Notification\IManager as NotificationManager;
+use OCP\Share\IManager;
+use OCP\Util;
+use Psr\Container\ContainerInterface;
+
+class Application extends App implements IBootstrap {
+	public const APP_ID = 'deck';
+
+	public const COMMENT_ENTITY_TYPE = 'deckCard';
+
+	/** @var IServerContainer */
+	private $server;
+
+	public function __construct(array $urlParams = []) {
+		parent::__construct(self::APP_ID, $urlParams);
+
+		$this->server = \OC::$server;
 	}
-} else {
-	class Application extends ApplicationLegacy {
+
+	public function boot(IBootContext $context): void {
+		$context->injectFn(Closure::fromCallable([$this, 'registerUserGroupHooks']));
+		$context->injectFn(Closure::fromCallable([$this, 'registerCommentsEntity']));
+		$context->injectFn(Closure::fromCallable([$this, 'registerCommentsEventHandler']));
+		$context->injectFn(Closure::fromCallable([$this, 'registerNotifications']));
+		$context->injectFn(Closure::fromCallable([$this, 'registerCollaborationResources']));
+
+		$context->injectFn(function (IManager $shareManager) {
+			$shareManager->registerShareProvider(DeckShareProvider::class);
+		});
+
+		$context->injectFn(function (Listener $listener, IEventDispatcher $eventDispatcher) {
+			$listener->register($eventDispatcher);
+		});
+	}
+
+	public function register(IRegistrationContext $context): void {
+		if ((@include_once __DIR__ . '/../../vendor/autoload.php') === false) {
+			throw new Exception('Cannot include autoload. Did you run install dependencies using composer?');
+		}
+
+		$context->registerCapability(Capabilities::class);
+		$context->registerMiddleWare(ExceptionMiddleware::class);
+		$context->registerMiddleWare(DefaultBoardMiddleware::class);
+
+		$context->registerService('databaseType', static function (ContainerInterface $c) {
+			return $c->get(IConfig::class)->getSystemValue('dbtype', 'sqlite');
+		});
+		$context->registerService('database4ByteSupport', static function (ContainerInterface $c) {
+			return $c->get(IDBConnection::class)->supports4ByteText();
+		});
+
+		$context->registerSearchProvider(DeckProvider::class);
+		$context->registerSearchProvider(CardCommentProvider::class);
+		$context->registerDashboardWidget(DeckWidget::class);
+
+		$context->registerEventListener(BeforeTemplateRenderedEvent::class, BeforeTemplateRenderedListener::class);
+		
+		// Event listening for full text search indexing
+		$context->registerEventListener(CardCreatedEvent::class, FullTextSearchEventListener::class);
+		$context->registerEventListener(CardUpdatedEvent::class, FullTextSearchEventListener::class);
+		$context->registerEventListener(CardDeletedEvent::class, FullTextSearchEventListener::class);
+		$context->registerEventListener(AclCreatedEvent::class, FullTextSearchEventListener::class);
+		$context->registerEventListener(AclUpdatedEvent::class, FullTextSearchEventListener::class);
+		$context->registerEventListener(AclDeletedEvent::class, FullTextSearchEventListener::class);
+	}
+
+	public function registerNotifications(NotificationManager $notificationManager): void {
+		$notificationManager->registerNotifierService(Notifier::class);
+	}
+
+	private function registerUserGroupHooks(IUserManager $userManager, IGroupManager $groupManager): void {
+		$container = $this->getContainer();
+		// Delete user/group acl entries when they get deleted
+		$userManager->listen('\OC\User', 'postDelete', static function (IUser $user) use ($container) {
+			// delete existing acl entries for deleted user
+			/** @var AclMapper $aclMapper */
+			$aclMapper = $container->query(AclMapper::class);
+			$acls = $aclMapper->findByParticipant(Acl::PERMISSION_TYPE_USER, $user->getUID());
+			foreach ($acls as $acl) {
+				$aclMapper->delete($acl);
+			}
+			// delete existing user assignments
+			$assignmentMapper = $container->query(AssignmentMapper::class);
+			$assignments = $assignmentMapper->findByParticipant($user->getUID());
+			foreach ($assignments as $assignment) {
+				$assignmentMapper->delete($assignment);
+			}
+
+			/** @var BoardMapper $boardMapper */
+			$boardMapper = $container->query(BoardMapper::class);
+			$boards = $boardMapper->findAllByOwner($user->getUID());
+			foreach ($boards as $board) {
+				$boardMapper->delete($board);
+			}
+		});
+
+		$groupManager->listen('\OC\Group', 'postDelete', static function (IGroup $group) use ($container) {
+			/** @var AclMapper $aclMapper */
+			$aclMapper = $container->query(AclMapper::class);
+			$aclMapper->findByParticipant(Acl::PERMISSION_TYPE_GROUP, $group->getGID());
+			$acls = $aclMapper->findByParticipant(Acl::PERMISSION_TYPE_GROUP, $group->getGID());
+			foreach ($acls as $acl) {
+				$aclMapper->delete($acl);
+			}
+		});
+	}
+
+	public function registerCommentsEntity(IEventDispatcher $eventDispatcher): void {
+		$eventDispatcher->addListener(CommentsEntityEvent::EVENT_ENTITY, function (CommentsEntityEvent $event) {
+			$event->addEntityCollection(self::COMMENT_ENTITY_TYPE, function ($name) {
+				/** @var CardMapper */
+				$cardMapper = $this->getContainer()->get(CardMapper::class);
+				$permissionService = $this->getContainer()->get(PermissionService::class);
+
+				try {
+					return $permissionService->checkPermission($cardMapper, (int) $name, Acl::PERMISSION_READ);
+				} catch (\Exception $e) {
+					return false;
+				}
+			});
+		});
+	}
+
+	protected function registerCommentsEventHandler(ICommentsManager $commentsManager): void {
+		$commentsManager->registerEventHandler(function () {
+			return $this->getContainer()->query(CommentEventHandler::class);
+		});
+	}
+
+	protected function registerCollaborationResources(IProviderManager $resourceManager, SymfonyAdapter $symfonyAdapter): void {
+		$resourceManager->registerResourceProvider(ResourceProvider::class);
+		$resourceManager->registerResourceProvider(ResourceProviderCard::class);
+
+		$symfonyAdapter->addListener('\OCP\Collaboration\Resources::loadAdditionalScripts', static function () {
+			if (strpos(\OC::$server->getRequest()->getPathInfo(), '/call/') === 0) {
+				// Talk integration has its own entrypoint which already includes collections handling
+				return;
+			}
+			Util::addScript('deck', 'collections');
+		});
 	}
 }

lib/AppInfo/Application20.php

@@ -1,252 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016 Julius Härtl <jus@bitgrid.net>
- *
- * @author Julius Härtl <jus@bitgrid.net>
- *
- * @license GNU AGPL version 3 or any later version
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace OCA\Deck\AppInfo;
-
-use Closure;
-use Exception;
-use OC\EventDispatcher\SymfonyAdapter;
-use OCA\Deck\Activity\CommentEventHandler;
-use OCA\Deck\Capabilities;
-use OCA\Deck\Collaboration\Resources\ResourceProvider;
-use OCA\Deck\Collaboration\Resources\ResourceProviderCard;
-use OCA\Deck\Dashboard\DeckWidget;
-use OCA\Deck\Db\Acl;
-use OCA\Deck\Db\AclMapper;
-use OCA\Deck\Db\AssignmentMapper;
-use OCA\Deck\Db\BoardMapper;
-use OCA\Deck\Db\CardMapper;
-use OCA\Deck\Listeners\BeforeTemplateRenderedListener;
-use OCA\Deck\Middleware\DefaultBoardMiddleware;
-use OCA\Deck\Middleware\ExceptionMiddleware;
-use OCA\Deck\Notification\Notifier;
-use OCA\Deck\Search\DeckProvider;
-use OCA\Deck\Service\FullTextSearchService;
-use OCA\Deck\Service\PermissionService;
-use OCA\Deck\Sharing\DeckShareProvider;
-use OCA\Deck\Sharing\Listener;
-use OCP\AppFramework\App;
-use OCP\AppFramework\Bootstrap\IBootContext;
-use OCP\AppFramework\Bootstrap\IBootstrap;
-use OCP\AppFramework\Bootstrap\IRegistrationContext;
-use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
-use OCP\Collaboration\Resources\IProviderManager;
-use OCP\Comments\CommentsEntityEvent;
-use OCP\Comments\ICommentsManager;
-use OCP\EventDispatcher\Event;
-use OCP\EventDispatcher\IEventDispatcher;
-use OCP\FullTextSearch\IFullTextSearchManager;
-use OCP\IConfig;
-use OCP\IDBConnection;
-use OCP\IGroup;
-use OCP\IGroupManager;
-use OCP\IServerContainer;
-use OCP\IUser;
-use OCP\IUserManager;
-use OCP\Notification\IManager as NotificationManager;
-use OCP\Share\IManager;
-use OCP\Util;
-use Psr\Container\ContainerInterface;
-
-class Application20 extends App implements IBootstrap {
-	public const APP_ID = 'deck';
-
-	public const COMMENT_ENTITY_TYPE = 'deckCard';
-
-	/** @var IServerContainer */
-	private $server;
-
-	/** @var FullTextSearchService */
-	private $fullTextSearchService;
-
-	/** @var IFullTextSearchManager */
-	private $fullTextSearchManager;
-
-	public function __construct(array $urlParams = []) {
-		parent::__construct(self::APP_ID, $urlParams);
-
-		$this->server = \OC::$server;
-	}
-
-	public function boot(IBootContext $context): void {
-		$context->injectFn(Closure::fromCallable([$this, 'registerUserGroupHooks']));
-		$context->injectFn(Closure::fromCallable([$this, 'registerCommentsEntity']));
-		$context->injectFn(Closure::fromCallable([$this, 'registerCommentsEventHandler']));
-		$context->injectFn(Closure::fromCallable([$this, 'registerNotifications']));
-		$context->injectFn(Closure::fromCallable([$this, 'registerFullTextSearch']));
-		$context->injectFn(Closure::fromCallable([$this, 'registerCollaborationResources']));
-
-		$context->injectFn(function (IManager $shareManager) {
-			if (method_exists($shareManager, 'registerShareProvider')) {
-				$shareManager->registerShareProvider(DeckShareProvider::class);
-			}
-		});
-
-		$context->injectFn(function (Listener $listener, IEventDispatcher $eventDispatcher) {
-			$listener->register($eventDispatcher);
-		});
-	}
-
-	public function register(IRegistrationContext $context): void {
-		if ((@include_once __DIR__ . '/../../vendor/autoload.php') === false) {
-			throw new Exception('Cannot include autoload. Did you run install dependencies using composer?');
-		}
-
-		$context->registerCapability(Capabilities::class);
-		$context->registerMiddleWare(ExceptionMiddleware::class);
-		$context->registerMiddleWare(DefaultBoardMiddleware::class);
-
-		$context->registerService('databaseType', static function (ContainerInterface $c) {
-			return $c->get(IConfig::class)->getSystemValue('dbtype', 'sqlite');
-		});
-		$context->registerService('database4ByteSupport', static function (ContainerInterface $c) {
-			return $c->get(IDBConnection::class)->supports4ByteText();
-		});
-
-		$context->registerSearchProvider(DeckProvider::class);
-		$context->registerDashboardWidget(DeckWidget::class);
-
-		$context->registerEventListener(BeforeTemplateRenderedEvent::class, BeforeTemplateRenderedListener::class);
-	}
-
-	public function registerNotifications(NotificationManager $notificationManager): void {
-		$notificationManager->registerNotifierService(Notifier::class);
-	}
-
-	private function registerUserGroupHooks(IUserManager $userManager, IGroupManager $groupManager): void {
-		$container = $this->getContainer();
-		// Delete user/group acl entries when they get deleted
-		$userManager->listen('\OC\User', 'postDelete', static function (IUser $user) use ($container) {
-			// delete existing acl entries for deleted user
-			/** @var AclMapper $aclMapper */
-			$aclMapper = $container->query(AclMapper::class);
-			$acls = $aclMapper->findByParticipant(Acl::PERMISSION_TYPE_USER, $user->getUID());
-			foreach ($acls as $acl) {
-				$aclMapper->delete($acl);
-			}
-			// delete existing user assignments
-			$assignmentMapper = $container->query(AssignmentMapper::class);
-			$assignments = $assignmentMapper->findByParticipant($user->getUID());
-			foreach ($assignments as $assignment) {
-				$assignmentMapper->delete($assignment);
-			}
-
-			/** @var BoardMapper $boardMapper */
-			$boardMapper = $container->query(BoardMapper::class);
-			$boards = $boardMapper->findAllByOwner($user->getUID());
-			foreach ($boards as $board) {
-				$boardMapper->delete($board);
-			}
-		});
-
-		$groupManager->listen('\OC\Group', 'postDelete', static function (IGroup $group) use ($container) {
-			/** @var AclMapper $aclMapper */
-			$aclMapper = $container->query(AclMapper::class);
-			$aclMapper->findByParticipant(Acl::PERMISSION_TYPE_GROUP, $group->getGID());
-			$acls = $aclMapper->findByParticipant(Acl::PERMISSION_TYPE_GROUP, $group->getGID());
-			foreach ($acls as $acl) {
-				$aclMapper->delete($acl);
-			}
-		});
-	}
-
-	public function registerCommentsEntity(IEventDispatcher $eventDispatcher): void {
-		$eventDispatcher->addListener(CommentsEntityEvent::EVENT_ENTITY, function (CommentsEntityEvent $event) {
-			$event->addEntityCollection(self::COMMENT_ENTITY_TYPE, function ($name) {
-				/** @var CardMapper */
-				$cardMapper = $this->getContainer()->get(CardMapper::class);
-				$permissionService = $this->getContainer()->get(PermissionService::class);
-
-				try {
-					return $permissionService->checkPermission($cardMapper, (int) $name, Acl::PERMISSION_READ);
-				} catch (\Exception $e) {
-					return false;
-				}
-			});
-		});
-	}
-
-	protected function registerCommentsEventHandler(ICommentsManager $commentsManager): void {
-		$commentsManager->registerEventHandler(function () {
-			return $this->getContainer()->query(CommentEventHandler::class);
-		});
-	}
-
-	protected function registerCollaborationResources(IProviderManager $resourceManager, SymfonyAdapter $symfonyAdapter): void {
-		$resourceManager->registerResourceProvider(ResourceProvider::class);
-		$resourceManager->registerResourceProvider(ResourceProviderCard::class);
-
-		$symfonyAdapter->addListener('\OCP\Collaboration\Resources::loadAdditionalScripts', static function () {
-			if (strpos(\OC::$server->getRequest()->getPathInfo(), '/call/') === 0) {
-				// Talk integration has its own entrypoint which already includes collections handling
-				return;
-			}
-			Util::addScript('deck', 'collections');
-		});
-	}
-
-	public function registerFullTextSearch(IFullTextSearchManager $fullTextSearchManager, IEventDispatcher $eventDispatcher): void {
-		if (!$fullTextSearchManager->isAvailable()) {
-			return;
-		}
-
-		// FIXME move to addServiceListener
-		$server = $this->server;
-		$eventDispatcher->addListener(
-			'\OCA\Deck\Card::onCreate', function (Event $e) use ($server) {
-				$fullTextSearchService = $server->get(FullTextSearchService::class);
-				$fullTextSearchService->onCardCreated($e);
-			}
-		);
-		$eventDispatcher->addListener(
-			'\OCA\Deck\Card::onUpdate', function (Event $e) use ($server) {
-				$fullTextSearchService = $server->get(FullTextSearchService::class);
-				$fullTextSearchService->onCardUpdated($e);
-			}
-		);
-		$eventDispatcher->addListener(
-			'\OCA\Deck\Card::onDelete', function (Event $e) use ($server) {
-				$fullTextSearchService = $server->get(FullTextSearchService::class);
-				$fullTextSearchService->onCardDeleted($e);
-			}
-		);
-		$eventDispatcher->addListener(
-			'\OCA\Deck\Board::onShareNew', function (Event $e) use ($server) {
-				$fullTextSearchService = $server->get(FullTextSearchService::class);
-				$fullTextSearchService->onBoardShares($e);
-			}
-		);
-		$eventDispatcher->addListener(
-			'\OCA\Deck\Board::onShareEdit', function (Event $e) use ($server) {
-				$fullTextSearchService = $server->get(FullTextSearchService::class);
-				$fullTextSearchService->onBoardShares($e);
-			}
-		);
-		$eventDispatcher->addListener(
-			'\OCA\Deck\Board::onShareDelete', function (Event $e) use ($server) {
-				$fullTextSearchService = $server->get(FullTextSearchService::class);
-				$fullTextSearchService->onBoardShares($e);
-			}
-		);
-	}
-}

lib/AppInfo/ApplicationLegacy.php

@@ -1,249 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016 Julius Härtl <jus@bitgrid.net>
- *
- * @author Julius Härtl <jus@bitgrid.net>
- *
- * @license GNU AGPL version 3 or any later version
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace OCA\Deck\AppInfo;
-
-use Exception;
-use OCA\Deck\Activity\CommentEventHandler;
-use OCA\Deck\Capabilities;
-use OCA\Deck\Collaboration\Resources\ResourceProvider;
-use OCA\Deck\Collaboration\Resources\ResourceProviderCard;
-use OCA\Deck\Db\Acl;
-use OCA\Deck\Db\AclMapper;
-use OCA\Deck\Db\AssignmentMapper;
-use OCA\Deck\Db\BoardMapper;
-use OCA\Deck\Db\CardMapper;
-use OCA\Deck\Middleware\DefaultBoardMiddleware;
-use OCA\Deck\Middleware\ExceptionMiddleware;
-use OCA\Deck\Notification\Notifier;
-use OCA\Deck\Service\FullTextSearchService;
-use OCA\Deck\Service\PermissionService;
-use OCP\AppFramework\App;
-use OCP\Collaboration\Resources\IManager;
-use OCP\Collaboration\Resources\IProviderManager;
-use OCP\Comments\CommentsEntityEvent;
-use OCP\EventDispatcher\Event;
-use OCP\EventDispatcher\IEventDispatcher;
-use OCP\FullTextSearch\IFullTextSearchManager;
-use OCP\IGroup;
-use OCP\IServerContainer;
-use OCP\IUser;
-use OCP\IUserManager;
-use OCP\Util;
-
-if ((@include_once __DIR__ . '/../../vendor/autoload.php') === false) {
-	throw new Exception('Cannot include autoload. Did you run install dependencies using composer?');
-}
-
-class ApplicationLegacy extends App {
-	public const APP_ID = 'deck';
-
-	public const COMMENT_ENTITY_TYPE = 'deckCard';
-
-	/** @var IServerContainer */
-	private $server;
-
-	/** @var FullTextSearchService */
-	private $fullTextSearchService;
-
-	/** @var IFullTextSearchManager */
-	private $fullTextSearchManager;
-
-	public function __construct(array $urlParams = []) {
-		parent::__construct('deck', $urlParams);
-
-		$container = $this->getContainer();
-		$server = $this->getContainer()->getServer();
-
-		$this->server = $server;
-
-		$container->registerCapability(Capabilities::class);
-		$container->registerMiddleWare(ExceptionMiddleware::class);
-		$container->registerMiddleWare(DefaultBoardMiddleware::class);
-
-		$container->registerService('databaseType', static function () use ($server) {
-			return $server->getConfig()->getSystemValue('dbtype', 'sqlite');
-		});
-		$container->registerService('database4ByteSupport', static function () use ($server) {
-			return $server->getDatabaseConnection()->supports4ByteText();
-		});
-
-		$this->register();
-	}
-
-	public function register(): void {
-		$this->registerUserGroupHooks();
-		$this->registerNotifications();
-		$this->registerCommentsEntity();
-		$this->registerFullTextSearch();
-		$this->registerCollaborationResources();
-	}
-
-	private function registerUserGroupHooks(): void {
-		$container = $this->getContainer();
-		// Delete user/group acl entries when they get deleted
-		/** @var IUserManager $userManager */
-		$userManager = $this->server->getUserManager();
-		$userManager->listen('\OC\User', 'postDelete', static function (IUser $user) use ($container) {
-			// delete existing acl entries for deleted user
-			/** @var AclMapper $aclMapper */
-			$aclMapper = $container->query(AclMapper::class);
-			$acls = $aclMapper->findByParticipant(Acl::PERMISSION_TYPE_USER, $user->getUID());
-			foreach ($acls as $acl) {
-				$aclMapper->delete($acl);
-			}
-			// delete existing user assignments
-			$assignmentMapper = $container->query(AssignmentMapper::class);
-			$assignments = $assignmentMapper->findByParticipant($user->getUID());
-			foreach ($assignments as $assignment) {
-				$assignmentMapper->delete($assignment);
-			}
-
-			/** @var BoardMapper $boardMapper */
-			$boardMapper = $container->query(BoardMapper::class);
-			$boards = $boardMapper->findAllByOwner($user->getUID());
-			foreach ($boards as $board) {
-				$boardMapper->delete($board);
-			}
-		});
-
-		/** @var IUserManager $userManager */
-		$groupManager = $this->server->getGroupManager();
-		$groupManager->listen('\OC\Group', 'postDelete', static function (IGroup $group) use ($container) {
-			/** @var AclMapper $aclMapper */
-			$aclMapper = $container->query(AclMapper::class);
-			$aclMapper->findByParticipant(Acl::PERMISSION_TYPE_GROUP, $group->getGID());
-			$acls = $aclMapper->findByParticipant(Acl::PERMISSION_TYPE_GROUP, $group->getGID());
-			foreach ($acls as $acl) {
-				$aclMapper->delete($acl);
-			}
-		});
-	}
-
-	public function registerNotifications(): void {
-		$notificationManager = $this->server->getNotificationManager();
-		$notificationManager->registerNotifierService(Notifier::class);
-	}
-
-	public function registerCommentsEntity(): void {
-		$this->server->getEventDispatcher()->addListener(CommentsEntityEvent::EVENT_ENTITY, function (CommentsEntityEvent $event) {
-			$event->addEntityCollection(self::COMMENT_ENTITY_TYPE, function ($name) {
-				/** @var CardMapper */
-				$cardMapper = $this->getContainer()->query(CardMapper::class);
-				$permissionService = $this->getContainer()->query(PermissionService::class);
-
-				try {
-					return $permissionService->checkPermission($cardMapper, (int) $name, Acl::PERMISSION_READ);
-				} catch (\Exception $e) {
-					return false;
-				}
-			});
-		});
-		$this->registerCommentsEventHandler();
-	}
-
-	/**
-	 */
-	protected function registerCommentsEventHandler(): void {
-		$this->server->getCommentsManager()->registerEventHandler(function () {
-			return $this->getContainer()->query(CommentEventHandler::class);
-		});
-	}
-
-	protected function registerCollaborationResources(): void {
-		$version = \OCP\Util::getVersion()[0];
-		if ($version < 16) {
-			return;
-		}
-
-		/**
-		 * Register Collaboration ResourceProvider
-		 *
-		 * @Todo: Remove if min-version is 18
-		 */
-		if ($version < 18) {
-			/** @var IManager $resourceManager */
-			$resourceManager = $this->getContainer()->query(IManager::class);
-		} else {
-			/** @var IProviderManager $resourceManager */
-			$resourceManager = $this->getContainer()->query(IProviderManager::class);
-		}
-		$resourceManager->registerResourceProvider(ResourceProvider::class);
-		$resourceManager->registerResourceProvider(ResourceProviderCard::class);
-
-		$this->server->getEventDispatcher()->addListener('\OCP\Collaboration\Resources::loadAdditionalScripts', static function () {
-			Util::addScript('deck', 'collections');
-		});
-	}
-
-	public function registerFullTextSearch(): void {
-		if (Util::getVersion()[0] < 16) {
-			return;
-		}
-
-		$c = $this->getContainer();
-		try {
-			$this->fullTextSearchService = $c->query(FullTextSearchService::class);
-			$this->fullTextSearchManager = $c->query(IFullTextSearchManager::class);
-		} catch (Exception $e) {
-			return;
-		}
-
-		if (!$this->fullTextSearchManager->isAvailable()) {
-			return;
-		}
-
-		/** @var IEventDispatcher $eventDispatcher */
-		$eventDispatcher = $this->server->query(IEventDispatcher::class);
-		$eventDispatcher->addListener(
-			'\OCA\Deck\Card::onCreate', function (Event $e) {
-				$this->fullTextSearchService->onCardCreated($e);
-			}
-		);
-		$eventDispatcher->addListener(
-			'\OCA\Deck\Card::onUpdate', function (Event $e) {
-				$this->fullTextSearchService->onCardUpdated($e);
-			}
-		);
-		$eventDispatcher->addListener(
-			'\OCA\Deck\Card::onDelete', function (Event $e) {
-				$this->fullTextSearchService->onCardDeleted($e);
-			}
-		);
-		$eventDispatcher->addListener(
-			'\OCA\Deck\Board::onShareNew', function (Event $e) {
-				$this->fullTextSearchService->onBoardShares($e);
-			}
-		);
-		$eventDispatcher->addListener(
-			'\OCA\Deck\Board::onShareEdit', function (Event $e) {
-				$this->fullTextSearchService->onBoardShares($e);
-			}
-		);
-		$eventDispatcher->addListener(
-			'\OCA\Deck\Board::onShareDelete', function (Event $e) {
-				$this->fullTextSearchService->onBoardShares($e);
-			}
-		);
-	}
-}

lib/Controller/CommentsApiController.php

@@ -36,8 +36,10 @@ class CommentsApiController extends OCSController {
 	private $commentService;
 
 	public function __construct(
-		$appName, IRequest $request, $corsMethods = 'PUT, POST, GET, DELETE, PATCH', $corsAllowedHeaders = 'Authorization, Content-Type, Accept', $corsMaxAge = 1728000,
-		CommentService $commentService
+		string $appName,
+		IRequest $request,
+		CommentService $commentService,
+		string $corsMethods = 'PUT, POST, GET, DELETE, PATCH', string $corsAllowedHeaders = 'Authorization, Content-Type, Accept', int $corsMaxAge = 1728000
 	) {
 		parent::__construct($appName, $request, $corsMethods, $corsAllowedHeaders, $corsMaxAge);
 		$this->commentService = $commentService;

lib/Controller/SearchController.php

@@ -0,0 +1,59 @@
+<?php
+/*
+ * @copyright Copyright (c) 2021 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+declare(strict_types=1);
+
+
+namespace OCA\Deck\Controller;
+
+use OCA\Deck\Db\Card;
+use OCA\Deck\Service\SearchService;
+use OCP\AppFramework\Http\DataResponse;
+use OCP\AppFramework\OCSController;
+use OCP\IRequest;
+
+class SearchController extends OCSController {
+
+	/**
+	 * @var SearchService
+	 */
+	private $searchService;
+
+	public function __construct(string $appName, IRequest $request, SearchService $searchService) {
+		parent::__construct($appName, $request);
+		$this->searchService = $searchService;
+	}
+
+	/**
+	 * @NoAdminRequired
+	 */
+	public function search(string $term, ?int $limit = null, ?int $cursor = null): DataResponse {
+		$cards = $this->searchService->searchCards($term, $limit, $cursor);
+		return new DataResponse(array_map(function (Card $card) {
+			$json = $card->jsonSerialize();
+			$json['relatedStack'] = $card->getRelatedStack();
+			$json['relatedBoard'] = $card->getRelatedBoard();
+			return $json;
+		}, $cards));
+	}
+}

lib/Db/BoardMapper.php

@@ -23,11 +23,12 @@
 
 namespace OCA\Deck\Db;
 
+use OC\Cache\CappedMemoryCache;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\IDBConnection;
-use OCP\ILogger;
 use OCP\IUserManager;
 use OCP\IGroupManager;
+use Psr\Log\LoggerInterface;
 
 class BoardMapper extends DeckMapper implements IPermissionMapper {
 	private $labelMapper;
@@ -35,16 +36,20 @@ class BoardMapper extends DeckMapper implements IPermissionMapper {
 	private $stackMapper;
 	private $userManager;
 	private $groupManager;
+	private $logger;
 
 	private $circlesEnabled;
 
+	private $userBoardCache;
+
 	public function __construct(
 		IDBConnection $db,
 		LabelMapper $labelMapper,
 		AclMapper $aclMapper,
 		StackMapper $stackMapper,
 		IUserManager $userManager,
-		IGroupManager $groupManager
+		IGroupManager $groupManager,
+		LoggerInterface $logger
 	) {
 		parent::__construct($db, 'deck_boards', Board::class);
 		$this->labelMapper = $labelMapper;
@@ -52,6 +57,10 @@ class BoardMapper extends DeckMapper implements IPermissionMapper {
 		$this->stackMapper = $stackMapper;
 		$this->userManager = $userManager;
 		$this->groupManager = $groupManager;
+		$this->logger = $logger;
+
+		$this->userBoardCache = new CappedMemoryCache();
+
 
 		$this->circlesEnabled = \OC::$server->getAppManager()->isEnabledForUser('circles');
 	}
@@ -86,13 +95,21 @@ class BoardMapper extends DeckMapper implements IPermissionMapper {
 	}
 
 	public function findAllForUser(string $userId, int $since = -1, $includeArchived = true): array {
-		$groups = $this->groupManager->getUserGroupIds(
-			$this->userManager->get($userId)
-		);
-		$userBoards = $this->findAllByUser($userId, null, null, $since, $includeArchived);
-		$groupBoards = $this->findAllByGroups($userId, $groups,null, null, $since, $includeArchived);
-		$circleBoards = $this->findAllByCircles($userId, null, null,  $since, $includeArchived);
-		return array_unique(array_merge($userBoards, $groupBoards, $circleBoards));
+		$useCache = ($since === -1 && $includeArchived === true);
+		if (!isset($this->userBoardCache[$userId]) || !$useCache) {
+			$groups = $this->groupManager->getUserGroupIds(
+				$this->userManager->get($userId)
+			);
+			$userBoards = $this->findAllByUser($userId, null, null, $since, $includeArchived);
+			$groupBoards = $this->findAllByGroups($userId, $groups, null, null, $since, $includeArchived);
+			$circleBoards = $this->findAllByCircles($userId, null, null, $since, $includeArchived);
+			$allBoards = array_unique(array_merge($userBoards, $groupBoards, $circleBoards));
+			if ($useCache) {
+				$this->userBoardCache[$userId] = $allBoards;
+			}
+			return $allBoards;
+		}
+		return $this->userBoardCache[$userId];
 	}
 
 	/**
@@ -248,7 +265,7 @@ class BoardMapper extends DeckMapper implements IPermissionMapper {
 				if ($user !== null) {
 					return new User($user);
 				}
-				\OC::$server->getLogger()->debug('User ' . $acl->getId() . ' not found when mapping acl ' . $acl->getParticipant());
+				$this->logger->debug('User ' . $acl->getId() . ' not found when mapping acl ' . $acl->getParticipant());
 				return null;
 			}
 			if ($acl->getType() === Acl::PERMISSION_TYPE_GROUP) {
@@ -256,7 +273,7 @@ class BoardMapper extends DeckMapper implements IPermissionMapper {
 				if ($group !== null) {
 					return new Group($group);
 				}
-				\OC::$server->getLogger()->debug('Group ' . $acl->getId() . ' not found when mapping acl ' . $acl->getParticipant());
+				$this->logger->debug('Group ' . $acl->getId() . ' not found when mapping acl ' . $acl->getParticipant());
 				return null;
 			}
 			if ($acl->getType() === Acl::PERMISSION_TYPE_CIRCLE) {
@@ -268,11 +285,12 @@ class BoardMapper extends DeckMapper implements IPermissionMapper {
 					if ($circle) {
 						return new Circle($circle);
 					}
-				} catch (\Exception $e) {
+				} catch (\Throwable $e) {
+					$this->logger->error('Failed to get circle details when building ACL', ['exception' => $e]);
 				}
 				return null;
 			}
-			\OC::$server->getLogger()->log(ILogger::WARN, 'Unknown permission type for mapping acl ' . $acl->getId());
+			$this->logger->warning('Unknown permission type for mapping acl ' . $acl->getId());
 			return null;
 		});
 	}

lib/Db/Card.php

@@ -49,6 +49,10 @@ class Card extends RelationalEntity {
 	protected $notified = false;
 	protected $deletedAt = 0;
 	protected $commentsUnread = 0;
+	protected $commentsCount = 0;
+	
+	protected $relatedStack = null;
+	protected $relatedBoard = null;
 
 	private $databaseType = 'sqlite';
 
@@ -72,7 +76,11 @@ class Card extends RelationalEntity {
 		$this->addRelation('attachmentCount');
 		$this->addRelation('participants');
 		$this->addRelation('commentsUnread');
+		$this->addRelation('commentsCount');
 		$this->addResolvable('owner');
+		
+		$this->addRelation('relatedStack');
+		$this->addRelation('relatedBoard');
 	}
 
 	public function setDatabaseType($type) {
@@ -119,6 +127,8 @@ class Card extends RelationalEntity {
 		$json['duedate'] = $this->getDuedate(true);
 		unset($json['notified']);
 		unset($json['descriptionPrev']);
+		unset($json['relatedStack']);
+		unset($json['relatedBoard']);
 		return $json;
 	}
 

lib/Db/CardMapper.php

@@ -23,11 +23,16 @@
 
 namespace OCA\Deck\Db;
 
+use DateTime;
 use Exception;
+use OCA\Deck\AppInfo\Application;
+use OCA\Deck\Search\Query\SearchQuery;
 use OCP\AppFramework\Db\Entity;
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
+use OCP\IGroupManager;
+use OCP\IUser;
 use OCP\IUserManager;
 use OCP\Notification\IManager;
 
@@ -37,6 +42,8 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 	private $labelMapper;
 	/** @var IUserManager */
 	private $userManager;
+	/** @var IGroupManager */
+	private $groupManager;
 	/** @var IManager */
 	private $notificationManager;
 	private $databaseType;
@@ -46,13 +53,15 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 		IDBConnection $db,
 		LabelMapper $labelMapper,
 		IUserManager $userManager,
+		IGroupManager $groupManager,
 		IManager $notificationManager,
-		$databaseType = 'sqlite',
+		$databaseType = 'sqlite3',
 		$database4ByteSupport = true
 	) {
 		parent::__construct($db, 'deck_cards', Card::class);
 		$this->labelMapper = $labelMapper;
 		$this->userManager = $userManager;
+		$this->groupManager = $groupManager;
 		$this->notificationManager = $notificationManager;
 		$this->databaseType = $databaseType;
 		$this->database4ByteSupport = $database4ByteSupport;
@@ -117,7 +126,7 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 			->addOrderBy('id');
 		/** @var Card $card */
 		$card = $this->findEntity($qb);
-		$labels = $this->labelMapper->findAssignedLabelsForCard($card->id);
+		$labels = $this->labelMapper->findAssignedLabelsForCard($card->getId());
 		$card->setLabels($labels);
 		$this->mapOwner($card);
 		return $card;
@@ -260,25 +269,217 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 		return $this->findEntities($qb);
 	}
 
-	public function search($boardIds, $term, $limit = null, $offset = null) {
+	public function search(array $boardIds, SearchQuery $query, int $limit = null, int $offset = null): array {
 		$qb = $this->queryCardsByBoards($boardIds);
-		$qb->andWhere($qb->expr()->eq('c.deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)));
-		$qb->andWhere($qb->expr()->eq('s.deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)));
-		$qb->andWhere(
-			$qb->expr()->orX(
-				$qb->expr()->iLike('c.title', $qb->createNamedParameter('%' . $this->db->escapeLikeParameter($term) . '%')),
-				$qb->expr()->iLike('c.description', $qb->createNamedParameter('%' . $this->db->escapeLikeParameter($term) . '%'))
-			)
-		);
+		$this->extendQueryByFilter($qb, $query);
+
+		if (count($query->getTextTokens()) > 0) {
+			$tokenMatching = $qb->expr()->andX(
+				...array_map(function (string $token) use ($qb) {
+					return $qb->expr()->orX(
+						$qb->expr()->iLike(
+							'c.title',
+							$qb->createNamedParameter('%' . $this->db->escapeLikeParameter($token) . '%', IQueryBuilder::PARAM_STR),
+							IQueryBuilder::PARAM_STR
+						),
+						$qb->expr()->iLike(
+							'c.description',
+							$qb->createNamedParameter('%' . $this->db->escapeLikeParameter($token) . '%', IQueryBuilder::PARAM_STR),
+							IQueryBuilder::PARAM_STR
+						)
+					);
+				}, $query->getTextTokens())
+			);
+			$qb->andWhere(
+				$tokenMatching
+			);
+		}
+
+		$qb->groupBy('c.id');
+		$qb->orderBy('c.last_modified', 'DESC');
 		if ($limit !== null) {
 			$qb->setMaxResults($limit);
 		}
 		if ($offset !== null) {
-			$qb->setFirstResult($offset);
+			$qb->andWhere($qb->expr()->lt('c.last_modified', $qb->createNamedParameter($offset, IQueryBuilder::PARAM_INT)));
 		}
-		return $this->findEntities($qb);
+
+		$result = $qb->execute();
+		$entities = [];
+		while ($row = $result->fetch()) {
+			$entities[] = Card::fromRow($row);
+		}
+		$result->closeCursor();
+		return $entities;
 	}
 
+	public function searchComments(array $boardIds, SearchQuery $query, int $limit = null, int $offset = null): array {
+		if (count($query->getTextTokens()) === 0) {
+			return [];
+		}
+		$qb = $this->queryCardsByBoards($boardIds);
+		$this->extendQueryByFilter($qb, $query);
+
+		$qb->innerJoin('c', 'comments', 'comments', $qb->expr()->andX(
+			$qb->expr()->eq('comments.object_id', $qb->expr()->castColumn('c.id', IQueryBuilder::PARAM_STR)),
+			$qb->expr()->eq('comments.object_type', $qb->createNamedParameter(Application::COMMENT_ENTITY_TYPE, IQueryBuilder::PARAM_STR))
+		));
+		$qb->selectAlias('comments.id', 'comment_id');
+
+		$tokenMatching = $qb->expr()->andX(
+			...array_map(function (string $token) use ($qb) {
+				return $qb->expr()->iLike(
+					'comments.message',
+					$qb->createNamedParameter('%' . $this->db->escapeLikeParameter($token) . '%', IQueryBuilder::PARAM_STR),
+					IQueryBuilder::PARAM_STR
+				);
+			}, $query->getTextTokens())
+		);
+		$qb->andWhere(
+			$tokenMatching
+		);
+
+		$qb->groupBy('comments.id', 'c.id');
+		$qb->orderBy('comments.id', 'DESC');
+		if ($limit !== null) {
+			$qb->setMaxResults($limit);
+		}
+		if ($offset !== null) {
+			$qb->andWhere($qb->expr()->lt('comments.id', $qb->createNamedParameter($offset, IQueryBuilder::PARAM_INT)));
+		}
+
+		$result = $qb->execute();
+		$entities = $result->fetchAll();
+		$result->closeCursor();
+		return $entities;
+	}
+
+	private function extendQueryByFilter(IQueryBuilder $qb, SearchQuery $query) {
+		$qb->andWhere($qb->expr()->eq('c.deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)));
+		$qb->andWhere($qb->expr()->eq('s.deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)));
+		$qb->innerJoin('s', 'deck_boards', 'b', $qb->expr()->eq('b.id', 's.board_id'));
+		$qb->andWhere($qb->expr()->eq('b.deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)));
+
+		foreach ($query->getTitle() as $title) {
+			$qb->andWhere($qb->expr()->iLike('c.title', $qb->createNamedParameter('%' . $this->db->escapeLikeParameter($title->getValue()) . '%', IQueryBuilder::PARAM_STR)));
+		}
+
+		foreach ($query->getDescription() as $description) {
+			$qb->andWhere($qb->expr()->iLike('c.description', $qb->createNamedParameter('%' . $this->db->escapeLikeParameter($description->getValue()) . '%', IQueryBuilder::PARAM_STR)));
+		}
+
+		foreach ($query->getStack() as $stack) {
+			$qb->andWhere($qb->expr()->iLike('s.title', $qb->createNamedParameter('%' . $this->db->escapeLikeParameter($stack->getValue()) . '%', IQueryBuilder::PARAM_STR)));
+		}
+
+		if (count($query->getTag())) {
+			foreach ($query->getTag() as $index => $tag) {
+				$qb->innerJoin('c', 'deck_assigned_labels', 'al' . $index, $qb->expr()->eq('c.id', 'al' . $index . '.card_id'));
+				$qb->innerJoin('al'. $index, 'deck_labels', 'l' . $index, $qb->expr()->eq('al' . $index . '.label_id', 'l' . $index . '.id'));
+				$qb->andWhere($qb->expr()->iLike('l' . $index . '.title', $qb->createNamedParameter('%' . $this->db->escapeLikeParameter($tag->getValue()) . '%', IQueryBuilder::PARAM_STR)));
+			}
+		}
+
+		foreach ($query->getDuedate() as $duedate) {
+			$dueDateColumn = $this->databaseType === 'sqlite3' ? $qb->createFunction('DATETIME(`c`.`duedate`)') : 'c.duedate';
+			$date = $duedate->getValue();
+			if ($date === "") {
+				$qb->andWhere($qb->expr()->isNotNull('c.duedate'));
+				continue;
+			}
+			$supportedFilters = ['overdue', 'today', 'week', 'month', 'none'];
+			if (in_array($date, $supportedFilters, true)) {
+				$currentDate = new DateTime();
+				$rangeDate = new DateTime();
+				if ($date === 'overdue') {
+					$qb->andWhere($qb->expr()->lt($dueDateColumn, $this->dateTimeParameter($qb, $currentDate)));
+				} elseif ($date === 'today') {
+					$rangeDate = $rangeDate->add(new \DateInterval('P1D'));
+					$qb->andWhere($qb->expr()->gte($dueDateColumn, $this->dateTimeParameter($qb, $currentDate)));
+					$qb->andWhere($qb->expr()->lte($dueDateColumn, $this->dateTimeParameter($qb, $rangeDate)));
+				} elseif ($date === 'week') {
+					$rangeDate = $rangeDate->add(new \DateInterval('P7D'));
+					$qb->andWhere($qb->expr()->gte($dueDateColumn, $this->dateTimeParameter($qb, $currentDate)));
+					$qb->andWhere($qb->expr()->lte($dueDateColumn, $this->dateTimeParameter($qb, $rangeDate)));
+				} elseif ($date === 'month') {
+					$rangeDate = $rangeDate->add(new \DateInterval('P1M'));
+					$qb->andWhere($qb->expr()->gte($dueDateColumn, $this->dateTimeParameter($qb, $currentDate)));
+					$qb->andWhere($qb->expr()->lte($dueDateColumn, $this->dateTimeParameter($qb, $rangeDate)));
+				} else {
+					$qb->andWhere($qb->expr()->isNull('c.duedate'));
+				}
+			} else {
+				try {
+					$date = new DateTime($date);
+					if ($duedate->getComparator() === SearchQuery::COMPARATOR_LESS) {
+						$qb->andWhere($qb->expr()->lt($dueDateColumn, $this->dateTimeParameter($qb, $date)));
+					} elseif ($duedate->getComparator() === SearchQuery::COMPARATOR_LESS_EQUAL) {
+						// take the end of the day to include due dates at the same day (as datetime does't allow just setting the day)
+						$date->setTime(23, 59, 59);
+						$qb->andWhere($qb->expr()->lte($dueDateColumn, $this->dateTimeParameter($qb, $date)));
+					} elseif ($duedate->getComparator() === SearchQuery::COMPARATOR_MORE) {
+						// take the end of the day to exclude due dates at the same day (as datetime does't allow just setting the day)
+						$date->setTime(23, 59, 59);
+						$qb->andWhere($qb->expr()->gt($dueDateColumn, $this->dateTimeParameter($qb, $date)));
+					} elseif ($duedate->getComparator() === SearchQuery::COMPARATOR_MORE_EQUAL) {
+						$qb->andWhere($qb->expr()->gte($dueDateColumn, $this->dateTimeParameter($qb, $date)));
+					}
+				} catch (Exception $e) {
+					// Invalid date, ignoring
+				}
+			}
+		}
+
+		if (count($query->getAssigned()) > 0) {
+			foreach ($query->getAssigned() as $index => $assignment) {
+				$qb->innerJoin('c', 'deck_assigned_users', 'au' . $index, $qb->expr()->eq('c.id', 'au' . $index . '.card_id'));
+				$assignedQueryValue = $assignment->getValue();
+				if ($assignedQueryValue === "") {
+					$qb->andWhere($qb->expr()->isNotNull('au' . $index . '.participant'));
+					continue;
+				}
+				$searchUsers = $this->userManager->searchDisplayName($assignment->getValue());
+				$users = array_filter($searchUsers, function (IUser $user) use ($assignedQueryValue) {
+					return (mb_strtolower($user->getDisplayName()) === mb_strtolower($assignedQueryValue) || $user->getUID() === $assignedQueryValue);
+				});
+				$groups = $this->groupManager->search($assignment->getValue());
+				foreach ($searchUsers as $user) {
+					$groups = array_merge($groups, $this->groupManager->getUserIdGroups($user->getUID()));
+				}
+
+				$assignmentSearches = [];
+				$hasAssignedMatches = false;
+				foreach ($users as $user) {
+					$hasAssignedMatches = true;
+					$assignmentSearches[] = $qb->expr()->andX(
+						$qb->expr()->eq('au' . $index . '.participant', $qb->createNamedParameter($user->getUID(), IQueryBuilder::PARAM_STR)),
+						$qb->expr()->eq('au' . $index . '.type', $qb->createNamedParameter(Assignment::TYPE_USER, IQueryBuilder::PARAM_INT))
+					);
+				}
+				foreach ($groups as $group) {
+					$hasAssignedMatches = true;
+					$assignmentSearches[] = $qb->expr()->andX(
+						$qb->expr()->eq('au' . $index . '.participant', $qb->createNamedParameter($group->getGID(), IQueryBuilder::PARAM_STR)),
+						$qb->expr()->eq('au' . $index . '.type', $qb->createNamedParameter(Assignment::TYPE_GROUP, IQueryBuilder::PARAM_INT))
+					);
+				}
+				if (!$hasAssignedMatches) {
+					return [];
+				}
+				$qb->andWhere($qb->expr()->orX(...$assignmentSearches));
+			}
+		}
+	}
+
+	private function dateTimeParameter(IQueryBuilder $qb, DateTime $dateTime) {
+		if ($this->databaseType === 'sqlite3') {
+			return $qb->createFunction('DATETIME("' . $dateTime->format('Y-m-d\TH:i:s') . '")');
+		}
+		return $qb->createNamedParameter($dateTime, IQueryBuilder::PARAM_DATE);
+	}
+	
+	
+
 	public function searchRaw($boardIds, $term, $limit = null, $offset = null) {
 		$qb = $this->queryCardsByBoards($boardIds)
 			->select('s.board_id', 'board_id')

lib/Event/AAclEvent.php

@@ -1,6 +1,6 @@
 <?php
-/**
- * @copyright Copyright (c) 2020 Julius Härtl <jus@bitgrid.net>
+/*
+ * @copyright Copyright (c) 2021 Julius Härtl <jus@bitgrid.net>
  *
  * @author Julius Härtl <jus@bitgrid.net>
  *
@@ -21,31 +21,24 @@
  *
  */
 
+declare(strict_types=1);
+
+
 namespace OCA\Deck\Event;
 
+use OCA\Deck\Db\Acl;
 use OCP\EventDispatcher\Event;
 
-/**
- * This is a class to keep compatibility for currently used events in full text search integration
- */
-class FTSEvent extends Event {
-
-	/**
-	 * @var array
-	 */
-	private $arguments;
-
-	public function __construct($subject, $arguments = []) {
+abstract class AAclEvent extends Event {
+	private $acl;
+	
+	public function __construct(Acl $acl) {
 		parent::__construct();
 
-		$this->arguments = $arguments;
+		$this->acl = $acl;
 	}
 
-	public function getArgument($key) {
-		if (isset($this->arguments[$key])) {
-			return $this->arguments[$key];
-		}
-
-		throw new \InvalidArgumentException(sprintf('Argument "%s" not found.', $key));
+	public function getAcl(): Acl {
+		return $this->acl;
 	}
 }

lib/Event/ACardEvent.php

@@ -0,0 +1,44 @@
+<?php
+/*
+ * @copyright Copyright (c) 2021 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+declare(strict_types=1);
+
+
+namespace OCA\Deck\Event;
+
+use OCA\Deck\Db\Card;
+use OCP\EventDispatcher\Event;
+
+abstract class ACardEvent extends Event {
+	private $card;
+	
+	public function __construct(Card $card) {
+		parent::__construct();
+
+		$this->card = $card;
+	}
+
+	public function getCard(): Card {
+		return $this->card;
+	}
+}

lib/Event/AclCreatedEvent.php

@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+
+namespace OCA\Deck\Event;
+
+class AclCreatedEvent extends AAclEvent {
+}

lib/Event/AclDeletedEvent.php

@@ -0,0 +1,30 @@
+<?php
+/*
+ * @copyright Copyright (c) 2021 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+declare(strict_types=1);
+
+
+namespace OCA\Deck\Event;
+
+class AclDeletedEvent extends AAclEvent {
+}

lib/Event/AclUpdatedEvent.php

@@ -0,0 +1,30 @@
+<?php
+/*
+ * @copyright Copyright (c) 2021 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+declare(strict_types=1);
+
+
+namespace OCA\Deck\Event;
+
+class AclUpdatedEvent extends AAclEvent {
+}

lib/Event/CardCreatedEvent.php

@@ -0,0 +1,30 @@
+<?php
+/*
+ * @copyright Copyright (c) 2021 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+declare(strict_types=1);
+
+
+namespace OCA\Deck\Event;
+
+class CardCreatedEvent extends ACardEvent {
+}

lib/Event/CardDeletedEvent.php

@@ -0,0 +1,30 @@
+<?php
+/*
+ * @copyright Copyright (c) 2021 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+declare(strict_types=1);
+
+
+namespace OCA\Deck\Event;
+
+class CardDeletedEvent extends ACardEvent {
+}

lib/Event/CardUpdatedEvent.php

@@ -0,0 +1,30 @@
+<?php
+/*
+ * @copyright Copyright (c) 2021 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+declare(strict_types=1);
+
+
+namespace OCA\Deck\Event;
+
+class CardUpdatedEvent extends ACardEvent {
+}

lib/Listeners/FullTextSearchEventListener.php

@@ -0,0 +1,107 @@
+<?php
+/*
+ * @copyright Copyright (c) 2021 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+declare(strict_types=1);
+
+
+namespace OCA\Deck\Listeners;
+
+use OCA\Deck\Db\Card;
+use OCA\Deck\Event\AAclEvent;
+use OCA\Deck\Event\ACardEvent;
+use OCA\Deck\Event\CardCreatedEvent;
+use OCA\Deck\Event\CardDeletedEvent;
+use OCA\Deck\Event\CardUpdatedEvent;
+use OCA\Deck\Provider\DeckProvider;
+use OCA\Deck\Service\FullTextSearchService;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
+use OCP\FullTextSearch\Exceptions\FullTextSearchAppNotAvailableException;
+use OCP\FullTextSearch\IFullTextSearchManager;
+use OCP\FullTextSearch\Model\IIndex;
+use Psr\Container\ContainerInterface;
+use Psr\Log\LoggerInterface;
+
+class FullTextSearchEventListener implements IEventListener {
+	
+	/** @var string|null */
+	private $userId;
+	/** @var IFullTextSearchManager|null */
+	private $manager;
+	/** @var FullTextSearchService|null */
+	private $service;
+	/** @var LoggerInterface */
+	private $logger;
+	
+	public function __construct(ContainerInterface $container, $userId) {
+		$this->userId = $userId;
+		$this->logger = $container->get(LoggerInterface::class);
+		try {
+			$this->manager = $container->get(IFullTextSearchManager::class);
+			$this->service = $container->get(FullTextSearchService::class);
+		} catch (\Exception $e) {
+			// skipping in case FTS is not available
+		}
+	}
+
+	public function handle(Event $event): void {
+		if (!$event instanceof ACardEvent && !$event instanceof AAclEvent) {
+			return;
+		}
+		
+		try {
+			if ($event instanceof CardCreatedEvent) {
+				$this->manager->createIndex(
+					DeckProvider::DECK_PROVIDER_ID, (string)$event->getCard()->getId(), $this->userId
+				);
+			}
+			if ($event instanceof CardUpdatedEvent) {
+				$this->manager->updateIndexStatus(
+					DeckProvider::DECK_PROVIDER_ID, (string)$event->getCard()->getId(), IIndex::INDEX_CONTENT
+				);
+			}
+			if ($event instanceof CardDeletedEvent) {
+				$this->manager->updateIndexStatus(
+					DeckProvider::DECK_PROVIDER_ID, (string)$event->getCard()->getId(), IIndex::INDEX_REMOVE
+				);
+			}
+
+			if ($event instanceof AAclEvent) {
+				$acl = $event->getAcl();
+				$cards = array_map(
+					static function (Card $card) {
+						return (string)$card->getId();
+					},
+					$this->service->getCardsFromBoard($acl->getBoardId())
+				);
+				$this->manager->updateIndexesStatus(
+					DeckProvider::DECK_PROVIDER_ID, $cards, IIndex::INDEX_META
+				);
+			}
+		} catch (FullTextSearchAppNotAvailableException $e) {
+			// Skip silently if no full text search app is available
+		} catch (\Exception $e) {
+			$this->logger->error('Error when handling deck full text search event', ['exception' => $e]);
+		}
+	}
+}

lib/Middleware/ExceptionMiddleware.php

@@ -32,6 +32,7 @@ use OCP\AppFramework\Http\JSONResponse;
 use OCP\AppFramework\OCS\OCSException;
 use OCP\AppFramework\OCSController;
 use OCP\ILogger;
+use OCP\IRequest;
 use OCP\Util;
 use OCP\IConfig;
 
@@ -41,6 +42,8 @@ class ExceptionMiddleware extends Middleware {
 	private $logger;
 	/** @var IConfig */
 	private $config;
+	/** @var IRequest */
+	private $request;
 
 	/**
 	 * SharingMiddleware constructor.
@@ -48,9 +51,10 @@ class ExceptionMiddleware extends Middleware {
 	 * @param ILogger $logger
 	 * @param IConfig $config
 	 */
-	public function __construct(ILogger $logger, IConfig $config) {
+	public function __construct(ILogger $logger, IConfig $config, IRequest $request) {
 		$this->logger = $logger;
 		$this->config = $config;
+		$this->request = $request;
 	}
 
 	/**
@@ -67,45 +71,10 @@ class ExceptionMiddleware extends Middleware {
 			throw $exception;
 		}
 
-		if ($exception instanceof ConflictException) {
-			if ($this->config->getSystemValue('loglevel', Util::WARN) === Util::DEBUG) {
-				$this->logger->logException($exception);
-			}
-			return new JSONResponse([
-				'status' => $exception->getStatus(),
-				'message' => $exception->getMessage(),
-				'data' => $exception->getData(),
-			], $exception->getStatus());
-		}
-		
-		if ($exception instanceof StatusException) {
-			if ($this->config->getSystemValue('loglevel', Util::WARN) === Util::DEBUG) {
-				$this->logger->logException($exception);
-			}
-
-			if ($controller instanceof OCSController) {
-				$exception = new OCSException($exception->getMessage(), $exception->getStatus(), $exception);
-				throw $exception;
-			}
-			return new JSONResponse([
-				'status' => $exception->getStatus(),
-				'message' => $exception->getMessage()
-			], $exception->getStatus());
-		}
-
-		if (strpos(get_class($controller), 'OCA\\Deck\\Controller\\') === 0) {
-			$response = [
-				'status' => 500,
-				'message' => $exception->getMessage()
-			];
-			if ($this->config->getSystemValue('loglevel', Util::WARN) === Util::DEBUG) {
-				$this->logger->logException($exception);
-			}
-			if ($this->config->getSystemValue('debug', true) === true) {
-				$response['exception'] = (array) $exception;
-			}
-			return new JSONResponse($response, 500);
-		}
+		$debugMode = $this->config->getSystemValue('debug', false);
+		$exceptionMessage = $debugMode !== true
+			? 'Internal server error: Please contact the server administrator if this error reappears multiple times, please include the request ID "' . $this->request->getId() . '" below in your report.'
+			: $exception->getMessage();
 
 		// uncatched DoesNotExistExceptions will be thrown when the main entity is not found
 		// we return a 403 so we don't leak information over existing entries
@@ -116,6 +85,43 @@ class ExceptionMiddleware extends Middleware {
 				'message' => 'Permission denied'
 			], 403);
 		}
+		
+		if ($exception instanceof StatusException) {
+			if ($this->config->getSystemValue('loglevel', Util::WARN) === Util::DEBUG) {
+				$this->logger->logException($exception);
+			}
+
+			if ($exception instanceof ConflictException) {
+				return new JSONResponse([
+					'status' => $exception->getStatus(),
+					'message' => $exception->getMessage(),
+					'data' => $exception->getData(),
+				], $exception->getStatus());
+			}
+
+			if ($controller instanceof OCSController) {
+				$exception = new OCSException($exception->getMessage(), $exception->getStatus(), $exception);
+				throw $exception;
+			}
+
+			return new JSONResponse([
+				'status' => $exception->getStatus(),
+				'message' => $exception->getMessage(),
+			], $exception->getStatus());
+		}
+
+		if (strpos(get_class($controller), 'OCA\\Deck\\Controller\\') === 0) {
+			$response = [
+				'status' => 500,
+				'message' => $exceptionMessage,
+				'requestId' => $this->request->getId(),
+			];
+			$this->logger->logException($exception);
+			if ($debugMode === true) {
+				$response['exception'] = (array) $exception;
+			}
+			return new JSONResponse($response, 500);
+		}
 
 		throw $exception;
 	}

lib/Notification/NotificationHelper.php

@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * @copyright Copyright (c) 2017 Julius Härtl <jus@bitgrid.net>
  *
@@ -24,19 +27,24 @@
 namespace OCA\Deck\Notification;
 
 use DateTime;
+use Exception;
 use OCA\Deck\AppInfo\Application;
 use OCA\Deck\Db\Acl;
 use OCA\Deck\Db\AssignmentMapper;
 use OCA\Deck\Db\Board;
 use OCA\Deck\Db\BoardMapper;
+use OCA\Deck\Db\Card;
 use OCA\Deck\Db\CardMapper;
 use OCA\Deck\Db\User;
 use OCA\Deck\Service\ConfigService;
 use OCA\Deck\Service\PermissionService;
+use OCP\AppFramework\Db\DoesNotExistException;
+use OCP\AppFramework\Db\MultipleObjectsReturnedException;
 use OCP\Comments\IComment;
 use OCP\IConfig;
 use OCP\IGroupManager;
 use OCP\Notification\IManager;
+use OCP\Notification\INotification;
 
 class NotificationHelper {
 
@@ -80,10 +88,10 @@ class NotificationHelper {
 	}
 
 	/**
-	 * @param $card
-	 * @throws \OCP\AppFramework\Db\DoesNotExistException
+	 * @throws DoesNotExistException
+	 * @throws Exception thrown on invalid due date
 	 */
-	public function sendCardDuedate($card) {
+	public function sendCardDuedate(Card $card): void {
 		// check if notification has already been sent
 		// ideally notifications should not be deleted once seen by the user so we can
 		// also deliver due date notifications for users who have been added later to a board
@@ -117,7 +125,7 @@ class NotificationHelper {
 				$notification
 					->setApp('deck')
 					->setUser((string)$user->getUID())
-					->setObject('card', $card->getId())
+					->setObject('card', (string)$card->getId())
 					->setSubject('card-overdue', [
 						$card->getTitle(), $board->getTitle()
 					])
@@ -128,25 +136,29 @@ class NotificationHelper {
 		$this->cardMapper->markNotified($card);
 	}
 
-	public function markDuedateAsRead($card) {
+	public function markDuedateAsRead(Card $card): void {
 		$notification = $this->notificationManager->createNotification();
 		$notification
 			->setApp('deck')
-			->setObject('card', $card->getId())
+			->setObject('card', (string)$card->getId())
 			->setSubject('card-overdue', []);
 		$this->notificationManager->markProcessed($notification);
 	}
 
-	public function sendCardAssigned($card, $userId) {
+	public function sendCardAssigned(Card $card, string $userId): void {
 		$boardId = $this->cardMapper->findBoardId($card->getId());
-		$board = $this->getBoard($boardId);
+		try {
+			$board = $this->getBoard($boardId);
+		} catch (Exception $e) {
+			return;
+		}
 
 		$notification = $this->notificationManager->createNotification();
 		$notification
 			->setApp('deck')
-			->setUser((string) $userId)
+			->setUser($userId)
 			->setDateTime(new DateTime())
-			->setObject('card', $card->getId())
+			->setObject('card', (string)$card->getId())
 				->setSubject('card-assigned', [
 					$card->getTitle(),
 					$board->getTitle(),
@@ -155,29 +167,56 @@ class NotificationHelper {
 		$this->notificationManager->notify($notification);
 	}
 
+	public function markCardAssignedAsRead(Card $card, string $userId): void {
+		$notification = $this->notificationManager->createNotification();
+		$notification
+			->setApp('deck')
+			->setUser($userId)
+			->setObject('card', (string)$card->getId())
+			->setSubject('card-assigned', []);
+		$this->notificationManager->markProcessed($notification);
+	}
+
 	/**
 	 * Send notifications that a board was shared with a user/group
-	 *
-	 * @param $boardId
-	 * @param Acl $acl
-	 * @throws \InvalidArgumentException
 	 */
-	public function sendBoardShared($boardId, $acl) {
-		$board = $this->getBoard($boardId);
+	public function sendBoardShared(int $boardId, Acl $acl, bool $markAsRead = false): void {
+		try {
+			$board = $this->getBoard($boardId);
+		} catch (Exception $e) {
+			return;
+		}
+
 		if ($acl->getType() === Acl::PERMISSION_TYPE_USER) {
 			$notification = $this->generateBoardShared($board, $acl->getParticipant());
-			$this->notificationManager->notify($notification);
+			if ($markAsRead) {
+				$this->notificationManager->markProcessed($notification);
+			} else {
+				$notification->setDateTime(new DateTime());
+				$this->notificationManager->notify($notification);
+			}
 		}
 		if ($acl->getType() === Acl::PERMISSION_TYPE_GROUP) {
 			$group = $this->groupManager->get($acl->getParticipant());
+			if ($group === null) {
+				return;
+			}
 			foreach ($group->getUsers() as $user) {
+				if ($user->getUID() === $this->currentUser) {
+					continue;
+				}
 				$notification = $this->generateBoardShared($board, $user->getUID());
-				$this->notificationManager->notify($notification);
+				if ($markAsRead) {
+					$this->notificationManager->markProcessed($notification);
+				} else {
+					$notification->setDateTime(new DateTime());
+					$this->notificationManager->notify($notification);
+				}
 			}
 		}
 	}
 
-	public function sendMention(IComment $comment) {
+	public function sendMention(IComment $comment): void {
 		foreach ($comment->getMentions() as $mention) {
 			$card = $this->cardMapper->find($comment->getObjectId());
 			$boardId = $this->cardMapper->findBoardId($card->getId());
@@ -194,27 +233,22 @@ class NotificationHelper {
 	}
 
 	/**
-	 * @param $boardId
-	 * @return Board
-	 * @throws \OCP\AppFramework\Db\DoesNotExistException
+	 * @throws DoesNotExistException
+	 * @throws MultipleObjectsReturnedException
 	 */
-	private function getBoard($boardId, bool $withLabels = false, bool $withAcl = false) {
+	private function getBoard(int $boardId, bool $withLabels = false, bool $withAcl = false): Board {
 		if (!array_key_exists($boardId, $this->boards)) {
 			$this->boards[$boardId] = $this->boardMapper->find($boardId, $withLabels, $withAcl);
 		}
 		return $this->boards[$boardId];
 	}
-
-	/**
-	 * @param Board $board
-	 */
-	private function generateBoardShared($board, $userId) {
+	
+	private function generateBoardShared(Board $board, string $userId): INotification {
 		$notification = $this->notificationManager->createNotification();
 		$notification
 			->setApp('deck')
-			->setUser((string) $userId)
-			->setDateTime(new DateTime())
-			->setObject('board', $board->getId())
+			->setUser($userId)
+			->setObject('board', (string)$board->getId())
 			->setSubject('board-shared', [$board->getTitle(), $this->currentUser]);
 		return $notification;
 	}

lib/Notification/Notifier.php

@@ -25,6 +25,7 @@ namespace OCA\Deck\Notification;
 
 use OCA\Deck\Db\BoardMapper;
 use OCA\Deck\Db\CardMapper;
+use OCA\Deck\Db\StackMapper;
 use OCP\IURLGenerator;
 use OCP\IUserManager;
 use OCP\L10N\IFactory;
@@ -41,6 +42,8 @@ class Notifier implements INotifier {
 	protected $userManager;
 	/** @var CardMapper */
 	protected $cardMapper;
+	/** @var StackMapper */
+	protected $stackMapper;
 	/** @var BoardMapper */
 	protected $boardMapper;
 
@@ -49,12 +52,14 @@ class Notifier implements INotifier {
 		IURLGenerator $url,
 		IUserManager $userManager,
 		CardMapper $cardMapper,
+		StackMapper $stackMapper,
 		BoardMapper $boardMapper
 	) {
 		$this->l10nFactory = $l10nFactory;
 		$this->url = $url;
 		$this->userManager = $userManager;
 		$this->cardMapper = $cardMapper;
+		$this->stackMapper = $stackMapper;
 		$this->boardMapper = $boardMapper;
 	}
 
@@ -100,6 +105,11 @@ class Notifier implements INotifier {
 				if (!$boardId) {
 					throw new AlreadyProcessedException();
 				}
+
+				$card = $this->cardMapper->find($cardId);
+				$stackId = $card->getStackId();
+				$stack = $this->stackMapper->find($stackId);
+
 				$initiator = $this->userManager->get($params[2]);
 				if ($initiator !== null) {
 					$dn = $initiator->getDisplayName();
@@ -110,8 +120,22 @@ class Notifier implements INotifier {
 					(string) $l->t('The card "%s" on "%s" has been assigned to you by %s.', [$params[0], $params[1], $dn])
 				);
 				$notification->setRichSubject(
-					(string) $l->t('{user} has assigned the card "%s" on "%s" to you.', [$params[0], $params[1]]),
+					$l->t('{user} has assigned the card {deck-card} on {deck-board} to you.'),
 					[
+						'deck-card' => [
+							'type' => 'deck-card',
+							'id' => $cardId,
+							'name' => $params[0],
+							'boardname' => $params[1],
+							'stackname' => $stack->getTitle(),
+							'link' => $this->url->linkToRouteAbsolute('deck.page.index') . '#/board/' . $boardId . '/card/' . $cardId . '',
+						],
+						'deck-board' => [
+							'type' => 'deck-board',
+							'id' => $boardId,
+							'name' => $params[1],
+							'link' => $this->url->linkToRouteAbsolute('deck.page.index') . '#/board/' . $boardId,
+						],
 						'user' => [
 							'type' => 'user',
 							'id' => $params[2],
@@ -127,9 +151,33 @@ class Notifier implements INotifier {
 				if (!$boardId) {
 					throw new AlreadyProcessedException();
 				}
+
+				$card = $this->cardMapper->find($cardId);
+				$stackId = $card->getStackId();
+				$stack = $this->stackMapper->find($stackId);
+
 				$notification->setParsedSubject(
 					(string) $l->t('The card "%s" on "%s" has reached its due date.', $params)
 				);
+				$notification->setRichSubject(
+					$l->t('The card {deck-card} on {deck-board} has reached its due date.'),
+					[
+						'deck-card' => [
+							'type' => 'deck-card',
+							'id' => $cardId,
+							'name' => $params[0],
+							'boardname' => $params[1],
+							'stackname' => $stack->getTitle(),
+							'link' => $this->url->linkToRouteAbsolute('deck.page.index') . '#/board/' . $boardId . '/card/' . $cardId . '',
+						],
+						'deck-board' => [
+							'type' => 'deck-board',
+							'id' => $boardId,
+							'name' => $params[1],
+							'link' => $this->url->linkToRouteAbsolute('deck.page.index') . '#/board/' . $boardId,
+						],
+					]
+				);
 				$notification->setLink($this->url->linkToRouteAbsolute('deck.page.index') . '#/board/' . $boardId . '/card/' . $cardId . '');
 				break;
 			case 'card-comment-mentioned':
@@ -138,6 +186,11 @@ class Notifier implements INotifier {
 				if (!$boardId) {
 					throw new AlreadyProcessedException();
 				}
+
+				$card = $this->cardMapper->find($cardId);
+				$stackId = $card->getStackId();
+				$stack = $this->stackMapper->find($stackId);
+
 				$initiator = $this->userManager->get($params[2]);
 				if ($initiator !== null) {
 					$dn = $initiator->getDisplayName();
@@ -148,8 +201,16 @@ class Notifier implements INotifier {
 					(string) $l->t('%s has mentioned you in a comment on "%s".', [$dn, $params[0]])
 				);
 				$notification->setRichSubject(
-					(string) $l->t('{user} has mentioned you in a comment on "%s".', [$params[0]]),
+					$l->t('{user} has mentioned you in a comment on {deck-card}.'),
 					[
+						'deck-card' => [
+							'type' => 'deck-card',
+							'id' => $cardId,
+							'name' => $params[0],
+							'boardname' => $params[1],
+							'stackname' => $stack->getTitle(),
+							'link' => $this->url->linkToRouteAbsolute('deck.page.index') . '#/board/' . $boardId . '/card/' . $cardId . '',
+						],
 						'user' => [
 							'type' => 'user',
 							'id' => $params[2],
@@ -177,8 +238,14 @@ class Notifier implements INotifier {
 					(string) $l->t('The board "%s" has been shared with you by %s.', [$params[0], $dn])
 				);
 				$notification->setRichSubject(
-					(string) $l->t('{user} has shared the board %s with you.', [$params[0]]),
+					$l->t('{user} has shared {deck-board} with you.'),
 					[
+						'deck-board' => [
+							'type' => 'deck-board',
+							'id' => $boardId,
+							'name' => $params[0],
+							'link' => $this->url->linkToRouteAbsolute('deck.page.index') . '#/board/' . $boardId,
+						],
 						'user' => [
 							'type' => 'user',
 							'id' => $params[1],

lib/Search/CardCommentProvider.php

@@ -0,0 +1,84 @@
+<?php
+/**
+ * @copyright Copyright (c) 2020 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+declare(strict_types=1);
+
+
+namespace OCA\Deck\Search;
+
+use OCA\Deck\Service\SearchService;
+use OCP\IL10N;
+use OCP\IUser;
+use OCP\Search\IProvider;
+use OCP\Search\ISearchQuery;
+use OCP\Search\SearchResult;
+
+class CardCommentProvider implements IProvider {
+
+	/** @var SearchService */
+	private $searchService;
+	/** @var IL10N */
+	private $l10n;
+
+	public function __construct(
+		SearchService $searchService,
+		IL10N $l10n
+	) {
+		$this->searchService = $searchService;
+		$this->l10n = $l10n;
+	}
+
+	public function getId(): string {
+		return 'deck-comment';
+	}
+
+	public function getName(): string {
+		return $this->l10n->t('Card comments');
+	}
+
+	public function search(IUser $user, ISearchQuery $query): SearchResult {
+		$cursor = $query->getCursor() !== null ? (int)$query->getCursor() : null;
+		$results = $this->searchService->searchComments($query->getTerm(), $query->getLimit(), $cursor);
+		if (count($results) < $query->getLimit()) {
+			return SearchResult::complete(
+				$this->l10n->t('Card comments'),
+				$results
+			);
+		}
+		
+		return SearchResult::paginated(
+			$this->l10n->t('Card comments'),
+			$results,
+			$results[count($results) - 1]->getCommentId()
+		);
+	}
+
+	public function getOrder(string $route, array $routeParameters): int {
+		// Negative value to force showing deck providers on first position if the app is opened
+		// This provider always has an order 1 higher than the default DeckProvider
+		if ($route === 'deck.Page.index') {
+			return -4;
+		}
+		return 11;
+	}
+}

lib/Search/CommentSearchResultEntry.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * @copyright Copyright (c) 2020 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+declare(strict_types=1);
+
+
+namespace OCA\Deck\Search;
+
+use OCA\Deck\Db\Card;
+use OCP\IL10N;
+use OCP\IURLGenerator;
+use OCP\Search\SearchResultEntry;
+
+class CommentSearchResultEntry extends SearchResultEntry {
+	private $commentId;
+
+	public function __construct(string $commentId, string $commentMessage, string $commentAuthor, Card $card, IURLGenerator $urlGenerator, IL10N $l10n) {
+		parent::__construct(
+			'',
+			// TRANSLATORS This is describing the author and card title related to a comment e.g. "Jane on MyTask"
+			$l10n->t('%s on %s', [$commentAuthor, $card->getTitle()]),
+			$commentMessage,
+			$urlGenerator->linkToRouteAbsolute('deck.page.index') . '#/board/' . $card->getRelatedBoard()->getId() . '/card/' . $card->getId() . '/comments/' . $commentId, // $commentId
+			'icon-comment');
+		$this->commentId = $commentId;
+	}
+
+	public function getCommentId(): string {
+		return $this->commentId;
+	}
+}

lib/Search/DeckProvider.php

@@ -28,9 +28,7 @@ namespace OCA\Deck\Search;
 
 use OCA\Deck\Db\Board;
 use OCA\Deck\Db\Card;
-use OCA\Deck\Db\CardMapper;
-use OCA\Deck\Db\StackMapper;
-use OCA\Deck\Service\BoardService;
+use OCA\Deck\Service\SearchService;
 use OCP\IURLGenerator;
 use OCP\IUser;
 use OCP\Search\IProvider;
@@ -40,31 +38,19 @@ use OCP\Search\SearchResult;
 class DeckProvider implements IProvider {
 
 	/**
-	 * @var BoardService
+	 * @var SearchService
 	 */
-	private $boardService;
-	/**
-	 * @var CardMapper
-	 */
-	private $cardMapper;
-	/**
-	 * @var StackMapper
-	 */
-	private $stackMapper;
+	private $searchService;
 	/**
 	 * @var IURLGenerator
 	 */
 	private $urlGenerator;
 
 	public function __construct(
-		BoardService $boardService,
-		StackMapper $stackMapper,
-		CardMapper $cardMapper,
+		SearchService $searchService,
 		IURLGenerator $urlGenerator
 	) {
-		$this->boardService = $boardService;
-		$this->stackMapper = $stackMapper;
-		$this->cardMapper = $cardMapper;
+		$this->searchService = $searchService;
 		$this->urlGenerator = $urlGenerator;
 	}
 
@@ -77,39 +63,82 @@ class DeckProvider implements IProvider {
 	}
 
 	public function search(IUser $user, ISearchQuery $query): SearchResult {
-		$boards = $this->boardService->getUserBoards();
+		$cursor = $query->getCursor();
+		[$boardCursor, $cardCursor] = $this->parseCursor($cursor);
 
-		$matchedBoards = array_filter($this->boardService->getUserBoards(), static function (Board $board) use ($query) {
-			return mb_stripos($board->getTitle(), $query->getTerm()) > -1;
+		$boardObjects = $this->searchService->searchBoards($query->getTerm(), $query->getLimit(), $boardCursor);
+		$boardResults = array_map(function (Board $board) {
+			return [
+				'object' => $board,
+				'entry' => new BoardSearchResultEntry($board, $this->urlGenerator)
+			];
+		}, $boardObjects);
+
+		$cardObjects = $this->searchService->searchCards($query->getTerm(), $query->getLimit(), $cardCursor);
+		$cardResults = array_map(function (Card $card) {
+			return [
+				'object' => $card,
+				'entry' => new CardSearchResultEntry($card->getRelatedBoard(), $card->getRelatedStack(), $card, $this->urlGenerator)
+			];
+		}, $cardObjects);
+
+		$results = array_merge($boardResults, $cardResults);
+
+		usort($results, function ($a, $b) {
+			$ta = $a['object']->getLastModified();
+			$tb = $b['object']->getLastModified();
+			return $ta === $tb
+				? 0
+				: ($ta > $tb ? -1 : 1);
 		});
 
-		$matchedCards = $this->cardMapper->search(array_map(static function (Board $board) {
-			return $board->getId();
-		}, $boards), $query->getTerm(), $query->getLimit(), $query->getCursor());
+		$resultEntries = array_map(function (array $result) {
+			return $result['entry'];
+		}, $results);
 
-		$self = $this;
-		$results = array_merge(
-			array_map(function (Board $board) {
-				return new BoardSearchResultEntry($board, $this->urlGenerator);
-			}, $matchedBoards),
+		// if both cards and boards results are less then the limit, we know we won't get more
+		if (count($resultEntries) < $query->getLimit()) {
+			return SearchResult::complete(
+				'Deck',
+				$resultEntries
+			);
+		}
 
-			array_map(function (Card $card) use ($self) {
-				$board = $self->boardService->find($self->cardMapper->findBoardId($card->getId()));
-				$stack = $self->stackMapper->find($card->getStackId());
-				return new CardSearchResultEntry($board, $stack, $card, $this->urlGenerator);
-			}, $matchedCards)
-		);
-
-		return SearchResult::complete(
+		$newCursor = $this->getNewCursor($boardObjects, $cardObjects);
+		return SearchResult::paginated(
 			'Deck',
-			$results
+			$resultEntries,
+			$newCursor
 		);
 	}
 
 	public function getOrder(string $route, array $routeParameters): int {
-		if ($route === 'deck.page.index') {
+		if ($route === 'deck.Page.index') {
 			return -5;
 		}
 		return 10;
 	}
+
+	private function parseCursor(?string $cursor): array {
+		$boardCursor = null;
+		$cardCursor = null;
+		if ($cursor !== null) {
+			$splitCursor = explode('|', $cursor);
+			if (count($splitCursor) >= 2) {
+				$boardCursor = (int)$splitCursor[0] ?: null;
+				$cardCursor = (int)$splitCursor[1] ?: null;
+			}
+		}
+		return [$boardCursor, $cardCursor];
+	}
+
+	private function getNewCursor(array $boards, array $cards): string {
+		$boardTimestamps = array_map(function (Board $board) {
+			return $board->getLastModified();
+		}, $boards);
+		$cardTimestamps = array_map(function (Card $card) {
+			return $card->getLastModified();
+		}, $cards);
+		return (min($boardTimestamps) ?: '') . '|' . (min($cardTimestamps) ?: '');
+	}
 }

lib/Search/FilterStringParser.php

@@ -0,0 +1,125 @@
+<?php
+/*
+ * @copyright Copyright (c) 2021 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+declare(strict_types=1);
+
+
+namespace OCA\Deck\Search;
+
+use OCA\Deck\Search\Query\DateQueryParameter;
+use OCA\Deck\Search\Query\SearchQuery;
+use OCA\Deck\Search\Query\StringQueryParameter;
+use OCP\IL10N;
+
+class FilterStringParser {
+
+	/**
+	 * @var IL10N
+	 */
+	private $l10n;
+
+	public function __construct(IL10N $l10n) {
+		$this->l10n = $l10n;
+	}
+	
+	public function parse(?string $filter): SearchQuery {
+		$query = new SearchQuery();
+		if (empty($filter)) {
+			return $query;
+		}
+		/**
+		 * Match search tokens that are separated by spaces
+		 * do not match spaces that are surrounded by single or double quotes
+		 * in order to still match quotes
+		 * e.g.:
+		 * - test
+		 * - test:query
+		 * - test:<123
+		 * - test:"1 2 3"
+		 * - test:>="2020-01-01"
+		 */
+		$searchQueryExpression = '/((\w+:(<|<=|>|>=)?)?("([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'([^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\')|[^\s]+)/';
+		preg_match_all($searchQueryExpression, $filter, $matches, PREG_SET_ORDER, 0);
+		foreach ($matches as $match) {
+			$token = $match[0];
+			if (!$this->parseFilterToken($query, $token)) {
+				$query->addTextToken($this->removeQuotes($token));
+			}
+		}
+
+		return $query;
+	}
+
+	private function parseFilterToken(SearchQuery $query, string $token): bool {
+		if (strpos($token, ':') === false) {
+			return false;
+		}
+
+		[$type, $param] = explode(':', $token, 2);
+		$type = strtolower($type);
+
+		$qualifier = null;
+
+		switch ($type) {
+			case 'date':
+				$comparator = SearchQuery::COMPARATOR_EQUAL;
+				$value = $param;
+				if ($param[0] === '<' || $param[0] === '>') {
+					$orEquals = $param[1] === '=';
+					$value = $orEquals ? substr($param, 2) : substr($param, 1);
+					$comparator = (
+						($param[0] === '<' ? SearchQuery::COMPARATOR_LESS : 0) |
+						($param[0] === '>' ? SearchQuery::COMPARATOR_MORE : 0) |
+						($orEquals ? SearchQuery::COMPARATOR_EQUAL : 0)
+					);
+				}
+				$query->addDuedate(new DateQueryParameter('date', $comparator, $this->removeQuotes($value)));
+				return true;
+			case 'title':
+				$query->addTitle(new StringQueryParameter('title', SearchQuery::COMPARATOR_EQUAL, $this->removeQuotes($param)));
+				return true;
+			case 'description':
+				$query->addDescription(new StringQueryParameter('description', SearchQuery::COMPARATOR_EQUAL, $this->removeQuotes($param)));
+				return true;
+			case 'list':
+				$query->addStack(new StringQueryParameter('list', SearchQuery::COMPARATOR_EQUAL, $this->removeQuotes($param)));
+				return true;
+			case 'tag':
+				$query->addTag(new StringQueryParameter('tag', SearchQuery::COMPARATOR_EQUAL, $this->removeQuotes($param)));
+				return true;
+			case 'assigned':
+				$query->addAssigned(new StringQueryParameter('assigned', SearchQuery::COMPARATOR_EQUAL, $this->removeQuotes($param)));
+				return true;
+		}
+
+		return false;
+	}
+
+	protected function removeQuotes(string $token): string {
+		if (mb_strlen($token) > 1) {
+			$token = ($token[0] === '"' && $token[mb_strlen($token) - 1] === '"') ? mb_substr($token, 1, -1) : $token;
+			$token = ($token[0] === '\'' && $token[mb_strlen($token) - 1] === '\'') ? mb_substr($token, 1, -1) : $token;
+		}
+		return $token;
+	}
+}

lib/Search/Query/AQueryParameter.php

@@ -0,0 +1,49 @@
+<?php
+/*
+ * @copyright Copyright (c) 2021 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+declare(strict_types=1);
+
+
+namespace OCA\Deck\Search\Query;
+
+class AQueryParameter {
+
+	/** @var string */
+	protected $field;
+	/** @var int */
+	protected $comparator;
+	/** @var mixed */
+	protected $value;
+	
+	public function getValue() {
+		if (is_string($this->value) && mb_strlen($this->value) > 1) {
+			$param = (mb_substr($this->value, 0, 1) === '"' && mb_substr($this->value, -1, 1) === '"') ? mb_substr($this->value, 1, -1): $this->value;
+			return $param;
+		}
+		return $this->value;
+	}
+	
+	public function getComparator(): int {
+		return $this->comparator;
+	}
+}

lib/Search/Query/DateQueryParameter.php

@@ -0,0 +1,38 @@
+<?php
+/*
+ * @copyright Copyright (c) 2021 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+declare(strict_types=1);
+
+
+namespace OCA\Deck\Search\Query;
+
+class DateQueryParameter extends AQueryParameter {
+	/** @var string|null */
+	protected $value;
+
+	public function __construct(string $field, int $comparator, ?string $value) {
+		$this->field = $field;
+		$this->comparator = $comparator;
+		$this->value = $value;
+	}
+}

lib/Search/Query/SearchQuery.php

@@ -0,0 +1,109 @@
+<?php
+/*
+ * @copyright Copyright (c) 2021 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+declare(strict_types=1);
+
+
+namespace OCA\Deck\Search\Query;
+
+class SearchQuery {
+	public const COMPARATOR_EQUAL = 1;
+	
+	public const COMPARATOR_LESS = 2;
+	public const COMPARATOR_MORE = 4;
+	
+	public const COMPARATOR_LESS_EQUAL = 3;
+	public const COMPARATOR_MORE_EQUAL = 5;
+
+	/** @var string[] */
+	private $textTokens = [];
+	/** @var StringQueryParameter[] */
+	private $title = [];
+	/** @var StringQueryParameter[] */
+	private $description = [];
+	/** @var StringQueryParameter[] */
+	private $stack = [];
+	/** @var StringQueryParameter[] */
+	private $tag = [];
+	/** @var StringQueryParameter[] */
+	private $assigned = [];
+	/** @var DateQueryParameter[] */
+	private $duedate = [];
+
+
+	public function addTextToken(string $textToken): void {
+		$this->textTokens[] = $textToken;
+	}
+
+	public function getTextTokens(): array {
+		return $this->textTokens;
+	}
+	
+	public function addTitle(StringQueryParameter $title): void {
+		$this->title[] = $title;
+	}
+	
+	public function getTitle(): array {
+		return $this->title;
+	}
+
+	public function addDescription(StringQueryParameter $description): void {
+		$this->description[] = $description;
+	}
+
+	public function getDescription(): array {
+		return $this->description;
+	}
+
+	public function addStack(StringQueryParameter $stack): void {
+		$this->stack[] = $stack;
+	}
+
+	public function getStack(): array {
+		return $this->stack;
+	}
+
+	public function addTag(StringQueryParameter $tag): void {
+		$this->tag[] = $tag;
+	}
+
+	public function getTag(): array {
+		return $this->tag;
+	}
+
+	public function addAssigned(StringQueryParameter $assigned): void {
+		$this->assigned[] = $assigned;
+	}
+
+	public function getAssigned(): array {
+		return $this->assigned;
+	}
+
+	public function addDuedate(DateQueryParameter $date): void {
+		$this->duedate[] = $date;
+	}
+
+	public function getDuedate(): array {
+		return $this->duedate;
+	}
+}

lib/Search/Query/StringQueryParameter.php

@@ -0,0 +1,39 @@
+<?php
+/*
+ * @copyright Copyright (c) 2021 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+declare(strict_types=1);
+
+
+namespace OCA\Deck\Search\Query;
+
+class StringQueryParameter extends AQueryParameter {
+	
+	/** @var string */
+	protected $value;
+	
+	public function __construct(string $field, int $comparator, string $value) {
+		$this->field = $field;
+		$this->comparator = $comparator;
+		$this->value = $value;
+	}
+}

lib/Service/AssignmentService.php

@@ -31,7 +31,7 @@ use OCA\Deck\Db\Assignment;
 use OCA\Deck\Db\AssignmentMapper;
 use OCA\Deck\Db\CardMapper;
 use OCA\Deck\Db\ChangeHelper;
-use OCA\Deck\Event\FTSEvent;
+use OCA\Deck\Event\CardUpdatedEvent;
 use OCA\Deck\NoPermissionException;
 use OCA\Deck\NotFoundException;
 use OCA\Deck\Notification\NotificationHelper;
@@ -74,6 +74,8 @@ class AssignmentService {
 	 * @var IEventDispatcher
 	 */
 	private $eventDispatcher;
+	/** @var string|null */
+	private $currentUser;
 
 	public function __construct(
 		PermissionService $permissionService,
@@ -138,8 +140,7 @@ class AssignmentService {
 		}
 
 
-		if ($userId !== $this->currentUser) {
-			/* Notifyuser about the card assignment */
+		if ($type === Assignment::TYPE_USER && $userId !== $this->currentUser) {
 			$this->notificationHelper->sendCardAssigned($card, $userId);
 		}
 
@@ -151,9 +152,7 @@ class AssignmentService {
 		$this->changeHelper->cardChanged($cardId);
 		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_CARD, $card, ActivityManager::SUBJECT_CARD_USER_ASSIGN, ['assigneduser' => $userId]);
 
-		$this->eventDispatcher->dispatch(
-			'\OCA\Deck\Card::onUpdate', new FTSEvent(null, ['id' => $cardId, 'card' => $card])
-		);
+		$this->eventDispatcher->dispatchTyped(new CardUpdatedEvent($card));
 
 		return $assignment;
 	}
@@ -185,11 +184,13 @@ class AssignmentService {
 				$assignment = $this->assignedUsersMapper->delete($assignment);
 				$card = $this->cardMapper->find($cardId);
 				$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_CARD, $card, ActivityManager::SUBJECT_CARD_USER_UNASSIGN, ['assigneduser' => $userId]);
+				if ($type === Assignment::TYPE_USER && $userId !== $this->currentUser) {
+					$this->notificationHelper->markCardAssignedAsRead($card, $userId);
+				}
 				$this->changeHelper->cardChanged($cardId);
 
-				$this->eventDispatcher->dispatch(
-					'\OCA\Deck\Card::onUpdate', new FTSEvent(null, ['id' => $cardId, 'card' => $card])
-				);
+
+				$this->eventDispatcher->dispatchTyped(new CardUpdatedEvent($card));
 
 				return $assignment;
 			}

lib/Service/AttachmentService.php

@@ -35,6 +35,7 @@ use OCA\Deck\InvalidAttachmentType;
 use OCA\Deck\NoPermissionException;
 use OCA\Deck\NotFoundException;
 use OCA\Deck\StatusException;
+use OCP\AppFramework\Db\IMapperException;
 use OCP\AppFramework\Http\Response;
 use OCP\ICache;
 use OCP\ICacheFactory;
@@ -320,14 +321,10 @@ class AttachmentService {
 	 * Either mark an attachment as deleted for later removal or just remove it depending
 	 * on the IAttachmentService implementation
 	 *
-	 * @param $attachmentId
-	 * @return \OCP\AppFramework\Db\Entity
-	 * @throws \OCA\Deck\NoPermissionException
-	 * @throws \OCP\AppFramework\Db\DoesNotExistException
-	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
-	 * @throws BadRequestException
+	 * @throws NoPermissionException
+	 * @throws NotFoundException
 	 */
-	public function delete($cardId, $attachmentId, $type = 'deck_file') {
+	public function delete(int $cardId, int $attachmentId, string $type = 'deck_file'): Attachment {
 		try {
 			$service = $this->getService($type);
 		} catch (InvalidAttachmentType $e) {
@@ -340,40 +337,32 @@ class AttachmentService {
 			$attachment->setType($type);
 			$attachment->setCardId($cardId);
 			$service->extendData($attachment);
-			$service->delete($attachment);
-			$this->changeHelper->cardChanged($attachment->getCardId());
-			$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_CARD, $attachment, ActivityManager::SUBJECT_ATTACHMENT_DELETE);
-			return $attachment;
+		} else {
+			try {
+				$attachment = $this->attachmentMapper->find($attachmentId);
+			} catch (IMapperException $e) {
+				throw new NoPermissionException('Permission denied');
+			}
 		}
-
-		try {
-			$attachment = $this->attachmentMapper->find($attachmentId);
-		} catch (\Exception $e) {
-			throw new NoPermissionException('Permission denied');
-		}
-
 		$this->permissionService->checkPermission($this->cardMapper, $attachment->getCardId(), Acl::PERMISSION_EDIT);
-		$this->cache->clear('card-' . $attachment->getCardId());
 
 		if ($service->allowUndo()) {
 			$service->markAsDeleted($attachment);
-			$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_CARD, $attachment, ActivityManager::SUBJECT_ATTACHMENT_DELETE);
-			$this->changeHelper->cardChanged($attachment->getCardId());
-			return $this->attachmentMapper->update($attachment);
+			$attachment = $this->attachmentMapper->update($attachment);
+		} else {
+			$service->delete($attachment);
+			if (!$service instanceof ICustomAttachmentService) {
+				$attachment = $this->attachmentMapper->delete($attachment);
+			}
 		}
-		$service->delete($attachment);
 
-		$attachment = $this->attachmentMapper->delete($attachment);
+		$this->cache->clear('card-' . $attachment->getCardId());
 		$this->changeHelper->cardChanged($attachment->getCardId());
 		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_CARD, $attachment, ActivityManager::SUBJECT_ATTACHMENT_DELETE);
 		return $attachment;
 	}
 
-	public function restore($cardId, $attachmentId, $type = 'deck_file') {
-		if (is_numeric($attachmentId) === false) {
-			throw new BadRequestException('attachment id must be a number');
-		}
-
+	public function restore(int $cardId, int $attachmentId, string $type = 'deck_file'): Attachment {
 		try {
 			$attachment = $this->attachmentMapper->find($attachmentId);
 		} catch (\Exception $e) {

lib/Service/BoardService.php

@@ -24,7 +24,6 @@
 
 namespace OCA\Deck\Service;
 
-use OC\EventDispatcher\SymfonyAdapter;
 use OCA\Deck\Activity\ActivityManager;
 use OCA\Deck\Activity\ChangeSet;
 use OCA\Deck\AppInfo\Application;
@@ -36,9 +35,13 @@ use OCA\Deck\Db\IPermissionMapper;
 use OCA\Deck\Db\Label;
 use OCA\Deck\Db\Stack;
 use OCA\Deck\Db\StackMapper;
+use OCA\Deck\Event\AclCreatedEvent;
+use OCA\Deck\Event\AclDeletedEvent;
+use OCA\Deck\Event\AclUpdatedEvent;
 use OCA\Deck\NoPermissionException;
 use OCA\Deck\Notification\NotificationHelper;
 use OCP\AppFramework\Db\DoesNotExistException;
+use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IConfig;
 use OCP\IGroupManager;
 use OCP\IL10N;
@@ -47,7 +50,6 @@ use OCA\Deck\Db\BoardMapper;
 use OCA\Deck\Db\LabelMapper;
 use OCP\IUserManager;
 use OCA\Deck\BadRequestException;
-use Symfony\Component\EventDispatcher\GenericEvent;
 
 class BoardService {
 	private $boardMapper;
@@ -83,7 +85,7 @@ class BoardService {
 		IUserManager $userManager,
 		IGroupManager $groupManager,
 		ActivityManager $activityManager,
-		SymfonyAdapter $eventDispatcher,
+		IEventDispatcher $eventDispatcher,
 		ChangeHelper $changeHelper,
 		$userId
 	) {
@@ -327,13 +329,6 @@ class BoardService {
 		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_BOARD, $new_board, ActivityManager::SUBJECT_BOARD_CREATE, [], $userId);
 		$this->changeHelper->boardChanged($new_board->getId());
 
-		$this->eventDispatcher->dispatch(
-			'\OCA\Deck\Board::onCreate',
-			new GenericEvent(
-				null, ['id' => $new_board->getId(), 'userId' => $userId, 'board' => $new_board]
-			)
-		);
-
 		return $new_board;
 	}
 
@@ -360,10 +355,6 @@ class BoardService {
 		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_BOARD, $board, ActivityManager::SUBJECT_BOARD_DELETE);
 		$this->changeHelper->boardChanged($board->getId());
 
-		$this->eventDispatcher->dispatch(
-			'\OCA\Deck\Board::onDelete', new GenericEvent(null, ['id' => $id])
-		);
-
 		return $board;
 	}
 
@@ -386,10 +377,6 @@ class BoardService {
 		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_BOARD, $board, ActivityManager::SUBJECT_BOARD_RESTORE);
 		$this->changeHelper->boardChanged($board->getId());
 
-		$this->eventDispatcher->dispatch(
-			'\OCA\Deck\Board::onUpdate', new GenericEvent(null, ['id' => $id, 'board' => $board])
-		);
-
 		return $board;
 	}
 
@@ -410,10 +397,6 @@ class BoardService {
 		$board = $this->find($id);
 		$delete = $this->boardMapper->delete($board);
 
-		$this->eventDispatcher->dispatch(
-			'\OCA\Deck\Board::onDelete', new GenericEvent(null, ['id' => $id])
-		);
-
 		return $delete;
 	}
 
@@ -457,10 +440,6 @@ class BoardService {
 		$this->activityManager->triggerUpdateEvents(ActivityManager::DECK_OBJECT_BOARD, $changes, ActivityManager::SUBJECT_BOARD_UPDATE);
 		$this->changeHelper->boardChanged($board->getId());
 
-		$this->eventDispatcher->dispatch(
-			'\OCA\Deck\Board::onUpdate', new GenericEvent(null, ['id' => $id, 'board' => $board])
-		);
-
 		return $board;
 	}
 
@@ -531,28 +510,21 @@ class BoardService {
 		$acl->setPermissionEdit($edit);
 		$acl->setPermissionShare($share);
 		$acl->setPermissionManage($manage);
-
-		/* Notify users about the shared board */
-		$this->notificationHelper->sendBoardShared($boardId, $acl);
-
 		$newAcl = $this->aclMapper->insert($acl);
+
 		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_BOARD, $newAcl, ActivityManager::SUBJECT_BOARD_SHARE);
+		$this->notificationHelper->sendBoardShared((int)$boardId, $acl);
 		$this->boardMapper->mapAcl($newAcl);
 		$this->changeHelper->boardChanged($boardId);
 
 		// TODO: use the dispatched event for this
-		$version = \OCP\Util::getVersion()[0];
-		if ($version >= 16) {
-			try {
-				$resourceProvider = \OC::$server->query(\OCA\Deck\Collaboration\Resources\ResourceProvider::class);
-				$resourceProvider->invalidateAccessCache($boardId);
-			} catch (\Exception $e) {
-			}
+		try {
+			$resourceProvider = \OC::$server->query(\OCA\Deck\Collaboration\Resources\ResourceProvider::class);
+			$resourceProvider->invalidateAccessCache($boardId);
+		} catch (\Exception $e) {
 		}
 
-		$this->eventDispatcher->dispatch(
-			'\OCA\Deck\Board::onShareNew', new GenericEvent(null, ['id' => $newAcl->getId(), 'acl' => $newAcl, 'boardId' => $boardId])
-		);
+		$this->eventDispatcher->dispatchTyped(new AclCreatedEvent($acl));
 
 		return $newAcl;
 	}
@@ -597,9 +569,7 @@ class BoardService {
 		$board = $this->aclMapper->update($acl);
 		$this->changeHelper->boardChanged($acl->getBoardId());
 
-		$this->eventDispatcher->dispatch(
-			'\OCA\Deck\Board::onShareEdit', new GenericEvent(null, ['id' => $id, 'boardId' => $acl->getBoardId(), 'acl' => $acl])
-		);
+		$this->eventDispatcher->dispatchTyped(new AclUpdatedEvent($acl));
 
 		return $board;
 	}
@@ -627,7 +597,9 @@ class BoardService {
 				$this->assignedUsersMapper->delete($assignement);
 			}
 		}
+
 		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_BOARD, $acl, ActivityManager::SUBJECT_BOARD_UNSHARE);
+		$this->notificationHelper->sendBoardShared($acl->getBoardId(), $acl, true);
 		$this->changeHelper->boardChanged($acl->getBoardId());
 
 		$version = \OCP\Util::getVersion()[0];
@@ -640,9 +612,7 @@ class BoardService {
 		}
 		$delete = $this->aclMapper->delete($acl);
 
-		$this->eventDispatcher->dispatch(
-			'\OCA\Deck\Board::onShareDelete', new GenericEvent(null, ['id' => $id, 'boardId' => $acl->getBoardId(), 'acl' => $acl])
-		);
+		$this->eventDispatcher->dispatchTyped(new AclDeletedEvent($acl));
 
 		return $delete;
 	}

lib/Service/CardService.php

@@ -29,13 +29,14 @@ namespace OCA\Deck\Service;
 use OCA\Deck\Activity\ActivityManager;
 use OCA\Deck\Activity\ChangeSet;
 use OCA\Deck\Db\AssignmentMapper;
-use OCA\Deck\Db\Board;
 use OCA\Deck\Db\Card;
 use OCA\Deck\Db\CardMapper;
 use OCA\Deck\Db\Acl;
 use OCA\Deck\Db\ChangeHelper;
 use OCA\Deck\Db\StackMapper;
-use OCA\Deck\Event\FTSEvent;
+use OCA\Deck\Event\CardCreatedEvent;
+use OCA\Deck\Event\CardDeletedEvent;
+use OCA\Deck\Event\CardUpdatedEvent;
 use OCA\Deck\Notification\NotificationHelper;
 use OCA\Deck\Db\BoardMapper;
 use OCA\Deck\Db\LabelMapper;
@@ -104,8 +105,15 @@ class CardService {
 		$card->setAttachmentCount($this->attachmentService->count($cardId));
 		$user = $this->userManager->get($this->currentUser);
 		$lastRead = $this->commentsManager->getReadMark('deckCard', (string)$card->getId(), $user);
-		$count = $this->commentsManager->getNumberOfCommentsForObject('deckCard', (string)$card->getId(), $lastRead);
-		$card->setCommentsUnread($count);
+		$countUnreadComments = $this->commentsManager->getNumberOfCommentsForObject('deckCard', (string)$card->getId(), $lastRead);
+		$countComments = $this->commentsManager->getNumberOfCommentsForObject('deckCard', (string)$card->getId());
+		$card->setCommentsUnread($countUnreadComments);
+		$card->setCommentsCount($countComments);
+		
+		$stack = $this->stackMapper->find($card->getStackId());
+		$board = $this->boardService->find($stack->getBoardId());
+		$card->setRelatedStack($stack);
+		$card->setRelatedBoard($board);
 	}
 
 	public function fetchDeleted($boardId) {
@@ -117,22 +125,6 @@ class CardService {
 		return $cards;
 	}
 
-	public function search(string $term, int $limit = null, int $offset = null): array {
-		$boards = $this->boardService->getUserBoards();
-		$boardIds = array_map(static function (Board $board) {
-			return $board->getId();
-		}, $boards);
-		return $this->cardMapper->search($boardIds, $term, $limit, $offset);
-	}
-
-	public function searchRaw(string $term, int $limit = null, int $offset = null): array {
-		$boards = $this->boardService->getUserBoards();
-		$boardIds = array_map(static function (Board $board) {
-			return $board->getId();
-		}, $boards);
-		return $this->cardMapper->searchRaw($boardIds, $term, $limit, $offset);
-	}
-
 	/**
 	 * @param $cardId
 	 * @return \OCA\Deck\Db\RelationalEntity
@@ -222,15 +214,10 @@ class CardService {
 		$card->setDescription($description);
 		$card->setDuedate($duedate);
 		$card = $this->cardMapper->insert($card);
+		
 		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_CARD, $card, ActivityManager::SUBJECT_CARD_CREATE);
 		$this->changeHelper->cardChanged($card->getId(), false);
-
-		$this->eventDispatcher->dispatch(
-			'\OCA\Deck\Card::onCreate',
-			new FTSEvent(
-				null, ['id' => $card->getId(), 'card' => $card, 'userId' => $owner, 'stackId' => $stackId]
-			)
-		);
+		$this->eventDispatcher->dispatchTyped(new CardCreatedEvent($card));
 
 		return $card;
 	}
@@ -256,12 +243,11 @@ class CardService {
 		$card = $this->cardMapper->find($id);
 		$card->setDeletedAt(time());
 		$this->cardMapper->update($card);
+		
 		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_CARD, $card, ActivityManager::SUBJECT_CARD_DELETE);
+		$this->notificationHelper->markDuedateAsRead($card);
 		$this->changeHelper->cardChanged($card->getId(), false);
-
-		$this->eventDispatcher->dispatch(
-			'\OCA\Deck\Card::onDelete', new FTSEvent(null, ['id' => $id, 'card' => $card])
-		);
+		$this->eventDispatcher->dispatchTyped(new CardDeletedEvent($card));
 
 		return $card;
 	}
@@ -339,6 +325,15 @@ class CardService {
 		$card->setOrder($order);
 		$card->setOwner($owner);
 		$card->setDuedate($duedate);
+		$resetDuedateNotification = false;
+		if (
+			$card->getDuedate() === null ||
+			(new \DateTime($card->getDuedate())) != (new \DateTime($changes->getBefore()->getDuedate()))
+		) {
+			$card->setNotified(false);
+			$resetDuedateNotification = true;
+		}
+
 		if ($deletedAt !== null) {
 			$card->setDeletedAt($deletedAt);
 		}
@@ -358,11 +353,12 @@ class CardService {
 
 
 		$card = $this->cardMapper->update($card);
+		if ($resetDuedateNotification) {
+			$this->notificationHelper->markDuedateAsRead($card);
+		}
 		$this->changeHelper->cardChanged($card->getId(), true);
 
-		$this->eventDispatcher->dispatch(
-			'\OCA\Deck\Card::onUpdate', new FTSEvent(null, ['id' => $id, 'card' => $card])
-		);
+		$this->eventDispatcher->dispatchTyped(new CardUpdatedEvent($card));
 
 		return $card;
 	}
@@ -402,9 +398,7 @@ class CardService {
 		$this->changeHelper->cardChanged($card->getId(), false);
 		$update = $this->cardMapper->update($card);
 
-		$this->eventDispatcher->dispatch(
-			'\OCA\Deck\Card::onUpdate', new FTSEvent(null, ['id' => $id, 'card' => $card])
-		);
+		$this->eventDispatcher->dispatchTyped(new CardUpdatedEvent($card));
 
 		return $update;
 	}
@@ -501,9 +495,7 @@ class CardService {
 		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_CARD, $newCard, ActivityManager::SUBJECT_CARD_UPDATE_ARCHIVE);
 		$this->changeHelper->cardChanged($id, false);
 
-		$this->eventDispatcher->dispatch(
-			'\OCA\Deck\Card::onUpdate', new FTSEvent(null, ['id' => $id, 'card' => $card])
-		);
+		$this->eventDispatcher->dispatchTyped(new CardUpdatedEvent($card));
 
 		return $newCard;
 	}
@@ -532,9 +524,7 @@ class CardService {
 		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_CARD, $newCard, ActivityManager::SUBJECT_CARD_UPDATE_UNARCHIVE);
 		$this->changeHelper->cardChanged($id, false);
 
-		$this->eventDispatcher->dispatch(
-			'\OCA\Deck\Card::onUpdate', new FTSEvent(null, ['id' => $id, 'card' => $card])
-		);
+		$this->eventDispatcher->dispatchTyped(new CardUpdatedEvent($card));
 
 		return $newCard;
 	}
@@ -570,9 +560,7 @@ class CardService {
 		$this->changeHelper->cardChanged($cardId);
 		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_CARD, $card, ActivityManager::SUBJECT_LABEL_ASSIGN, ['label' => $label]);
 
-		$this->eventDispatcher->dispatch(
-			'\OCA\Deck\Card::onUpdate', new FTSEvent(null, ['id' => $cardId, 'card' => $card])
-		);
+		$this->eventDispatcher->dispatchTyped(new CardUpdatedEvent($card));
 	}
 
 	/**
@@ -606,9 +594,7 @@ class CardService {
 		$this->changeHelper->cardChanged($cardId);
 		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_CARD, $card, ActivityManager::SUBJECT_LABEL_UNASSING, ['label' => $label]);
 
-		$this->eventDispatcher->dispatch(
-			'\OCA\Deck\Card::onUpdate', new FTSEvent(null, ['id' => $cardId, 'card' => $card])
-		);
+		$this->eventDispatcher->dispatchTyped(new CardUpdatedEvent($card));
 	}
 
 	/**

lib/Service/CirclesService.php

@@ -26,6 +26,7 @@ declare(strict_types=1);
 
 namespace OCA\Deck\Service;
 
+use OCA\Circles\Api\v1\Circles;
 use OCP\App\IAppManager;
 
 /**
@@ -53,8 +54,8 @@ class CirclesService {
 		}
 
 		try {
-			\OCA\Circles\Api\v1\Circles::getMember($circleId, $userId, 1, true);
-			return true;
+			$member = \OCA\Circles\Api\v1\Circles::getMember($circleId, $userId, 1, true);
+			return $member->getLevel() >= Circles::LEVEL_MEMBER;
 		} catch (\Exception $e) {
 		}
 		return false;

lib/Service/ConfigService.php

@@ -73,16 +73,20 @@ class ConfigService {
 				if (!$this->groupManager->isAdmin($this->userId)) {
 					throw new NoPermissionException('You must be admin to get the group limit');
 				}
-				$result = $this->getGroupLimit();
-				break;
+				return $this->getGroupLimit();
 			case 'calendar':
-				$result = (bool)$this->config->getUserValue($this->userId, Application::APP_ID, 'calendar', true);
-				break;
+				if ($this->userId === null) {
+					return false;
+				}
+				return (bool)$this->config->getUserValue($this->userId, Application::APP_ID, 'calendar', true);
 		}
-		return $result;
 	}
 
 	public function isCalendarEnabled(int $boardId = null): bool {
+		if ($this->userId === null) {
+			return false;
+		}
+
 		$defaultState = (bool)$this->config->getUserValue($this->userId, Application::APP_ID, 'calendar', true);
 		if ($boardId === null) {
 			return $defaultState;

lib/Service/FilesAppService.php

@@ -23,7 +23,10 @@
 
 namespace OCA\Deck\Service;
 
+use OCA\Deck\Db\Acl;
 use OCA\Deck\Db\Attachment;
+use OCA\Deck\Db\CardMapper;
+use OCA\Deck\NoPermissionException;
 use OCA\Deck\Sharing\DeckShareProvider;
 use OCA\Deck\StatusException;
 use OCP\AppFramework\Http\StreamResponse;
@@ -35,9 +38,10 @@ use OCP\IDBConnection;
 use OCP\IL10N;
 use OCP\IPreview;
 use OCP\IRequest;
-use OCP\Share;
+use OCP\Share\Exceptions\ShareNotFound;
 use OCP\Share\IManager;
 use OCP\Share\IShare;
+use Psr\Log\LoggerInterface;
 
 class FilesAppService implements IAttachmentService, ICustomAttachmentService {
 	private $request;
@@ -48,8 +52,10 @@ class FilesAppService implements IAttachmentService, ICustomAttachmentService {
 	private $configService;
 	private $l10n;
 	private $preview;
-	private $permissionService;
 	private $mimeTypeDetector;
+	private $permissionService;
+	private $cardMapper;
+	private $logger;
 
 	public function __construct(
 		IRequest $request,
@@ -59,8 +65,10 @@ class FilesAppService implements IAttachmentService, ICustomAttachmentService {
 		ConfigService $configService,
 		DeckShareProvider $shareProvider,
 		IPreview $preview,
-		PermissionService $permissionService,
 		IMimeTypeDetector $mimeTypeDetector,
+		PermissionService $permissionService,
+		CardMapper  $cardMapper,
+		LoggerInterface $logger,
 		string $userId = null
 	) {
 		$this->request = $request;
@@ -72,15 +80,20 @@ class FilesAppService implements IAttachmentService, ICustomAttachmentService {
 		$this->userId = $userId;
 		$this->preview = $preview;
 		$this->mimeTypeDetector = $mimeTypeDetector;
+		$this->permissionService = $permissionService;
+		$this->cardMapper = $cardMapper;
+		$this->logger = $logger;
 	}
 
 	public function listAttachments(int $cardId): array {
 		$shares = $this->shareProvider->getSharedWithByType($cardId, IShare::TYPE_DECK, -1, 0);
-		$shares = array_filter($shares, function ($share) {
-			return $share->getPermissions() > 0;
-		});
-		return array_map(function (IShare $share) use ($cardId) {
-			$file = $share->getNode();
+		return array_filter(array_map(function (IShare $share) use ($cardId) {
+			try {
+				$file = $share->getNode();
+			} catch (NotFoundException $e) {
+				$this->logger->debug('Unable to find node for share with ID ' . $share->getId());
+				return null;
+			}
 			$attachment = new Attachment();
 			$attachment->setType('file');
 			$attachment->setId((int)$share->getId());
@@ -89,9 +102,9 @@ class FilesAppService implements IAttachmentService, ICustomAttachmentService {
 			$attachment->setData($file->getName());
 			$attachment->setLastModified($file->getMTime());
 			$attachment->setCreatedAt($share->getShareTime()->getTimestamp());
-			$attachment->setDeletedAt(0);
+			$attachment->setDeletedAt($share->getPermissions() === 0 ? $share->getShareTime()->getTimestamp() : 0);
 			return $attachment;
-		}, $shares);
+		}, $shares));
 	}
 
 	public function getAttachmentCount(int $cardId): int {
@@ -125,7 +138,11 @@ class FilesAppService implements IAttachmentService, ICustomAttachmentService {
 	public function extendData(Attachment $attachment) {
 		$userFolder = $this->rootFolder->getUserFolder($this->userId);
 		$share = $this->shareProvider->getShareById($attachment->getId());
-		$file = $share->getNode();
+		$files = $userFolder->getById($share->getNode()->getId());
+		if (count($files) === 0) {
+			return $attachment;
+		}
+		$file = array_shift($files);
 		$attachment->setExtendedData([
 			'path' => $userFolder->getRelativePath($file->getPath()),
 			'fileid' => $file->getId(),
@@ -140,9 +157,11 @@ class FilesAppService implements IAttachmentService, ICustomAttachmentService {
 	}
 
 	public function display(Attachment $attachment) {
+		// Problem: Folders
+		/** @psalm-suppress InvalidCatch */
 		try {
 			$share = $this->shareProvider->getShareById($attachment->getId());
-		} catch (Share\Exceptions\ShareNotFound $e) {
+		} catch (ShareNotFound $e) {
 			throw new NotFoundException('File not found');
 		}
 		$file = $share->getNode();
@@ -160,6 +179,9 @@ class FilesAppService implements IAttachmentService, ICustomAttachmentService {
 		$file = $this->getUploadedFile();
 		$fileName = $file['name'];
 
+		// get shares for current card
+		// check if similar filename already exists
+
 		$userFolder = $this->rootFolder->getUserFolder($this->userId);
 		try {
 			$folder = $userFolder->get($this->configService->getAttachmentFolder());
@@ -240,12 +262,16 @@ class FilesAppService implements IAttachmentService, ICustomAttachmentService {
 		$file = $share->getNode();
 		$attachment->setData($file->getName());
 
-		if ($file->getOwner() !== null && $file->getOwner()->getUID() === $this->userId) {
-			$file->delete();
+		// Deleting a Nextcloud file attachment will remove the share to the card, keeping the source file untouched
+		// Opt-out of individual shares per user is no longer performed within deck but can still be done through the files app
+		$canEdit = $this->permissionService->checkPermission($this->cardMapper, $attachment->getCardId(), Acl::PERMISSION_EDIT);
+		$isFileOwner = $file->getOwner() !== null && $file->getOwner()->getUID() === $this->userId;
+		if ($isFileOwner || $canEdit) {
+			$this->shareManager->deleteShare($share);
 			return;
 		}
 
-		$this->shareManager->deleteFromSelf($share, $this->userId);
+		throw new NoPermissionException('No permission to remove the attachment from the card');
 	}
 
 	public function allowUndo() {

lib/Service/FullTextSearchService.php

@@ -37,14 +37,10 @@ use OCA\Deck\Db\Card;
 use OCA\Deck\Db\CardMapper;
 use OCA\Deck\Db\Stack;
 use OCA\Deck\Db\StackMapper;
-use OCA\Deck\Event\FTSEvent;
 use OCA\Deck\Provider\DeckProvider;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
-use OCP\FullTextSearch\Exceptions\FullTextSearchAppNotAvailableException;
-use OCP\FullTextSearch\IFullTextSearchManager;
 use OCP\FullTextSearch\Model\IDocumentAccess;
-use OCP\FullTextSearch\Model\IIndex;
 use OCP\FullTextSearch\Model\IIndexDocument;
 
 /**
@@ -63,98 +59,15 @@ class FullTextSearchService {
 
 	/** @var CardMapper */
 	private $cardMapper;
-
-	/** @var IFullTextSearchManager */
-	private $fullTextSearchManager;
-
-
-	/**
-	 * FullTextSearchService constructor.
-	 *
-	 * @param BoardMapper $boardMapper
-	 * @param StackMapper $stackMapper
-	 * @param CardMapper $cardMapper
-	 * @param IFullTextSearchManager $fullTextSearchManager
-	 */
+	
 	public function __construct(
-		BoardMapper $boardMapper, StackMapper $stackMapper, CardMapper $cardMapper,
-		IFullTextSearchManager $fullTextSearchManager
+		BoardMapper $boardMapper, StackMapper $stackMapper, CardMapper $cardMapper
 	) {
 		$this->boardMapper = $boardMapper;
 		$this->stackMapper = $stackMapper;
 		$this->cardMapper = $cardMapper;
-
-		$this->fullTextSearchManager = $fullTextSearchManager;
 	}
 
-
-	/**
-	 * @param FTSEvent $e
-	 */
-	public function onCardCreated(FTSEvent $e) {
-		$cardId = $e->getArgument('id');
-		$userId = $e->getArgument('userId');
-
-		try {
-			$this->fullTextSearchManager->createIndex(
-				DeckProvider::DECK_PROVIDER_ID, (string)$cardId, $userId, IIndex::INDEX_FULL
-			);
-		} catch (FullTextSearchAppNotAvailableException $e) {
-		}
-	}
-
-
-	/**
-	 * @param FTSEvent $e
-	 */
-	public function onCardUpdated(FTSEvent $e) {
-		$cardId = $e->getArgument('id');
-
-		try {
-			$this->fullTextSearchManager->updateIndexStatus(
-			DeckProvider::DECK_PROVIDER_ID, (string)$cardId, IIndex::INDEX_CONTENT
-		);
-		} catch (FullTextSearchAppNotAvailableException $e) {
-		}
-	}
-
-
-	/**
-	 * @param FTSEvent $e
-	 */
-	public function onCardDeleted(FTSEvent $e) {
-		$cardId = $e->getArgument('id');
-
-		try {
-			$this->fullTextSearchManager->updateIndexStatus(
-				DeckProvider::DECK_PROVIDER_ID, (string)$cardId, IIndex::INDEX_REMOVE
-			);
-		} catch (FullTextSearchAppNotAvailableException $e) {
-		}
-	}
-
-
-	/**
-	 * @param FTSEvent $e
-	 */
-	public function onBoardShares(FTSEvent $e) {
-		$boardId = (int)$e->getArgument('boardId');
-
-		$cards = array_map(
-			function (Card $item) {
-				return $item->getId();
-			},
-			$this->getCardsFromBoard($boardId)
-		);
-		try {
-			$this->fullTextSearchManager->updateIndexesStatus(
-				DeckProvider::DECK_PROVIDER_ID, $cards, IIndex::INDEX_META
-			);
-		} catch (FullTextSearchAppNotAvailableException $e) {
-		}
-	}
-
-
 	/**
 	 * @param Card $card
 	 *
@@ -175,11 +88,9 @@ class FullTextSearchService {
 	 * @throws MultipleObjectsReturnedException
 	 */
 	public function fillIndexDocument(IIndexDocument $document) {
-		/** @var Card $card */
 		$card = $this->cardMapper->find((int)$document->getId());
-
-		$document->setTitle(($card->getTitle() === null) ? '' : $card->getTitle());
-		$document->setContent(($card->getDescription() === null) ? '' : $card->getDescription());
+		$document->setTitle(!empty($card->getTitle()) ? $card->getTitle() : '');
+		$document->setContent(!empty($card->getDescription()) ? $card->getDescription() : '');
 		$document->setAccess($this->generateDocumentAccessFromCardId((int)$card->getId()));
 	}
 

lib/Service/PermissionService.php

@@ -23,6 +23,8 @@
 
 namespace OCA\Deck\Service;
 
+use OC\Cache\CappedMemoryCache;
+use OCA\Circles\Model\Member;
 use OCA\Deck\Db\Acl;
 use OCA\Deck\Db\AclMapper;
 use OCA\Deck\Db\Board;
@@ -31,7 +33,6 @@ use OCA\Deck\Db\IPermissionMapper;
 use OCA\Deck\Db\User;
 use OCA\Deck\NoPermissionException;
 use OCP\AppFramework\Db\DoesNotExistException;
-use OCP\AppFramework\Db\Entity;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
 use OCP\IConfig;
 use OCP\IGroupManager;
@@ -61,6 +62,7 @@ class PermissionService {
 	private $users = [];
 
 	private $circlesEnabled = false;
+	private $boardCache;
 
 	public function __construct(
 		ILogger $logger,
@@ -81,6 +83,8 @@ class PermissionService {
 		$this->config = $config;
 		$this->userId = $userId;
 
+		$this->boardCache = new CappedMemoryCache();
+
 		$this->circlesEnabled = \OC::$server->getAppManager()->isEnabledForUser('circles') &&
 			(version_compare(\OC::$server->getAppManager()->getAppVersion('circles'), '0.17.1') >= 0);
 	}
@@ -149,10 +153,13 @@ class PermissionService {
 			return true;
 		}
 
-		$acls = $this->aclMapper->findAll($boardId);
-		$result = $this->userCan($acls, $permission, $userId);
-		if ($result) {
-			return true;
+		try {
+			$acls = $this->getBoard($boardId)->getAcl();
+			$result = $this->userCan($acls, $permission, $userId);
+			if ($result) {
+				return true;
+			}
+		} catch (DoesNotExistException | MultipleObjectsReturnedException $e) {
 		}
 
 		// Throw NoPermission to not leak information about existing entries
@@ -168,13 +175,24 @@ class PermissionService {
 			$userId = $this->userId;
 		}
 		try {
-			$board = $this->boardMapper->find($boardId);
-			return $board && $userId === $board->getOwner();
+			$board = $this->getBoard($boardId);
+			return $userId === $board->getOwner();
 		} catch (DoesNotExistException | MultipleObjectsReturnedException $e) {
 		}
 		return false;
 	}
 
+	/**
+	 * @throws MultipleObjectsReturnedException
+	 * @throws DoesNotExistException
+	 */
+	private function getBoard($boardId): Board {
+		if (!isset($this->boardCache[$boardId])) {
+			$this->boardCache[$boardId] = $this->boardMapper->find($boardId, false, true);
+		}
+		return $this->boardCache[$boardId];
+	}
+
 	/**
 	 * Check if permission matches the acl rules for current user and groups
 	 *
@@ -194,8 +212,8 @@ class PermissionService {
 
 			if ($this->circlesEnabled && $acl->getType() === Acl::PERMISSION_TYPE_CIRCLE) {
 				try {
-					\OCA\Circles\Api\v1\Circles::getMember($acl->getParticipant(), $this->userId, 1, true);
-					return $acl->getPermission($permission);
+					$member = \OCA\Circles\Api\v1\Circles::getMember($acl->getParticipant(), $this->userId, 1, true);
+					return $member->getLevel() >= Member::LEVEL_MEMBER && $acl->getPermission($permission);
 				} catch (\Exception $e) {
 					$this->logger->info('Member not found in circle that was accessed. This should not happen.');
 				}

lib/Service/SearchService.php

@@ -0,0 +1,132 @@
+<?php
+/*
+ * @copyright Copyright (c) 2021 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+declare(strict_types=1);
+
+
+namespace OCA\Deck\Service;
+
+use OCA\Deck\Db\Board;
+use OCA\Deck\Db\Card;
+use OCA\Deck\Db\CardMapper;
+use OCA\Deck\Search\CommentSearchResultEntry;
+use OCA\Deck\Search\FilterStringParser;
+use OCP\Comments\ICommentsManager;
+use OCP\IL10N;
+use OCP\IURLGenerator;
+use OCP\IUserManager;
+
+class SearchService {
+
+	/** @var BoardService */
+	private $boardService;
+	/** @var CardMapper */
+	private $cardMapper;
+	/** @var CardService */
+	private $cardService;
+	/** @var ICommentsManager */
+	private $commentsManager;
+	/** @var FilterStringParser */
+	private $filterStringParser;
+	/** @var IUserManager */
+	private $userManager;
+	/** @var IL10N */
+	private $l10n;
+	/** @var IURLGenerator */
+	private $urlGenerator;
+
+	public function __construct(
+		BoardService $boardService,
+		CardMapper $cardMapper,
+		CardService $cardService,
+		ICommentsManager $commentsManager,
+		FilterStringParser $filterStringParser,
+		IUserManager $userManager,
+		IL10N $l10n,
+		IURLGenerator $urlGenerator
+	) {
+		$this->boardService = $boardService;
+		$this->cardMapper = $cardMapper;
+		$this->cardService = $cardService;
+		$this->commentsManager = $commentsManager;
+		$this->filterStringParser = $filterStringParser;
+		$this->userManager = $userManager;
+		$this->l10n = $l10n;
+		$this->urlGenerator = $urlGenerator;
+	}
+
+	public function searchCards(string $term, int $limit = null, ?int $cursor = null): array {
+		$boards = $this->boardService->getUserBoards();
+		$boardIds = array_map(static function (Board $board) {
+			return $board->getId();
+		}, $boards);
+		$matchedCards = $this->cardMapper->search($boardIds, $this->filterStringParser->parse($term), $limit, $cursor);
+
+		$self = $this;
+		return array_map(function (Card $card) use ($self) {
+			$self->cardService->enrich($card);
+			return $card;
+		}, $matchedCards);
+	}
+
+	public function searchBoards(string $term, ?int $limit, ?int $cursor): array {
+		$boards = $this->boardService->getUserBoards();
+		// get boards that have a lastmodified date which is lower than the cursor
+		// and which match the search term
+		$filteredBoards = array_filter($boards, static function (Board $board) use ($term, $cursor) {
+			return (
+				($cursor === null || $board->getLastModified() < $cursor)
+				&& mb_stripos(mb_strtolower($board->getTitle()), mb_strtolower($term)) > -1
+			);
+		});
+		// sort the boards, recently modified first
+		usort($filteredBoards, function ($boardA, $boardB) {
+			$ta = $boardA->getLastModified();
+			$tb = $boardB->getLastModified();
+			return $ta === $tb
+				? 0
+				: ($ta > $tb ? -1 : 1);
+		});
+		// limit the number of results
+		return array_slice($filteredBoards, 0, $limit);
+	}
+
+	public function searchComments(string $term, ?int $limit = null, ?int $cursor = null): array {
+		$boards = $this->boardService->getUserBoards();
+		$boardIds = array_map(static function (Board $board) {
+			return $board->getId();
+		}, $boards);
+		$matchedComments = $this->cardMapper->searchComments($boardIds, $this->filterStringParser->parse($term), $limit, $cursor);
+
+		$self = $this;
+		return array_map(function ($cardRow) use ($self) {
+			$comment = $this->commentsManager->get($cardRow['comment_id']);
+			unset($cardRow['comment_id']);
+			$card = Card::fromRow($cardRow);
+			$self->cardService->enrich($card);
+			$user = $this->userManager->get($comment->getActorId());
+			$displayName = $user ? $user->getDisplayName() : '';
+			return new CommentSearchResultEntry($comment->getId(), $comment->getMessage(), $displayName, $card, $this->urlGenerator, $this->l10n);
+		}, $matchedComments);
+	}
+}

lib/Service/StackService.php

@@ -24,7 +24,6 @@
 
 namespace OCA\Deck\Service;
 
-use OC\EventDispatcher\SymfonyAdapter;
 use OCA\Deck\Activity\ActivityManager;
 use OCA\Deck\Activity\ChangeSet;
 use OCA\Deck\BadRequestException;
@@ -37,7 +36,6 @@ use OCA\Deck\Db\LabelMapper;
 use OCA\Deck\Db\Stack;
 use OCA\Deck\Db\StackMapper;
 use OCA\Deck\StatusException;
-use Symfony\Component\EventDispatcher\GenericEvent;
 
 class StackService {
 	private $stackMapper;
@@ -50,7 +48,6 @@ class StackService {
 	private $assignedUsersMapper;
 	private $attachmentService;
 	private $activityManager;
-	private $symfonyAdapter;
 	private $changeHelper;
 
 	public function __construct(
@@ -64,7 +61,6 @@ class StackService {
 		AssignmentMapper $assignedUsersMapper,
 		AttachmentService $attachmentService,
 		ActivityManager $activityManager,
-		SymfonyAdapter $eventDispatcher,
 		ChangeHelper $changeHelper
 	) {
 		$this->stackMapper = $stackMapper;
@@ -77,7 +73,6 @@ class StackService {
 		$this->assignedUsersMapper = $assignedUsersMapper;
 		$this->attachmentService = $attachmentService;
 		$this->activityManager = $activityManager;
-		$this->symfonyAdapter = $eventDispatcher;
 		$this->changeHelper = $changeHelper;
 	}
 
@@ -114,6 +109,7 @@ class StackService {
 			throw new BadRequestException('stack id must be a number');
 		}
 
+		$this->permissionService->checkPermission($this->stackMapper, $stackId, Acl::PERMISSION_READ);
 		$stack = $this->stackMapper->find($stackId);
 		$cards = $this->cardMapper->findAll($stackId);
 		foreach ($cards as $cardIndex => $card) {
@@ -225,11 +221,6 @@ class StackService {
 		);
 		$this->changeHelper->boardChanged($boardId);
 
-		$this->symfonyAdapter->dispatch(
-			'\OCA\Deck\Stack::onCreate',
-			new GenericEvent(null, ['id' => $stack->getId(), 'stack' => $stack])
-		);
-
 		return $stack;
 	}
 
@@ -259,10 +250,6 @@ class StackService {
 		$this->changeHelper->boardChanged($stack->getBoardId());
 		$this->enrichStackWithCards($stack);
 
-		$this->symfonyAdapter->dispatch(
-			'\OCA\Deck\Stack::onDelete', new GenericEvent(null, ['id' => $id, 'stack' => $stack])
-		);
-
 		return $stack;
 	}
 
@@ -314,10 +301,6 @@ class StackService {
 		);
 		$this->changeHelper->boardChanged($stack->getBoardId());
 
-		$this->symfonyAdapter->dispatch(
-			'\OCA\Deck\Stack::onUpdate', new GenericEvent(null, ['id' => $id, 'stack' => $stack])
-		);
-
 		return $stack;
 	}
 

lib/Sharing/DeckShareProvider.php

@@ -271,9 +271,9 @@ class DeckShareProvider implements \OCP\Share\IShareProvider {
 		return $share;
 	}
 
-	private function applyBoardPermission($share, $permissions) {
+	private function applyBoardPermission($share, $permissions, $userId) {
 		try {
-			$this->permissionService->checkPermission($this->cardMapper, $share->getSharedWith(), Acl::PERMISSION_EDIT);
+			$this->permissionService->checkPermission($this->cardMapper, $share->getSharedWith(), Acl::PERMISSION_EDIT, $userId);
 		} catch (NoPermissionException $e) {
 			$permissions &= Constants::PERMISSION_ALL - Constants::PERMISSION_UPDATE;
 			$permissions &= Constants::PERMISSION_ALL - Constants::PERMISSION_CREATE;
@@ -281,7 +281,7 @@ class DeckShareProvider implements \OCP\Share\IShareProvider {
 		}
 
 		try {
-			$this->permissionService->checkPermission($this->cardMapper, $share->getSharedWith(), Acl::PERMISSION_SHARE);
+			$this->permissionService->checkPermission($this->cardMapper, $share->getSharedWith(), Acl::PERMISSION_SHARE, $userId);
 		} catch (NoPermissionException $e) {
 			$permissions &= Constants::PERMISSION_ALL - Constants::PERMISSION_SHARE;
 		}
@@ -562,6 +562,7 @@ class DeckShareProvider implements \OCP\Share\IShareProvider {
 
 	/**
 	 * @inheritDoc
+	 * @throws ShareNotFound
 	 */
 	public function getShareById($id, $recipientId = null) {
 		$qb = $this->dbConnection->getQueryBuilder();
@@ -645,7 +646,7 @@ class DeckShareProvider implements \OCP\Share\IShareProvider {
 			$stmt = $query->execute();
 
 			while ($data = $stmt->fetch()) {
-				$this->applyBoardPermission($shareMap[$data['parent']], (int)$data['permissions']);
+				$this->applyBoardPermission($shareMap[$data['parent']], (int)$data['permissions'], $userId);
 				$shareMap[$data['parent']]->setTarget($data['file_target']);
 			}
 

lib/StatusException.php

@@ -23,6 +23,12 @@
 
 namespace OCA\Deck;
 
+/**
+ * User facing exception that can be thrown with an error being reported to the frontend
+ * or consumers of the API
+ *
+ * This exception is catched in the ExceptionMiddleware
+ */
 class StatusException extends \Exception {
 	public function __construct($message) {
 		parent::__construct($message);

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "deck",
 	"description": "",
-	"version": "1.0.0",
+	"version": "1.4.6",
 	"authors": [
 		{
 			"name": "Julius Härtl",
@@ -129,4 +129,4 @@
 			"<rootDir>/node_modules/jest-serializer-vue"
 		]
 	}
-}
+}

src/components/AttachmentDragAndDrop.vue

@@ -131,6 +131,12 @@ export default {
 		position: relative;
 	}
 
+	.attachments-drag-zone.drop-upload--sidebar {
+		display: flex;
+		flex-direction: column;
+		flex-basis: 100%;
+	}
+
 	.dragover {
 		position: absolute;
 		background: var(--color-primary-light);

src/components/Controls.vue

@@ -33,8 +33,14 @@
 				({{ t('deck', 'Archived cards') }})
 			</p>
 		</div>
-		<div v-if="board" class="board-actions">
-			<div v-if="canManage && !showArchived && !board.archived"
+		<div class="board-actions">
+			<div v-if="searchQuery || true" class="deck-search">
+				<input type="search"
+					class="icon-search"
+					:value="searchQuery"
+					@input="$store.commit('setSearchQuery', $event.target.value)">
+			</div>
+			<div v-if="board && canManage && !showArchived && !board.archived"
 				id="stack-add"
 				v-click-outside="hideAddStack">
 				<Actions v-if="!isAddStackVisible">
@@ -57,7 +63,7 @@
 						value="">
 				</form>
 			</div>
-			<div class="board-action-buttons">
+			<div v-if="board" class="board-action-buttons">
 				<Popover @show="filterVisible=true" @hide="filterVisible=false">
 					<Actions slot="trigger" :title="t('deck', 'Apply filter')">
 						<ActionButton v-if="isFilterActive" icon="icon-filter_set" />
@@ -237,6 +243,7 @@ export default {
 		]),
 		...mapState({
 			compactMode: state => state.compactMode,
+			searchQuery: state => state.searchQuery,
 		}),
 		detailsRoute() {
 			return {
@@ -374,6 +381,13 @@ export default {
 		}
 	}
 
+	.deck-search {
+		input[type=search] {
+			background-position: 5px;
+			padding-left: 24px;
+		}
+	}
+
 	.filter--item {
 		input + label {
 			display: block;

src/components/board/Board.vue

@@ -32,7 +32,7 @@
 			</div>
 			<EmptyContent v-else-if="isEmpty" key="empty" icon="icon-deck">
 				{{ t('deck', 'No lists available') }}
-				<template #desc>
+				<template v-if="canManage" #desc>
 					{{ t('deck', 'Create a new list to add cards to this board') }}
 					<form @submit.prevent="addNewStack()">
 						<input id="new-stack-input-main"
@@ -65,6 +65,7 @@
 				<p />
 			</div>
 		</transition>
+		<GlobalSearchResults />
 	</div>
 </template>
 
@@ -75,10 +76,12 @@ import { mapState, mapGetters } from 'vuex'
 import Controls from '../Controls'
 import Stack from './Stack'
 import { EmptyContent } from '@nextcloud/vue'
+import GlobalSearchResults from '../search/GlobalSearchResults'
 
 export default {
 	name: 'Board',
 	components: {
+		GlobalSearchResults,
 		Controls,
 		Container,
 		Draggable,
@@ -107,6 +110,7 @@ export default {
 		}),
 		...mapGetters([
 			'canEdit',
+			'canManage',
 		]),
 		stacksByBoard() {
 			return this.$store.getters.stacksByBoard(this.board.id)
@@ -178,13 +182,17 @@ export default {
 		width: 100%;
 		height: 100%;
 		max-height: calc(100vh - 50px);
+		display: flex;
+		flex-direction: column;
 	}
 
 	.board {
 		padding-left: $board-spacing;
 		position: relative;
-		height: calc(100% - 44px);
-		overflow-x: scroll;
+		max-height: calc(100% - 44px);
+		overflow: hidden;
+		overflow-x: auto;
+		flex-grow: 1;
 	}
 
 	/**

src/components/board/SharingTabSidebar.vue

@@ -73,7 +73,7 @@ import { CollectionList } from 'nextcloud-vue-collections'
 import { mapGetters, mapState } from 'vuex'
 import { getCurrentUser } from '@nextcloud/auth'
 import { showError } from '@nextcloud/dialogs'
-import { debounce } from 'lodash'
+import debounce from 'lodash/debounce'
 
 export default {
 	name: 'SharingTabSidebar',

src/components/card/AttachmentList.vue

@@ -22,7 +22,7 @@
 
 <template>
 	<AttachmentDragAndDrop :card-id="cardId" class="drop-upload--sidebar">
-		<div class="button-group">
+		<div class="button-group" v-if="!isReadOnly">
 			<button class="icon-upload" @click="uploadNewFile()">
 				{{ t('deck', 'Upload new files') }}
 			</button>
@@ -49,18 +49,25 @@
 			</li>
 			<li v-for="attachment in attachments"
 				:key="attachment.id"
-				class="attachment">
+				class="attachment"
+				:class="{ 'attachment--deleted': attachment.deletedAt > 0 }">
 				<a class="fileicon"
+					:href="internalLink(attachment)"
 					:style="mimetypeForAttachment(attachment)"
 					@click.prevent="showViewer(attachment)" />
 				<div class="details">
-					<a @click.prevent="showViewer(attachment)">
+					<a :href="internalLink(attachment)" @click.prevent="showViewer(attachment)">
 						<div class="filename">
 							<span class="basename">{{ attachment.data }}</span>
 						</div>
-						<span class="filesize">{{ formattedFileSize(attachment.extendedData.filesize) }}</span>
-						<span class="filedate">{{ relativeDate(attachment.createdAt*1000) }}</span>
-						<span class="filedate">{{ attachment.createdBy }}</span>
+						<div v-if="attachment.deletedAt === 0">
+							<span class="filesize">{{ formattedFileSize(attachment.extendedData.filesize) }}</span>
+							<span class="filedate">{{ relativeDate(attachment.createdAt*1000) }}</span>
+							<span class="filedate">{{ attachment.createdBy }}</span>
+						</div>
+						<div v-else>
+							<span class="attachment--info">{{ t('deck', 'Pending share') }}</span>
+						</div>
 					</a>
 				</div>
 				<Actions v-if="selectable">
@@ -68,12 +75,12 @@
 						{{ t('deck', 'Add this attachment') }}
 					</ActionButton>
 				</Actions>
-				<Actions v-if="removable" :force-menu="true">
+				<Actions v-if="removable && !isReadOnly" :force-menu="true">
 					<ActionLink v-if="attachment.extendedData.fileid" icon="icon-folder" :href="internalLink(attachment)">
 						{{ t('deck', 'Show in Files') }}
 					</ActionLink>
-					<ActionButton v-if="attachment.extendedData.fileid" icon="icon-delete" @click="unshareAttachment(attachment)">
-						{{ t('deck', 'Unshare file') }}
+					<ActionButton v-if="attachment.extendedData.fileid && !isReadOnly" icon="icon-delete" @click="unshareAttachment(attachment)">
+						{{ t('deck', 'Remove attachment') }}
 					</ActionButton>
 
 					<ActionButton v-if="!attachment.extendedData.fileid && attachment.deletedAt === 0" icon="icon-delete" @click="$emit('deleteAttachment', attachment)">
@@ -143,6 +150,7 @@ export default {
 	},
 	computed: {
 		attachments() {
+			// FIXME sort propertly by last modified / deleted at
 			return [...this.$store.getters.attachmentsByCard(this.cardId)].filter(attachment => attachment.deletedAt >= 0).sort((a, b) => b.id - a.id)
 		},
 		mimetypeForAttachment() {
@@ -320,9 +328,10 @@ export default {
 					opacity: 0.7;
 				}
 			}
+			.attachment--info,
 			.filesize, .filedate {
 				font-size: 90%;
-				color: darkgray;
+				color: var(--color-text-maxcontrast);
 			}
 			.app-popover-menu-utils {
 				position: relative;

src/components/card/CardSidebar.vue

@@ -22,6 +22,7 @@
 
 <template>
 	<AppSidebar v-if="currentBoard && currentCard"
+		:active="tabId"
 		:title="title"
 		:subtitle="subtitle"
 		:title-editable="titleEditable"
@@ -65,7 +66,7 @@
 			:order="2"
 			:name="t('deck', 'Comments')"
 			icon="icon-comment">
-			<CardSidebarTabComments :card="currentCard" />
+			<CardSidebarTabComments :card="currentCard" :tab-query="tabQuery" />
 		</AppSidebarTab>
 
 		<AppSidebarTab v-if="hasActivity"
@@ -109,6 +110,16 @@ export default {
 			type: Number,
 			required: true,
 		},
+		tabId: {
+			type: String,
+			required: false,
+			default: null,
+		},
+		tabQuery: {
+			type: String,
+			required: false,
+			default: null,
+		},
 	},
 	data() {
 		return {
@@ -174,6 +185,13 @@ export default {
 
 <style lang="scss" scoped>
 
+	section.app-sidebar__tab--active {
+		min-height: auto;
+		display: flex;
+		flex-direction: column;
+		height: 100%;
+	}
+
 	// FIXME: Obivously we should at some point not randomly reuse the sidebar component
 	// since this is not oficially supported
 	.modal__card .app-sidebar {
@@ -191,7 +209,6 @@ export default {
 			.app-sidebar-header {
 				position: sticky;
 				top: 0;
-				padding-top: $modal-padding;
 				z-index: 100;
 				background-color: var(--color-main-background);
 			}
@@ -203,12 +220,6 @@ export default {
 				background-color: var(--color-main-background);
 			}
 
-			section.app-sidebar__tab--active {
-				min-height: auto;
-				display: flex;
-				flex-direction: column;
-			}
-
 			#emptycontent, .emptycontent {
 				margin-top: 88px;
 			}

src/components/card/CardSidebarTabComments.vue

@@ -7,7 +7,11 @@
 			</span>
 		</div>
 
-		<CommentItem v-if="replyTo" :comment="replyTo" :reply="true" />
+		<CommentItem v-if="replyTo"
+			:comment="replyTo"
+			:reply="true"
+			:preview="true"
+			@cancel="cancelReply" />
 		<CommentForm v-model="newComment" @submit="createComment" />
 
 		<ul v-if="getCommentsForCard(card.id).length > 0" id="commentsFeed">
@@ -23,8 +27,8 @@
 		</ul>
 		<div v-else-if="isLoading" class="icon icon-loading" />
 		<div v-else class="emptycontent">
-			<div class="icon-comment" />
-			<p>{{ t('deck', 'No comments yet. Begin the discussion!') }}</p>
+			<div :class="{ 'icon-comment': !error, 'icon-error': error }" />
+			<p>{{ error || t('deck', 'No comments yet. Begin the discussion!') }}</p>
 		</div>
 	</div>
 </template>
@@ -36,6 +40,7 @@ import CommentItem from './CommentItem'
 import CommentForm from './CommentForm'
 import InfiniteLoading from 'vue-infinite-loading'
 import { getCurrentUser } from '@nextcloud/auth'
+
 export default {
 	name: 'CardSidebarTabComments',
 	components: {
@@ -49,12 +54,18 @@ export default {
 			type: Object,
 			default: undefined,
 		},
+		tabQuery: {
+			type: String,
+			required: false,
+			default: null,
+		},
 	},
 	data() {
 		return {
 			newComment: '',
 			isLoading: false,
 			currentUser: getCurrentUser(),
+			error: null,
 		}
 	},
 	computed: {
@@ -80,19 +91,34 @@ export default {
 	},
 	methods: {
 		async infiniteHandler($state) {
-			await this.loadMore()
-			if (this.hasMoreComments(this.card.id)) {
-				$state.loaded()
-			} else {
+			this.error = null
+			try {
+				await this.loadMore()
+				if (this.hasMoreComments(this.card.id)) {
+					$state.loaded()
+				} else {
+					$state.complete()
+				}
+			} catch (e) {
+				console.error('Failed to fetch more comments during infinite loading', e)
+				this.error = t('deck', 'Failed to load comments')
 				$state.complete()
 			}
 		},
 		async loadComments() {
+			this.$store.dispatch('setReplyTo', null)
+			this.error = null
 			this.isLoading = true
-			await this.$store.dispatch('fetchComments', { cardId: this.card.id })
-			this.isLoading = false
-			if (this.card.commentsUnread > 0) {
-				await this.$store.dispatch('markCommentsAsRead', this.card.id)
+			try {
+				await this.$store.dispatch('fetchComments', { cardId: this.card.id })
+				this.isLoading = false
+				if (this.card.commentsUnread > 0) {
+					await this.$store.dispatch('markCommentsAsRead', this.card.id)
+				}
+			} catch (e) {
+				this.isLoading = false
+				console.error('Failed to fetch more comments during infinite loading', e)
+				this.error = t('deck', 'Failed to load comments')
 			}
 		},
 		async createComment(content) {
@@ -110,6 +136,9 @@ export default {
 			await this.$store.dispatch('fetchMore', { cardId: this.card.id })
 			this.isLoading = false
 		},
+		cancelReply() {
+			this.$store.dispatch('setReplyTo', null)
+		},
 	},
 }
 </script>

src/components/card/CommentForm.vue

@@ -26,7 +26,7 @@
 			<At ref="at"
 				v-model="commentText"
 				:members="members"
-				name-key="uid"
+				name-key="displayname"
 				:tab-select="true">
 				<template v-slot:item="s">
 					<Avatar class="atwho-li--avatar" :user="s.item.uid" :size="24" />
@@ -41,6 +41,7 @@
 					</span>
 				</template>
 				<div ref="contentEditable"
+					class="comment-form__contenteditable"
 					contenteditable
 					@keydown.enter="handleKeydown"
 					@paste="onPaste"
@@ -175,6 +176,11 @@ export default {
 <style scoped lang="scss">
 	@import '../../css/comments';
 
+	.comment-form__contenteditable {
+		word-break: break-word;
+		border-radius: var(--border-radius-large)
+	}
+
 	.atwho-wrap {
 		width: 100%;
 		& > div[contenteditable] {

src/components/card/CommentItem.vue

@@ -1,10 +1,22 @@
 <template>
-	<div v-if="reply" class="reply">
-		<span class="reply--hint">{{ t('deck', 'In reply to') }} <UserBubble :user="comment.actorId" :display-name="comment.actorDisplayName" /></span>
-		<RichText class="comment--content"
-			:text="richText(comment)"
-			:arguments="richArgs(comment)"
-			:autolink="true" />
+	<div v-if="reply" class="reply" :class="{ 'reply--preview': preview }">
+		<div class="reply--wrapper">
+			<div class="reply--header">
+				<div class="reply--hint">
+					{{ t('deck', 'In reply to') }}
+					<UserBubble :user="comment.actorId" :display-name="comment.actorDisplayName" />
+				</div>
+				<Actions v-if="preview" class="reply--cancel">
+					<ActionButton icon="icon-close" @click="$emit('cancel')">
+						{{ t('deck', 'Cancel reply') }}
+					</ActionButton>
+				</Actions>
+			</div>
+			<RichText class="comment--content"
+				:text="richText(comment)"
+				:arguments="richArgs(comment)"
+				:autolink="true" />
+		</div>
 	</div>
 	<li v-else class="comment">
 		<template>
@@ -14,13 +26,19 @@
 					{{ comment.actorDisplayName }}
 				</span>
 				<Actions v-show="!edit" :force-menu="true">
-					<ActionButton icon="icon-reply" @click="replyTo()">
+					<ActionButton icon="icon-reply" :close-after-click="true" @click="replyTo()">
 						{{ t('deck', 'Reply') }}
 					</ActionButton>
-					<ActionButton v-if="canEdit" icon="icon-rename" @click="showUpdateForm()">
+					<ActionButton v-if="canEdit"
+						icon="icon-rename"
+						:close-after-click="true"
+						@click="showUpdateForm()">
 						{{ t('deck', 'Update') }}
 					</ActionButton>
-					<ActionButton v-if="canEdit" icon="icon-delete" @click="deleteComment()">
+					<ActionButton v-if="canEdit"
+						icon="icon-delete"
+						:close-after-click="true"
+						@click="deleteComment()">
 						{{ t('deck', 'Delete') }}
 					</ActionButton>
 				</Actions>
@@ -86,6 +104,10 @@ export default {
 			type: Boolean,
 			default: false,
 		},
+		preview: {
+			type: Boolean,
+			default: false,
+		},
 	},
 	data() {
 		return {
@@ -175,20 +197,41 @@ export default {
 	@import '../../css/comments';
 
 	.reply {
-		border-left: 3px solid var(--color-primary-element);
-		padding-left: 5px;
-		margin-left: 2px;
-		margin-bottom: 5px;
+		margin: 0 0 0 44px;
+
+		&.reply--preview {
+			margin: 4px 0;
+			padding: 8px;
+			background-color: var(--color-background-hover);
+			border-radius: var(--border-radius-large);
+
+			.reply--wrapper {
+				margin: 8px;
+			}
+
+			.reply--cancel {
+				margin-right: -12px;
+				margin-top: -12px;
+			}
+		}
+
+		.reply--wrapper {
+			border-left: 4px solid var(--color-border-dark);
+			padding-left: 8px;
+		}
 
 		&::v-deep .rich-text--wrapper {
 			margin-top: -3px;
-			color: var(--color-text-light);
+			color: var(--color-text-lighter);
+		}
+
+		.reply--header {
+			display: flex;
 		}
 
 		.reply--hint {
-			font-size: 0.9em;
 			color: var(--color-text-lighter);
-			vertical-align: top;
+			flex-grow: 1;
 		}
 
 		.comment--content {

src/components/card/Description.vue

@@ -306,6 +306,7 @@ h5 {
 	padding: 0;
 	background-color: var(--color-main-background);
 	color: var(--color-main-text);
+	width: 100%;
 }
 
 .CodeMirror-placeholder {

src/components/cards/CardBadges.vue

@@ -22,7 +22,13 @@
 
 <template>
 	<div v-if="card" class="badges">
-		<div v-if="card.commentsUnread > 0" class="icon icon-comment" />
+		<div v-if="card.commentsCount > 0"
+			v-tooltip="commentsHint"
+			class="icon icon-comment"
+			:class="{ 'icon-comment--unread': card.commentsUnread > 0 }"
+			@click.stop="openComments">
+			{{ card.commentsCount }}
+		</div>
 
 		<div v-if="card.description && checkListCount > 0" class="card-tasks icon icon-checkmark">
 			{{ checkListCheckedCount }}/{{ checkListCount }}
@@ -58,6 +64,21 @@ export default {
 		checkListCheckedCount() {
 			return (this.card.description.match(/^\s*([*+-]|(\d\.))\s+\[\s*x\s*\](.*)$/gim) || []).length
 		},
+		commentsHint() {
+			if (this.card.commentsUnread > 0) {
+				return t('deck', '{count} comments, {unread} unread', {
+					count: this.card.commentsCount,
+					unread: this.card.commentsUnread
+				})
+			}
+			return null
+		},
+	},
+	methods: {
+		openComments() {
+			const boardId = this.card && this.card.boardId ? this.card.boardId : this.$route.params.id
+			this.$router.push({ name: 'card', params: { id: boardId, cardId: this.card.id, tabId: 'comments' } })
+		},
 	},
 }
 </script>
@@ -70,7 +91,7 @@ export default {
 
 		.icon {
 			opacity: 0.5;
-			padding: 12px 18px;
+			padding: 10px 20px;
 			padding-right: 4px;
 			margin-right: 5px;
 			background-position: left;
@@ -78,8 +99,8 @@ export default {
 			span {
 				margin-left: 18px;
 			}
-			&.icon-edit {
-				opacity: 0.5;
+			&.icon-comment--unread {
+				opacity: 1;
 			}
 		}
 	}

src/components/cards/CardItem.vue

@@ -26,12 +26,16 @@
 
 <template>
 	<AttachmentDragAndDrop v-if="card" :card-id="card.id" class="drop-upload--card">
-		<div :class="{'compact': compactMode, 'current-card': currentCard, 'has-labels': card.labels && card.labels.length > 0, 'is-editing': editing, 'card__editable': canEdit}"
+		<div :class="{'compact': compactMode, 'current-card': currentCard, 'has-labels': card.labels && card.labels.length > 0, 'is-editing': editing, 'card__editable': canEdit, 'card__archived': card.archived }"
 			tag="div"
 			class="card"
 			@click="openCard">
+			<div v-if="standalone" class="card-related">
+				<div :style="{backgroundColor: '#' + board.color}" class="board-bullet" />
+				{{ board.title }} » {{ stack.title }}
+			</div>
 			<div class="card-upper">
-				<h3 v-if="compactMode || isArchived || showArchived || !canEdit">
+				<h3 v-if="compactMode || isArchived || showArchived || !canEdit || standalone">
 					{{ card.title }}
 				</h3>
 				<h3 v-else-if="!editing">
@@ -98,6 +102,10 @@ export default {
 			type: Object,
 			default: null,
 		},
+		standalone: {
+			type: Boolean,
+			default: false,
+		},
 	},
 	data() {
 		return {
@@ -114,6 +122,12 @@ export default {
 		...mapGetters([
 			'isArchived',
 		]),
+		board() {
+			return this.$store.getters.boardById(this?.stack?.boardId)
+		},
+		stack() {
+			return this.$store.getters.stackById(this?.card?.stackId)
+		},
 		canEdit() {
 			if (this.currentBoard) {
 				return !this.currentBoard.archived && this.$store.getters.canEdit
@@ -233,6 +247,9 @@ export default {
 		&.card__editable .card-controls {
 			margin-right: 0;
 		}
+		&.card__archived {
+			background-color: var(--color-background-dark);
+		}
 	}
 
 	.duedate {
@@ -244,6 +261,24 @@ export default {
 		align-items: flex-start;
 	}
 
+	.card-related {
+		display: flex;
+		padding: 12px;
+		padding-bottom: 0px;
+		color: var(--color-text-maxcontrast);
+
+		.board-bullet {
+			display: inline-block;
+			width: 12px;
+			height: 12px;
+			border: none;
+			border-radius: 50%;
+			background-color: transparent;
+			margin-top: 4px;
+			margin-right: 4px;
+		}
+	}
+
 	.compact {
 		min-height: 44px;
 

src/components/cards/CardMenu.vue

@@ -23,7 +23,7 @@
 <template>
 	<div v-if="card">
 		<div @click.stop.prevent>
-			<Actions v-if="canEdit && !isArchived">
+			<Actions>
 				<ActionButton v-if="showArchived === false && !isCurrentUserAssigned"
 					icon="icon-user"
 					:close-after-click="true"
@@ -43,7 +43,7 @@
 					{{ t('deck', 'Card details') }}
 				</ActionButton>
 				<ActionButton icon="icon-archive" :close-after-click="true" @click="archiveUnarchiveCard()">
-					{{ showArchived ? t('deck', 'Unarchive card') : t('deck', 'Archive card') }}
+					{{ card.archived ? t('deck', 'Unarchive card') : t('deck', 'Archive card') }}
 				</ActionButton>
 				<ActionButton v-if="showArchived === false"
 					icon="icon-delete"

src/components/overview/Overview.vue

@@ -73,6 +73,8 @@
 				</div>
 			</div>
 		</div>
+
+		<GlobalSearchResults />
 	</div>
 </template>
 
@@ -82,6 +84,7 @@ import Controls from '../Controls'
 import CardItem from '../cards/CardItem'
 import { mapGetters } from 'vuex'
 import moment from '@nextcloud/moment'
+import GlobalSearchResults from '../search/GlobalSearchResults'
 
 const FILTER_UPCOMING = 'upcoming'
 
@@ -92,6 +95,7 @@ const SUPPORTED_FILTERS = [
 export default {
 	name: 'Overview',
 	components: {
+		GlobalSearchResults,
 		Controls,
 		CardItem,
 	},
@@ -203,6 +207,8 @@ export default {
 	width: 100%;
 	height: 100%;
 	max-height: calc(100vh - 50px);
+	display: flex;
+	flex-direction: column;
 }
 
 .overview {

src/components/search/GlobalSearchResults.vue

@@ -0,0 +1,224 @@
+<!--
+  - @copyright Copyright (c) 2021 Julius Härtl <jus@bitgrid.net>
+  -
+  - @author Julius Härtl <jus@bitgrid.net>
+  -
+  - @license GNU AGPL version 3 or any later version
+  -
+  - This program is free software: you can redistribute it and/or modify
+  - it under the terms of the GNU Affero General Public License as
+  - published by the Free Software Foundation, either version 3 of the
+  - License, or (at your option) any later version.
+  -
+  - This program is distributed in the hope that it will be useful,
+  - but WITHOUT ANY WARRANTY; without even the implied warranty of
+  - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  - GNU Affero General Public License for more details.
+  -
+  - You should have received a copy of the GNU Affero General Public License
+  - along with this program. If not, see <http://www.gnu.org/licenses/>.
+  -
+  -->
+
+<template>
+	<div v-if="searchQuery!==''" class="global-search">
+		<h2>
+			<RichText :text="t('deck', 'Search for {searchQuery} in all boards')" :arguments="queryStringArgs" />
+			<div v-if="loading" class="icon-loading-small" />
+		</h2>
+		<Actions>
+			<ActionButton icon="icon-close" @click="$store.commit('setSearchQuery', '')" />
+		</Actions>
+		<div class="search-wrapper">
+			<div v-if="loading || filteredResults.length > 0" class="search-results">
+				<CardItem v-for="card in filteredResults"
+					:id="card.id"
+					:key="card.id"
+					:standalone="true" />
+				<Placeholder v-if="loading" />
+				<InfiniteLoading :identifier="searchQuery" @infinite="infiniteHandler">
+					<div slot="spinner" />
+					<div slot="no-more" />
+					<div slot="no-results">
+						{{ t('deck', 'No results found') }}
+					</div>
+				</InfiniteLoading>
+			</div>
+			<div v-else>
+				<p>{{ t('deck', 'No results found') }}</p>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+import CardItem from '../cards/CardItem'
+import { mapState } from 'vuex'
+import axios from '@nextcloud/axios'
+import { generateOcsUrl } from '@nextcloud/router'
+import InfiniteLoading from 'vue-infinite-loading'
+import RichText from '@juliushaertl/vue-richtext'
+import Placeholder from './Placeholder'
+import { Actions, ActionButton } from '@nextcloud/vue'
+
+const createCancelToken = () => axios.CancelToken.source()
+
+function search({ query, cursor }) {
+	const cancelToken = createCancelToken()
+
+	const request = async() => axios.get(generateOcsUrl('apps/deck/api/v1.0', 2) + '/search', {
+		cancelToken: cancelToken.token,
+		params: {
+			term: query,
+			limit: 20,
+			cursor,
+		},
+	})
+
+	return {
+		request,
+		cancel: cancelToken.cancel,
+	}
+}
+
+export default {
+	name: 'GlobalSearchResults',
+	components: { CardItem, InfiniteLoading, RichText, Placeholder, Actions, ActionButton },
+	data() {
+		return {
+			results: [],
+			cancel: null,
+			loading: false,
+			cursor: null,
+		}
+	},
+	computed: {
+		...mapState({
+			searchQuery: state => state.searchQuery,
+		}),
+		filteredResults() {
+			const sortFn = (a, b) => a.archived - b.archived || b.lastModified - a.lastModified
+			if (this.$route.params.id) {
+				return this.results.filter((result) => result.relatedBoard.id.toString() !== this.$route.params.id.toString()).sort(sortFn)
+			}
+			return [...this.results].sort(sortFn)
+		},
+		queryStringArgs() {
+			return {
+				searchQuery: this.searchQuery,
+			}
+		},
+	},
+	watch: {
+		async searchQuery() {
+			this.cursor = null
+			this.loading = true
+			try {
+				await this.search()
+				this.loading = false
+			} catch (e) {
+				if (!axios.isCancel(e)) {
+					console.error('Search request failed', e)
+					this.loading = false
+				}
+			}
+		},
+	},
+	methods: {
+		async infiniteHandler($state) {
+			this.loading = true
+			try {
+				const data = await this.search()
+				if (data.length) {
+					$state.loaded()
+				} else {
+					$state.complete()
+				}
+				this.loading = false
+			} catch (e) {
+				if (!axios.isCancel(e)) {
+					console.error('Search request failed', e)
+					$state.complete()
+					this.loading = false
+				}
+			}
+		},
+		async search() {
+			if (this.cancel) {
+				this.cancel()
+			}
+			const { request, cancel } = await search({ query: this.searchQuery, cursor: this.cursor })
+			this.cancel = cancel
+			const { data } = await request()
+
+			if (this.cursor === null) {
+				this.results = []
+			}
+			if (data.ocs.data.length > 0) {
+				data.ocs.data.forEach((card) => {
+					this.$store.dispatch('addCardData', card)
+				})
+				this.results = [...this.results, ...data.ocs.data]
+				this.cursor = data.ocs.data[data.ocs.data.length - 1].lastModified
+			}
+			return data.ocs.data
+		},
+	},
+}
+</script>
+
+<style lang="scss" scoped>
+@import '../../css/variables.scss';
+
+.global-search {
+	width: 100%;
+	padding: $board-spacing + $stack-spacing;
+	padding-bottom: 0;
+	overflow: hidden;
+	min-height: 35vh;
+	max-height: 50vh;
+	flex-shrink: 1;
+	flex-grow: 1;
+	border-top: 1px solid var(--color-border);
+	z-index: 1010;
+	position: relative;
+
+	.action-item.icon-close {
+		position: absolute;
+		top: 10px;
+		right: 10px;
+	}
+	.search-wrapper {
+		overflow: scroll;
+		height: 100%;
+		position: relative;
+		padding: 10px;
+	}
+
+	h2 > div {
+		display: inline-block;
+
+		&.icon-loading-small {
+			margin-right: 20px;
+		}
+	}
+	h2::v-deep span {
+		background-color: var(--color-background-dark);
+		padding: 3px;
+		border-radius: var(--border-radius);
+	}
+
+	.search-results {
+		display: flex;
+		flex-wrap: wrap;
+
+		& > div {
+			flex-grow: 0;
+		}
+	}
+	&::v-deep .card {
+		width: $stack-width;
+		margin-right: $stack-spacing;
+	}
+}
+</style>

src/components/search/Placeholder.vue

@@ -0,0 +1,115 @@
+<template>
+	<div class="card--placeholder">
+		<svg class="card-placeholder__gradient">
+			<defs>
+				<linearGradient id="card-placeholder__gradient">
+					<stop offset="0%" :stop-color="light">
+						<animate attributeName="stop-color"
+							:values="`${light}; ${light}; ${dark}; ${dark}; ${light}`"
+							dur="2s"
+							repeatCount="indefinite" />
+					</stop>
+					<stop offset="100%" :stop-color="dark">
+						<animate attributeName="stop-color"
+							:values="`${dark}; ${light}; ${light}; ${dark}; ${dark}`"
+							dur="2s"
+							repeatCount="indefinite" />
+					</stop>
+				</linearGradient>
+			</defs>
+		</svg>
+		<svg
+			class="card-placeholder__placeholder"
+			:class="{ 'standalone': standalone }"
+			xmlns="http://www.w3.org/2000/svg"
+			fill="url(#card-placeholder__gradient)">
+			<rect class="card-placeholder__placeholder-line-header" :style="{width: `calc(${randWidth()}%)`}" />
+			<rect class="card-placeholder__placeholder-line-one" />
+			<rect class="card-placeholder__placeholder-line-two" :style="{width: `calc(${randWidth()}%)`}" />
+		</svg>
+	</div>
+</template>
+
+<script>
+export default {
+	name: 'Placeholder',
+	data() {
+		return {
+			light: null,
+			dark: null,
+			standalone: true,
+		}
+	},
+	mounted() {
+		const styles = getComputedStyle(document.documentElement)
+		this.dark = styles.getPropertyValue('--color-placeholder-dark')
+		this.light = styles.getPropertyValue('--color-placeholder-light')
+	},
+
+	methods: {
+		randWidth() {
+			return Math.floor(Math.random() * 20) + 40
+		},
+	},
+}
+</script>
+
+<style lang="scss" scoped>
+@import '../../css/variables.scss';
+$clickable-area: 44px;
+
+.card--placeholder {
+	width: $stack-width;
+	margin-right: $stack-spacing;
+	padding: $card-padding;
+	transition: box-shadow 0.1s ease-in-out;
+	box-shadow: 0 0 2px 0 var(--color-box-shadow);
+	border-radius: var(--border-radius-large);
+	font-size: 100%;
+	margin-bottom: $card-spacing;
+	height: 100px;
+}
+
+.card-placeholder__gradient {
+	position: fixed;
+	height: 0;
+	width: 0;
+	z-index: -1;
+}
+
+.card-placeholder__placeholder {
+	width: 100%;
+	&-line-header,
+	&-line-one,
+	&-line-two {
+		width: 100%;
+		height: 1em;
+		x: 0;
+	}
+	&-line-header {
+		visibility: hidden;
+	}
+	&-line-one {
+		y: 5px;
+	}
+
+	&-line-two {
+		y: 25px;
+	}
+
+	&.standalone {
+		.card-placeholder__placeholder-line-header {
+			visibility: visible;
+			y: 5px;
+		}
+		.card-placeholder__placeholder-line-one {
+			y: 40px;
+		}
+
+		.card-placeholder__placeholder-line-two {
+			y: 60px;
+		}
+	}
+}
+
+</style>

src/css/comments.scss

@@ -48,4 +48,5 @@
 
 .comment--content {
 	margin-left: 44px;
+	word-break: break-word;
 }

src/router.js

@@ -116,7 +116,7 @@ export default new Router({
 					},
 				},
 				{
-					path: 'card/:cardId',
+					path: 'card/:cardId/:tabId?/:tabQuery?',
 					name: 'card',
 					components: {
 						sidebar: CardSidebar,
@@ -130,6 +130,8 @@ export default new Router({
 						sidebar: (route) => {
 							return {
 								id: parseInt(route.params.cardId, 10),
+								tabId: route.params.tabId,
+								tabQuery: route.params.tabQuery,
 							}
 						},
 					},

src/store/card.js

@@ -21,6 +21,7 @@
  */
 
 import { CardApi } from './../services/CardApi'
+import moment from 'moment'
 import Vue from 'vue'
 
 const apiClient = new CardApi()
@@ -86,8 +87,109 @@ export default {
 						return true
 					}
 
-					return card.title.toLowerCase().includes(getters.getSearchQuery.toLowerCase())
-						|| card.description.toLowerCase().includes(getters.getSearchQuery.toLowerCase())
+					let hasMatch = true
+					const matches = getters.getSearchQuery.match(/(?:[^\s"]+|"[^"]*")+/g)
+
+					const filterOutQuotes = (q) => {
+						if (q[0] === '"' && q[q.length - 1] === '"') {
+							return q.substr(1, q.length - 2)
+						}
+						return q
+					}
+					for (const match of matches) {
+						let [filter, query] = match.indexOf(':') !== -1 ? match.split(/:(.*)/) : [null, match]
+						const isEmptyQuery = typeof query === 'undefined' || filterOutQuotes(query) === ''
+
+						if (filter === 'title') {
+							if (isEmptyQuery) {
+								continue
+							}
+							hasMatch = hasMatch && card.title.toLowerCase().includes(filterOutQuotes(query).toLowerCase())
+						} else if (filter === 'description') {
+							if (isEmptyQuery) {
+								hasMatch = hasMatch && !!card.description
+								continue
+							}
+							hasMatch = hasMatch && card.description.toLowerCase().includes(filterOutQuotes(query).toLowerCase())
+						} else if (filter === 'list') {
+							if (isEmptyQuery) {
+								continue
+							}
+							const stack = getters.stackById(card.stackId)
+							if (!stack) {
+								return false
+							}
+							hasMatch = hasMatch && stack.title.toLowerCase().includes(filterOutQuotes(query).toLowerCase())
+						} else if (filter === 'tag') {
+							if (isEmptyQuery) {
+								hasMatch = hasMatch && card.labels.length > 0
+								continue
+							}
+							hasMatch = hasMatch && card.labels.findIndex((label) => label.title.toLowerCase().includes(filterOutQuotes(query).toLowerCase())) !== -1
+						} else if (filter === 'date') {
+							const datediffHour = ((new Date(card.duedate) - new Date()) / 3600 / 1000)
+							query = filterOutQuotes(query)
+							switch (query) {
+							case 'overdue':
+								hasMatch = hasMatch && (card.overdue === 3)
+								break
+							case 'today':
+								hasMatch = hasMatch && (datediffHour > 0 && datediffHour <= 24 && card.duedate !== null)
+								break
+							case 'week':
+								hasMatch = hasMatch && (datediffHour > 0 && datediffHour <= 7 * 24 && card.duedate !== null)
+								break
+							case 'month':
+								hasMatch = hasMatch && (datediffHour > 0 && datediffHour <= 30 * 24 && card.duedate !== null)
+								break
+							case 'none':
+								hasMatch = hasMatch && (card.duedate === null)
+								break
+							}
+
+							if (card.duedate === null || !hasMatch) {
+								return false
+							}
+							const comparator = query[0] + (query[1] === '=' ? '=' : '')
+							const isValidComparator = ['<', '<=', '>', '>='].indexOf(comparator) !== -1
+							const parsedCardDate = moment(card.duedate)
+							const parsedDate = moment(query.substr(isValidComparator ? comparator.length : 0))
+							switch (comparator) {
+							case '<':
+								hasMatch = hasMatch && parsedCardDate.isBefore(parsedDate)
+								break
+							case '<=':
+								hasMatch = hasMatch && parsedCardDate.isSameOrBefore(parsedDate)
+								break
+							case '>':
+								hasMatch = hasMatch && parsedCardDate.isAfter(parsedDate)
+								break
+							case '>=':
+								hasMatch = hasMatch && parsedCardDate.isSameOrAfter(parsedDate)
+								break
+							default:
+								hasMatch = hasMatch && parsedCardDate.isSame(parsedDate)
+								break
+							}
+
+						} else if (filter === 'assigned') {
+							if (isEmptyQuery) {
+								hasMatch = hasMatch && card.assignedUsers.length > 0
+								continue
+							}
+							hasMatch = hasMatch && card.assignedUsers.findIndex((assignment) => {
+								return assignment.participant.primaryKey.toLowerCase() === filterOutQuotes(query).toLowerCase()
+									|| assignment.participant.displayname.toLowerCase() === filterOutQuotes(query).toLowerCase()
+							}) !== -1
+						} else {
+							hasMatch = hasMatch && (card.title.toLowerCase().includes(filterOutQuotes(match).toLowerCase())
+								|| card.description.toLowerCase().includes(filterOutQuotes(match).toLowerCase()))
+						}
+						if (!hasMatch) {
+							return false
+						}
+					}
+					return true
 				})
 				.sort((a, b) => a.order - b.order || a.createdAt - b.createdAt)
 		},
@@ -210,7 +312,7 @@ export default {
 			}
 
 			const updatedCard = await apiClient[call](card)
-			commit('deleteCard', updatedCard)
+			commit('updateCard', updatedCard)
 		},
 		async assignCardToUser({ commit }, { card, assignee }) {
 			const user = await apiClient.assignUser(card.id, assignee.userId, assignee.type)
@@ -236,5 +338,14 @@ export default {
 			const updatedCard = await apiClient.updateCard(card)
 			commit('updateCardProperty', { property: 'duedate', card: updatedCard })
 		},
+
+		addCardData({ commit }, cardData) {
+			const card = { ...cardData }
+			commit('addStack', card.relatedStack)
+			commit('addBoard', card.relatedBoard)
+			delete card.relatedStack
+			delete card.relatedBoard
+			commit('addCard', card)
+		},
 	},
 }

src/store/main.js

@@ -91,6 +91,9 @@ export default new Vuex.Store({
 		boards: state => {
 			return state.boards
 		},
+		boardById: state => (id) => {
+			return state.boards.find((board) => board.id === id)
+		},
 		assignables: state => {
 			return [
 				...state.assignableUsers.map((user) => ({ ...user, type: 0 })),
@@ -417,6 +420,7 @@ export default new Vuex.Store({
 			params.append('format', 'json')
 			params.append('perPage', 20)
 			params.append('itemType', [0, 1, 4, 7])
+			params.append('lookup', false)
 
 			const response = await axios.get(generateOcsUrl('apps/files_sharing/api/v1') + 'sharees', { params })
 			commit('setSharees', response.data.ocs.data)

tests/integration/config/behat.yml

@@ -5,10 +5,8 @@ default:
         - '%paths.base%/../features/'
       contexts:
         - ServerContext:
-            baseUrl:  http://localhost:8080/index.php/ocs/
-            admin:
-              - admin
-              - admin
-            regular_user_password: 123456
-        - BoardContext:
             baseUrl:  http://localhost:8080/
+        - RequestContext
+        - BoardContext
+        - CommentContext
+        - SearchContext

tests/integration/features/bootstrap/BoardContext.php

@@ -1,6 +1,7 @@
 <?php
 
 use Behat\Behat\Context\Context;
+use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\Gherkin\Node\TableNode;
 use PHPUnit\Framework\Assert;
 
@@ -16,25 +17,39 @@ class BoardContext implements Context {
 	/** @var array last card response */
 	private $card = null;
 
+	/** @var ServerContext */
+	private $serverContext;
+
+	/** @BeforeScenario */
+	public function gatherContexts(BeforeScenarioScope $scope) {
+		$environment = $scope->getEnvironment();
+
+		$this->serverContext = $environment->getContext('ServerContext');
+	}
+
+	public function getLastUsedCard() {
+		return $this->card;
+	}
+
 	/**
 	 * @Given /^creates a board named "([^"]*)" with color "([^"]*)"$/
 	 */
 	public function createsABoardNamedWithColor($title, $color) {
-		$this->sendJSONrequest('POST', '/index.php/apps/deck/boards', [
+		$this->requestContext->sendJSONrequest('POST', '/index.php/apps/deck/boards', [
 			'title' => $title,
 			'color' => $color
 		]);
-		$this->response->getBody()->seek(0);
-		$this->board = json_decode((string)$this->response->getBody(), true);
+		$this->getResponse()->getBody()->seek(0);
+		$this->board = json_decode((string)$this->getResponse()->getBody(), true);
 	}
 
 	/**
 	 * @When /^fetches the board named "([^"]*)"$/
 	 */
 	public function fetchesTheBoardNamed($boardName) {
-		$this->sendJSONrequest('GET', '/index.php/apps/deck/boards/' . $this->board['id'], []);
-		$this->response->getBody()->seek(0);
-		$this->board = json_decode((string)$this->response->getBody(), true);
+		$this->requestContext->sendJSONrequest('GET', '/index.php/apps/deck/boards/' . $this->board['id'], []);
+		$this->getResponse()->getBody()->seek(0);
+		$this->board = json_decode((string)$this->getResponse()->getBody(), true);
 	}
 
 	/**
@@ -48,7 +63,7 @@ class BoardContext implements Context {
 		];
 		$tableRows = isset($permissions) ? $permissions->getRowsHash() : [];
 		$result = array_merge($defaults, $tableRows);
-		$this->sendJSONrequest('POST', '/index.php/apps/deck/boards/' . $this->board['id'] . '/acl', [
+		$this->requestContext->sendJSONrequest('POST', '/index.php/apps/deck/boards/' . $this->board['id'] . '/acl', [
 			'type' => 0,
 			'participant' => $user,
 			'permissionEdit' => $result['permissionEdit'] === '1',
@@ -68,7 +83,7 @@ class BoardContext implements Context {
 		];
 		$tableRows = isset($permissions) ? $permissions->getRowsHash() : [];
 		$result = array_merge($defaults, $tableRows);
-		$this->sendJSONrequest('POST', '/index.php/apps/deck/boards/' . $this->board['id'] . '/acl', [
+		$this->requestContext->sendJSONrequest('POST', '/index.php/apps/deck/boards/' . $this->board['id'] . '/acl', [
 			'type' => 1,
 			'participant' => $group,
 			'permissionEdit' => $result['permissionEdit'] === '1',
@@ -82,38 +97,38 @@ class BoardContext implements Context {
 	 * @When /^fetching the board list$/
 	 */
 	public function fetchingTheBoardList() {
-		$this->sendJSONrequest('GET', '/index.php/apps/deck/boards');
+		$this->requestContext->sendJSONrequest('GET', '/index.php/apps/deck/boards');
 	}
 
 	/**
 	 * @When /^fetching the board with id "([^"]*)"$/
 	 */
 	public function fetchingTheBoardWithId($id) {
-		$this->sendJSONrequest('GET', '/index.php/apps/deck/boards/' . $id);
+		$this->requestContext->sendJSONrequest('GET', '/index.php/apps/deck/boards/' . $id);
 	}
 
 	/**
 	 * @Given /^create a stack named "([^"]*)"$/
 	 */
 	public function createAStackNamed($name) {
-		$this->sendJSONrequest('POST', '/index.php/apps/deck/stacks', [
+		$this->requestContext->sendJSONrequest('POST', '/index.php/apps/deck/stacks', [
 			'title' => $name,
 			'boardId' => $this->board['id']
 		]);
-		$this->response->getBody()->seek(0);
-		$this->stack = json_decode((string)$this->response->getBody(), true);
+		$this->requestContext->getResponse()->getBody()->seek(0);
+		$this->stack = json_decode((string)$this->getResponse()->getBody(), true);
 	}
 
 	/**
 	 * @Given /^create a card named "([^"]*)"$/
 	 */
 	public function createACardNamed($name) {
-		$this->sendJSONrequest('POST', '/index.php/apps/deck/cards', [
+		$this->requestContext->sendJSONrequest('POST', '/index.php/apps/deck/cards', [
 			'title' => $name,
 			'stackId' => $this->stack['id']
 		]);
-		$this->response->getBody()->seek(0);
-		$this->card = json_decode((string)$this->response->getBody(), true);
+		$this->requestContext->getResponse()->getBody()->seek(0);
+		$this->card = json_decode((string)$this->getResponse()->getBody(), true);
 	}
 
 	/**
@@ -151,4 +166,70 @@ class BoardContext implements Context {
 		]);
 		$this->serverContext->creatingShare($table);
 	}
+
+	/**
+	 * @Given /^set the description to "([^"]*)"$/
+	 */
+	public function setTheDescriptionTo($description) {
+		$this->requestContext->sendJSONrequest('PUT', '/index.php/apps/deck/cards/' . $this->card['id'], array_merge(
+			$this->card,
+			['description' => $description]
+		));
+		$this->requestContext->getResponse()->getBody()->seek(0);
+		$this->card = json_decode((string)$this->getResponse()->getBody(), true);
+	}
+
+	/**
+	 * @Given /^set the card attribute "([^"]*)" to "([^"]*)"$/
+	 */
+	public function setCardAttribute($attribute, $value) {
+		$this->requestContext->sendJSONrequest('PUT', '/index.php/apps/deck/cards/' . $this->card['id'], array_merge(
+			$this->card,
+			[$attribute => $value]
+		));
+		$this->requestContext->getResponse()->getBody()->seek(0);
+		$this->card = json_decode((string)$this->getResponse()->getBody(), true);
+	}
+
+	/**
+	 * @Given /^set the card duedate to "([^"]*)"$/
+	 */
+	public function setTheCardDuedateTo($arg1) {
+		$date = new DateTime($arg1);
+		$this->setCardAttribute('duedate', $date->format(DateTimeInterface::ATOM));
+	}
+
+	/**
+	 * @Given /^assign the card to the user "([^"]*)"$/
+	 */
+	public function assignTheCardToTheUser($user) {
+		$this->assignToCard($user, 0);
+	}
+
+	/**
+	 * @Given /^assign the card to the group "([^"]*)"$/
+	 */
+	public function assignTheCardToTheGroup($user) {
+		$this->assignToCard($user, 1);
+	}
+
+	private function assignToCard($participant, $type) {
+		$this->requestContext->sendJSONrequest('POST', '/index.php/apps/deck/cards/' . $this->card['id'] .'/assign', [
+			'userId' => $participant,
+			'type' => $type
+		]);
+		$this->requestContext->getResponse()->getBody()->seek(0);
+	}
+
+	/**
+	 * @Given /^assign the tag "([^"]*)" to the card$/
+	 */
+	public function assignTheTagToTheCard($tag) {
+		$filteredLabels = array_filter($this->board['labels'], function ($label) use ($tag) {
+			return $label['title'] === $tag;
+		});
+		$label = array_shift($filteredLabels);
+		$this->requestContext->sendJSONrequest('POST', '/index.php/apps/deck/cards/' . $this->card['id'] .'/label/' . $label['id']);
+		$this->requestContext->getResponse()->getBody()->seek(0);
+	}
 }

tests/integration/features/bootstrap/CommentContext.php

@@ -0,0 +1,31 @@
+<?php
+
+use Behat\Behat\Context\Context;
+use Behat\Behat\Hook\Scope\BeforeScenarioScope;
+
+require_once __DIR__ . '/../../vendor/autoload.php';
+
+class CommentContext implements Context {
+	use RequestTrait;
+
+	/** @var BoardContext */
+	protected $boardContext;
+
+	/** @BeforeScenario */
+	public function gatherContexts(BeforeScenarioScope $scope) {
+		$environment = $scope->getEnvironment();
+
+		$this->boardContext = $environment->getContext('BoardContext');
+	}
+
+	/**
+	 * @Given /^post a comment with content "([^"]*)" on the card$/
+	 */
+	public function postACommentWithContentOnTheCard($content) {
+		$card = $this->boardContext->getLastUsedCard();
+		$this->requestContext->sendOCSRequest('POST', '/apps/deck/api/v1.0/cards/' . $card['id'] . '/comments', [
+			'message' => $content,
+			'parentId' => null
+		]);
+	}
+}

tests/integration/features/bootstrap/RequestContext.php

@@ -0,0 +1,140 @@
+<?php
+
+use Behat\Behat\Hook\Scope\BeforeScenarioScope;
+use Behat\Gherkin\Node\TableNode;
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\ClientException;
+use PHPUnit\Framework\Assert;
+use Behat\Behat\Context\Context;
+use Psr\Http\Message\ResponseInterface;
+
+require_once __DIR__ . '/../../vendor/autoload.php';
+
+class RequestContext implements Context {
+	private $response;
+
+	/** @var ServerContext */
+	private $serverContext;
+
+	/** @BeforeScenario */
+	public function gatherContexts(BeforeScenarioScope $scope) {
+		$environment = $scope->getEnvironment();
+
+		$this->serverContext = $environment->getContext('ServerContext');
+	}
+
+	private function getBaseUrl() {
+	}
+
+	/**
+	 * @Then the response should have a status code :code
+	 * @param string $code
+	 * @throws InvalidArgumentException
+	 */
+	public function theResponseShouldHaveStatusCode($code) {
+		$currentCode = $this->response->getStatusCode();
+		if ($currentCode !== (int)$code) {
+			throw new InvalidArgumentException(
+				sprintf(
+					'Expected %s as code got %s',
+					$code,
+					$currentCode
+				)
+			);
+		}
+	}
+
+	/**
+	 * @Then /^the response Content-Type should be "([^"]*)"$/
+	 * @param string $contentType
+	 */
+	public function theResponseContentTypeShouldbe($contentType) {
+		Assert::assertEquals($contentType, $this->response->getHeader('Content-Type')[0]);
+	}
+
+	/**
+	 * @Then the response should be a JSON array with the following mandatory values
+	 * @param TableNode $table
+	 * @throws InvalidArgumentException
+	 */
+	public function theResponseShouldBeAJsonArrayWithTheFollowingMandatoryValues(TableNode $table) {
+		$this->response->getBody()->seek(0);
+		$expectedValues = $table->getColumnsHash();
+		$realResponseArray = json_decode($this->response->getBody()->getContents(), true);
+		foreach ($expectedValues as $value) {
+			if ((string)$realResponseArray[$value['key']] !== (string)$value['value']) {
+				throw new InvalidArgumentException(
+					sprintf(
+						'Expected %s for key %s got %s',
+						(string)$value['value'],
+						$value['key'],
+						(string)$realResponseArray[$value['key']]
+					)
+				);
+			}
+		}
+	}
+
+	/**
+	 * @Then the response should be a JSON array with a length of :length
+	 * @param int $length
+	 * @throws InvalidArgumentException
+	 */
+	public function theResponseShouldBeAJsonArrayWithALengthOf($length) {
+		$this->response->getBody()->seek(0);
+		$realResponseArray = json_decode($this->response->getBody()->getContents(), true);
+		if ((int)count($realResponseArray) !== (int)$length) {
+			throw new InvalidArgumentException(
+				sprintf(
+					'Expected %d as length got %d',
+					$length,
+					count($realResponseArray)
+				)
+			);
+		}
+	}
+
+	public function sendJSONrequest($method, $url, $data = []) {
+		$client = new Client;
+		try {
+			$this->response = $client->request(
+				$method,
+				rtrim($this->serverContext->getBaseUrl(), '/') . '/' . ltrim($url, '/'),
+				[
+					'cookies' => $this->serverContext->getCookieJar(),
+					'json' => $data,
+					'headers' => [
+						'requesttoken' => $this->serverContext->getReqestToken(),
+					]
+				]
+			);
+		} catch (ClientException $e) {
+			$this->response = $e->getResponse();
+		}
+	}
+
+	public function sendOCSRequest($method, $url, $data = []) {
+		$client = new Client;
+		try {
+			$this->response = $client->request(
+				$method,
+				rtrim($this->serverContext->getBaseUrl(), '/') . '/ocs/v2.php/' . ltrim($url, '/'),
+				[
+					'cookies' => $this->serverContext->getCookieJar(),
+					'json' => $data,
+					'headers' => [
+						'requesttoken' => $this->serverContext->getReqestToken(),
+						'OCS-APIREQUEST' => 'true',
+						'Accept' => 'application/json'
+					]
+				]
+			);
+		} catch (ClientException $e) {
+			$this->response = $e->getResponse();
+		}
+	}
+
+	public function getResponse(): ResponseInterface {
+		return $this->response;
+	}
+}

tests/integration/features/bootstrap/RequestTrait.php

@@ -1,121 +1,46 @@
 <?php
+/*
+ * @copyright Copyright (c) 2021 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+declare(strict_types=1);
+
 
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
-use Behat\Gherkin\Node\TableNode;
-use GuzzleHttp\Client;
-use GuzzleHttp\Exception\ClientException;
-use PHPUnit\Framework\Assert;
 
 require_once __DIR__ . '/../../vendor/autoload.php';
 
+
 trait RequestTrait {
-	private $baseUrl;
-	private $adminUser;
-	private $regularUser;
-	private $cookieJar;
 
-	private $response;
-
-	public function __construct($baseUrl, $admin = 'admin', $regular_user_password = '123456') {
-		$this->baseUrl = $baseUrl;
-		$this->adminUser = $admin === 'admin' ? ['admin', 'admin'] : $admin;
-		$this->regularUser = $regular_user_password;
-	}
-
-	/** @var ServerContext */
-	private $serverContext;
+	/** @var RequestContext */
+	protected $requestContext;
 
 	/** @BeforeScenario */
-	public function gatherContexts(BeforeScenarioScope $scope) {
+	public function gatherRequestTraitContext(BeforeScenarioScope $scope) {
 		$environment = $scope->getEnvironment();
-
-		$this->serverContext = $environment->getContext('ServerContext');
+		$this->requestContext = $environment->getContext('RequestContext');
 	}
 
-	/**
-	 * @Then the response should have a status code :code
-	 * @param string $code
-	 * @throws InvalidArgumentException
-	 */
-	public function theResponseShouldHaveStatusCode($code) {
-		$currentCode = $this->response->getStatusCode();
-		if ($currentCode !== (int)$code) {
-			throw new InvalidArgumentException(
-				sprintf(
-					'Expected %s as code got %s',
-					$code,
-					$currentCode
-				)
-			);
-		}
-	}
-
-	/**
-	 * @Then /^the response Content-Type should be "([^"]*)"$/
-	 * @param string $contentType
-	 */
-	public function theResponseContentTypeShouldbe($contentType) {
-		Assert::assertEquals($contentType, $this->response->getHeader('Content-Type')[0]);
-	}
-
-	/**
-	 * @Then the response should be a JSON array with the following mandatory values
-	 * @param TableNode $table
-	 * @throws InvalidArgumentException
-	 */
-	public function theResponseShouldBeAJsonArrayWithTheFollowingMandatoryValues(TableNode $table) {
-		$this->response->getBody()->seek(0);
-		$expectedValues = $table->getColumnsHash();
-		$realResponseArray = json_decode($this->response->getBody()->getContents(), true);
-		foreach ($expectedValues as $value) {
-			if ((string)$realResponseArray[$value['key']] !== (string)$value['value']) {
-				throw new InvalidArgumentException(
-					sprintf(
-						'Expected %s for key %s got %s',
-						(string)$value['value'],
-						$value['key'],
-						(string)$realResponseArray[$value['key']]
-					)
-				);
-			}
-		}
-	}
-
-	/**
-	 * @Then the response should be a JSON array with a length of :length
-	 * @param int $length
-	 * @throws InvalidArgumentException
-	 */
-	public function theResponseShouldBeAJsonArrayWithALengthOf($length) {
-		$this->response->getBody()->seek(0);
-		$realResponseArray = json_decode($this->response->getBody()->getContents(), true);
-		if ((int)count($realResponseArray) !== (int)$length) {
-			throw new InvalidArgumentException(
-				sprintf(
-					'Expected %d as length got %d',
-					$length,
-					count($realResponseArray)
-				)
-			);
-		}
-	}
-
-	private function sendJSONrequest($method, $url, $data = []) {
-		$client = new Client;
-		try {
-			$this->response = $client->request(
-				$method,
-				$this->baseUrl . $url,
-				[
-					'cookies' => $this->serverContext->getCookieJar(),
-					'json' => $data,
-					'headers' => [
-						'requesttoken' => $this->serverContext->getReqestToken()
-					]
-				]
-			);
-		} catch (ClientException $e) {
-			$this->response = $e->getResponse();
-		}
+	public function getResponse() {
+		return $this->requestContext->getResponse();
 	}
 }

tests/integration/features/bootstrap/SearchContext.php

@@ -0,0 +1,123 @@
+<?php
+
+use Behat\Behat\Context\Context;
+use Behat\Behat\Hook\Scope\BeforeScenarioScope;
+use PHPUnit\Framework\Assert;
+
+require_once __DIR__ . '/../../vendor/autoload.php';
+
+class SearchContext implements Context {
+	use RequestTrait;
+
+	/** @var BoardContext */
+	protected $boardContext;
+
+	private $searchResults;
+	private $unifiedSearchResult;
+
+	/** @BeforeScenario */
+	public function gatherContexts(BeforeScenarioScope $scope) {
+		$environment = $scope->getEnvironment();
+
+		$this->boardContext = $environment->getContext('BoardContext');
+	}
+	
+	/**
+	 * @When /^searching for "([^"]*)"$/
+	 * @param string $term
+	 */
+	public function searchingFor(string $term) {
+		$this->requestContext->sendOCSRequest('GET', '/apps/deck/api/v1.0/search?term=' . urlencode($term), []);
+		$this->requestContext->getResponse()->getBody()->seek(0);
+		$data = (string)$this->getResponse()->getBody();
+		$this->searchResults = json_decode($data, true);
+	}
+
+	/**
+	 * @When /^searching for "([^"]*)" in comments in unified search$/
+	 * @param string $term
+	 * https://cloud.nextcloud.com/ocs/v2.php/search/providers/talk-conversations/search?term=an&from=%2Fapps%2Fdashboard%2F
+	 */
+	public function searchingForComments(string $term) {
+		$this->requestContext->sendOCSRequest('GET', '/search/providers/deck-comment/search?term=' . urlencode($term), []);
+		$this->requestContext->getResponse()->getBody()->seek(0);
+		$data = (string)$this->getResponse()->getBody();
+		$this->unifiedSearchResult = json_decode($data, true);
+	}
+
+	/**
+	 * @When /^searching for '([^']*)'$/
+	 * @param string $term
+	 */
+	public function searchingForQuotes(string $term) {
+		$this->searchingFor($term);
+	}
+
+	/**
+	 * @Then /^the board "([^"]*)" is found$/
+	 */
+	public function theBoardIsFound($arg1) {
+		$ocsData = $this->searchResults['ocs']['data'];
+		$found = false;
+		foreach ($ocsData as $result) {
+			if ($result['title'] === $arg1) {
+				$found = true;
+			}
+		}
+		Assert::assertTrue($found, 'Board can be found');
+	}
+
+	private function cardIsFound($arg1) {
+		$ocsData = $this->searchResults['ocs']['data'];
+		$found = false;
+		foreach ($ocsData as $result) {
+			if ($result['title'] === $arg1) {
+				$found = true;
+			}
+		}
+		return $found;
+	}
+
+	/**
+	 * @Then /^the card "([^"]*)" is found$/
+	 */
+	public function theCardIsFound($arg1) {
+		Assert::assertTrue($this->cardIsFound($arg1), 'Card can be found');
+	}
+
+	/**
+	 * @Then /^the card "([^"]*)" is not found$/
+	 */
+	public function theCardIsNotFound($arg1) {
+		Assert::assertFalse($this->cardIsFound($arg1), 'Card can not be found');
+	}
+
+	/**
+	 * @Then /^the comment with "([^"]*)" is found$/
+	 */
+	public function theCommentWithIsFound($arg1) {
+		$ocsData = $this->unifiedSearchResult['ocs']['data']['entries'];
+		$found = null;
+		foreach ($ocsData as $result) {
+			if ($result['subline'] === $arg1) {
+				$found = $result;
+			}
+		}
+		Assert::assertNotNull($found, 'Comment was expected but was not found');
+		Assert::assertEquals('admin on Card with comment', $found['title']);
+	}
+
+	/**
+	 * @Then /^the comment with "([^"]*)" is not found$/
+	 */
+	public function theCommentWithIsNotFound($arg1) {
+		$ocsData = $this->unifiedSearchResult['ocs']['data']['entries'];
+		$found = null;
+		foreach ($ocsData as $result) {
+			if ($result['subline'] === $arg1) {
+				$found = $result;
+			}
+		}
+		Assert::assertNull($found, 'Comment was found but not expected');
+	}
+}

tests/integration/features/bootstrap/ServerContext.php

@@ -6,7 +6,14 @@ use GuzzleHttp\Cookie\CookieJar;
 require_once __DIR__ . '/../../vendor/autoload.php';
 
 class ServerContext implements Context {
-	use WebDav;
+	use WebDav {
+		WebDav::__construct as private __tConstruct;
+	}
+
+	public function __construct($baseUrl) {
+		$this->rawBaseUrl = $baseUrl;
+		$this->__tConstruct($baseUrl . '/index.php/ocs/', ['admin', 'admin'], '123456');
+	}
 
 	/** @var string */
 	private $mappedUserId;
@@ -28,6 +35,10 @@ class ServerContext implements Context {
 		$this->asAn($user);
 	}
 
+	public function getBaseUrl(): string {
+		return $this->rawBaseUrl;
+	}
+
 	public function getCookieJar(): CookieJar {
 		return $this->cookieJar;
 	}

tests/integration/features/decks.feature

@@ -4,23 +4,6 @@ Feature: decks
     Given user "admin" exists
     Given user "user0" exists
 
-  Scenario: Request the main frontend page
-    Given Logging in using web as "admin"
-    When Sending a "GET" to "/index.php/apps/deck" without requesttoken
-    Then the HTTP status code should be "200"
-
-  Scenario: Fetch the board list
-    Given Logging in using web as "admin"
-    When fetching the board list
-    Then the response should have a status code "200"
-    And the response Content-Type should be "application/json; charset=utf-8"
-
-  Scenario: Fetch board details of a nonexisting board
-    Given Logging in using web as "admin"
-    When fetching the board with id "99999999"
-    Then the response should have a status code "403"
-    And the response Content-Type should be "application/json; charset=utf-8"
-
   Scenario: Create a new board
     Given Logging in using web as "admin"
     When creates a board named "MyBoard" with color "000000"

tests/integration/features/search.feature

@@ -0,0 +1,266 @@
+Feature: Searching for cards
+
+  Background:
+    Given user "admin" exists
+    Given user "user0" exists
+    Given Logging in using web as "admin"
+    When creates a board named "MyBoard" with color "000000"
+    When create a stack named "ToDo"
+    And create a card named "Example task 1"
+    And create a card named "Example task 2"
+    When create a stack named "In progress"
+    And create a card named "Progress task 1"
+    And create a card named "Progress task 2"
+    When create a stack named "Done"
+    And create a card named "Done task 1"
+    And set the description to "Done task description 1"
+    And create a card named "Done task 2"
+    And set the description to "Done task description 2"
+    And shares the board with user "user0"
+
+
+  Scenario: Search for a card with multiple terms
+    When searching for "Example task"
+    Then the card "Example task 1" is found
+    Then the card "Example task 2" is found
+    Then the card "Progress task 1" is not found
+    Then the card "Progress task 2" is not found
+    Then the card "Done task 1" is not found
+    Then the card "Done task 2" is not found
+
+  Scenario: Search for a card in a specific list
+    When searching for "task list:Done"
+    Then the card "Example task 1" is not found
+    Then the card "Example task 2" is not found
+    Then the card "Progress task 1" is not found
+    Then the card "Progress task 2" is not found
+    Then the card "Done task 1" is found
+    Then the card "Done task 2" is found
+
+  Scenario: Search for a card with one term
+    When searching for "task"
+    Then the card "Example task 1" is found
+    Then the card "Example task 2" is found
+    Then the card "Progress task 1" is found
+    Then the card "Progress task 2" is found
+    Then the card "Done task 1" is found
+    Then the card "Done task 2" is found
+
+  Scenario: Search for a card with an differently cased term
+    When searching for "tAsk"
+    Then the card "Example task 1" is found
+    Then the card "Example task 2" is found
+    Then the card "Progress task 1" is found
+    Then the card "Progress task 2" is found
+    Then the card "Done task 1" is found
+    Then the card "Done task 2" is found
+
+  Scenario: Search for a card title
+    When searching for 'title:"Done task 1"'
+    Then the card "Example task 1" is not found
+    Then the card "Example task 2" is not found
+    Then the card "Progress task 1" is not found
+    Then the card "Progress task 2" is not found
+    Then the card "Done task 1" is found
+    Then the card "Done task 2" is not found
+
+  Scenario: Search for a card description
+    When searching for 'description:"Done task description"'
+    Then the card "Example task 1" is not found
+    Then the card "Example task 2" is not found
+    Then the card "Progress task 1" is not found
+    Then the card "Progress task 2" is not found
+    Then the card "Done task 1" is found
+    Then the card "Done task 2" is found
+
+  Scenario: Search for a non-existing card description
+    When searching for 'description:"Example"'
+    Then the card "Example task 1" is not found
+    Then the card "Example task 2" is not found
+    Then the card "Progress task 1" is not found
+    Then the card "Progress task 2" is not found
+    Then the card "Done task 1" is not found
+    Then the card "Done task 2" is not found
+
+  Scenario: Search on shared boards
+    Given Logging in using web as "user0"
+    When searching for "task"
+    Then the card "Example task 1" is found
+    Then the card "Example task 2" is found
+    Then the card "Progress task 1" is found
+    Then the card "Progress task 2" is found
+    Then the card "Done task 1" is found
+    Then the card "Done task 2" is found
+
+  Scenario: Search for a card due date
+    Given create a card named "Overdue task"
+    And set the card attribute "duedate" to "2020-12-12"
+    And create a card named "Future task"
+    And set the card attribute "duedate" to "3000-12-12"
+    And create a card named "Tomorrow task"
+    And set the card duedate to "tomorrow"
+    When searching for 'date:overdue'
+    Then the card "Example task 1" is not found
+    Then the card "Example task 2" is not found
+    Then the card "Progress task 1" is not found
+    Then the card "Progress task 2" is not found
+    Then the card "Done task 1" is not found
+    Then the card "Done task 2" is not found
+    Then the card "Overdue task" is found
+    Then the card "Future task" is not found
+
+  Scenario: Search for a card due date
+    And create a card named "Overdue task"
+    And set the card attribute "duedate" to "2020-12-12"
+    And create a card named "Future task"
+    And set the card attribute "duedate" to "3000-12-12"
+    And create a card named "Tomorrow task"
+    And set the card duedate to "+12 hours"
+    And create a card named "Next week task"
+    And set the card duedate to "+5 days"
+
+    When searching for 'date:today'
+    Then the card "Example task 1" is not found
+    Then the card "Example task 2" is not found
+    Then the card "Progress task 1" is not found
+    Then the card "Progress task 2" is not found
+    Then the card "Done task 1" is not found
+    Then the card "Done task 2" is not found
+    Then the card "Overdue task" is not found
+    Then the card "Future task" is not found
+    Then the card "Tomorrow task" is found
+    Then the card "Next week task" is not found
+
+    When searching for 'date:week'
+    Then the card "Example task 1" is not found
+    Then the card "Example task 2" is not found
+    Then the card "Progress task 1" is not found
+    Then the card "Progress task 2" is not found
+    Then the card "Done task 1" is not found
+    Then the card "Done task 2" is not found
+    Then the card "Overdue task" is not found
+    Then the card "Future task" is not found
+    Then the card "Tomorrow task" is found
+    Then the card "Next week task" is found
+
+    When searching for 'date:month'
+    Then the card "Example task 1" is not found
+    Then the card "Example task 2" is not found
+    Then the card "Progress task 1" is not found
+    Then the card "Progress task 2" is not found
+    Then the card "Done task 1" is not found
+    Then the card "Done task 2" is not found
+    Then the card "Overdue task" is not found
+    Then the card "Future task" is not found
+    Then the card "Tomorrow task" is found
+    Then the card "Next week task" is found
+
+    When searching for 'date:none'
+    Then the card "Example task 1" is found
+    Then the card "Example task 2" is found
+    Then the card "Progress task 1" is found
+    Then the card "Progress task 2" is found
+    Then the card "Done task 1" is found
+    Then the card "Done task 2" is found
+    Then the card "Overdue task" is not found
+    Then the card "Future task" is not found
+    Then the card "Tomorrow task" is not found
+    Then the card "Next week task" is not found
+
+    When searching for 'date:<"+7 days"'
+    Then the card "Example task 1" is not found
+    Then the card "Example task 2" is not found
+    Then the card "Progress task 1" is not found
+    Then the card "Progress task 2" is not found
+    Then the card "Done task 1" is not found
+    Then the card "Done task 2" is not found
+    Then the card "Overdue task" is found
+    Then the card "Future task" is not found
+    Then the card "Tomorrow task" is found
+    Then the card "Next week task" is found
+
+    When searching for 'date:>"+10 days"'
+    Then the card "Example task 1" is not found
+    Then the card "Example task 2" is not found
+    Then the card "Progress task 1" is not found
+    Then the card "Progress task 2" is not found
+    Then the card "Done task 1" is not found
+    Then the card "Done task 2" is not found
+    Then the card "Overdue task" is not found
+    Then the card "Future task" is found
+    Then the card "Tomorrow task" is not found
+    Then the card "Next week task" is not found
+
+  Scenario: Search for assigned user
+    Given user "user1" exists
+    And shares the board with user "user1"
+    Given create a card named "Assigned card to user1"
+    And assign the card to the user "user1"
+    When searching for 'assigned:user1'
+    Then the card "Example task 1" is not found
+    And the card "Assigned card to user1" is found
+
+  Scenario: Search for assigned user by displayname
+    Given user "ada" with displayname "Ada Lovelace" exists
+    And shares the board with user "ada"
+    Given create a card named "Assigned card to ada"
+    And assign the card to the user "ada"
+    When searching for 'assigned:"Ada Lovelace"'
+    Then the card "Example task 1" is not found
+    And the card "Assigned card to ada" is found
+
+  Scenario: Search for assigned users
+    Given user "user1" exists
+    And shares the board with user "user1"
+    Given create a card named "Assigned card to user0"
+    And assign the card to the user "user0"
+    Given create a card named "Assigned card to user01"
+    And assign the card to the user "user0"
+    And assign the card to the user "user1"
+    When searching for 'assigned:user0 assigned:user1'
+    Then the card "Example task 1" is not found
+    And the card "Assigned card to user0" is not found
+    And the card "Assigned card to user01" is found
+
+  Scenario: Search for assigned group
+    Given user "user1" exists
+    And shares the board with user "user1"
+    Given group "group1" exists
+    And shares the board with group "group1"
+    Given user "user1" belongs to group "group1"
+    Given create a card named "Assigned card to group1"
+    And assign the card to the group "group1"
+    When searching for 'assigned:user1'
+    Then the card "Example task 1" is not found
+    And the card "Assigned card to group1" is found
+
+    When searching for 'assigned:group1'
+    Then the card "Example task 1" is not found
+    And the card "Assigned card to group1" is found
+
+  Scenario: Search for assigned tag
+    Given create a card named "Labeled card"
+    # Default labels from boards are used for this test case
+    And assign the tag "Finished" to the card
+    When searching for 'tag:Finished'
+    Then the card "Example task 1" is not found
+    And the card "Labeled card" is found
+
+    Given create a card named "Multi labeled card"
+    And assign the tag "Finished" to the card
+    And assign the tag "To review" to the card
+    When searching for 'tag:Finished tag:Later'
+    Then the card "Example task 1" is not found
+    And the card "Multi labeled card" is not found
+
+    When searching for 'tag:Finished tag:"To review"'
+    Then the card "Example task 1" is not found
+    And the card "Labeled card" is not found
+    And the card "Multi labeled card" is found
+
+  Scenario: Search for a card comment
+    Given create a card named "Card with comment"
+    And post a comment with content "My first comment" on the card
+    When searching for "My first comment" in comments in unified search
+    Then the comment with "My first comment" is found
+    Then the comment with "Any other" is not found

tests/psalm-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.6.4@97fe86c4e158b5a57c5150aa5055c38b5a809aab">
+<files psalm-version="4.7.0@d4377c0baf3ffbf0b1ec6998e8d1be2a40971005">
   <file src="lib/Activity/ActivityManager.php">
     <TypeDoesNotContainType occurrences="1">
       <code>$message !== null</code>
@@ -10,16 +10,6 @@
       <code>(int)$subjectParams['comment']</code>
     </InvalidScalarArgument>
   </file>
-  <file src="lib/AppInfo/Application.php">
-    <DuplicateClass occurrences="1">
-      <code>Application</code>
-    </DuplicateClass>
-  </file>
-  <file src="lib/AppInfo/Application20.php">
-    <RedundantCondition occurrences="1">
-      <code>method_exists($shareManager, 'registerShareProvider')</code>
-    </RedundantCondition>
-  </file>
   <file src="lib/Command/UserExport.php">
     <ImplementedReturnTypeMismatch occurrences="1">
       <code>void</code>
@@ -115,7 +105,8 @@
     <ParamNameMismatch occurrences="1">
       <code>$boardId</code>
     </ParamNameMismatch>
-    <UndefinedClass occurrences="1">
+    <UndefinedClass occurrences="2">
+      <code>\OCA\Circles\Api\v1\Circles</code>
       <code>\OCA\Circles\Api\v1\Circles</code>
     </UndefinedClass>
   </file>
@@ -126,12 +117,16 @@
     </UndefinedClass>
   </file>
   <file src="lib/Db/CardMapper.php">
+    <InvalidArgument occurrences="1"/>
     <InvalidScalarArgument occurrences="1">
       <code>$entity-&gt;getId()</code>
     </InvalidScalarArgument>
     <ParamNameMismatch occurrences="1">
       <code>$cardId</code>
     </ParamNameMismatch>
+    <UndefinedInterfaceMethod occurrences="1">
+      <code>getUserIdGroups</code>
+    </UndefinedInterfaceMethod>
   </file>
   <file src="lib/Db/ChangeHelper.php">
     <UndefinedThisPropertyAssignment occurrences="3">
@@ -176,11 +171,6 @@
       <code>$stackId</code>
     </ParamNameMismatch>
   </file>
-  <file src="lib/Notification/NotificationHelper.php">
-    <InvalidScalarArgument occurrences="1">
-      <code>$board-&gt;getId()</code>
-    </InvalidScalarArgument>
-  </file>
   <file src="lib/Notification/Notifier.php">
     <RedundantCast occurrences="7">
       <code>(string) $l-&gt;t('%s has mentioned you in a comment on "%s".', [$dn, $params[0]])</code>
@@ -202,12 +192,9 @@
       <code>$cardId</code>
       <code>$cardId</code>
     </InvalidScalarArgument>
-    <UndefinedThisPropertyAssignment occurrences="1">
-      <code>$this-&gt;currentUser</code>
-    </UndefinedThisPropertyAssignment>
-    <UndefinedThisPropertyFetch occurrences="1">
-      <code>$this-&gt;currentUser</code>
-    </UndefinedThisPropertyFetch>
+  </file>
+  <file src="lib/Service/AttachmentService.php">
+    <InvalidCatch occurrences="1"/>
   </file>
   <file src="lib/Service/BoardService.php">
     <TooManyArguments occurrences="2">
@@ -271,16 +258,16 @@
     </RedundantCondition>
   </file>
   <file src="lib/Service/FilesAppService.php">
-    <InvalidCatch occurrences="1"/>
     <MissingDependency occurrences="4">
       <code>$this-&gt;rootFolder</code>
       <code>$this-&gt;rootFolder</code>
       <code>IRootFolder</code>
-      <code>Share\Exceptions\ShareNotFound</code>
+      <code>ShareNotFound</code>
     </MissingDependency>
   </file>
   <file src="lib/Service/PermissionService.php">
-    <UndefinedClass occurrences="2">
+    <UndefinedClass occurrences="3">
+      <code>Member</code>
       <code>\OCA\Circles\Api\v1\Circles</code>
       <code>\OCA\Circles\Api\v1\Circles</code>
     </UndefinedClass>
@@ -297,7 +284,7 @@
     <InvalidReturnType occurrences="1">
       <code>getSharesInFolder</code>
     </InvalidReturnType>
-    <MissingDependency occurrences="7">
+    <MissingDependency occurrences="8">
       <code>GenericShareException</code>
       <code>GenericShareException</code>
       <code>ShareNotFound</code>
@@ -305,6 +292,7 @@
       <code>ShareNotFound</code>
       <code>ShareNotFound</code>
       <code>ShareNotFound</code>
+      <code>ShareNotFound</code>
     </MissingDependency>
   </file>
   <file src="lib/Sharing/Listener.php">

tests/unit/Command/UserExportTest.php

@@ -111,7 +111,7 @@ class UserExportTest extends \Test\TestCase {
 			->method('find')
 			->willReturn($cards[0]);
 		$this->assignedUserMapper->expects($this->exactly(count($boards) * count($stacks) * count($cards)))
-			->method('find')
+			->method('findAll')
 			->willReturn([]);
 		$result = $this->invokePrivate($this->userExport, 'execute', [$input, $output]);
 	}

tests/unit/Db/AclMapperTest.php

@@ -25,6 +25,7 @@ namespace OCA\Deck\Db;
 
 use OCP\IGroupManager;
 use OCP\IUserManager;
+use Psr\Log\LoggerInterface;
 use Test\AppFramework\Db\MapperTestUtility;
 
 /**
@@ -54,7 +55,8 @@ class AclMapperTest extends MapperTestUtility {
 			$this->aclMapper,
 			\OC::$server->query(StackMapper::class),
 			$this->userManager,
-			$this->groupManager
+			$this->groupManager,
+			$this->createMock(LoggerInterface::class)
 		);
 
 		$this->boards = [

tests/unit/Db/BoardMapperTest.php

@@ -26,6 +26,7 @@ namespace OCA\Deck\Db;
 use OCP\IDBConnection;
 use OCP\IGroupManager;
 use OCP\IUserManager;
+use Psr\Log\LoggerInterface;
 use Test\AppFramework\Db\MapperTestUtility;
 
 /**
@@ -61,7 +62,8 @@ class BoardMapperTest extends MapperTestUtility {
 			\OC::$server->query(AclMapper::class),
 			\OC::$server->query(StackMapper::class),
 			$this->userManager,
-			$this->groupManager
+			$this->groupManager,
+			$this->createMock(LoggerInterface::class)
 		);
 		$this->aclMapper = \OC::$server->query(AclMapper::class);
 		$this->labelMapper = \OC::$server->query(LabelMapper::class);
@@ -132,9 +134,15 @@ class BoardMapperTest extends MapperTestUtility {
 
 	public function testFindAll() {
 		$actual = $this->boardMapper->findAll();
-		$this->assertEquals($this->boards[0]->getId(), $actual[0]->getId());
-		$this->assertEquals($this->boards[1]->getId(), $actual[1]->getId());
-		$this->assertEquals($this->boards[2]->getId(), $actual[2]->getId());
+		$this->assertEquals(1, count(array_filter($actual, function ($card) {
+			return $card->getId() === $this->boards[0]->getId();
+		})));
+		$this->assertEquals(1, count(array_filter($actual, function ($card) {
+			return $card->getId() === $this->boards[1]->getId();
+		})));
+		$this->assertEquals(1, count(array_filter($actual, function ($card) {
+			return $card->getId() === $this->boards[2]->getId();
+		})));
 	}
 
 	public function testFindAllToDelete() {

tests/unit/Db/CardTest.php

@@ -83,6 +83,7 @@ class CardTest extends TestCase {
 			'assignedUsers' => null,
 			'deletedAt' => 0,
 			'commentsUnread' => 0,
+			'commentsCount' => 0,
 			'lastEditor' => null,
 			'ETag' => $card->getETag(),
 		], $card->jsonSerialize());
@@ -109,6 +110,7 @@ class CardTest extends TestCase {
 			'assignedUsers' => null,
 			'deletedAt' => 0,
 			'commentsUnread' => 0,
+			'commentsCount' => 0,
 			'lastEditor' => null,
 			'ETag' => $card->getETag(),
 		], $card->jsonSerialize());
@@ -145,6 +147,7 @@ class CardTest extends TestCase {
 			'assignedUsers' => ['user1'],
 			'deletedAt' => 0,
 			'commentsUnread' => 0,
+			'commentsCount' => 0,
 			'lastEditor' => null,
 			'ETag' => $card->getETag(),
 		], $card->jsonSerialize());

tests/unit/Middleware/ExceptionMiddlewareTest.php

@@ -47,10 +47,12 @@ class ExceptionMiddlewareTest extends \Test\TestCase {
 	public function setUp(): void {
 		$this->logger = $this->createMock(ILogger::class);
 		$this->config = $this->createMock(IConfig::class);
+		$this->request = $this->createMock(IRequest::class);
 		$this->controller = $this->createMock(Controller::class);
 		$this->exceptionMiddleware = new ExceptionMiddleware(
 			$this->logger,
-			$this->config
+			$this->config,
+			$this->request
 		);
 	}
 
@@ -81,10 +83,11 @@ class ExceptionMiddlewareTest extends \Test\TestCase {
 	}
 
 	public function testAfterExceptionFail() {
+		$this->request->expects($this->any())->method('getId')->willReturn('abc123');
 		// BoardService $boardService, PermissionService $permissionService, $userId
 		$boardController = new BoardController('deck', $this->createMock(IRequest::class), $this->createMock(BoardService::class), $this->createMock(PermissionService::class), 'admin');
-		$result = $this->exceptionMiddleware->afterException($boardController, 'bar', new \Exception('failed hard'));
-		$this->assertEquals('failed hard', $result->getData()['message']);
+		$result = $this->exceptionMiddleware->afterException($boardController, 'bar', new \Exception('other exception message'));
+		$this->assertEquals('Internal server error: Please contact the server administrator if this error reappears multiple times, please include the request ID "abc123" below in your report.', $result->getData()['message']);
 		$this->assertEquals(500, $result->getData()['status']);
 	}
 }

tests/unit/Notification/NotificationHelperTest.php

@@ -24,7 +24,7 @@
 namespace OCA\Deck\Notification;
 
 use OCA\Deck\Db\Acl;
-use OCA\Deck\Db\AssignedUsersMapper;
+use OCA\Deck\Db\AssignmentMapper;
 use OCA\Deck\Db\Board;
 use OCA\Deck\Db\BoardMapper;
 use OCA\Deck\Db\Card;
@@ -59,7 +59,7 @@ class NotificationHelperTest extends \Test\TestCase {
 	protected $cardMapper;
 	/** @var BoardMapper|MockObject */
 	protected $boardMapper;
-	/** @var AssignedUsersMapper|MockObject  */
+	/** @var AssignmentMapper|MockObject  */
 	protected $assignedUsersMapper;
 	/** @var PermissionService|MockObject */
 	protected $permissionService;
@@ -78,7 +78,7 @@ class NotificationHelperTest extends \Test\TestCase {
 		parent::setUp();
 		$this->cardMapper = $this->createMock(CardMapper::class);
 		$this->boardMapper = $this->createMock(BoardMapper::class);
-		$this->assignedUsersMapper = $this->createMock(AssignedUsersMapper::class);
+		$this->assignedUsersMapper = $this->createMock(AssignmentMapper::class);
 		$this->permissionService = $this->createMock(PermissionService::class);
 		$this->config = $this->createMock(IConfig::class);
 		$this->notificationManager = $this->createMock(IManager::class);
@@ -130,7 +130,8 @@ class NotificationHelperTest extends \Test\TestCase {
 		$card = Card::fromParams([
 			'notified' => false,
 			'id' => 123,
-			'title' => 'MyCardTitle'
+			'title' => 'MyCardTitle',
+			'duedate' => '2020-12-24'
 		]);
 		$this->cardMapper->expects($this->once())
 			->method('findBoardId')
@@ -225,7 +226,8 @@ class NotificationHelperTest extends \Test\TestCase {
 		$card = Card::fromParams([
 			'notified' => false,
 			'id' => 123,
-			'title' => 'MyCardTitle'
+			'title' => 'MyCardTitle',
+			'duedate' => '2020-12-24'
 		]);
 		$card->setAssignedUsers([
 			new User($users[0])
@@ -323,7 +325,8 @@ class NotificationHelperTest extends \Test\TestCase {
 		$card = Card::fromParams([
 			'notified' => false,
 			'id' => 123,
-			'title' => 'MyCardTitle'
+			'title' => 'MyCardTitle',
+			'duedate' => '2020-12-24'
 		]);
 		$card->setAssignedUsers([
 			new User($users[0])
@@ -470,7 +473,7 @@ class NotificationHelperTest extends \Test\TestCase {
 			->with(123)
 			->willReturn($board);
 		$user = $this->createMock(IUser::class);
-		$user->expects($this->once())
+		$user->expects($this->any())
 			->method('getUID')
 			->willReturn('userA');
 		$group = $this->createMock(IGroup::class);

tests/unit/Notification/NotifierTest.php

@@ -25,29 +25,33 @@ namespace OCA\Deck\Notification;
 
 use OCA\Deck\Db\BoardMapper;
 use OCA\Deck\Db\CardMapper;
+use OCA\Deck\Db\StackMapper;
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\IUser;
 use OCP\IUserManager;
 use OCP\L10N\IFactory;
 use OCP\Notification\INotification;
+use PHPUnit\Framework\MockObject\MockObject;
 
 class NotifierTest extends \Test\TestCase {
 
-	/** @var IFactory */
+	/** @var IFactory|MockObject */
 	protected $l10nFactory;
-	/** @var IURLGenerator */
+	/** @var IURLGenerator|MockObject */
 	protected $url;
-	/** @var IUserManager */
+	/** @var IUserManager|MockObject */
 	protected $userManager;
-	/** @var CardMapper */
+	/** @var CardMapper|MockObject */
 	protected $cardMapper;
+	/** @var StackMapper|MockObject */
+	protected $stackMapper;
 	/** @var BoardMapper */
 	protected $boardMapper;
+	/** @var IL10N|MockObject */
+	protected $l10n;
 	/** @var Notifier */
 	protected $notifier;
-	/** @var IL10N */
-	protected $l10n;
 
 	public function setUp(): void {
 		parent::setUp();
@@ -55,12 +59,14 @@ class NotifierTest extends \Test\TestCase {
 		$this->url = $this->createMock(IURLGenerator::class);
 		$this->userManager = $this->createMock(IUserManager::class);
 		$this->cardMapper = $this->createMock(CardMapper::class);
+		$this->stackMapper = $this->createMock(StackMapper::class);
 		$this->boardMapper = $this->createMock(BoardMapper::class);
 		$this->notifier = new Notifier(
 			$this->l10nFactory,
 			$this->url,
 			$this->userManager,
 			$this->cardMapper,
+			$this->stackMapper,
 			$this->boardMapper
 		);
 		$this->l10n = \OC::$server->getL10N('deck');
@@ -149,7 +155,7 @@ class NotifierTest extends \Test\TestCase {
 			->with($expectedMessage);
 		$notification->expects($this->once())
 			->method('setRichSubject')
-			->with('{user} has mentioned you in a comment on "Card title".');
+			->with('{user} has mentioned you in a comment on {deck-card}.');
 
 
 		$this->url->expects($this->once())
@@ -218,11 +224,25 @@ class NotifierTest extends \Test\TestCase {
 			->with($expectedMessage);
 		$notification->expects($this->once())
 			->method('setRichSubject')
-			->with('{user} has assigned the card "Card title" on "Board title" to you.', [
+			->with('{user} has assigned the card {deck-card} on {deck-board} to you.', [
 				'user' => [
 					'type' => 'user',
 					'id' => 'otheruser',
 					'name' => $dn,
+				],
+				'deck-card' => [
+					'type' => 'deck-card',
+					'id' => '123',
+					'name' => 'Card title',
+					'boardname' => 'Board title',
+					'stackname' => null,
+					'link' => '#/board/123/card/123',
+				],
+				'deck-board' => [
+					'type' => 'deck-board',
+					'id' => 123,
+					'name' => 'Board title',
+					'link' => '#/board/123',
 				]
 			]);
 
@@ -288,11 +308,17 @@ class NotifierTest extends \Test\TestCase {
 			->with($expectedMessage);
 		$notification->expects($this->once())
 			->method('setRichSubject')
-			->with('{user} has shared the board Board title with you.', [
+			->with('{user} has shared {deck-board} with you.', [
 				'user' => [
 					'type' => 'user',
 					'id' => 'otheruser',
 					'name' => $dn,
+				],
+				'deck-board' => [
+					'type' => 'deck-board',
+					'id' => 123,
+					'name' => 'Board title',
+					'link' => '#/board/123',
 				]
 			]);
 

tests/unit/Search/FilterStringParserTest.php

@@ -0,0 +1,133 @@
+<?php
+/*
+ * @copyright Copyright (c) 2021 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+declare(strict_types=1);
+
+namespace OCA\Deck\Search;
+
+use OCA\Deck\Search\Query\DateQueryParameter;
+use OCA\Deck\Search\Query\SearchQuery;
+use OCA\Deck\Search\Query\StringQueryParameter;
+use OCP\IL10N;
+use PHPUnit\Framework\Assert;
+use PHPUnit\Framework\TestCase;
+
+class FilterStringParserTest extends TestCase {
+	private $l10n;
+	private $parser;
+
+	public function setUp(): void {
+		$this->l10n = $this->createMock(IL10N::class);
+		$this->parser = new FilterStringParser($this->l10n);
+	}
+
+	public function testParseEmpty() {
+		$result = $this->parser->parse(null);
+		$expected = new SearchQuery();
+		Assert::assertEquals($expected, $result);
+	}
+
+	public function testParseTextTokens() {
+		$result = $this->parser->parse('a b c');
+		$expected = new SearchQuery();
+		$expected->addTextToken('a');
+		$expected->addTextToken('b');
+		$expected->addTextToken('c');
+		Assert::assertEquals($expected, $result);
+	}
+
+	public function testParseTextToken() {
+		$result = $this->parser->parse('abc');
+		$expected = new SearchQuery();
+		$expected->addTextToken('abc');
+		Assert::assertEquals($expected, $result);
+	}
+
+	public function testParseTextTokenQuotes() {
+		$result = $this->parser->parse('a b c "a b c" tag:abc tag:"a b c" tag:\'d e f\'');
+		$expected = new SearchQuery();
+		$expected->addTextToken('a');
+		$expected->addTextToken('b');
+		$expected->addTextToken('c');
+		$expected->addTextToken('a b c');
+		$expected->addTag(new StringQueryParameter('tag', SearchQuery::COMPARATOR_EQUAL, 'abc'));
+		$expected->addTag(new StringQueryParameter('tag', SearchQuery::COMPARATOR_EQUAL, 'a b c'));
+		$expected->addTag(new StringQueryParameter('tag', SearchQuery::COMPARATOR_EQUAL, 'd e f'));
+		Assert::assertEquals($expected, $result);
+	}
+
+	public function testParseTagComparatorNotSupported() {
+		$result = $this->parser->parse('tag:<"a tag"');
+		$expected = new SearchQuery();
+		$expected->addTag(new StringQueryParameter('tag', SearchQuery::COMPARATOR_EQUAL, '<"a tag"'));
+		Assert::assertEquals($expected, $result);
+	}
+
+	public function testParseTextTokenQuotesSingle() {
+		$result = $this->parser->parse('a b c \'a b c\'');
+		$expected = new SearchQuery();
+		$expected->addTextToken('a');
+		$expected->addTextToken('b');
+		$expected->addTextToken('c');
+		$expected->addTextToken('a b c');
+		Assert::assertEquals($expected, $result);
+	}
+
+	public function testParseTextTokenQuotesWrong() {
+		$result = $this->parser->parse('"a b" c"');
+		$expected = new SearchQuery();
+		$expected->addTextToken('a b');
+		$expected->addTextToken('c"');
+		Assert::assertEquals($expected, $result);
+	}
+
+	public function dataParseDate() {
+		return [
+			['date:today', [new DateQueryParameter('date', SearchQuery::COMPARATOR_EQUAL, 'today')], []],
+			['date:>today', [new DateQueryParameter('date', SearchQuery::COMPARATOR_MORE, 'today')], []],
+			['date:>=today', [new DateQueryParameter('date', SearchQuery::COMPARATOR_MORE_EQUAL, 'today')], []],
+			['date:<today', [new DateQueryParameter('date', SearchQuery::COMPARATOR_LESS, 'today')], []],
+			['date:<=today', [new DateQueryParameter('date', SearchQuery::COMPARATOR_LESS_EQUAL, 'today')], []],
+			['date:<+today', [new DateQueryParameter('date', SearchQuery::COMPARATOR_LESS, '+today')], []],
+			['date:<>today', [new DateQueryParameter('date', SearchQuery::COMPARATOR_LESS, '>today')], []],
+			['date:=today', [new DateQueryParameter('date', SearchQuery::COMPARATOR_EQUAL, '=today')], []],
+			['date:today todo', [new DateQueryParameter('date', SearchQuery::COMPARATOR_EQUAL, 'today')], ['todo']],
+			['date:"last day of next month" todo', [new DateQueryParameter('date', SearchQuery::COMPARATOR_EQUAL, 'last day of next month')], ['todo']],
+			['date:"last day of next month" "todo task" task', [new DateQueryParameter('date', SearchQuery::COMPARATOR_EQUAL, 'last day of next month')], ['todo task', 'task']],
+		];
+	}
+	/**
+	 * @dataProvider dataParseDate
+	 */
+	public function testParseDate($query, $dates, array $tokens) {
+		$result = $this->parser->parse($query);
+		$expected = new SearchQuery();
+		foreach ($dates as $date) {
+			$expected->addDuedate($date);
+		}
+		foreach ($tokens as $token) {
+			$expected->addTextToken($token);
+		}
+		Assert::assertEquals($expected, $result);
+	}
+}

tests/unit/Search/Query/AQueryParameterTest.php

@@ -0,0 +1,47 @@
+<?php
+/*
+ * @copyright Copyright (c) 2021 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+declare(strict_types=1);
+
+namespace OCA\Deck\Search\Query;
+
+use PHPUnit\Framework\TestCase;
+
+class AQueryParameterTest extends TestCase {
+	public function dataValue() {
+		return [
+			['foo', 'foo'],
+			['spätial character', 'spätial character'],
+			['"spätial character"', 'spätial character'],
+			['"spätial "character"', 'spätial "character'],
+			['"spätial 🐘"', 'spätial 🐘'],
+			['\'spätial character\'', '\'spätial character\''],
+		];
+	}
+
+	/** @dataProvider dataValue */
+	public function testValue($input, $expectedValue) {
+		$parameter = new StringQueryParameter('test', 0, $input);
+		$this->assertEquals($expectedValue, $parameter->getValue());
+	}
+}

tests/unit/Service/BoardServiceTest.php

@@ -23,7 +23,6 @@
 
 namespace OCA\Deck\Service;
 
-use OC\EventDispatcher\SymfonyAdapter;
 use OC\L10N\L10N;
 use OCA\Deck\Activity\ActivityManager;
 use OCA\Deck\Db\Acl;
@@ -37,11 +36,11 @@ use OCA\Deck\Db\LabelMapper;
 use OCA\Deck\Db\StackMapper;
 use OCA\Deck\NoPermissionException;
 use OCA\Deck\Notification\NotificationHelper;
+use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IConfig;
 use OCP\IUser;
 use OCP\IUserManager;
 use OCP\IGroupManager;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use \Test\TestCase;
 
 class BoardServiceTest extends TestCase {
@@ -72,7 +71,7 @@ class BoardServiceTest extends TestCase {
 	private $activityManager;
 	/** @var ChangeHelper */
 	private $changeHelper;
-	/** @var EventDispatcherInterface */
+	/** @var IEventDispatcher */
 	private $eventDispatcher;
 	private $userId = 'admin';
 
@@ -91,7 +90,7 @@ class BoardServiceTest extends TestCase {
 		$this->groupManager = $this->createMock(IGroupManager::class);
 		$this->activityManager = $this->createMock(ActivityManager::class);
 		$this->changeHelper = $this->createMock(ChangeHelper::class);
-		$this->eventDispatcher = $this->createMock(SymfonyAdapter::class);
+		$this->eventDispatcher = $this->createMock(IEventDispatcher::class);
 
 		$this->service = new BoardService(
 			$this->boardMapper,
@@ -383,7 +382,7 @@ class BoardServiceTest extends TestCase {
 		$assignment = new Assignment();
 		$assignment->setParticipant('admin');
 		$this->assignedUsersMapper->expects($this->once())
-			->method('findByUserId')
+			->method('findByParticipant')
 			->with('admin')
 			->willReturn([$assignment]);
 		$this->assignedUsersMapper->expects($this->once())

tests/unit/Service/CardServiceTest.php

@@ -25,9 +25,11 @@ namespace OCA\Deck\Service;
 
 use OCA\Deck\Activity\ActivityManager;
 use OCA\Deck\Db\AssignmentMapper;
+use OCA\Deck\Db\Board;
 use OCA\Deck\Db\Card;
 use OCA\Deck\Db\CardMapper;
 use OCA\Deck\Db\ChangeHelper;
+use OCA\Deck\Db\Stack;
 use OCA\Deck\Db\StackMapper;
 use OCA\Deck\Db\BoardMapper;
 use OCA\Deck\Db\LabelMapper;
@@ -126,6 +128,17 @@ class CardServiceTest extends TestCase {
 		$this->userManager->expects($this->once())
 			->method('get')
 			->willReturn($user);
+		$this->commentsManager->expects($this->any())
+			->method('getNumberOfCommentsForObject')
+			->willReturn(0);
+		$boardMock = $this->createMock(Board::class);
+		$stackMock = $this->createMock(Stack::class);
+		$this->stackMapper->expects($this->any())
+			->method('find')
+			->willReturn($stackMock);
+		$this->boardService->expects($this->any())
+			->method('find')
+			->willReturn($boardMock);
 		$card = new Card();
 		$card->setId(1337);
 		$this->cardMapper->expects($this->any())
@@ -133,12 +146,14 @@ class CardServiceTest extends TestCase {
 			->with(123)
 			->willReturn($card);
 		$this->assignedUsersMapper->expects($this->any())
-			->method('find')
+			->method('findAll')
 			->with(1337)
 			->willReturn(['user1', 'user2']);
 		$cardExpected = new Card();
 		$cardExpected->setId(1337);
 		$cardExpected->setAssignedUsers(['user1', 'user2']);
+		$cardExpected->setRelatedBoard($boardMock);
+		$cardExpected->setRelatedStack($stackMock);
 		$this->assertEquals($cardExpected, $this->cardService->find(123));
 	}
 

tests/unit/Service/PermissionServiceTest.php

@@ -146,7 +146,7 @@ class PermissionServiceTest extends \Test\TestCase {
 	}
 
 	public function testUserIsBoardOwnerNull() {
-		$this->boardMapper->expects($this->once())->method('find')->willReturn(null);
+		$this->boardMapper->expects($this->once())->method('find')->willThrowException(new DoesNotExistException('board does not exist'));
 		$this->assertEquals(false, $this->service->userIsBoardOwner(123));
 	}
 
@@ -225,12 +225,9 @@ class PermissionServiceTest extends \Test\TestCase {
 		$board = new Board();
 		$board->setId($boardId);
 		$board->setOwner($owner);
+		$board->setAcl($this->getAcls($boardId));
 		$this->boardMapper->expects($this->any())->method('find')->willReturn($board);
 
-		// acl check
-		$acls = $this->getAcls($boardId);
-		$this->aclMapper->expects($this->any())->method('findAll')->willReturn($acls);
-
 		$this->shareManager->expects($this->any())
 			->method('sharingDisabledForUser')
 			->willReturn(false);
@@ -250,14 +247,12 @@ class PermissionServiceTest extends \Test\TestCase {
 		$board = new Board();
 		$board->setId($boardId);
 		$board->setOwner($owner);
+		$board->setAcl($this->getAcls($boardId));
 		if ($boardId === null) {
 			$this->boardMapper->expects($this->any())->method('find')->willThrowException(new DoesNotExistException('not found'));
 		} else {
 			$this->boardMapper->expects($this->any())->method('find')->willReturn($board);
 		}
-		$acls = $this->getAcls($boardId);
-		$this->aclMapper->expects($this->any())->method('findAll')->willReturn($acls);
-
 
 		if ($result) {
 			$actual = $this->service->checkPermission($mapper, 1234, $permission);

tests/unit/Service/StackServiceTest.php

@@ -23,7 +23,6 @@
 
 namespace OCA\Deck\Service;
 
-use OC\EventDispatcher\SymfonyAdapter;
 use OCA\Deck\Activity\ActivityManager;
 use OCA\Deck\Db\AssignmentMapper;
 use OCA\Deck\Db\Card;
@@ -34,7 +33,6 @@ use OCA\Deck\Db\Label;
 use OCA\Deck\Db\LabelMapper;
 use OCA\Deck\Db\Stack;
 use OCA\Deck\Db\StackMapper;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use \Test\TestCase;
 
 /**
@@ -69,8 +67,6 @@ class StackServiceTest extends TestCase {
 	private $activityManager;
 	/** @var ChangeHelper|\PHPUnit\Framework\MockObject\MockObject */
 	private $changeHelper;
-	/** @var EventDispatcherInterface */
-	private $eventDispatcher;
 
 	public function setUp(): void {
 		parent::setUp();
@@ -85,7 +81,6 @@ class StackServiceTest extends TestCase {
 		$this->labelMapper = $this->createMock(LabelMapper::class);
 		$this->activityManager = $this->createMock(ActivityManager::class);
 		$this->changeHelper = $this->createMock(ChangeHelper::class);
-		$this->eventDispatcher = $this->createMock(SymfonyAdapter::class);
 
 		$this->stackService = new StackService(
 			$this->stackMapper,
@@ -98,7 +93,6 @@ class StackServiceTest extends TestCase {
 			$this->assignedUsersMapper,
 			$this->attachmentService,
 			$this->activityManager,
-			$this->eventDispatcher,
 			$this->changeHelper
 		);
 	}