Bump version to 1.8.2

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

.editorconfig

@@ -3,7 +3,10 @@ root = true
 [*]
 charset = utf-8
 end_of_line = lf
+indent_size = tab
+indent_style = tab
 insert_final_newline = true
+trim_trailing_whitespace = true
 
 [*.{js,vue}]
 indent_style = tab

.eslintrc.js

@@ -1,4 +1,5 @@
 module.exports = {
+	root: true,
 	extends: [
 		'@nextcloud',
 	],
@@ -7,6 +8,7 @@ module.exports = {
 		'jsdoc/require-param-type': ['off'],
 		'jsdoc/check-param-names': ['off'],
 		'jsdoc/no-undefined-types': ['off'],
-		'jsdoc/require-property-description' : ['off']
+		'jsdoc/require-property-description': ['off'],
+		'import/no-named-as-default-member': ['off']
 	},
 }

.github/workflows/appbuild.yml

@@ -1,7 +1,11 @@
 name: Package build
 
 on:
-  pull_request:
+  push:
+    branches:
+      - main
+      - master
+      - stable*
 
 jobs:
   build:
@@ -20,7 +24,7 @@ jobs:
     - name: Set up npm7
       run: npm i -g npm@7
     - name: Setup PHP
-      uses: shivammathur/setup-php@2.18.0
+      uses: shivammathur/setup-php@2.21.2
       with:
         php-version: '7.4'
         tools: composer

.github/workflows/appstore-build-publish.yml

@@ -66,7 +66,7 @@ jobs:
         run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"
 
       - name: Set up php ${{ env.PHP_VERSION }}
-        uses: shivammathur/setup-php@2.18.0
+        uses: shivammathur/setup-php@2.21.2
         with:
           php-version: ${{ env.PHP_VERSION }}
           coverage: none

.github/workflows/command-rebase.yml

@@ -9,9 +9,14 @@ on:
   issue_comment:
     types: created
 
+permissions:	
+  contents: read	
+
 jobs:
   rebase:
     runs-on: ubuntu-latest
+    permissions:
+      contents: none
 
     # On pull requests and if the comment starts with `/rebase`
     if: github.event.issue.pull_request != '' && startsWith(github.event.comment.body, '/rebase')
@@ -32,7 +37,7 @@ jobs:
           token: ${{ secrets.COMMAND_BOT_PAT }}
 
       - name: Automatic Rebase
-        uses: cirrus-actions/rebase@1.5
+        uses: cirrus-actions/rebase@1.7
         env:
           GITHUB_TOKEN: ${{ secrets.COMMAND_BOT_PAT }}
 

.github/workflows/cypress.yml

@@ -0,0 +1,112 @@
+name: Cypress
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - stable*
+
+env:
+  APP_NAME: deck
+  CYPRESS_baseUrl: http://localhost:8081/index.php
+
+jobs:
+  cypress:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        node-version: [14.x]
+        # containers: [1, 2, 3]
+        php-versions: [ '7.4' ]
+        databases: [ 'sqlite' ]
+        server-versions: [ 'stable25' ]
+
+    steps:
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Set up npm7
+        run: npm i -g npm@7
+
+      - name: Checkout server
+        uses: actions/checkout@v3
+        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 ${{ env.APP_NAME }}
+        uses: actions/checkout@v3
+        with:
+          path: apps/${{ env.APP_NAME }}
+
+      - name: Set up php ${{ matrix.php-versions }}
+        uses: shivammathur/setup-php@2.21.2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, zip, gd, apcu
+          ini-values:
+            apc.enable_cli=on
+          coverage: none
+
+      - name: Set up Nextcloud
+        env:
+          DB_PORT: 4444
+          PHP_CLI_SERVER_WORKERS: 10
+        run: |
+          mkdir data
+          php 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
+          php occ config:system:set memcache.local --value="\\OC\\Memcache\\APCu"
+          php occ config:system:set debug --value=true --type=boolean
+          php -f index.php
+          php -S 0.0.0.0:8081 &
+          export OC_PASS=1234561
+          php occ user:add --password-from-env user1
+          php occ user:add --password-from-env user2
+          php occ app:enable deck
+          php occ app:list
+          cd apps/deck
+          composer install --no-dev
+          npm ci
+          npm run build
+          cd ../../
+          curl -v http://localhost:8081/index.php/login
+
+      - name: Cypress run
+        uses: cypress-io/github-action@v4
+        with:
+          record: true
+          parallel: false
+          wait-on: '${{ env.CYPRESS_baseUrl }}'
+          working-directory: 'apps/${{ env.APP_NAME }}'
+          config: defaultCommandTimeout=10000,video=false
+        env:
+          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
+          npm_package_name: ${{ env.APP_NAME }}
+
+      - name: Upload test failure screenshots
+        uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: Upload screenshots
+          path: apps/${{ env.APP_NAME }}/cypress/screenshots/
+          retention-days: 5
+
+      - name: Upload nextcloud logs
+        uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: Upload nextcloud log
+          path: data/nextcloud.log
+          retention-days: 5

.github/workflows/dependabot-approve-merge.yml

@@ -8,13 +8,20 @@ name: Dependabot
 on:
   pull_request_target:
     branches:
+      - main
       - master
       - stable*
 
+permissions:
+  contents: read
+
 jobs:
   auto-approve-merge:
     if: github.actor == 'dependabot[bot]'
     runs-on: ubuntu-latest
+    permissions:
+      # for hmarr/auto-approve-action to approve PRs
+      pull-requests: write 
 
     steps:
       # Github actions bot approve

.github/workflows/integration.yml

@@ -2,6 +2,14 @@ name: Integration tests
 
 on:
   pull_request:
+    paths:
+      - '.github/workflows/integration.yml'
+      - 'appinfo/**'
+      - 'lib/**'
+      - 'templates/**'
+      - 'tests/**'
+      - 'composer.json'
+      - 'composer.lock'
   push:
     branches:
       - master
@@ -19,7 +27,7 @@ jobs:
       matrix:
         php-versions: ['7.4']
         databases: ['sqlite', 'mysql', 'pgsql']
-        server-versions: ['stable24']
+        server-versions: ['stable25']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 
@@ -54,7 +62,7 @@ jobs:
           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
-          cd build/integration && composer require --dev phpunit/phpunit:~8
+          cd build/integration && composer require --dev phpunit/phpunit:~9
 
       - name: Checkout app
         uses: actions/checkout@v3
@@ -62,7 +70,7 @@ jobs:
           path: apps/${{ env.APP_NAME }}
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@2.18.0
+        uses: shivammathur/setup-php@2.21.2
         with:
           php-version: ${{ matrix.php-versions }}
           tools: phpunit

.github/workflows/lint.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up php${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@2.18.0
+        uses: shivammathur/setup-php@2.21.2
         with:
           php-version: ${{ matrix.php-versions }}
           coverage: none
@@ -33,7 +33,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
     - name: Set up php
-      uses: shivammathur/setup-php@2.18.0
+      uses: shivammathur/setup-php@2.21.2
       with:
         php-version: 7.4
         coverage: none

.github/workflows/nightly.yml

@@ -25,7 +25,7 @@ jobs:
     - name: Set up npm7
       run: npm i -g npm@7
     - name: Setup PHP
-      uses: shivammathur/setup-php@2.18.0
+      uses: shivammathur/setup-php@2.21.2
       with:
         php-version: '7.4'
         tools: composer

.github/workflows/phpunit.yml

@@ -2,6 +2,14 @@ name: PHPUnit
 
 on:
   pull_request:
+    paths:
+      - '.github/workflows/phpunit.yml'
+      - 'appinfo/**'
+      - 'lib/**'
+      - 'templates/**'
+      - 'tests/**'
+      - 'composer.json'
+      - 'composer.lock'
   push:
     branches:
       - master
@@ -20,7 +28,7 @@ jobs:
       matrix:
         php-versions: ['7.4', '8.0', '8.1']
         databases: ['sqlite', 'mysql', 'pgsql']
-        server-versions: ['stable24']
+        server-versions: ['stable25']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 
@@ -62,7 +70,7 @@ jobs:
           path: apps/${{ env.APP_NAME }}
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@2.18.0
+        uses: shivammathur/setup-php@2.21.2
         with:
           php-version: ${{ matrix.php-versions }}
           tools: phpunit

CHANGELOG.md

@@ -1,30 +1,77 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## 1.7.2
+## 1.8.2
 
 ### Fixed
 
-- Cache user membership for circles [#4132](https://github.com/nextcloud/deck/pull/4132)
-- Set event link also for notifications that get emitted from activities [#4118](https://github.com/nextcloud/deck/pull/4118)
-- Fix Card menu not displaying when description is not set [#4103](https://github.com/nextcloud/deck/pull/4103)
-- disable Create card button while no stack is chosen [#4019](https://github.com/nextcloud/deck/pull/4019)
-- to nextcloud/OCP package in stable24 [#4093](https://github.com/nextcloud/deck/pull/4093)
-- Fix attachment creator name: show display name [#4037](https://github.com/nextcloud/deck/pull/4037)
-- Use capped memory cache for board permissions [#3997](https://github.com/nextcloud/deck/pull/3997)
-- Improve CalDAV integration performance [#3995](https://github.com/nextcloud/deck/pull/3995)
-- Fetch attachment folder for the correct user during cron job [#3959](https://github.com/nextcloud/deck/pull/3959)
-- Switch to 'markdown-it-task-checkbox' for rendering of task lists [#3925](https://github.com/nextcloud/deck/pull/3925)
-- Prevent opening card and applyLabelFilter on card drag end [#3917](https://github.com/nextcloud/deck/pull/3917)
-- Fix for issue #3637 [#3901](https://github.com/nextcloud/deck/pull/3901)
-- Fix z-index for deck sidebar [#3885](https://github.com/nextcloud/deck/pull/3885)
+- minor style fixes [#4201](https://github.com/nextcloud/deck/pull/4201)
+- feat: add validators to check values in services [#4174](https://github.com/nextcloud/deck/pull/4174)
+- Add integration test for attachment handling on cards [#4179](https://github.com/nextcloud/deck/pull/4179)
+- Add missing userId property [#4198](https://github.com/nextcloud/deck/pull/4198)
 
-## 1.7.1
+## 1.8.1
 
 ### Fixed
-- Align Duedate-delete icon properly - fixes nextcloud/deck#3791 [#3817](https://github.com/nextcloud/deck/pull/3817)
-- Increase file count after sharing [#3806](https://github.com/nextcloud/deck/pull/3806)
-- Fetch full board data after cloning [#3781](https://github.com/nextcloud/deck/pull/3781)
+
+ - Fix Duedate activity @nickvergessen [#4155](https://github.com/nextcloud/deck/pull/4155)
+
+## 1.8.0
+
+### Added
+
+- Nextcloud 25 compatibility
+- Performance improvements
+  - Use capped memory cache for board permissions @juliushaertl [#3980](https://github.com/nextcloud/deck/pull/3980)
+  - Improve CalDAV integration performance @juliushaertl [#3982](https://github.com/nextcloud/deck/pull/3982)
+  - Simpify query for getting shared files @juliushaertl [#3983](https://github.com/nextcloud/deck/pull/3983)
+- Accessibility improvements
+  - Add a11y label for sidebar button @marcelklehr [#3986](https://github.com/nextcloud/deck/pull/3986)
+  - Improve filter popover accessibility @juliushaertl [#3820](https://github.com/nextcloud/deck/pull/3820)
+  - Set ids to skip to content/navigation @juliushaertl [#3924](https://github.com/nextcloud/deck/pull/3924)
+  - Invert icons properly in dark mode @juliushaertl [#3939](https://github.com/nextcloud/deck/pull/3939)
+- Implement card reference widget @eneiluj [#4031](https://github.com/nextcloud/deck/pull/4031)
+- Implement new dashboard widget interfaces @eneiluj [#4033](https://github.com/nextcloud/deck/pull/4033)
+- Add related resources panel to board sharing tab sidebar @Pytal [#4000](https://github.com/nextcloud/deck/pull/4000)
+
+### Fixed
+
+- Fix sorting stacks [#4116](https://github.com/nextcloud/deck/pull/4116)
+- Fix issue with duedate format [#4140](https://github.com/nextcloud/deck/pull/4140)
+- Fix missing icon for activity rendering [#4090](https://github.com/nextcloud/deck/pull/4090)
+- disables autocomplete on card creation [#4142](https://github.com/nextcloud/deck/pull/4142)
+- Set event link also for notifications that get emitted from activities [#4117](https://github.com/nextcloud/deck/pull/4117)
+- Fix attachment creator name: show display name @eneiluj [#4036](https://github.com/nextcloud/deck/pull/4036)
+- Fix reference provider when caching @eneiluj [#4056](https://github.com/nextcloud/deck/pull/4056)
+- Use global import for nextcloud-vue [#4072](https://github.com/nextcloud/deck/pull/4072)
+- Disable Create card button while no stack is chosen @icewind1991 [#4014](https://github.com/nextcloud/deck/pull/4014)
+- Adjust testing matrix for Nextcloud 25 on stable25 @nickvergessen [#4068](https://github.com/nextcloud/deck/pull/4068)
+- Fix Card menu not displaying when description is not set  @marcelklehr [#4105](https://github.com/nextcloud/deck/pull/4105)
+- Reference widget adjustments for Text [#4075](https://github.com/nextcloud/deck/pull/4075)
+- use OCP\Collaboration\Reference\Reference [#4078](https://github.com/nextcloud/deck/pull/4078)
+- Cache user membership for circles [#4141](https://github.com/nextcloud/deck/pull/4141)
+- set last modified when the card was found. Fixes #3763 @ylebre [#3796](https://github.com/nextcloud/deck/pull/3796)
+- Increase file count after sharing @luka-nextcloud [#3682](https://github.com/nextcloud/deck/pull/3682)
+- Align Duedate-delete icon properly - fixes nextcloud/deck#3791 @Ben-Ro [#3811](https://github.com/nextcloud/deck/pull/3811)
+- Fix for issue #3637 @flummer [#3833](https://github.com/nextcloud/deck/pull/3833)
+- Switch to 'markdown-it-task-checkbox' for rendering of task lists @q-wertz [#3898](https://github.com/nextcloud/deck/pull/3898)
+- Make rename functions accessibly by keyboard navigation @juliushaertl [#3813](https://github.com/nextcloud/deck/pull/3813)
+- Prevent opening card and applyLabelFilter on card drag end @eneiluj [#3916](https://github.com/nextcloud/deck/pull/3916)
+- Inserted required property in the rename list field, to prevent the l… @mstolf [#3862](https://github.com/nextcloud/deck/pull/3862)
+- Fix share provider for master changes @nickvergessen [#3942](https://github.com/nextcloud/deck/pull/3942)
+- Fetch attachment folder for the correct user during cron job @juliushaertl [#3952](https://github.com/nextcloud/deck/pull/3952)
+- Fix z-index for deck sidebar @Raudius [#3884](https://github.com/nextcloud/deck/pull/3884)
+
+### Other
+
+- Switch from OC::$server->get to OCP\Server::get @CarlSchwan [#3801](https://github.com/nextcloud/deck/pull/3801)
+- Add performance section in README @eneiluj [#3830](https://github.com/nextcloud/deck/pull/3830)
+- Fix static analysis by stubbing more circle methods @juliushaertl [#3900](https://github.com/nextcloud/deck/pull/3900)
+- fix(docs): fix links to JSON schemas for Trello @wiktor2200 [#3872](https://github.com/nextcloud/deck/pull/3872)
+- Move to OCP\Collaboration\Resources\LoadAdditionalScriptsEvent @juliushaertl [#3818](https://github.com/nextcloud/deck/pull/3818)
+- Rename settings to deck settings @PVince81 [#3928](https://github.com/nextcloud/deck/pull/3928)
+- SCSS cleanup @juliushaertl [#3803](https://github.com/nextcloud/deck/pull/3803)
+- Hide deprecated projects in sidebar and card details by default @Pytal [#3984](https://github.com/nextcloud/deck/pull/3984)
 
 ## 1.7.0
 
@@ -76,7 +123,7 @@ All notable changes to this project will be documented in this file.
 - Adapt the card modal to upstream changes [#3764](https://github.com/nextcloud/deck/pull/3764)
 - Fix text selection in dark mode and modal view [#3765](https://github.com/nextcloud/deck/pull/3765)
 - Add missing indices [#3754](https://github.com/nextcloud/deck/pull/3754)
-- Handle qb mapper exception messages properly @juliushaertl [#3769](https://github.com/nextcloud/deck/pull/3769)
+
 
 ## 1.6.0-beta1
 
@@ -447,7 +494,7 @@ Android app team for helping to improve our REST API:
 - Fix comment activities on Nextcloud 15
 - Fix issues with Edge
 - API: Fix numeric types that were returned as strings
-- API: Fix If-Modified-Since header parsing  
+- API: Fix If-Modified-Since header parsing
 
 
 ## 0.5.1 - 2018-12-05
@@ -574,7 +621,7 @@ Android app team for helping to improve our REST API:
 ### Fixed
 - Various frontend fixes
 - Fix sidebar drag issues
-- Improvements for IE11 
+- Improvements for IE11
 - Fix bug when draging a card to an empty stack
 
 ## 0.2.1 - 2017-07-04
@@ -648,7 +695,7 @@ Android app team for helping to improve our REST API:
 
 ### Fixed
 - Various styling improvements
-- Fix problems with MySQL and PostgreSQL 
+- Fix problems with MySQL and PostgreSQL
 - Select first color by default when creating boards
 - Fix error when changing board permissions
 
@@ -656,9 +703,9 @@ Android app team for helping to improve our REST API:
 
 ### Added
 - Sharing boards with other users
-- Create and manage boards 
+- Create and manage boards
 - Sort cards on stacks by drag-and-drop
 - Assign labels
 - Markdown notes for each card
-- Archive cards 
+- Archive cards
 

README.md

@@ -24,9 +24,9 @@ Deck is a kanban style organization tool aimed at personal planning and project
 ### 3rd-Party Integrations
 
 - [trello-to-deck](https://github.com/maxammann/trello-to-deck) - Migrates cards from Trello
-- [mail2deck](https://github.com/newroco/mail2deck) - Provides an "email in" solution 
+- [mail2deck](https://github.com/newroco/mail2deck) - Provides an "email in" solution
 - [A-deck](https://github.com/leoossa/A-deck) - Chrome Extension that allows to create new card in selected stack based on current tab
- 
+
 ## Installation/Update
 
 This app is supposed to work on the two latest Nextcloud versions.
@@ -52,6 +52,17 @@ Please make sure you have installed the following dependencies: `make, which, ta
 
 Instead of setting everything up manually, you can just [download the nightly build](https://github.com/nextcloud/deck/releases/tag/nightly) instead. These builds are updated every 24 hours, and are pre-configured with all the needed dependencies.
 
+## Performance limitations
+
+Deck is not yet ready for intensive usage.
+A lot of database queries are generated when the number of boards, cards and attachments is high.
+For example, a user having access to 13 boards, with each board having on average 100 cards,
+and each card having on average 5 attachments,
+would generate 6500 database queries when doing the file related queries
+which would increase the page loading time significantly.
+
+Improvements on Nextcloud server and Deck itself will improve the situation.
+
 ## Developing
 
 ### PHP
@@ -60,6 +71,8 @@ Nothing to prepare, just dig into the code.
 
 ### JavaScript
 
+This requires at least Node 14 and npm 7 to be installed.
+
 Deck requires running a `make build-js` to install npm dependencies and build the JavaScript code using webpack. While developing you can also use `make watch` to rebuild everytime the code changes.
 
 #### Hot reloading

appinfo/info.xml

@@ -16,7 +16,7 @@
 - 🚀 Get your project organized
 
 </description>
-    <version>1.7.2</version>
+    <version>1.8.2</version>
     <licence>agpl</licence>
     <author>Julius Härtl</author>
     <namespace>Deck</namespace>
@@ -34,7 +34,7 @@
         <database min-version="9.4">pgsql</database>
         <database>sqlite</database>
         <database min-version="8.0">mysql</database>
-        <nextcloud min-version="24" max-version="24"/>
+        <nextcloud min-version="25" max-version="25"/>
     </dependencies>
     <background-jobs>
         <job>OCA\Deck\Cron\DeleteCron</job>

composer.json

@@ -19,7 +19,7 @@
 		"symfony/event-dispatcher": "^4.0",
 		"vimeo/psalm": "^4.3",
 		"php-parallel-lint/php-parallel-lint": "^1.2",
-		"nextcloud/ocp": "dev-stable24"
+		"nextcloud/ocp": "dev-stable25"
 	},
 	"config": {
 		"optimize-autoloader": true,
@@ -36,6 +36,7 @@
 		"cs:check": "php-cs-fixer fix --dry-run --diff",
 		"cs:fix": "php-cs-fixer fix",
 		"psalm": "psalm",
+		"psalm:update-baseline": "psalm --update-baseline",
 		"psalm:fix": "psalm --alter --issues=InvalidReturnType,InvalidNullableReturnType,MismatchingDocblockParamType,MismatchingDocblockReturnType,MissingParamType,InvalidFalsableReturnType",
 		"test": [
 			"@test:unit",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "fdd039ec52f9c829403494423b527e10",
+    "content-hash": "445858d371d9a1c7057d0603c566966a",
     "packages": [
         {
             "name": "cogpowered/finediff",
@@ -63,16 +63,16 @@
         },
         {
             "name": "justinrainbow/json-schema",
-            "version": "5.2.11",
+            "version": "5.2.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/justinrainbow/json-schema.git",
-                "reference": "2ab6744b7296ded80f8cc4f9509abbff393399aa"
+                "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/2ab6744b7296ded80f8cc4f9509abbff393399aa",
-                "reference": "2ab6744b7296ded80f8cc4f9509abbff393399aa",
+                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/ad87d5a5ca981228e0e205c2bc7dfb8e24559b60",
+                "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60",
                 "shasum": ""
             },
             "require": {
@@ -127,9 +127,9 @@
             ],
             "support": {
                 "issues": "https://github.com/justinrainbow/json-schema/issues",
-                "source": "https://github.com/justinrainbow/json-schema/tree/5.2.11"
+                "source": "https://github.com/justinrainbow/json-schema/tree/5.2.12"
             },
-            "time": "2021-07-22T09:24:00+00:00"
+            "time": "2022-04-13T08:02:27+00:00"
         }
     ],
     "packages-dev": [
@@ -445,16 +445,16 @@
         },
         {
             "name": "composer/semver",
-            "version": "3.2.9",
+            "version": "3.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/semver.git",
-                "reference": "a951f614bd64dcd26137bc9b7b2637ddcfc57649"
+                "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/a951f614bd64dcd26137bc9b7b2637ddcfc57649",
-                "reference": "a951f614bd64dcd26137bc9b7b2637ddcfc57649",
+                "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9",
+                "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9",
                 "shasum": ""
             },
             "require": {
@@ -506,7 +506,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/semver/issues",
-                "source": "https://github.com/composer/semver/tree/3.2.9"
+                "source": "https://github.com/composer/semver/tree/3.3.2"
             },
             "funding": [
                 {
@@ -522,7 +522,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-04T13:58:43+00:00"
+            "time": "2022-04-01T19:23:25+00:00"
         },
         {
             "name": "composer/xdebug-handler",
@@ -896,16 +896,16 @@
         },
         {
             "name": "felixfbecker/language-server-protocol",
-            "version": "1.5.1",
+            "version": "v1.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/felixfbecker/php-language-server-protocol.git",
-                "reference": "9d846d1f5cf101deee7a61c8ba7caa0a975cd730"
+                "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/9d846d1f5cf101deee7a61c8ba7caa0a975cd730",
-                "reference": "9d846d1f5cf101deee7a61c8ba7caa0a975cd730",
+                "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/6e82196ffd7c62f7794d778ca52b69feec9f2842",
+                "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842",
                 "shasum": ""
             },
             "require": {
@@ -946,9 +946,9 @@
             ],
             "support": {
                 "issues": "https://github.com/felixfbecker/php-language-server-protocol/issues",
-                "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/1.5.1"
+                "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/v1.5.2"
             },
-            "time": "2021-02-22T14:02:09+00:00"
+            "time": "2022-03-02T22:36:06+00:00"
         },
         {
             "name": "friendsofphp/php-cs-fixer",
@@ -1192,16 +1192,16 @@
         },
         {
             "name": "nextcloud/ocp",
-            "version": "dev-stable24",
+            "version": "dev-stable25",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nextcloud-deps/ocp.git",
-                "reference": "aa88708d8280ffd8498ccda9954d923a1da55c92"
+                "reference": "9b19a5a12c990cafe832aa8ccc95be4f57f24c9d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/aa88708d8280ffd8498ccda9954d923a1da55c92",
-                "reference": "aa88708d8280ffd8498ccda9954d923a1da55c92",
+                "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/9b19a5a12c990cafe832aa8ccc95be4f57f24c9d",
+                "reference": "9b19a5a12c990cafe832aa8ccc95be4f57f24c9d",
                 "shasum": ""
             },
             "require": {
@@ -1213,7 +1213,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "24.0.0-dev"
+                    "dev-master": "26.0.0-dev"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1228,22 +1228,23 @@
             ],
             "description": "Composer package containing Nextcloud's public API (classes, interfaces)",
             "support": {
-                "source": "https://github.com/nextcloud-deps/ocp/tree/stable24"
+                "issues": "https://github.com/nextcloud-deps/ocp/issues",
+                "source": "https://github.com/nextcloud-deps/ocp/tree/stable25"
             },
-            "time": "2022-09-27T08:15:22+00:00"
+            "time": "2022-11-11T00:48:02+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.13.2",
+            "version": "v4.14.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "210577fe3cf7badcc5814d99455df46564f3c077"
+                "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077",
-                "reference": "210577fe3cf7badcc5814d99455df46564f3c077",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/34bea19b6e03d8153165d8f30bba4c3be86184c1",
+                "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1",
                 "shasum": ""
             },
             "require": {
@@ -1284,9 +1285,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.2"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.14.0"
             },
-            "time": "2021-11-30T19:35:32+00:00"
+            "time": "2022-05-31T20:59:12+00:00"
         },
         {
             "name": "openlss/lib-array2xml",
@@ -1721,92 +1722,25 @@
             },
             "time": "2022-03-15T21:29:03+00:00"
         },
-        {
-            "name": "phpspec/prophecy",
-            "version": "v1.15.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
-                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.2",
-                "php": "^7.2 || ~8.0, <8.2",
-                "phpdocumentor/reflection-docblock": "^5.2",
-                "sebastian/comparator": "^3.0 || ^4.0",
-                "sebastian/recursion-context": "^3.0 || ^4.0"
-            },
-            "require-dev": {
-                "phpspec/phpspec": "^6.0 || ^7.0",
-                "phpunit/phpunit": "^8.0 || ^9.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Prophecy\\": "src/Prophecy"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                },
-                {
-                    "name": "Marcello Duarte",
-                    "email": "marcello.duarte@gmail.com"
-                }
-            ],
-            "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "https://github.com/phpspec/prophecy",
-            "keywords": [
-                "Double",
-                "Dummy",
-                "fake",
-                "mock",
-                "spy",
-                "stub"
-            ],
-            "support": {
-                "issues": "https://github.com/phpspec/prophecy/issues",
-                "source": "https://github.com/phpspec/prophecy/tree/v1.15.0"
-            },
-            "time": "2021-12-08T12:19:24+00:00"
-        },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.15",
+            "version": "9.2.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f"
+                "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
-                "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/aa94dc41e8661fe90c7316849907cba3007b10d8",
+                "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.13.0",
+                "nikic/php-parser": "^4.14",
                 "php": ">=7.3",
                 "phpunit/php-file-iterator": "^3.0.3",
                 "phpunit/php-text-template": "^2.0.2",
@@ -1855,7 +1789,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.15"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.17"
             },
             "funding": [
                 {
@@ -1863,7 +1797,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-03-07T09:28:20+00:00"
+            "time": "2022-08-30T12:24:04+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -2108,16 +2042,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.20",
+            "version": "9.5.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba"
+                "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/12bc8879fb65aef2138b26fc633cb1e3620cffba",
-                "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d0aa6097bef9fd42458a9b3c49da32c6ce6129c5",
+                "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5",
                 "shasum": ""
             },
             "require": {
@@ -2132,7 +2066,6 @@
                 "phar-io/manifest": "^2.0.3",
                 "phar-io/version": "^3.0.2",
                 "php": ">=7.3",
-                "phpspec/prophecy": "^1.12.1",
                 "phpunit/php-code-coverage": "^9.2.13",
                 "phpunit/php-file-iterator": "^3.0.5",
                 "phpunit/php-invoker": "^3.1.1",
@@ -2147,13 +2080,9 @@
                 "sebastian/global-state": "^5.0.1",
                 "sebastian/object-enumerator": "^4.0.3",
                 "sebastian/resource-operations": "^3.0.3",
-                "sebastian/type": "^3.0",
+                "sebastian/type": "^3.1",
                 "sebastian/version": "^3.0.2"
             },
-            "require-dev": {
-                "ext-pdo": "*",
-                "phpspec/prophecy-phpunit": "^2.0.1"
-            },
             "suggest": {
                 "ext-soap": "*",
                 "ext-xdebug": "*"
@@ -2195,7 +2124,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.20"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.24"
             },
             "funding": [
                 {
@@ -2207,7 +2136,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-04-01T12:37:26+00:00"
+            "time": "2022-08-30T07:42:16+00:00"
         },
         {
             "name": "psr/cache",
@@ -3204,16 +3133,16 @@
         },
         {
             "name": "sebastian/environment",
-            "version": "5.1.3",
+            "version": "5.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "388b6ced16caa751030f6a69e588299fa09200ac"
+                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/388b6ced16caa751030f6a69e588299fa09200ac",
-                "reference": "388b6ced16caa751030f6a69e588299fa09200ac",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7",
+                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7",
                 "shasum": ""
             },
             "require": {
@@ -3255,7 +3184,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.3"
+                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4"
             },
             "funding": [
                 {
@@ -3263,7 +3192,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T05:52:38+00:00"
+            "time": "2022-04-03T09:37:03+00:00"
         },
         {
             "name": "sebastian/exporter",
@@ -3695,16 +3624,16 @@
         },
         {
             "name": "sebastian/type",
-            "version": "3.0.0",
+            "version": "3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad"
+                "reference": "fb44e1cc6e557418387ad815780360057e40753e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
-                "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb44e1cc6e557418387ad815780360057e40753e",
+                "reference": "fb44e1cc6e557418387ad815780360057e40753e",
                 "shasum": ""
             },
             "require": {
@@ -3716,7 +3645,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "3.1-dev"
                 }
             },
             "autoload": {
@@ -3739,7 +3668,7 @@
             "homepage": "https://github.com/sebastianbergmann/type",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/3.0.0"
+                "source": "https://github.com/sebastianbergmann/type/tree/3.1.0"
             },
             "funding": [
                 {
@@ -3747,7 +3676,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-03-15T09:54:48+00:00"
+            "time": "2022-08-29T06:55:37+00:00"
         },
         {
             "name": "sebastian/version",
@@ -3804,16 +3733,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v5.4.5",
+            "version": "v5.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "d8111acc99876953f52fe16d4c50eb60940d49ad"
+                "reference": "c072aa8f724c3af64e2c7a96b796a4863d24dba1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/d8111acc99876953f52fe16d4c50eb60940d49ad",
-                "reference": "d8111acc99876953f52fe16d4c50eb60940d49ad",
+                "url": "https://api.github.com/repos/symfony/console/zipball/c072aa8f724c3af64e2c7a96b796a4863d24dba1",
+                "reference": "c072aa8f724c3af64e2c7a96b796a4863d24dba1",
                 "shasum": ""
             },
             "require": {
@@ -3883,7 +3812,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v5.4.5"
+                "source": "https://github.com/symfony/console/tree/v5.4.12"
             },
             "funding": [
                 {
@@ -3899,20 +3828,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-24T12:45:35+00:00"
+            "time": "2022-08-17T13:18:05+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v2.5.0",
+            "version": "v2.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8"
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8",
-                "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
                 "shasum": ""
             },
             "require": {
@@ -3950,7 +3879,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.0"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2"
             },
             "funding": [
                 {
@@ -3966,7 +3895,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-12T14:48:14+00:00"
+            "time": "2022-01-02T09:53:40+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -4054,16 +3983,16 @@
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v1.1.11",
+            "version": "v1.1.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "01e9a4efac0ee33a05dfdf93b346f62e7d0e998c"
+                "reference": "1d5cd762abaa6b2a4169d3e77610193a7157129e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/01e9a4efac0ee33a05dfdf93b346f62e7d0e998c",
-                "reference": "01e9a4efac0ee33a05dfdf93b346f62e7d0e998c",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/1d5cd762abaa6b2a4169d3e77610193a7157129e",
+                "reference": "1d5cd762abaa6b2a4169d3e77610193a7157129e",
                 "shasum": ""
             },
             "require": {
@@ -4113,7 +4042,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v1.1.11"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v1.1.13"
             },
             "funding": [
                 {
@@ -4129,7 +4058,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-03-23T15:25:38+00:00"
+            "time": "2022-01-02T09:41:36+00:00"
         },
         {
             "name": "symfony/filesystem",
@@ -4329,16 +4258,16 @@
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.25.0",
+            "version": "v1.26.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "30885182c981ab175d4d034db0f6f469898070ab"
+                "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab",
-                "reference": "30885182c981ab175d4d034db0f6f469898070ab",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4",
+                "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4",
                 "shasum": ""
             },
             "require": {
@@ -4353,7 +4282,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.26-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -4391,7 +4320,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0"
             },
             "funding": [
                 {
@@ -4407,20 +4336,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-10-20T20:35:02+00:00"
+            "time": "2022-05-24T11:49:31+00:00"
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.25.0",
+            "version": "v1.26.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "81b86b50cf841a64252b439e738e97f4a34e2783"
+                "reference": "433d05519ce6990bf3530fba6957499d327395c2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/81b86b50cf841a64252b439e738e97f4a34e2783",
-                "reference": "81b86b50cf841a64252b439e738e97f4a34e2783",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/433d05519ce6990bf3530fba6957499d327395c2",
+                "reference": "433d05519ce6990bf3530fba6957499d327395c2",
                 "shasum": ""
             },
             "require": {
@@ -4432,7 +4361,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.26-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -4472,7 +4401,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.25.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.26.0"
             },
             "funding": [
                 {
@@ -4488,20 +4417,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-23T21:10:46+00:00"
+            "time": "2022-05-24T11:49:31+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.25.0",
+            "version": "v1.26.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8"
+                "reference": "219aa369ceff116e673852dce47c3a41794c14bd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8",
-                "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd",
+                "reference": "219aa369ceff116e673852dce47c3a41794c14bd",
                 "shasum": ""
             },
             "require": {
@@ -4513,7 +4442,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.26-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -4556,7 +4485,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.25.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.26.0"
             },
             "funding": [
                 {
@@ -4572,20 +4501,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-02-19T12:13:01+00:00"
+            "time": "2022-05-24T11:49:31+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.25.0",
+            "version": "v1.26.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825"
+                "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825",
-                "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
+                "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
                 "shasum": ""
             },
             "require": {
@@ -4600,7 +4529,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.26-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -4639,7 +4568,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.25.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0"
             },
             "funding": [
                 {
@@ -4655,20 +4584,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-30T18:21:41+00:00"
+            "time": "2022-05-24T11:49:31+00:00"
         },
         {
             "name": "symfony/polyfill-php73",
-            "version": "v1.25.0",
+            "version": "v1.26.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5"
+                "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/cc5db0e22b3cb4111010e48785a97f670b350ca5",
-                "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/e440d35fa0286f77fb45b79a03fedbeda9307e85",
+                "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85",
                 "shasum": ""
             },
             "require": {
@@ -4677,7 +4606,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.26-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -4718,7 +4647,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php73/tree/v1.25.0"
+                "source": "https://github.com/symfony/polyfill-php73/tree/v1.26.0"
             },
             "funding": [
                 {
@@ -4734,20 +4663,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-06-05T21:20:04+00:00"
+            "time": "2022-05-24T11:49:31+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.25.0",
+            "version": "v1.26.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c"
+                "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4407588e0d3f1f52efb65fbe92babe41f37fe50c",
-                "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace",
+                "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace",
                 "shasum": ""
             },
             "require": {
@@ -4756,7 +4685,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.26-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -4801,7 +4730,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.25.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0"
             },
             "funding": [
                 {
@@ -4817,7 +4746,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-03-04T08:16:47+00:00"
+            "time": "2022-05-10T07:21:04+00:00"
         },
         {
             "name": "symfony/polyfill-php81",
@@ -4962,22 +4891,22 @@
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v2.5.0",
+            "version": "v2.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc"
+                "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc",
-                "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
+                "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
                 "psr/container": "^1.1",
-                "symfony/deprecation-contracts": "^2.1"
+                "symfony/deprecation-contracts": "^2.1|^3"
             },
             "conflict": {
                 "ext-psr": "<1.1|>=2"
@@ -5025,7 +4954,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v2.5.0"
+                "source": "https://github.com/symfony/service-contracts/tree/v2.5.2"
             },
             "funding": [
                 {
@@ -5041,7 +4970,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-04T16:48:04+00:00"
+            "time": "2022-05-30T19:17:29+00:00"
         },
         {
             "name": "symfony/stopwatch",
@@ -5107,16 +5036,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v5.4.3",
+            "version": "v5.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "92043b7d8383e48104e411bc9434b260dbeb5a10"
+                "reference": "2fc515e512d721bf31ea76bd02fe23ada4640058"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/92043b7d8383e48104e411bc9434b260dbeb5a10",
-                "reference": "92043b7d8383e48104e411bc9434b260dbeb5a10",
+                "url": "https://api.github.com/repos/symfony/string/zipball/2fc515e512d721bf31ea76bd02fe23ada4640058",
+                "reference": "2fc515e512d721bf31ea76bd02fe23ada4640058",
                 "shasum": ""
             },
             "require": {
@@ -5173,7 +5102,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v5.4.3"
+                "source": "https://github.com/symfony/string/tree/v5.4.12"
             },
             "funding": [
                 {
@@ -5189,7 +5118,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:53:40+00:00"
+            "time": "2022-08-12T17:03:11+00:00"
         },
         {
             "name": "theseer/tokenizer",
@@ -5243,16 +5172,16 @@
         },
         {
             "name": "vimeo/psalm",
-            "version": "4.22.0",
+            "version": "4.27.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vimeo/psalm.git",
-                "reference": "fc2c6ab4d5fa5d644d8617089f012f3bb84b8703"
+                "reference": "faf106e717c37b8c81721845dba9de3d8deed8ff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vimeo/psalm/zipball/fc2c6ab4d5fa5d644d8617089f012f3bb84b8703",
-                "reference": "fc2c6ab4d5fa5d644d8617089f012f3bb84b8703",
+                "url": "https://api.github.com/repos/vimeo/psalm/zipball/faf106e717c37b8c81721845dba9de3d8deed8ff",
+                "reference": "faf106e717c37b8c81721845dba9de3d8deed8ff",
                 "shasum": ""
             },
             "require": {
@@ -5277,6 +5206,7 @@
                 "php": "^7.1|^8",
                 "sebastian/diff": "^3.0 || ^4.0",
                 "symfony/console": "^3.4.17 || ^4.1.6 || ^5.0 || ^6.0",
+                "symfony/polyfill-php80": "^1.25",
                 "webmozart/path-util": "^2.3"
             },
             "provide": {
@@ -5343,27 +5273,27 @@
             ],
             "support": {
                 "issues": "https://github.com/vimeo/psalm/issues",
-                "source": "https://github.com/vimeo/psalm/tree/4.22.0"
+                "source": "https://github.com/vimeo/psalm/tree/4.27.0"
             },
-            "time": "2022-02-24T20:34:05+00:00"
+            "time": "2022-08-31T13:47:09+00:00"
         },
         {
             "name": "webmozart/assert",
-            "version": "1.10.0",
+            "version": "1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozarts/assert.git",
-                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25"
+                "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25",
-                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25",
+                "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991",
+                "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2 || ^8.0",
-                "symfony/polyfill-ctype": "^1.8"
+                "ext-ctype": "*",
+                "php": "^7.2 || ^8.0"
             },
             "conflict": {
                 "phpstan/phpstan": "<0.12.20",
@@ -5401,9 +5331,9 @@
             ],
             "support": {
                 "issues": "https://github.com/webmozarts/assert/issues",
-                "source": "https://github.com/webmozarts/assert/tree/1.10.0"
+                "source": "https://github.com/webmozarts/assert/tree/1.11.0"
             },
-            "time": "2021-03-09T10:59:23+00:00"
+            "time": "2022-06-03T18:03:27+00:00"
         },
         {
             "name": "webmozart/path-util",

css/deck.css

@@ -0,0 +1,9 @@
+.icon-deck {
+	background-image: url(../img/deck-dark.svg);
+	filter: var(--background-invert-if-dark);
+}
+
+.icon-deck-white, .icon-deck.icon-white {
+	background-image: url(../img/deck.svg);
+	filter: var(--background-invert-if-dark);
+}

css/deck.scss

@@ -1 +0,0 @@
-@include icon-black-white('deck', 'deck', 1);

css/icons.scss

@@ -1,41 +0,0 @@
-/**
- * Custom icons
- */
-@include icon-black-white('deck', 'deck', 1);
-@include icon-black-white('archive', 'deck', 1);
-@include icon-black-white('circles', 'deck', 1);
-@include icon-black-white('clone', 'deck', 1);
-@include icon-black-white('filter', 'deck', 1);
-@include icon-black-white('filter_set', 'deck', 1);
-@include icon-black-white('attach', 'deck', 1);
-@include icon-black-white('reply', 'deck', 1);
-@include icon-black-white('notifications-dark', 'deck', 1);
-@include icon-black-white('description', 'deck', 1);
-
-.icon-toggle-compact-collapsed {
-	@include icon-color('toggle-view-expand', 'deck', $color-black);
-}
-
-.icon-toggle-compact-expanded {
-	@include icon-color('toggle-view-collapse', 'deck', $color-black);
-}
-.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);
-}
-
-.icon-circles {
-	opacity: 1;
-	background-size: 20px;
-	background-position: center center;
-}
-
-.icon-colorpicker {
-	background-image: url('../img/color_picker.svg');
-}

cypress.config.js

@@ -0,0 +1,17 @@
+const { defineConfig } = require('cypress')
+
+module.exports = defineConfig({
+  projectId: '1s7wkc',
+  viewportWidth: 1280,
+  viewportHeight: 720,
+  e2e: {
+    // We've imported your old cypress plugins here.
+    // You may want to clean this up later by importing these.
+    setupNodeEvents(on, config) {
+      return require('./cypress/plugins/index.js')(on, config)
+    },
+    baseUrl: 'http://nextcloud.local/index.php',
+    experimentalSessionAndOrigin: true,
+    specPattern: 'cypress/e2e/**/*.{js,jsx,ts,tsx}',
+  },
+})

cypress/e2e/boardFeatures.js

@@ -0,0 +1,41 @@
+import { randHash } from '../utils'
+const randUser = randHash()
+
+describe('Board', function() {
+	const password = 'pass123'
+
+	before(function() {
+		cy.nextcloudCreateUser(randUser, password)
+	})
+
+	beforeEach(function() {
+		cy.login(randUser, password)
+	})
+
+	it('Can create a board', function() {
+		const board = 'TestBoard'
+
+		cy.intercept({
+			method: 'POST',
+			url: '/index.php/apps/deck/boards',
+		}).as('createBoardRequest')
+
+		// Click "Add board"
+		cy.openLeftSidebar()
+		cy.get('#app-navigation-vue .app-navigation__list .app-navigation-entry')
+			.eq(3).find('a').first().click({ force: true })
+
+		// Type the board title
+		cy.get('.board-create form input[type=text]')
+			.type(board, { force: true })
+
+		// Submit
+		cy.get('.board-create form input[type=submit]')
+			.first().click({ force: true })
+
+		cy.wait('@createBoardRequest').its('response.statusCode').should('equal', 200)
+
+		cy.get('.app-navigation__list .app-navigation-entry__children .app-navigation-entry')
+			.contains(board).should('be.visible')
+	})
+})

cypress/e2e/cardFeatures.js

@@ -0,0 +1,67 @@
+import { randHash } from '../utils'
+const randUser = randHash()
+
+const testBoardData = {
+	title: 'MyBoardTest',
+	color: '00ff00',
+	stacks: [
+		{
+			title: 'TestList',
+			cards: [
+				{
+					title: 'Hello world',
+				},
+			],
+		},
+	],
+}
+
+describe('Card', function() {
+	before(function() {
+		cy.nextcloudCreateUser(randUser, randUser)
+		cy.createExampleBoard({
+			user: randUser,
+			password: randUser,
+			board: testBoardData,
+		})
+	})
+
+	beforeEach(function() {
+		cy.login(randUser, randUser)
+	})
+
+	it('Can show card details modal', function() {
+		cy.openLeftSidebar()
+		cy.getNavigationEntry(testBoardData.title)
+			.first().click({ force: true })
+
+		cy.get('.board .stack').eq(0).within(() => {
+			cy.get('.card:contains("Hello world")').should('be.visible').click()
+		})
+
+		cy.get('.modal__card').should('be.visible')
+		cy.get('.app-sidebar-header__maintitle').contains('Hello world')
+	})
+
+	it('Can add a card', function() {
+		const newCardTitle = 'Write some cypress tests'
+
+		cy.openLeftSidebar()
+		cy.getNavigationEntry(testBoardData.title)
+			.first().click({ force: true })
+
+		cy.get('.board .stack').eq(0).within(() => {
+			cy.get('.card:contains("Hello world")').should('be.visible')
+
+			cy.get('.button-vue[aria-label*="Add card"]')
+				.first().click()
+
+			cy.get('.stack__card-add form input#new-stack-input-main')
+				.type(newCardTitle)
+			cy.get('.stack__card-add form input[type=submit]')
+				.first().click()
+			cy.get(`.card:contains("${newCardTitle}")`).should('be.visible')
+		})
+	})
+
+})

cypress/e2e/deckDashboard.js

@@ -0,0 +1,31 @@
+import { randHash } from '../utils'
+const randUser = randHash()
+
+describe('Deck dashboard', function() {
+	const password = 'pass123'
+
+	before(function() {
+		cy.nextcloudCreateUser(randUser, password)
+	})
+
+	beforeEach(function() {
+		cy.login(randUser, password)
+	})
+
+	it('Can show the right title on the dashboard', function() {
+		cy.get('.board-title h2')
+        	.should('have.length', 1).first()
+        	.should('have.text', 'Upcoming cards')
+	})
+
+	it('Can see the default "Personal Board" created for user by default', function() {
+		const defaultBoard = 'Personal'
+
+		cy.openLeftSidebar()
+		cy.get('.app-navigation-entry-wrapper[icon=icon-deck]')
+			.find('ul.app-navigation-entry__children .app-navigation-entry:contains(' + defaultBoard + ')')
+			.first()
+			.contains(defaultBoard)
+			.should('be.visible')
+	})
+})

cypress/e2e/stackFeatures.js

@@ -0,0 +1,30 @@
+import { randHash } from '../utils'
+const randUser = randHash()
+
+describe('Stack', function() {
+	const board = 'TestBoard'
+	const password = 'pass123'
+	const stack = 'List 1'
+
+	before(function() {
+		cy.nextcloudCreateUser(randUser, password)
+		cy.deckCreateBoard({ user: randUser, password }, board)
+	})
+
+	beforeEach(function() {
+		cy.logout()
+		cy.login(randUser, password)
+	})
+
+	it('Can create a stack', function() {
+		cy.openLeftSidebar()
+		cy.getNavigationEntry(board)
+			.click({ force: true })
+
+		cy.get('#stack-add button').first().click()
+		cy.get('#stack-add form input#new-stack-input-main').type(stack)
+		cy.get('#stack-add form input[type=submit]').first().click()
+
+		cy.get('.board .stack').eq(0).contains(stack).should('be.visible')
+	})
+})

cypress/fixtures/example.json

@@ -0,0 +1,5 @@
+{
+  "name": "Using fixtures to represent data",
+  "email": "hello@cypress.io",
+  "body": "Fixtures are a great way to mock data for responses to routes"
+}

cypress/plugins/index.js

@@ -0,0 +1,22 @@
+/// <reference types="cypress" />
+// ***********************************************************
+// This example plugins/index.js can be used to load plugins
+//
+// You can change the location of this file or turn off loading
+// the plugins file with the 'pluginsFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/plugins-guide
+// ***********************************************************
+
+// This function is called when a project is opened or re-opened (e.g. due to
+// the project's config changing)
+
+/**
+ * @type {Cypress.PluginConfig}
+ */
+// eslint-disable-next-line no-unused-vars
+module.exports = (on, config) => {
+	// `on` is used to hook into various events Cypress emits
+	// `config` is the resolved Cypress config
+}

cypress/support/commands.js

@@ -0,0 +1,159 @@
+/**
+ * @copyright Copyright (c) 2019 John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @author John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @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/>.
+ *
+ */
+
+const url = Cypress.config('baseUrl').replace(/\/index.php\/?$/g, '')
+Cypress.env('baseUrl', url)
+
+Cypress.Commands.add('login', (user, password, route = '/apps/deck/') => {
+	const session = `${user}-${Date.now()}`
+	cy.session(session, function() {
+		cy.visit(route)
+		cy.get('input[name=user]').type(user)
+		cy.get('input[name=password]').type(password)
+		cy.get('form[name=login] [type=submit]').click()
+		cy.url().should('include', route)
+	})
+	cy.visit(route)
+})
+
+Cypress.Commands.add('logout', (route = '/') => {
+	cy.session('_guest', function() {})
+})
+
+Cypress.Commands.add('nextcloudCreateUser', (user, password) => {
+	cy.clearCookies()
+	cy.request({
+		method: 'POST',
+		url: `${Cypress.env('baseUrl')}/ocs/v1.php/cloud/users?format=json`,
+		form: true,
+		body: {
+			userid: user,
+			password,
+		},
+		auth: { user: 'admin', pass: 'admin' },
+		headers: {
+			'OCS-ApiRequest': 'true',
+			'Content-Type': 'application/x-www-form-urlencoded',
+		},
+	}).then((response) => {
+		cy.log(`Created user ${user}`, response.status)
+	})
+})
+
+Cypress.Commands.add('nextcloudUpdateUser', (user, password, key, value) => {
+	cy.request({
+		method: 'PUT',
+		url: `${Cypress.env('baseUrl')}/ocs/v2.php/cloud/users/${user}`,
+		form: true,
+		body: { key, value },
+		auth: { user, pass: password },
+		headers: {
+			'OCS-ApiRequest': 'true',
+			'Content-Type': 'application/x-www-form-urlencoded',
+		},
+	}).then((response) => {
+		cy.log(`Updated user ${user} ${key} to ${value}`, response.status)
+	})
+})
+
+Cypress.Commands.add('openLeftSidebar', () => {
+	cy.get('.app-navigation button.app-navigation-toggle').click()
+})
+
+Cypress.Commands.add('deckCreateBoard', ({ user, password }, title) => {
+	cy.login(user, password)
+
+	cy.get('.app-navigation button.app-navigation-toggle').click()
+	cy.get('#app-navigation-vue .app-navigation__list .app-navigation-entry')
+		.eq(3)
+		.find('a')
+		.first()
+		.click({ force: true })
+
+	cy.get('.board-create form input[type=text]').type(title, { force: true })
+
+	cy.get('.board-create form input[type=submit]')
+		.first()
+		.click({ force: true })
+})
+
+Cypress.Commands.add('deckCreateList', ({ user, password }, title) => {
+	cy.login(user, password)
+
+	cy.get('.app-navigation button.app-navigation-toggle').click()
+	cy.get('#app-navigation-vue .app-navigation__list .app-navigation-entry')
+		.eq(3)
+		.find('a.app-navigation-entry-link')
+		.first()
+		.click({ force: true })
+
+	cy.get('#stack-add button').first().click()
+	cy.get('#stack-add form input#new-stack-input-main').type(title)
+	cy.get('#stack-add form input[type=submit]').first().click()
+})
+
+Cypress.Commands.add('createExampleBoard', ({ user, password, board }) => {
+	cy.request({
+		method: 'POST',
+		url: `${Cypress.env('baseUrl')}/index.php/apps/deck/api/v1.0/boards`,
+		auth: {
+			user,
+			password,
+		},
+		body: { title: board.title, color: board.color ?? 'ff0000' },
+	}).then((boardResponse) => {
+		expect(boardResponse.status).to.eq(200)
+		const boardData = boardResponse.body
+		for (const stackIndex in board.stacks) {
+			const stack = board.stacks[stackIndex]
+			cy.request({
+				method: 'POST',
+				url: `${Cypress.env('baseUrl')}/index.php/apps/deck/api/v1.0/boards/${boardData.id}/stacks`,
+				auth: {
+					user,
+					password,
+				},
+				body: { title: stack.title, order: 0 },
+			}).then((stackResponse) => {
+				const stackData = stackResponse.body
+				for (const cardIndex in stack.cards) {
+					const card = stack.cards[cardIndex]
+					cy.request({
+						method: 'POST',
+						url: `${Cypress.env('baseUrl')}/index.php/apps/deck/api/v1.0/boards/${boardData.id}/stacks/${stackData.id}/cards`,
+						auth: {
+							user,
+							password,
+						},
+						body: { title: card.title },
+					})
+				}
+			})
+		}
+	})
+})
+
+Cypress.Commands.add('getNavigationEntry', (boardTitle) => {
+	return cy.get('.app-navigation-entry-wrapper[icon=icon-deck]')
+		.find('ul.app-navigation-entry__children .app-navigation-entry:contains(' + boardTitle + ')')
+		.find('a.app-navigation-entry-link')
+})

cypress/support/e2e.js

@@ -0,0 +1,20 @@
+// ***********************************************************
+// This example support/index.js is processed and
+// loaded automatically before your test files.
+//
+// This is a great place to put global configuration and
+// behavior that modifies Cypress.
+//
+// You can change the location of this file or turn off
+// automatically serving support files with the
+// 'supportFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/configuration
+// ***********************************************************
+
+// Import commands.js using ES2015 syntax:
+import './commands'
+
+// Alternatively you can use CommonJS syntax:
+// require('./commands')

cypress/utils/index.js

@@ -0,0 +1 @@
+export const randHash = () => Math.random().toString(36).replace(/[^a-z]+/g, '').slice(0, 10)

docs/User_documentation_en.md

@@ -90,7 +90,7 @@ Steps:
 * Create the configuration file
 * Execute the import informing the import file path, data file and source as `Trello JSON`
 
-Create the configuration file respecting the [JSON Schema](https://github.com/nextcloud/deck/blob/master/lib/Service/fixtures/config-trelloJson-schema.json) for import `Trello JSON`
+Create the configuration file respecting the [JSON Schema](https://github.com/nextcloud/deck/blob/master/lib/Service/Importer/fixtures/config-trelloJson-schema.json) for import `Trello JSON`
 
 Example configuration file:
 ```json
@@ -120,7 +120,7 @@ https://api.trello.com/1/members/me/boards?key={yourKey}&token={yourToken}&field
   This ID you will use in the configuration file in the `board` property
 * Create the configuration file
 
-Create the configuration file respecting the [JSON Schema](https://github.com/nextcloud/deck/blob/master/lib/Service/fixtures/config-trelloApi-schema.json) for import `Trello JSON`
+Create the configuration file respecting the [JSON Schema](https://github.com/nextcloud/deck/blob/master/lib/Service/Importer/fixtures/config-trelloApi-schema.json) for import `Trello JSON`
 
 Example configuration file:
 ```json

img/activity-dark.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.0" viewbox="0 0 32 32">
+ <path d="m16 1-10 18h11l-1 12 10-18h-11z"/>
+</svg>

img/activity.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.0" viewBox="0 0 32 32">
+ <path d="m16 1-10 18h11l-1 12 10-18h-11z" fill="#FFF"/>
+</svg>

img/archive-white.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><g transform="translate(0 -1036.362)" fill="#fff"><path d="M1.93 1041.296c-.185 0-.336.138-.336.31v9.842c0 .172.15.313.336.313h12.517c.185 0 .333-.14.333-.313v-9.842c0-.172-.148-.31-.333-.31H1.93zm4.124 1.507h4.223c.39 0 .705.314.705.704v.43c0 .39-.315.705-.705.705H6.054a.703.703 0 0 1-.705-.705v-.43c0-.39.314-.704.705-.704z"/><rect width="15.742" height="2.296" x=".136" y="1037.543" ry="0"/></g></svg>

img/circles-dark.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 58 58" width="512" height="512"><g fill="#000"><path d="M54.319 37.839C54.762 35.918 55 33.96 55 32c0-9.095-4.631-17.377-12.389-22.153a1 1 0 1 0-1.049 1.703C48.724 15.96 53 23.604 53 32c0 1.726-.2 3.451-.573 5.147A6.992 6.992 0 0 0 51 37c-3.86 0-7 3.141-7 7s3.14 7 7 7 7-3.141 7-7a7.006 7.006 0 0 0-3.681-6.161zM38.171 54.182A23.867 23.867 0 0 1 29 56a24.047 24.047 0 0 1-17.017-7.092A6.974 6.974 0 0 0 14 44c0-3.859-3.14-7-7-7s-7 3.141-7 7 3.14 7 7 7a6.952 6.952 0 0 0 3.381-.875C15.26 55.136 21.994 58 29 58c3.435 0 6.778-.663 9.936-1.971.51-.211.753-.796.542-1.307a1.001 1.001 0 0 0-1.307-.54zM4 31.213a1 1 0 0 0 1.068-.927c.712-10.089 7.586-18.52 17.22-21.314C23.142 11.874 25.825 14 29 14c3.86 0 7-3.141 7-7s-3.14-7-7-7c-3.851 0-6.985 3.127-6.999 6.975C11.42 9.922 3.851 19.12 3.073 30.146A.999.999 0 0 0 4 31.213z"/></g></svg>

img/circles.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 58 58" width="512" height="512"><g fill="#000"><path d="M54.319 37.839C54.762 35.918 55 33.96 55 32c0-9.095-4.631-17.377-12.389-22.153a1 1 0 1 0-1.049 1.703C48.724 15.96 53 23.604 53 32c0 1.726-.2 3.451-.573 5.147A6.992 6.992 0 0 0 51 37c-3.86 0-7 3.141-7 7s3.14 7 7 7 7-3.141 7-7a7.006 7.006 0 0 0-3.681-6.161zM38.171 54.182A23.867 23.867 0 0 1 29 56a24.047 24.047 0 0 1-17.017-7.092A6.974 6.974 0 0 0 14 44c0-3.859-3.14-7-7-7s-7 3.141-7 7 3.14 7 7 7a6.952 6.952 0 0 0 3.381-.875C15.26 55.136 21.994 58 29 58c3.435 0 6.778-.663 9.936-1.971.51-.211.753-.796.542-1.307a1.001 1.001 0 0 0-1.307-.54zM4 31.213a1 1 0 0 0 1.068-.927c.712-10.089 7.586-18.52 17.22-21.314C23.142 11.874 25.825 14 29 14c3.86 0 7-3.141 7-7s-3.14-7-7-7c-3.851 0-6.985 3.127-6.999 6.975C11.42 9.922 3.851 19.12 3.073 30.146A.999.999 0 0 0 4 31.213z"/></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 58 58" width="512" height="512"><g fill="#fff"><path d="M54.319 37.839C54.762 35.918 55 33.96 55 32c0-9.095-4.631-17.377-12.389-22.153a1 1 0 1 0-1.049 1.703C48.724 15.96 53 23.604 53 32c0 1.726-.2 3.451-.573 5.147A6.992 6.992 0 0 0 51 37c-3.86 0-7 3.141-7 7s3.14 7 7 7 7-3.141 7-7a7.006 7.006 0 0 0-3.681-6.161zM38.171 54.182A23.867 23.867 0 0 1 29 56a24.047 24.047 0 0 1-17.017-7.092A6.974 6.974 0 0 0 14 44c0-3.859-3.14-7-7-7s-7 3.141-7 7 3.14 7 7 7a6.952 6.952 0 0 0 3.381-.875C15.26 55.136 21.994 58 29 58c3.435 0 6.778-.663 9.936-1.971.51-.211.753-.796.542-1.307a1.001 1.001 0 0 0-1.307-.54zM4 31.213a1 1 0 0 0 1.068-.927c.712-10.089 7.586-18.52 17.22-21.314C23.142 11.874 25.825 14 29 14c3.86 0 7-3.141 7-7s-3.14-7-7-7c-3.851 0-6.985 3.127-6.999 6.975C11.42 9.922 3.851 19.12 3.073 30.146A.999.999 0 0 0 4 31.213z"/></g></svg>

img/clone.svg

@@ -1 +0,0 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M11.8 13.8H2.2V4.2h9.6m1.2 0c0-.67-.53-1.2-1.2-1.2H2.2C1.53 3 1 3.53 1 4.2v9.6c0 .67.53 1.2 1.2 1.2h9.6c.67 0 1.2-.53 1.2-1.2"/><path d="m4.2 1c-0.67 0-1.2 0.54-1.2 1.2h10.8v10.8c0.67 0 1.2-0.53 1.2-1.2v-9.6c0-0.67-0.53-1.2-1.2-1.2z"/></svg>

img/reply.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M15 15s-.4-7.8-7-10V1L1 8l7 7v-4c5.1 0 7 4 7 4z"/></svg>

l10n/bg.js

@@ -183,8 +183,10 @@ OC.L10N.register(
     "Failed to transfer the board to {user}" : "Неуспешно прехвърляне на таблото на {user}",
     "Add a new list" : "Добавяне на нов списък",
     "Archive all cards" : "Архивира всички карти",
+    "Unarchive all cards" : "Разархивиране на всички карти",
     "Delete list" : "Изтрива списък",
     "Archive all cards in this list" : "Архивира всички карти в този списък",
+    "Unarchive all cards in this list" : "Разархивиране всички карти в този списък",
     "Add a new card" : "Добави нова карта",
     "Card name" : "Име на карта",
     "List deleted" : "Списъкът е изтрит",
@@ -260,6 +262,7 @@ OC.L10N.register(
     "Shared with you" : "Споделени с вас",
     "Deck settings" : "Настройки на платформата",
     "Use bigger card view" : "Използва по-голям изглед на картата",
+    "Show card ID badge" : "Показване на обозначение за самоличност на картата",
     "Show boards in calendar/tasks" : "Показване на таблата в календар / задачи",
     "Limit deck usage of groups" : "Ограничава използването на набора от групи",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Ограничаването на приложението Deck/набор/ ще блокира потребителите, които не са част от тези групи, да създават свои собствени табла. Потребителите все още ще могат да работят на таблата, които са споделени с тях.",

l10n/bg.json

@@ -181,8 +181,10 @@
     "Failed to transfer the board to {user}" : "Неуспешно прехвърляне на таблото на {user}",
     "Add a new list" : "Добавяне на нов списък",
     "Archive all cards" : "Архивира всички карти",
+    "Unarchive all cards" : "Разархивиране на всички карти",
     "Delete list" : "Изтрива списък",
     "Archive all cards in this list" : "Архивира всички карти в този списък",
+    "Unarchive all cards in this list" : "Разархивиране всички карти в този списък",
     "Add a new card" : "Добави нова карта",
     "Card name" : "Име на карта",
     "List deleted" : "Списъкът е изтрит",
@@ -258,6 +260,7 @@
     "Shared with you" : "Споделени с вас",
     "Deck settings" : "Настройки на платформата",
     "Use bigger card view" : "Използва по-голям изглед на картата",
+    "Show card ID badge" : "Показване на обозначение за самоличност на картата",
     "Show boards in calendar/tasks" : "Показване на таблата в календар / задачи",
     "Limit deck usage of groups" : "Ограничава използването на набора от групи",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Ограничаването на приложението Deck/набор/ ще блокира потребителите, които не са част от тези групи, да създават свои собствени табла. Потребителите все още ще могат да работят на таблата, които са споделени с тях.",

l10n/cs.js

@@ -183,8 +183,10 @@ OC.L10N.register(
     "Failed to transfer the board to {user}" : "Nepodařilo se předat vlastnictví tabule uživateli {user}",
     "Add a new list" : "Přidat nový sloupec",
     "Archive all cards" : "Archivovat všechny karty",
+    "Unarchive all cards" : "Zrušit archivaci všech karet",
     "Delete list" : "Smazat seznam",
     "Archive all cards in this list" : "Archivovat všechny karty v tomto seznamu",
+    "Unarchive all cards in this list" : "Zrušit archivaci všech karet v tomto seznamu",
     "Add a new card" : "Přidat novou kartu",
     "Card name" : "Název karty",
     "List deleted" : "Seznam smazán",
@@ -260,6 +262,7 @@ OC.L10N.register(
     "Shared with you" : "Sdíleno s vámi",
     "Deck settings" : "Nastavení pro Deck",
     "Use bigger card view" : "Použít větší zobrazení karet",
+    "Show card ID badge" : "Zobrazit odznáček s identifikátorem karty",
     "Show boards in calendar/tasks" : "Zobrazit tabule v kalendáři/úkolech",
     "Limit deck usage of groups" : "Omezit využití deck na skupiny",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Omezení nastavené pro Deck brání uživatelům, kteří nejsou součástí těchto skupin, ve vytváření vlastních tabulí. Nicméně i tak ale pořád budou moci pracovat na tabulích, které jsou jim nasdíleny.",

l10n/cs.json

@@ -181,8 +181,10 @@
     "Failed to transfer the board to {user}" : "Nepodařilo se předat vlastnictví tabule uživateli {user}",
     "Add a new list" : "Přidat nový sloupec",
     "Archive all cards" : "Archivovat všechny karty",
+    "Unarchive all cards" : "Zrušit archivaci všech karet",
     "Delete list" : "Smazat seznam",
     "Archive all cards in this list" : "Archivovat všechny karty v tomto seznamu",
+    "Unarchive all cards in this list" : "Zrušit archivaci všech karet v tomto seznamu",
     "Add a new card" : "Přidat novou kartu",
     "Card name" : "Název karty",
     "List deleted" : "Seznam smazán",
@@ -258,6 +260,7 @@
     "Shared with you" : "Sdíleno s vámi",
     "Deck settings" : "Nastavení pro Deck",
     "Use bigger card view" : "Použít větší zobrazení karet",
+    "Show card ID badge" : "Zobrazit odznáček s identifikátorem karty",
     "Show boards in calendar/tasks" : "Zobrazit tabule v kalendáři/úkolech",
     "Limit deck usage of groups" : "Omezit využití deck na skupiny",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Omezení nastavené pro Deck brání uživatelům, kteří nejsou součástí těchto skupin, ve vytváření vlastních tabulí. Nicméně i tak ale pořád budou moci pracovat na tabulích, které jsou jim nasdíleny.",

l10n/de.js

@@ -183,8 +183,10 @@ OC.L10N.register(
     "Failed to transfer the board to {user}" : "Das Board konnte nicht an {user} übertragen werden",
     "Add a new list" : "Eine neue Liste hinzufügen",
     "Archive all cards" : "Alle Karten archivieren",
+    "Unarchive all cards" : "Alle Karten dearchivieren",
     "Delete list" : "Liste löschen",
     "Archive all cards in this list" : "Alle Karten in dieser Liste archivieren",
+    "Unarchive all cards in this list" : "Alle Karten dieser Liste dearchivieren",
     "Add a new card" : "Neue Karte hinzufügen",
     "Card name" : "Kartenname",
     "List deleted" : "Liste gelöscht",
@@ -213,10 +215,10 @@ OC.L10N.register(
     "The title cannot be empty." : "Der Titel darf nicht leer sein.",
     "No comments yet. Begin the discussion!" : "Bislang keine Kommentare. Beginne die Diskussion!",
     "Failed to load comments" : "Das Laden der Kommentare ist fehlgeschlagen",
-    "Assign a tag to this card…" : "Dieser Karte ein Schlagwort zuweisen…",
+    "Assign a tag to this card…" : "Dieser Karte ein Schlagwort zuweisen …",
     "Assign to users" : "Benutzern zuweisen",
     "Assign to users/groups/circles" : "An Benutzer, Gruppen oder Kreise zuweisen",
-    "Assign a user to this card…" : "Diese Karte einem Benutzer zuweisen…",
+    "Assign a user to this card…" : "Diese Karte einem Benutzer zuweisen …",
     "Due date" : "Fälligkeitsdatum",
     "Set a due date" : "Ein Ablaufdatum setzen",
     "Remove due date" : "Fälligkeitsdatum löschen",
@@ -235,7 +237,7 @@ OC.L10N.register(
     "Description" : "Beschreibung",
     "(Unsaved)" : "(nicht gespeichert)",
     "(Saving…)" : "(Speichere…)",
-    "Formatting help" : "Formatierungshilfe",
+    "Formatting help" : "Hilfe zur Formatierung",
     "Edit description" : "Beschreibung bearbeiten",
     "View description" : "Beschreibung anzeigen",
     "Add Attachment" : "Anhang anhängen",

l10n/de.json

@@ -181,8 +181,10 @@
     "Failed to transfer the board to {user}" : "Das Board konnte nicht an {user} übertragen werden",
     "Add a new list" : "Eine neue Liste hinzufügen",
     "Archive all cards" : "Alle Karten archivieren",
+    "Unarchive all cards" : "Alle Karten dearchivieren",
     "Delete list" : "Liste löschen",
     "Archive all cards in this list" : "Alle Karten in dieser Liste archivieren",
+    "Unarchive all cards in this list" : "Alle Karten dieser Liste dearchivieren",
     "Add a new card" : "Neue Karte hinzufügen",
     "Card name" : "Kartenname",
     "List deleted" : "Liste gelöscht",
@@ -211,10 +213,10 @@
     "The title cannot be empty." : "Der Titel darf nicht leer sein.",
     "No comments yet. Begin the discussion!" : "Bislang keine Kommentare. Beginne die Diskussion!",
     "Failed to load comments" : "Das Laden der Kommentare ist fehlgeschlagen",
-    "Assign a tag to this card…" : "Dieser Karte ein Schlagwort zuweisen…",
+    "Assign a tag to this card…" : "Dieser Karte ein Schlagwort zuweisen …",
     "Assign to users" : "Benutzern zuweisen",
     "Assign to users/groups/circles" : "An Benutzer, Gruppen oder Kreise zuweisen",
-    "Assign a user to this card…" : "Diese Karte einem Benutzer zuweisen…",
+    "Assign a user to this card…" : "Diese Karte einem Benutzer zuweisen …",
     "Due date" : "Fälligkeitsdatum",
     "Set a due date" : "Ein Ablaufdatum setzen",
     "Remove due date" : "Fälligkeitsdatum löschen",
@@ -233,7 +235,7 @@
     "Description" : "Beschreibung",
     "(Unsaved)" : "(nicht gespeichert)",
     "(Saving…)" : "(Speichere…)",
-    "Formatting help" : "Formatierungshilfe",
+    "Formatting help" : "Hilfe zur Formatierung",
     "Edit description" : "Beschreibung bearbeiten",
     "View description" : "Beschreibung anzeigen",
     "Add Attachment" : "Anhang anhängen",

l10n/de_DE.js

@@ -183,8 +183,10 @@ OC.L10N.register(
     "Failed to transfer the board to {user}" : "Das Board konnte nicht auf {user} übertragen werden",
     "Add a new list" : "Eine neue Liste hinzufügen",
     "Archive all cards" : "Alle Karten archivieren",
+    "Unarchive all cards" : "Alle Karten dearchivieren",
     "Delete list" : "Liste löschen",
     "Archive all cards in this list" : "Alle Karten in dieser Liste archivieren",
+    "Unarchive all cards in this list" : "Alle Karten in dieser Liste dearchivieren",
     "Add a new card" : "Neue Karte hinzufügen",
     "Card name" : "Kartenname",
     "List deleted" : "Liste gelöscht",
@@ -260,6 +262,7 @@ OC.L10N.register(
     "Shared with you" : "Mit Ihnen geteilt",
     "Deck settings" : "Deck-Einstellungen",
     "Use bigger card view" : "Größere Kartenansicht verwenden",
+    "Show card ID badge" : "Abzeichen mit Karten-ID zeigen",
     "Show boards in calendar/tasks" : "Board in Kalender/Aufgaben anzeigen",
     "Limit deck usage of groups" : "Nutzung auf Gruppen einschränken",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Wenn Sie Deck einschränken, können Benutzer, die nicht zu diesen Gruppen gehören, keine eigenen Boards erstellen. Die Benutzer können weiterhin an Boards arbeiten, die für sie freigegeben wurden.",

l10n/de_DE.json

@@ -181,8 +181,10 @@
     "Failed to transfer the board to {user}" : "Das Board konnte nicht auf {user} übertragen werden",
     "Add a new list" : "Eine neue Liste hinzufügen",
     "Archive all cards" : "Alle Karten archivieren",
+    "Unarchive all cards" : "Alle Karten dearchivieren",
     "Delete list" : "Liste löschen",
     "Archive all cards in this list" : "Alle Karten in dieser Liste archivieren",
+    "Unarchive all cards in this list" : "Alle Karten in dieser Liste dearchivieren",
     "Add a new card" : "Neue Karte hinzufügen",
     "Card name" : "Kartenname",
     "List deleted" : "Liste gelöscht",
@@ -258,6 +260,7 @@
     "Shared with you" : "Mit Ihnen geteilt",
     "Deck settings" : "Deck-Einstellungen",
     "Use bigger card view" : "Größere Kartenansicht verwenden",
+    "Show card ID badge" : "Abzeichen mit Karten-ID zeigen",
     "Show boards in calendar/tasks" : "Board in Kalender/Aufgaben anzeigen",
     "Limit deck usage of groups" : "Nutzung auf Gruppen einschränken",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Wenn Sie Deck einschränken, können Benutzer, die nicht zu diesen Gruppen gehören, keine eigenen Boards erstellen. Die Benutzer können weiterhin an Boards arbeiten, die für sie freigegeben wurden.",

l10n/es.js

@@ -183,8 +183,10 @@ OC.L10N.register(
     "Failed to transfer the board to {user}" : "Failed to transfer the board to {user}",
     "Add a new list" : "Añadir una lista nueva",
     "Archive all cards" : "Archivar todas las tarjetas",
+    "Unarchive all cards" : "Desarchivar todas las tarjetas",
     "Delete list" : "Eliminar lista",
     "Archive all cards in this list" : "Archivar todas las tarjetas en esta lista",
+    "Unarchive all cards in this list" : "Desarchivar todas las tarjetas en esta lista",
     "Add a new card" : "Añadir una nueva tarjeta",
     "Card name" : "Nombre de la tarjeta",
     "List deleted" : "Lista borrada",
@@ -260,6 +262,7 @@ OC.L10N.register(
     "Shared with you" : "Compartido contigo",
     "Deck settings" : "Configuración del tablero",
     "Use bigger card view" : "Usar vista de tarjeta mayor",
+    "Show card ID badge" : "Mostrar insignia de la ID de tarjeta",
     "Show boards in calendar/tasks" : "Mostrar tableros en calendario/tareas",
     "Limit deck usage of groups" : "Limitar el uso de Deck a grupos",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Limitar Deck impedirá que usuarios que no formen parte de esos grupos creen sus propios tableros. Los usuarios todavía podrán trabajar en tableros que hayan sido compartidos con ellos.",

l10n/es.json

@@ -181,8 +181,10 @@
     "Failed to transfer the board to {user}" : "Failed to transfer the board to {user}",
     "Add a new list" : "Añadir una lista nueva",
     "Archive all cards" : "Archivar todas las tarjetas",
+    "Unarchive all cards" : "Desarchivar todas las tarjetas",
     "Delete list" : "Eliminar lista",
     "Archive all cards in this list" : "Archivar todas las tarjetas en esta lista",
+    "Unarchive all cards in this list" : "Desarchivar todas las tarjetas en esta lista",
     "Add a new card" : "Añadir una nueva tarjeta",
     "Card name" : "Nombre de la tarjeta",
     "List deleted" : "Lista borrada",
@@ -258,6 +260,7 @@
     "Shared with you" : "Compartido contigo",
     "Deck settings" : "Configuración del tablero",
     "Use bigger card view" : "Usar vista de tarjeta mayor",
+    "Show card ID badge" : "Mostrar insignia de la ID de tarjeta",
     "Show boards in calendar/tasks" : "Mostrar tableros en calendario/tareas",
     "Limit deck usage of groups" : "Limitar el uso de Deck a grupos",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Limitar Deck impedirá que usuarios que no formen parte de esos grupos creen sus propios tableros. Los usuarios todavía podrán trabajar en tableros que hayan sido compartidos con ellos.",

l10n/fr.js

@@ -183,8 +183,10 @@ OC.L10N.register(
     "Failed to transfer the board to {user}" : "Échec du transfert du tableau à {user}",
     "Add a new list" : "Ajouter une nouvelle liste",
     "Archive all cards" : "Archiver toutes les cartes",
+    "Unarchive all cards" : "Désarchiver toutes les cartes",
     "Delete list" : "Supprimer la liste",
     "Archive all cards in this list" : "Archiver toutes les cartes de cette liste",
+    "Unarchive all cards in this list" : "Désarchiver toutes les cartes de cette liste",
     "Add a new card" : "Ajouter une nouvelle carte",
     "Card name" : "Nom de la carte",
     "List deleted" : "Liste supprimée",
@@ -260,6 +262,7 @@ OC.L10N.register(
     "Shared with you" : "Partagés avec vous",
     "Deck settings" : "Paramètres de Deck",
     "Use bigger card view" : "Utiliser la vue large des cartes",
+    "Show card ID badge" : "Afficher la carte d'identité du badge",
     "Show boards in calendar/tasks" : "Afficher les tableaux dans les agendas/tâches",
     "Limit deck usage of groups" : "Limiter l'utilisation du tableau aux groupes",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Limiter Deck empêchera les utilisateurs ne faisant pas partie de ces groupes de créer leurs propres tableaux. Ces utilisateurs pourront toujours travailler sur les tableaux qui ont été partagés avec eux.",

l10n/fr.json

@@ -181,8 +181,10 @@
     "Failed to transfer the board to {user}" : "Échec du transfert du tableau à {user}",
     "Add a new list" : "Ajouter une nouvelle liste",
     "Archive all cards" : "Archiver toutes les cartes",
+    "Unarchive all cards" : "Désarchiver toutes les cartes",
     "Delete list" : "Supprimer la liste",
     "Archive all cards in this list" : "Archiver toutes les cartes de cette liste",
+    "Unarchive all cards in this list" : "Désarchiver toutes les cartes de cette liste",
     "Add a new card" : "Ajouter une nouvelle carte",
     "Card name" : "Nom de la carte",
     "List deleted" : "Liste supprimée",
@@ -258,6 +260,7 @@
     "Shared with you" : "Partagés avec vous",
     "Deck settings" : "Paramètres de Deck",
     "Use bigger card view" : "Utiliser la vue large des cartes",
+    "Show card ID badge" : "Afficher la carte d'identité du badge",
     "Show boards in calendar/tasks" : "Afficher les tableaux dans les agendas/tâches",
     "Limit deck usage of groups" : "Limiter l'utilisation du tableau aux groupes",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Limiter Deck empêchera les utilisateurs ne faisant pas partie de ces groupes de créer leurs propres tableaux. Ces utilisateurs pourront toujours travailler sur les tableaux qui ont été partagés avec eux.",

l10n/hu.js

@@ -183,8 +183,10 @@ OC.L10N.register(
     "Failed to transfer the board to {user}" : "A tábla átadása {user} számára sikertelen",
     "Add a new list" : "Új lista hozzáadása",
     "Archive all cards" : "Az összes kártya archiválása",
+    "Unarchive all cards" : "Az összes kártya archiválásának visszavonása",
     "Delete list" : "Lista törlése",
     "Archive all cards in this list" : "Az összes kártya archiválása ebben a listában",
+    "Unarchive all cards in this list" : "Az összes kártya archiválásának visszavonása ebben a listában",
     "Add a new card" : "Új kártya hozzáadása",
     "Card name" : "Kártya neve",
     "List deleted" : "Lista törölve",
@@ -260,6 +262,7 @@ OC.L10N.register(
     "Shared with you" : "Megosztva Önnel",
     "Deck settings" : "Kártyák beállításai",
     "Use bigger card view" : "Nagyobb kártyanézet használata",
+    "Show card ID badge" : "Kártyaazonosító jelvény megjelenítése",
     "Show boards in calendar/tasks" : "Táblák megjelenítése a naptárak/teendők között",
     "Limit deck usage of groups" : "A kártyák használatának csoportokra korlátozása",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "A Kártyák korlátozása blokkolja a saját táblák létrehozását azoknál a felhasználóknál, akik nem tagjai a megadott csoportoknak. A felhasználók továbbra is tudnak dolgozni a velük megosztott táblákon.",
@@ -286,6 +289,7 @@ OC.L10N.register(
     "Search for {searchQuery} in all boards" : "Keresés a(z) {searchQuery} kifejezésre az összes táblában",
     "No results found" : "Nincs találat",
     "{stack} in {board}" : "{stack} itt: {board}",
+    "Click to expand description" : "Kattintson a leírás kibontásához",
     "* Created on {created}\n* Last modified on {lastMod}\n* {nbAttachments} attachments\n* {nbComments} comments" : "* Létrehozva: {created}\n* Utoljára módosítva: {lastMod}\n* {nbAttachments} melléklet\n* {nbComments} megjegyzés",
     "{nbCards} cards" : "{nbCards} kártya",
     "No upcoming cards" : "Nincsenek közelgő kártyák",

l10n/hu.json

@@ -181,8 +181,10 @@
     "Failed to transfer the board to {user}" : "A tábla átadása {user} számára sikertelen",
     "Add a new list" : "Új lista hozzáadása",
     "Archive all cards" : "Az összes kártya archiválása",
+    "Unarchive all cards" : "Az összes kártya archiválásának visszavonása",
     "Delete list" : "Lista törlése",
     "Archive all cards in this list" : "Az összes kártya archiválása ebben a listában",
+    "Unarchive all cards in this list" : "Az összes kártya archiválásának visszavonása ebben a listában",
     "Add a new card" : "Új kártya hozzáadása",
     "Card name" : "Kártya neve",
     "List deleted" : "Lista törölve",
@@ -258,6 +260,7 @@
     "Shared with you" : "Megosztva Önnel",
     "Deck settings" : "Kártyák beállításai",
     "Use bigger card view" : "Nagyobb kártyanézet használata",
+    "Show card ID badge" : "Kártyaazonosító jelvény megjelenítése",
     "Show boards in calendar/tasks" : "Táblák megjelenítése a naptárak/teendők között",
     "Limit deck usage of groups" : "A kártyák használatának csoportokra korlátozása",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "A Kártyák korlátozása blokkolja a saját táblák létrehozását azoknál a felhasználóknál, akik nem tagjai a megadott csoportoknak. A felhasználók továbbra is tudnak dolgozni a velük megosztott táblákon.",
@@ -284,6 +287,7 @@
     "Search for {searchQuery} in all boards" : "Keresés a(z) {searchQuery} kifejezésre az összes táblában",
     "No results found" : "Nincs találat",
     "{stack} in {board}" : "{stack} itt: {board}",
+    "Click to expand description" : "Kattintson a leírás kibontásához",
     "* Created on {created}\n* Last modified on {lastMod}\n* {nbAttachments} attachments\n* {nbComments} comments" : "* Létrehozva: {created}\n* Utoljára módosítva: {lastMod}\n* {nbAttachments} melléklet\n* {nbComments} megjegyzés",
     "{nbCards} cards" : "{nbCards} kártya",
     "No upcoming cards" : "Nincsenek közelgő kártyák",

l10n/lt_LT.js

@@ -70,6 +70,7 @@ OC.L10N.register(
     "Personal" : "Asmeniniai",
     "The card \"%s\" on \"%s\" has been assigned to you by %s." : "Kortelę \"%s\" ties \"%s\" priskyrė jums %s.",
     "The card \"%s\" on \"%s\" has reached its due date." : "Kortelė „%s“, esanti lentoje „%s“, pasiekė savo galutinį terminą.",
+    "The card {deck-card} on {deck-board} has reached its due date." : "Kortelė {deck-card}, esanti lentoje {deck-board} pasiekė savo galutinio termino datą.",
     "%s has mentioned you in a comment on \"%s\"." : "%s paminėjo jus komentare ties \"%s\".",
     "The board \"%s\" has been shared with you by %s." : "Lentą \"%s\" su jumis bendrina %s.",
     "%s on %s" : "%s ant %s",
@@ -200,9 +201,9 @@ OC.L10N.register(
     "Assign to users" : "Priskirti naudotojams",
     "Assign to users/groups/circles" : "Priskirti naudotojams/grupėms/ratams",
     "Assign a user to this card…" : "Priskirti šiai kortelei naudotoją…",
-    "Due date" : "Terminas",
+    "Due date" : "Galutinio termino data",
     "Set a due date" : "Nustatyti galutinį terminą",
-    "Remove due date" : "Pašalinti terminą",
+    "Remove due date" : "Šalinti galutinio termino datą",
     "Select Date" : "Pasirinkti datą",
     "Today" : "Šiandien",
     "Tomorrow" : "Rytoj",
@@ -243,9 +244,9 @@ OC.L10N.register(
     "Clone board" : "Dubliuoti lentą",
     "Unarchive board" : "Išarchyvuoti lentą",
     "Archive board" : "Archyvuoti lentą",
-    "Turn on due date reminders" : "Įjungti priminimus apie galutinį terminą",
-    "Turn off due date reminders" : "Išjungti priminimus apie galutinį terminą",
-    "Due date reminders" : "Priminimai apie galutinį terminą",
+    "Turn on due date reminders" : "Įjungti priminimus apie galutinio termino datą",
+    "Turn off due date reminders" : "Išjungti priminimus apie galutinio termino datą",
+    "Due date reminders" : "Priminimai apie galutinio termino datą",
     "All cards" : "Visos kortelės",
     "Assigned cards" : "Priskirtos kortelės",
     "No notifications" : "Pranešimų nėra",
@@ -257,6 +258,7 @@ OC.L10N.register(
     "Delete the board?" : "Ištrinti lentą?",
     "No due" : "Be galutinio termino",
     "No results found" : "Nerasta jokių rezultatų",
+    "Due on {date}" : "Galutinis terminas {date}",
     "Link to a board" : "Susieti su lenta",
     "Link to a card" : "Susieti su kortele",
     "Create a card" : "Sukurti kortelę",

l10n/lt_LT.json

@@ -68,6 +68,7 @@
     "Personal" : "Asmeniniai",
     "The card \"%s\" on \"%s\" has been assigned to you by %s." : "Kortelę \"%s\" ties \"%s\" priskyrė jums %s.",
     "The card \"%s\" on \"%s\" has reached its due date." : "Kortelė „%s“, esanti lentoje „%s“, pasiekė savo galutinį terminą.",
+    "The card {deck-card} on {deck-board} has reached its due date." : "Kortelė {deck-card}, esanti lentoje {deck-board} pasiekė savo galutinio termino datą.",
     "%s has mentioned you in a comment on \"%s\"." : "%s paminėjo jus komentare ties \"%s\".",
     "The board \"%s\" has been shared with you by %s." : "Lentą \"%s\" su jumis bendrina %s.",
     "%s on %s" : "%s ant %s",
@@ -198,9 +199,9 @@
     "Assign to users" : "Priskirti naudotojams",
     "Assign to users/groups/circles" : "Priskirti naudotojams/grupėms/ratams",
     "Assign a user to this card…" : "Priskirti šiai kortelei naudotoją…",
-    "Due date" : "Terminas",
+    "Due date" : "Galutinio termino data",
     "Set a due date" : "Nustatyti galutinį terminą",
-    "Remove due date" : "Pašalinti terminą",
+    "Remove due date" : "Šalinti galutinio termino datą",
     "Select Date" : "Pasirinkti datą",
     "Today" : "Šiandien",
     "Tomorrow" : "Rytoj",
@@ -241,9 +242,9 @@
     "Clone board" : "Dubliuoti lentą",
     "Unarchive board" : "Išarchyvuoti lentą",
     "Archive board" : "Archyvuoti lentą",
-    "Turn on due date reminders" : "Įjungti priminimus apie galutinį terminą",
-    "Turn off due date reminders" : "Išjungti priminimus apie galutinį terminą",
-    "Due date reminders" : "Priminimai apie galutinį terminą",
+    "Turn on due date reminders" : "Įjungti priminimus apie galutinio termino datą",
+    "Turn off due date reminders" : "Išjungti priminimus apie galutinio termino datą",
+    "Due date reminders" : "Priminimai apie galutinio termino datą",
     "All cards" : "Visos kortelės",
     "Assigned cards" : "Priskirtos kortelės",
     "No notifications" : "Pranešimų nėra",
@@ -255,6 +256,7 @@
     "Delete the board?" : "Ištrinti lentą?",
     "No due" : "Be galutinio termino",
     "No results found" : "Nerasta jokių rezultatų",
+    "Due on {date}" : "Galutinis terminas {date}",
     "Link to a board" : "Susieti su lenta",
     "Link to a card" : "Susieti su kortele",
     "Create a card" : "Sukurti kortelę",

l10n/pl.js

@@ -183,8 +183,10 @@ OC.L10N.register(
     "Failed to transfer the board to {user}" : "Nie udało się przenieść tablicy do {user}",
     "Add a new list" : "Dodaj nową listę",
     "Archive all cards" : "Zarchiwizuj wszystkie karty",
+    "Unarchive all cards" : "Przywróć wszystkie karty z archiwum",
     "Delete list" : "Usuń listę",
     "Archive all cards in this list" : "Zarchiwizuj wszystkie karty na tej liście",
+    "Unarchive all cards in this list" : "Cofnij archiwizację wszystkich kart z tej listy",
     "Add a new card" : "Dodaj nową kartę",
     "Card name" : "Nazwa karty",
     "List deleted" : "Lista usunięta",
@@ -260,6 +262,7 @@ OC.L10N.register(
     "Shared with you" : "Udostępnione Tobie",
     "Deck settings" : "Ustawienia Tablicy",
     "Use bigger card view" : "Użyj większego widoku karty",
+    "Show card ID badge" : "Pokaż ID karty",
     "Show boards in calendar/tasks" : "Pokaż tablice w kalendarzu/zadaniach",
     "Limit deck usage of groups" : "Ogranicz użycie tablic dla grup",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Ograniczenie Tablicy zablokuje użytkownikom z tych grup możliwość tworzenia własnych tablic. Użytkownicy nadal będą mogli pracować na tablicach, które zostały im udostępnione.",

l10n/pl.json

@@ -181,8 +181,10 @@
     "Failed to transfer the board to {user}" : "Nie udało się przenieść tablicy do {user}",
     "Add a new list" : "Dodaj nową listę",
     "Archive all cards" : "Zarchiwizuj wszystkie karty",
+    "Unarchive all cards" : "Przywróć wszystkie karty z archiwum",
     "Delete list" : "Usuń listę",
     "Archive all cards in this list" : "Zarchiwizuj wszystkie karty na tej liście",
+    "Unarchive all cards in this list" : "Cofnij archiwizację wszystkich kart z tej listy",
     "Add a new card" : "Dodaj nową kartę",
     "Card name" : "Nazwa karty",
     "List deleted" : "Lista usunięta",
@@ -258,6 +260,7 @@
     "Shared with you" : "Udostępnione Tobie",
     "Deck settings" : "Ustawienia Tablicy",
     "Use bigger card view" : "Użyj większego widoku karty",
+    "Show card ID badge" : "Pokaż ID karty",
     "Show boards in calendar/tasks" : "Pokaż tablice w kalendarzu/zadaniach",
     "Limit deck usage of groups" : "Ogranicz użycie tablic dla grup",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Ograniczenie Tablicy zablokuje użytkownikom z tych grup możliwość tworzenia własnych tablic. Użytkownicy nadal będą mogli pracować na tablicach, które zostały im udostępnione.",

l10n/sk.js

@@ -183,8 +183,10 @@ OC.L10N.register(
     "Failed to transfer the board to {user}" : "Chyba pri presune nástenky na {user}",
     "Add a new list" : "Pridať nový zoznam",
     "Archive all cards" : "Archivovať všetky karty",
+    "Unarchive all cards" : "Zrušiť archiváciu všetkých kariet",
     "Delete list" : "Vymazať zoznam",
     "Archive all cards in this list" : "Archivovať všetky karty v tomto zozname",
+    "Unarchive all cards in this list" : "Zrušiť archiváciu všetkých kariet v tomto zozname",
     "Add a new card" : "Pridať novú kartu",
     "Card name" : "Názov karty",
     "List deleted" : "Zoznam bol vymazaný",
@@ -260,6 +262,7 @@ OC.L10N.register(
     "Shared with you" : "Vám sprístupnené",
     "Deck settings" : "Nastavenia paluby",
     "Use bigger card view" : "Použiť väčšie zobrazenie karty",
+    "Show card ID badge" : "Ukázať ID karty",
     "Show boards in calendar/tasks" : "Zobrazovať nástenky v kalendári/úlohách",
     "Limit deck usage of groups" : "Obmedziť použitie Deck na skupiny",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Obmedzenie Násteniek bráni používateľom, ktorí nie sú súčasťou týchto skupín, aby si vytvárali vlastné nástenky. Môžu však stále pracovať na nástenkách, ktoré im niekto sprístupní.",

l10n/sk.json

@@ -181,8 +181,10 @@
     "Failed to transfer the board to {user}" : "Chyba pri presune nástenky na {user}",
     "Add a new list" : "Pridať nový zoznam",
     "Archive all cards" : "Archivovať všetky karty",
+    "Unarchive all cards" : "Zrušiť archiváciu všetkých kariet",
     "Delete list" : "Vymazať zoznam",
     "Archive all cards in this list" : "Archivovať všetky karty v tomto zozname",
+    "Unarchive all cards in this list" : "Zrušiť archiváciu všetkých kariet v tomto zozname",
     "Add a new card" : "Pridať novú kartu",
     "Card name" : "Názov karty",
     "List deleted" : "Zoznam bol vymazaný",
@@ -258,6 +260,7 @@
     "Shared with you" : "Vám sprístupnené",
     "Deck settings" : "Nastavenia paluby",
     "Use bigger card view" : "Použiť väčšie zobrazenie karty",
+    "Show card ID badge" : "Ukázať ID karty",
     "Show boards in calendar/tasks" : "Zobrazovať nástenky v kalendári/úlohách",
     "Limit deck usage of groups" : "Obmedziť použitie Deck na skupiny",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Obmedzenie Násteniek bráni používateľom, ktorí nie sú súčasťou týchto skupín, aby si vytvárali vlastné nástenky. Môžu však stále pracovať na nástenkách, ktoré im niekto sprístupní.",

l10n/sv.js

@@ -136,6 +136,7 @@ OC.L10N.register(
     "Archived cards" : "Arkiverade kort",
     "Add list" : "Lägg till lista...",
     "List name" : "Namn på lista",
+    "Active filters" : "Aktiva filter",
     "Apply filter" : "Tillämpa filter",
     "Filter by tag" : "Filtrera efter tagg",
     "Filter by assigned user" : "Filtrera efter tilldelad användare",
@@ -175,11 +176,17 @@ OC.L10N.register(
     "Owner" : "Ägare",
     "Delete" : "Ta bort",
     "Failed to create share with {displayName}" : "Kunde inte skapa delning med {displayName}",
+    "Are you sure you want to transfer the board {title} to {user}?" : "Är du säker att du vill överföra tavlan {title} till {user}?",
+    "Transfer the board." : "Överför tavlan.",
     "Transfer" : "Överför",
+    "The board has been transferred to {user}" : "Tavlan har överförts till {user}",
+    "Failed to transfer the board to {user}" : "Kunde inte överföra tavlan till {user}",
     "Add a new list" : "Lägg till en ny lista",
     "Archive all cards" : "Arkivera alla kort",
+    "Unarchive all cards" : "Ta ut alla kort ur arkivet",
     "Delete list" : "Ta bort lista",
     "Archive all cards in this list" : "Arkivera alla kort i denna lista",
+    "Unarchive all cards in this list" : "Ta ut alla kort i denna lista ur arkivet",
     "Add a new card" : "Lägg till ett nytt kort",
     "Card name" : "Kortets namn",
     "List deleted" : "Listan har raderats",
@@ -237,7 +244,9 @@ OC.L10N.register(
     "Write a description …" : "Ange en beskrivning ...",
     "Choose attachment" : "Välj bilaga",
     "(group)" : " (grupp)",
+    "Todo items" : "Todo saker",
     "{count} comments, {unread} unread" : "{count} kommentarer, {unread} olästa",
+    "Edit card title" : "Ändra korttitel",
     "Assign to me" : "Tilldela till mig",
     "Unassign myself" : "Ta bort från mig själv",
     "Move card" : "Flytta kort",
@@ -251,7 +260,9 @@ OC.L10N.register(
     "All boards" : "Alla tavlor",
     "Archived boards" : "Arkiverade tavlor",
     "Shared with you" : "Delad med dig",
+    "Deck settings" : "Deck-inställningar",
     "Use bigger card view" : "Visa större kort",
+    "Show card ID badge" : "Visa kortets ID-märke",
     "Show boards in calendar/tasks" : "Visa tavlor i kalender / uppgifter",
     "Limit deck usage of groups" : "Begränsa användningen av grupper",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Begränsning av Deck blockerar användare som inte ingår i dessa grupper från att skapa egna tavlor. Användare kan dock fortfarande integrera med tavlor som har delats med dem.",
@@ -271,13 +282,19 @@ OC.L10N.register(
     "Only assigned cards" : "Bara tilldelade kort",
     "No reminder" : "Ingen påminnelse",
     "An error occurred" : "Ett fel uppstod",
+    "Are you sure you want to delete the board {title}? This will delete all the data of this board including archived cards." : "Är du säker på att du vill radera brädet {title}? Detta kommer radera all data som tillhör brädet inklusive arkiverade kort.",
     "Delete the board?" : "Ta bort tavlan?",
     "Loading filtered view" : "Laddar filtrerad vy",
     "No due" : "Inget slut",
     "Search for {searchQuery} in all boards" : "Sök efter {searchQuery} i alla tavlor",
     "No results found" : "Inga resultat funna",
+    "{stack} in {board}" : "{stack} i {board}",
+    "Click to expand description" : "Klicka för att utöka beskrivningen",
+    "* Created on {created}\n* Last modified on {lastMod}\n* {nbAttachments} attachments\n* {nbComments} comments" : "* Skapades {created}\n* Ändrades senast {lastMod}\n* {nbAttachments} bilagor\n* {nbComments} kommentarer",
+    "{nbCards} cards" : "{nbCards} kort",
     "No upcoming cards" : "Inga kommande kort",
     "upcoming cards" : "kommande kort",
+    "Due on {date}" : "Går ut {date}",
     "Link to a board" : "Länka till en tavla",
     "Link to a card" : "Länka till ett kort",
     "Create a card" : "Skapa ett kort",
@@ -290,7 +307,11 @@ OC.L10N.register(
     "Share {file} with a Deck card" : "Dela {file} med ett Deck-kort",
     "Share" : "Dela",
     "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized" : "Deck är en kanban-liknande projekt- och organiseringsapp för arbetsgrupper i Nextcloud.\n\n\n- 📥 Lägg till uppgifter på kort och ordna dem\n- 📄 Skriv anteckningar i markdown\n- 🔖 Tilldela etiketter för organisering\n- 👥 Dela med arbetsgruppen, vänner eller familj\n- 📎 Bifoga filer och bädda in dem i markdown-anteckningarna\n- 💬 Diskutera i arbetsgruppen genom kommentarer\n- ⚡ Håll koll på ändringar i aktivitetsflödet\n- 🚀 Börja organisera din arbetsgrupp nu!",
+    "Are you sure you want to transfer the board {title} for {user} ?" : "Är du säker på att du vill överföra brädet {title} för {user}?",
+    "Transfer the board for {user} successfully" : "Överförde brädet för {user}",
+    "Failed to transfer the board for {user}" : "Misslyckades med att överföra brädet för {user}",
     "Are you sure you want to delete the board {title}? This will delete all the data of this board." : "Är du säker på att du vill radera tavla {title}? Detta kommer att radera all information från denna tavla.",
-    "This week" : "Denna vecka"
+    "This week" : "Denna vecka",
+    "Are you sure you want to transfer the board {title} for {user}?" : "Är du säker på att du vill överföra brädet {title} för {user}?"
 },
 "nplurals=2; plural=(n != 1);");

l10n/sv.json

@@ -134,6 +134,7 @@
     "Archived cards" : "Arkiverade kort",
     "Add list" : "Lägg till lista...",
     "List name" : "Namn på lista",
+    "Active filters" : "Aktiva filter",
     "Apply filter" : "Tillämpa filter",
     "Filter by tag" : "Filtrera efter tagg",
     "Filter by assigned user" : "Filtrera efter tilldelad användare",
@@ -173,11 +174,17 @@
     "Owner" : "Ägare",
     "Delete" : "Ta bort",
     "Failed to create share with {displayName}" : "Kunde inte skapa delning med {displayName}",
+    "Are you sure you want to transfer the board {title} to {user}?" : "Är du säker att du vill överföra tavlan {title} till {user}?",
+    "Transfer the board." : "Överför tavlan.",
     "Transfer" : "Överför",
+    "The board has been transferred to {user}" : "Tavlan har överförts till {user}",
+    "Failed to transfer the board to {user}" : "Kunde inte överföra tavlan till {user}",
     "Add a new list" : "Lägg till en ny lista",
     "Archive all cards" : "Arkivera alla kort",
+    "Unarchive all cards" : "Ta ut alla kort ur arkivet",
     "Delete list" : "Ta bort lista",
     "Archive all cards in this list" : "Arkivera alla kort i denna lista",
+    "Unarchive all cards in this list" : "Ta ut alla kort i denna lista ur arkivet",
     "Add a new card" : "Lägg till ett nytt kort",
     "Card name" : "Kortets namn",
     "List deleted" : "Listan har raderats",
@@ -235,7 +242,9 @@
     "Write a description …" : "Ange en beskrivning ...",
     "Choose attachment" : "Välj bilaga",
     "(group)" : " (grupp)",
+    "Todo items" : "Todo saker",
     "{count} comments, {unread} unread" : "{count} kommentarer, {unread} olästa",
+    "Edit card title" : "Ändra korttitel",
     "Assign to me" : "Tilldela till mig",
     "Unassign myself" : "Ta bort från mig själv",
     "Move card" : "Flytta kort",
@@ -249,7 +258,9 @@
     "All boards" : "Alla tavlor",
     "Archived boards" : "Arkiverade tavlor",
     "Shared with you" : "Delad med dig",
+    "Deck settings" : "Deck-inställningar",
     "Use bigger card view" : "Visa större kort",
+    "Show card ID badge" : "Visa kortets ID-märke",
     "Show boards in calendar/tasks" : "Visa tavlor i kalender / uppgifter",
     "Limit deck usage of groups" : "Begränsa användningen av grupper",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Begränsning av Deck blockerar användare som inte ingår i dessa grupper från att skapa egna tavlor. Användare kan dock fortfarande integrera med tavlor som har delats med dem.",
@@ -269,13 +280,19 @@
     "Only assigned cards" : "Bara tilldelade kort",
     "No reminder" : "Ingen påminnelse",
     "An error occurred" : "Ett fel uppstod",
+    "Are you sure you want to delete the board {title}? This will delete all the data of this board including archived cards." : "Är du säker på att du vill radera brädet {title}? Detta kommer radera all data som tillhör brädet inklusive arkiverade kort.",
     "Delete the board?" : "Ta bort tavlan?",
     "Loading filtered view" : "Laddar filtrerad vy",
     "No due" : "Inget slut",
     "Search for {searchQuery} in all boards" : "Sök efter {searchQuery} i alla tavlor",
     "No results found" : "Inga resultat funna",
+    "{stack} in {board}" : "{stack} i {board}",
+    "Click to expand description" : "Klicka för att utöka beskrivningen",
+    "* Created on {created}\n* Last modified on {lastMod}\n* {nbAttachments} attachments\n* {nbComments} comments" : "* Skapades {created}\n* Ändrades senast {lastMod}\n* {nbAttachments} bilagor\n* {nbComments} kommentarer",
+    "{nbCards} cards" : "{nbCards} kort",
     "No upcoming cards" : "Inga kommande kort",
     "upcoming cards" : "kommande kort",
+    "Due on {date}" : "Går ut {date}",
     "Link to a board" : "Länka till en tavla",
     "Link to a card" : "Länka till ett kort",
     "Create a card" : "Skapa ett kort",
@@ -288,7 +305,11 @@
     "Share {file} with a Deck card" : "Dela {file} med ett Deck-kort",
     "Share" : "Dela",
     "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized" : "Deck är en kanban-liknande projekt- och organiseringsapp för arbetsgrupper i Nextcloud.\n\n\n- 📥 Lägg till uppgifter på kort och ordna dem\n- 📄 Skriv anteckningar i markdown\n- 🔖 Tilldela etiketter för organisering\n- 👥 Dela med arbetsgruppen, vänner eller familj\n- 📎 Bifoga filer och bädda in dem i markdown-anteckningarna\n- 💬 Diskutera i arbetsgruppen genom kommentarer\n- ⚡ Håll koll på ändringar i aktivitetsflödet\n- 🚀 Börja organisera din arbetsgrupp nu!",
+    "Are you sure you want to transfer the board {title} for {user} ?" : "Är du säker på att du vill överföra brädet {title} för {user}?",
+    "Transfer the board for {user} successfully" : "Överförde brädet för {user}",
+    "Failed to transfer the board for {user}" : "Misslyckades med att överföra brädet för {user}",
     "Are you sure you want to delete the board {title}? This will delete all the data of this board." : "Är du säker på att du vill radera tavla {title}? Detta kommer att radera all information från denna tavla.",
-    "This week" : "Denna vecka"
+    "This week" : "Denna vecka",
+    "Are you sure you want to transfer the board {title} for {user}?" : "Är du säker på att du vill överföra brädet {title} för {user}?"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

l10n/tr.js

@@ -183,8 +183,10 @@ OC.L10N.register(
     "Failed to transfer the board to {user}" : "Pano {user} kullanıcısına aktarılamadı",
     "Add a new list" : "Yeni liste ekle",
     "Archive all cards" : "Tüm kartları arşivle",
+    "Unarchive all cards" : "Tüm kartları arşivden çıkar",
     "Delete list" : "Listeyi sil",
     "Archive all cards in this list" : "Bu listedeki tüm kartları arşivle",
+    "Unarchive all cards in this list" : "Bu listedeki tüm kartları arşivden çıkar",
     "Add a new card" : "Yeni kart ekle",
     "Card name" : "Kart adı",
     "List deleted" : "Liste silindi",
@@ -260,6 +262,7 @@ OC.L10N.register(
     "Shared with you" : "Sizinle paylaşıldı",
     "Deck settings" : "Tahta ayarları",
     "Use bigger card view" : "Daha büyük kart görünümü kullanılsın",
+    "Show card ID badge" : "Kart kodu etiketi görüntülensin",
     "Show boards in calendar/tasks" : "Takvimler ve görevlerde panolar görüntülensin",
     "Limit deck usage of groups" : "Tahtayı şu gruplar kullanabilsin",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Tahta kullanımı gruplar ile sınırlandığında belirtilen grupların üyesi olmayan kişiler kendi tahtalarını oluşturamaz. Bu kullanıcılar ancak kendileri ile paylaşılan tahtalar üzerinde çalışabilir.",

l10n/tr.json

@@ -181,8 +181,10 @@
     "Failed to transfer the board to {user}" : "Pano {user} kullanıcısına aktarılamadı",
     "Add a new list" : "Yeni liste ekle",
     "Archive all cards" : "Tüm kartları arşivle",
+    "Unarchive all cards" : "Tüm kartları arşivden çıkar",
     "Delete list" : "Listeyi sil",
     "Archive all cards in this list" : "Bu listedeki tüm kartları arşivle",
+    "Unarchive all cards in this list" : "Bu listedeki tüm kartları arşivden çıkar",
     "Add a new card" : "Yeni kart ekle",
     "Card name" : "Kart adı",
     "List deleted" : "Liste silindi",
@@ -258,6 +260,7 @@
     "Shared with you" : "Sizinle paylaşıldı",
     "Deck settings" : "Tahta ayarları",
     "Use bigger card view" : "Daha büyük kart görünümü kullanılsın",
+    "Show card ID badge" : "Kart kodu etiketi görüntülensin",
     "Show boards in calendar/tasks" : "Takvimler ve görevlerde panolar görüntülensin",
     "Limit deck usage of groups" : "Tahtayı şu gruplar kullanabilsin",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Tahta kullanımı gruplar ile sınırlandığında belirtilen grupların üyesi olmayan kişiler kendi tahtalarını oluşturamaz. Bu kullanıcılar ancak kendileri ile paylaşılan tahtalar üzerinde çalışabilir.",

l10n/uk.js

@@ -11,7 +11,7 @@ OC.L10N.register(
     "{user} has shared the board {board} with {acl}" : "{user} поділився дошкою {board} з {acl}",
     "You have removed {acl} from the board {board}" : "Ви вилучили {acl} з дошки {board}",
     "{user} has removed {acl} from the board {board}" : "{user} вилучив {acl} з дошки {board}",
-    "You have renamed the board {before} to {board}" : "Ви перейменували дошку з {before} у {board}",
+    "You have renamed the board {before} to {board}" : "Ви перейменували дошку з {before} на {board}",
     "{user} has renamed the board {before} to {board}" : "{user} змінив назву дошки {before} на {board}",
     "You have archived the board {board}" : "Ви заархівували дошку {board}",
     "{user} has archived the board {before}" : "{user} заархівував дошку {before}",
@@ -190,7 +190,7 @@ OC.L10N.register(
     "Something went wrong" : "От халепа!",
     "Maximum file size of {size} exceeded" : "Досягнуто максимальний розмір файлу {size}",
     "Error creating the share" : "Помилка створення спільного доступу",
-    "Share" : "Поділитися",
+    "Share" : "Спільний доступ",
     "This week" : "Цього тижня"
 },
 "nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);");

l10n/uk.json

@@ -9,7 +9,7 @@
     "{user} has shared the board {board} with {acl}" : "{user} поділився дошкою {board} з {acl}",
     "You have removed {acl} from the board {board}" : "Ви вилучили {acl} з дошки {board}",
     "{user} has removed {acl} from the board {board}" : "{user} вилучив {acl} з дошки {board}",
-    "You have renamed the board {before} to {board}" : "Ви перейменували дошку з {before} у {board}",
+    "You have renamed the board {before} to {board}" : "Ви перейменували дошку з {before} на {board}",
     "{user} has renamed the board {before} to {board}" : "{user} змінив назву дошки {before} на {board}",
     "You have archived the board {board}" : "Ви заархівували дошку {board}",
     "{user} has archived the board {before}" : "{user} заархівував дошку {before}",
@@ -188,7 +188,7 @@
     "Something went wrong" : "От халепа!",
     "Maximum file size of {size} exceeded" : "Досягнуто максимальний розмір файлу {size}",
     "Error creating the share" : "Помилка створення спільного доступу",
-    "Share" : "Поділитися",
+    "Share" : "Спільний доступ",
     "This week" : "Цього тижня"
 },"pluralForm" :"nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);"
 }

l10n/zh_HK.js

@@ -183,8 +183,10 @@ OC.L10N.register(
     "Failed to transfer the board to {user}" : "未能將面板轉移給 {user}",
     "Add a new list" : "添加一張新清單",
     "Archive all cards" : "封存所有卡片",
+    "Unarchive all cards" : "解除封存所有卡片",
     "Delete list" : "刪除清單",
     "Archive all cards in this list" : "封存此清單內的所有卡片",
+    "Unarchive all cards in this list" : "解除封存所有此列表中的卡片",
     "Add a new card" : "添加一張新卡片",
     "Card name" : "卡片名稱",
     "List deleted" : "清單已被刪除",
@@ -260,6 +262,7 @@ OC.L10N.register(
     "Shared with you" : "收到的分享",
     "Deck settings" : "看板設定",
     "Use bigger card view" : "使用較大的卡片視圖",
+    "Show card ID badge" : "顯示卡片 ID 徽章",
     "Show boards in calendar/tasks" : "在日曆/任務中顯示面板",
     "Limit deck usage of groups" : "限制群組使用 Deck",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "限制 Deck 將阻止不屬於這些群組的用戶創建自己的面板。用戶仍然可以在與他們的面板上工作。",

l10n/zh_HK.json

@@ -181,8 +181,10 @@
     "Failed to transfer the board to {user}" : "未能將面板轉移給 {user}",
     "Add a new list" : "添加一張新清單",
     "Archive all cards" : "封存所有卡片",
+    "Unarchive all cards" : "解除封存所有卡片",
     "Delete list" : "刪除清單",
     "Archive all cards in this list" : "封存此清單內的所有卡片",
+    "Unarchive all cards in this list" : "解除封存所有此列表中的卡片",
     "Add a new card" : "添加一張新卡片",
     "Card name" : "卡片名稱",
     "List deleted" : "清單已被刪除",
@@ -258,6 +260,7 @@
     "Shared with you" : "收到的分享",
     "Deck settings" : "看板設定",
     "Use bigger card view" : "使用較大的卡片視圖",
+    "Show card ID badge" : "顯示卡片 ID 徽章",
     "Show boards in calendar/tasks" : "在日曆/任務中顯示面板",
     "Limit deck usage of groups" : "限制群組使用 Deck",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "限制 Deck 將阻止不屬於這些群組的用戶創建自己的面板。用戶仍然可以在與他們的面板上工作。",

l10n/zh_TW.js

@@ -183,8 +183,10 @@ OC.L10N.register(
     "Failed to transfer the board to {user}" : "轉移看板給 {user} 失敗",
     "Add a new list" : "新增列表",
     "Archive all cards" : "封存所有卡片",
+    "Unarchive all cards" : "解除封存所有卡片",
     "Delete list" : "刪除列表",
     "Archive all cards in this list" : "封存此列表中的所有卡片",
+    "Unarchive all cards in this list" : "解除封存所有此列表中的卡片",
     "Add a new card" : "新增卡片",
     "Card name" : "卡片名稱",
     "List deleted" : "列表已刪除",
@@ -260,6 +262,7 @@ OC.L10N.register(
     "Shared with you" : "與您分享",
     "Deck settings" : "Deck 設定",
     "Use bigger card view" : "使用較大的卡片檢視",
+    "Show card ID badge" : "顯示卡片 ID 徽章",
     "Show boards in calendar/tasks" : "在日曆／工作項目中顯示佈告欄",
     "Limit deck usage of groups" : "限制群組的 Deck 使用",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "限制 Deck 將會阻止不屬於這些群組的使用者建立自己的佈告欄。使用者仍然可以在與他們分享的佈告欄上工作。",

l10n/zh_TW.json

@@ -181,8 +181,10 @@
     "Failed to transfer the board to {user}" : "轉移看板給 {user} 失敗",
     "Add a new list" : "新增列表",
     "Archive all cards" : "封存所有卡片",
+    "Unarchive all cards" : "解除封存所有卡片",
     "Delete list" : "刪除列表",
     "Archive all cards in this list" : "封存此列表中的所有卡片",
+    "Unarchive all cards in this list" : "解除封存所有此列表中的卡片",
     "Add a new card" : "新增卡片",
     "Card name" : "卡片名稱",
     "List deleted" : "列表已刪除",
@@ -258,6 +260,7 @@
     "Shared with you" : "與您分享",
     "Deck settings" : "Deck 設定",
     "Use bigger card view" : "使用較大的卡片檢視",
+    "Show card ID badge" : "顯示卡片 ID 徽章",
     "Show boards in calendar/tasks" : "在日曆／工作項目中顯示佈告欄",
     "Limit deck usage of groups" : "限制群組的 Deck 使用",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "限制 Deck 將會阻止不屬於這些群組的使用者建立自己的佈告欄。使用者仍然可以在與他們分享的佈告欄上工作。",

lib/Activity/ActivityManager.php

@@ -45,7 +45,9 @@ use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
 use OCP\Comments\IComment;
 use OCP\IUser;
+use OCP\Server;
 use OCP\L10N\IFactory;
+use Psr\Log\LoggerInterface;
 
 class ActivityManager {
 	public const DECK_NOAUTHOR_COMMENT_SYSTEM_ENFORCED = 'DECK_NOAUTHOR_COMMENT_SYSTEM_ENFORCED';
@@ -53,14 +55,14 @@ class ActivityManager {
 	public const SUBJECT_PARAMS_MAX_LENGTH = 4000;
 	public const SHORTENED_DESCRIPTION_MAX_LENGTH = 2000;
 
-	private $manager;
-	private $userId;
-	private $permissionService;
-	private $boardMapper;
-	private $cardMapper;
-	private $aclMapper;
-	private $stackMapper;
-	private $l10nFactory;
+	private IManager $manager;
+	private ?string $userId;
+	private PermissionService $permissionService;
+	private BoardMapper $boardMapper;
+	private CardMapper $cardMapper;
+	private AclMapper $aclMapper;
+	private StackMapper $stackMapper;
+	private IFactory $l10nFactory;
 
 	public const DECK_OBJECT_BOARD = 'deck_board';
 	public const DECK_OBJECT_CARD = 'deck_card';
@@ -114,7 +116,7 @@ class ActivityManager {
 		StackMapper $stackMapper,
 		AclMapper $aclMapper,
 		IFactory $l10nFactory,
-		$userId
+		?string $userId
 	) {
 		$this->manager = $manager;
 		$this->permissionService = $permissionsService;
@@ -310,10 +312,10 @@ class ActivityManager {
 		try {
 			$object = $this->findObjectForEntity($objectType, $entity);
 		} catch (DoesNotExistException $e) {
-			\OC::$server->getLogger()->error('Could not create activity entry for ' . $subject . '. Entity not found.', (array)$entity);
+			Server::get(LoggerInterface::class)->error('Could not create activity entry for ' . $subject . '. Entity not found.', (array)$entity);
 			return null;
 		} catch (MultipleObjectsReturnedException $e) {
-			\OC::$server->getLogger()->error('Could not create activity entry for ' . $subject . '. Entity not found.', (array)$entity);
+			Server::get(LoggerInterface::class)->error('Could not create activity entry for ' . $subject . '. Entity not found.', (array)$entity);
 			return null;
 		}
 
@@ -365,7 +367,15 @@ class ActivityManager {
 			case self::SUBJECT_CARD_USER_ASSIGN:
 			case self::SUBJECT_CARD_USER_UNASSIGN:
 				$subjectParams = $this->findDetailsForCard($entity->getId(), $subject);
-				break;
+
+				if (isset($additionalParams['after']) && $additionalParams['after'] instanceof \DateTimeInterface) {
+					$additionalParams['after'] = $additionalParams['after']->format('c');
+				}
+				if (isset($additionalParams['before']) && $additionalParams['before'] instanceof \DateTimeInterface) {
+					$additionalParams['before'] = $additionalParams['before']->format('c');
+				}
+
+			break;
 			case self::SUBJECT_ATTACHMENT_CREATE:
 			case self::SUBJECT_ATTACHMENT_UPDATE:
 			case self::SUBJECT_ATTACHMENT_DELETE:

lib/Activity/DeckProvider.php

@@ -312,12 +312,19 @@ class DeckProvider implements IProvider {
 			$userLanguage = $this->config->getUserValue($event->getAuthor(), 'core', 'lang', $this->l10nFactory->findLanguage());
 			$userLocale = $this->config->getUserValue($event->getAuthor(), 'core', 'locale', $this->l10nFactory->findLocale());
 			$l10n = $this->l10nFactory->get('deck', $userLanguage, $userLocale);
-			$date = new \DateTime($subjectParams['after']);
-			$date->setTimezone(new \DateTimeZone(\date_default_timezone_get()));
+			if (is_array($subjectParams['after'])) {
+				// Unluckily there was a time when we stored jsonSerialized date objects in the database
+				// Broken in 1.8.0 and fixed again in 1.8.1
+				$date = new \DateTime($subjectParams['after']['date']);
+				$date->setTimezone(new \DateTimeZone(\date_default_timezone_get()));
+			} else {
+				$date = new \DateTime($subjectParams['after']);
+				$date->setTimezone(new \DateTimeZone(\date_default_timezone_get()));
+			}
 			$params['after'] = [
 				'type' => 'highlight',
 				'id' => 'dt:' . $subjectParams['after'],
-				'name' => $l10n->l('datetime', $date)
+				'name' => $l10n->l('datetime', $date),
 			];
 		}
 		return $params;

lib/AppInfo/Application.php

@@ -47,6 +47,7 @@ use OCA\Deck\Listeners\FullTextSearchEventListener;
 use OCA\Deck\Middleware\DefaultBoardMiddleware;
 use OCA\Deck\Middleware\ExceptionMiddleware;
 use OCA\Deck\Notification\Notifier;
+use OCA\Deck\Reference\CardReferenceProvider;
 use OCA\Deck\Search\CardCommentProvider;
 use OCA\Deck\Search\DeckProvider;
 use OCA\Deck\Service\PermissionService;
@@ -57,20 +58,22 @@ use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
+use OCP\Collaboration\Reference\RenderReferenceEvent;
 use OCP\Collaboration\Resources\IProviderManager;
 use OCP\Comments\CommentsEntityEvent;
 use OCP\Comments\ICommentsManager;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventDispatcher;
+use OCP\Group\Events\GroupDeletedEvent;
 use OCP\IConfig;
 use OCP\IDBConnection;
-use OCP\IGroup;
 use OCP\IGroupManager;
-use OCP\IServerContainer;
-use OCP\IUser;
+use OCP\IRequest;
+use OCP\Server;
 use OCP\IUserManager;
 use OCP\Notification\IManager as NotificationManager;
 use OCP\Share\IManager;
+use OCP\User\Events\UserDeletedEvent;
 use OCP\Util;
 use Psr\Container\ContainerInterface;
 
@@ -79,13 +82,16 @@ class Application extends App implements IBootstrap {
 
 	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;
+		// TODO move this back to ::register after fixing the autoload issue
+		// (and use a listener class)
+		$container = $this->getContainer();
+		$eventDispatcher = $container->get(IEventDispatcher::class);
+		$eventDispatcher->addListener(RenderReferenceEvent::class, function () {
+			Util::addScript(self::APP_ID, self::APP_ID . '-card-reference');
+		});
 	}
 
 	public function boot(IBootContext $context): void {
@@ -124,8 +130,12 @@ class Application extends App implements IBootstrap {
 		$context->registerSearchProvider(CardCommentProvider::class);
 		$context->registerDashboardWidget(DeckWidget::class);
 
+		// reference widget
+		$context->registerReferenceProvider(CardReferenceProvider::class);
+		// $context->registerEventListener(RenderReferenceEvent::class, CardReferenceListener::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);
@@ -141,33 +151,43 @@ class Application extends App implements IBootstrap {
 
 	private function registerUserGroupHooks(IUserManager $userManager, IGroupManager $groupManager): void {
 		$container = $this->getContainer();
+		/** @var IEventDispatcher $eventDispatcher */
+		$eventDispatcher = $container->get(IEventDispatcher::class);
 		// Delete user/group acl entries when they get deleted
-		$userManager->listen('\OC\User', 'postDelete', static function (IUser $user) use ($container) {
+		$eventDispatcher->addListener(UserDeletedEvent::class, static function (Event $event) use ($container): void {
+			if (!($event instanceof UserDeletedEvent)) {
+				return;
+			}
+			$user = $event->getUser();
 			// delete existing acl entries for deleted user
 			/** @var AclMapper $aclMapper */
-			$aclMapper = $container->query(AclMapper::class);
+			$aclMapper = $container->get(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);
+			$assignmentMapper = $container->get(AssignmentMapper::class);
 			$assignments = $assignmentMapper->findByParticipant($user->getUID());
 			foreach ($assignments as $assignment) {
 				$assignmentMapper->delete($assignment);
 			}
 
 			/** @var BoardMapper $boardMapper */
-			$boardMapper = $container->query(BoardMapper::class);
+			$boardMapper = $container->get(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) {
+		$eventDispatcher->addListener(GroupDeletedEvent::class, static function (Event $event) use ($container): void {
+			if (!($event instanceof GroupDeletedEvent)) {
+				return;
+			}
+			$group = $event->getGroup();
 			/** @var AclMapper $aclMapper */
-			$aclMapper = $container->query(AclMapper::class);
+			$aclMapper = $container->get(AclMapper::class);
 			$aclMapper->findByParticipant(Acl::PERMISSION_TYPE_GROUP, $group->getGID());
 			$acls = $aclMapper->findByParticipant(Acl::PERMISSION_TYPE_GROUP, $group->getGID());
 			foreach ($acls as $acl) {
@@ -181,6 +201,7 @@ class Application extends App implements IBootstrap {
 			$event->addEntityCollection(self::COMMENT_ENTITY_TYPE, function ($name) {
 				/** @var CardMapper */
 				$cardMapper = $this->getContainer()->get(CardMapper::class);
+				/** @var PermissionService $permissionService */
 				$permissionService = $this->getContainer()->get(PermissionService::class);
 
 				try {
@@ -203,7 +224,7 @@ class Application extends App implements IBootstrap {
 		$resourceManager->registerResourceProvider(ResourceProviderCard::class);
 
 		$symfonyAdapter->addListener('\OCP\Collaboration\Resources::loadAdditionalScripts', static function () {
-			if (strpos(\OC::$server->getRequest()->getPathInfo(), '/call/') === 0) {
+			if (strpos(Server::get(IRequest::class)->getPathInfo(), '/call/') === 0) {
 				// Talk integration has its own entrypoint which already includes collections handling
 				return;
 			}

lib/Collaboration/Resources/ResourceProvider.php

@@ -32,20 +32,23 @@ use OCP\AppFramework\QueryException;
 use OCP\Collaboration\Resources\IManager;
 use OCP\Collaboration\Resources\IProvider;
 use OCP\Collaboration\Resources\IResource;
+use OCP\IURLGenerator;
 use OCP\IUser;
+use OCP\Server;
 
 class ResourceProvider implements IProvider {
 	public const RESOURCE_TYPE = 'deck';
 
-	private $boardMapper;
-	private $permissionService;
+	private BoardMapper $boardMapper;
+	private PermissionService $permissionService;
+	private IURLGenerator $urlGenerator;
 
-	/** @var array */
-	protected $nodes = [];
+	protected array $nodes = [];
 
-	public function __construct(BoardMapper $boardMapper, PermissionService $permissionService) {
+	public function __construct(BoardMapper $boardMapper, PermissionService $permissionService, IURLGenerator $urlGenerator) {
 		$this->boardMapper = $boardMapper;
 		$this->permissionService = $permissionService;
+		$this->urlGenerator = $urlGenerator;
 	}
 
 	/**
@@ -70,14 +73,14 @@ class ResourceProvider implements IProvider {
 	 */
 	public function getResourceRichObject(IResource $resource): array {
 		$board = $this->getBoard($resource);
-		$link = \OC::$server->getURLGenerator()->linkToRoute('deck.page.index') . '#/board/' . $resource->getId();
+		$link = $this->urlGenerator->linkToRoute('deck.page.index') . '#/board/' . $resource->getId();
 
 		return [
 			'type' => self::RESOURCE_TYPE,
 			'id' => $resource->getId(),
 			'name' => $board->getTitle(),
 			'link' => $link,
-			'iconUrl' => \OC::$server->getURLGenerator()->imagePath('deck', 'deck-dark.svg')
+			'iconUrl' => $this->urlGenerator->imagePath('deck', 'deck-dark.svg')
 		];
 	}
 
@@ -118,7 +121,7 @@ class ResourceProvider implements IProvider {
 	public function invalidateAccessCache($boardId = null) {
 		try {
 			/** @var IManager $resourceManager */
-			$resourceManager = \OC::$server->query(IManager::class);
+			$resourceManager = Server::get(IManager::class);
 		} catch (QueryException $e) {
 		}
 		if ($boardId !== null) {

lib/Collaboration/Resources/ResourceProviderCard.php

@@ -37,24 +37,16 @@ use OCP\Collaboration\Resources\IResource;
 use OCP\Collaboration\Resources\ResourceException;
 use OCP\IURLGenerator;
 use OCP\IUser;
+use OCP\Server;
 
 class ResourceProviderCard implements IProvider {
 	public const RESOURCE_TYPE = 'deck-card';
 
-	/** @var CardMapper */
-	private $cardMapper;
-
-	/** @var BoardMapper */
-	private $boardMapper;
-
-	/** @var PermissionService */
-	private $permissionService;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var array */
-	protected $nodes = [];
+	private CardMapper $cardMapper;
+	private BoardMapper $boardMapper;
+	private PermissionService $permissionService;
+	private IURLGenerator $urlGenerator;
+	protected array $nodes = [];
 
 	public function __construct(CardMapper $cardMapper, BoardMapper $boardMapper, PermissionService $permissionService, IURLGenerator $urlGenerator) {
 		$this->cardMapper = $cardMapper;
@@ -147,7 +139,7 @@ class ResourceProviderCard implements IProvider {
 	public function invalidateAccessCache($cardId = null) {
 		try {
 			/** @var IManager $resourceManager */
-			$resourceManager = \OC::$server->query(IManager::class);
+			$resourceManager = Server::get(IManager::class);
 		} catch (QueryException $e) {
 		}
 		if ($cardId !== null) {

lib/Command/BoardImport.php

@@ -30,8 +30,7 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class BoardImport extends Command {
-	/** @var BoardImportCommandService */
-	private $boardImportCommandService;
+	private BoardImportCommandService $boardImportCommandService;
 
 	public function __construct(
 		BoardImportCommandService $boardImportCommandService

lib/Command/UserExport.php

@@ -27,6 +27,7 @@ use OCA\Deck\Db\AssignmentMapper;
 use OCA\Deck\Db\BoardMapper;
 use OCA\Deck\Db\CardMapper;
 use OCA\Deck\Db\StackMapper;
+use OCA\Deck\Model\CardDetails;
 use OCA\Deck\Service\BoardService;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
@@ -101,7 +102,9 @@ class UserExport extends Command {
 					$fullCard = $this->cardMapper->find($card->getId());
 					$assignedUsers = $this->assignedUsersMapper->findAll($card->getId());
 					$fullCard->setAssignedUsers($assignedUsers);
-					$data[$board->getId()]['stacks'][$stack->getId()]['cards'][] = (array)$fullCard->jsonSerialize();
+
+					$cardDetails = new CardDetails($fullCard, $fullBoard);
+					$data[$board->getId()]['stacks'][$stack->getId()]['cards'][] = $cardDetails->jsonSerialize();
 				}
 			}
 		}

lib/Controller/PageController.php

@@ -29,7 +29,9 @@ use OCA\Deck\Service\PermissionService;
 use OCA\Files\Event\LoadSidebar;
 use OCA\Viewer\Event\LoadViewer;
 use OCP\AppFramework\Http\ContentSecurityPolicy;
+use OCP\Collaboration\Resources\LoadAdditionalScriptsEvent as CollaborationResourcesEvent;
 use OCP\EventDispatcher\IEventDispatcher;
+use OCP\IConfig;
 use OCP\IInitialStateService;
 use OCP\IRequest;
 use OCP\AppFramework\Http\TemplateResponse;
@@ -41,16 +43,17 @@ use OCA\Deck\Db\Acl;
 use OCA\Deck\Service\CardService;
 
 class PageController extends Controller {
-	private $permissionService;
-	private $initialState;
-	private $configService;
-	private $eventDispatcher;
-	private $cardMapper;
-	private $urlGenerator;
-	private $cardService;
+	private PermissionService $permissionService;
+	private IInitialStateService $initialState;
+	private ConfigService $configService;
+	private IEventDispatcher $eventDispatcher;
+	private CardMapper $cardMapper;
+	private IURLGenerator $urlGenerator;
+	private CardService $cardService;
+	private IConfig $config;
 
 	public function __construct(
-		$AppName,
+		string $AppName,
 		IRequest $request,
 		PermissionService $permissionService,
 		IInitialStateService $initialStateService,
@@ -58,7 +61,8 @@ class PageController extends Controller {
 		IEventDispatcher $eventDispatcher,
 		CardMapper $cardMapper,
 		IURLGenerator $urlGenerator,
-		CardService $cardService
+		CardService $cardService,
+		IConfig $config
 		) {
 		parent::__construct($AppName, $request);
 
@@ -69,6 +73,7 @@ class PageController extends Controller {
 		$this->cardMapper = $cardMapper;
 		$this->urlGenerator = $urlGenerator;
 		$this->cardService = $cardService;
+		$this->config = $config;
 	}
 
 	/**
@@ -84,13 +89,17 @@ class PageController extends Controller {
 		$this->initialState->provideInitialState(Application::APP_ID, 'config', $this->configService->getAll());
 
 		$this->eventDispatcher->dispatchTyped(new LoadSidebar());
+		$this->eventDispatcher->dispatchTyped(new CollaborationResourcesEvent());
 		if (class_exists(LoadViewer::class)) {
 			$this->eventDispatcher->dispatchTyped(new LoadViewer());
 		}
 
-		$response = new TemplateResponse('deck', 'main');
+		$response = new TemplateResponse('deck', 'main', [
+			'id-app-content' => '#app-content-vue',
+			'id-app-navigation' => '#app-navigation-vue',
+		]);
 
-		if (\OC::$server->getConfig()->getSystemValueBool('debug', false)) {
+		if ($this->config->getSystemValueBool('debug', false)) {
 			$csp = new ContentSecurityPolicy();
 			$csp->addAllowedConnectDomain('*');
 			$csp->addAllowedScriptDomain('*');

lib/Controller/SearchController.php

@@ -27,6 +27,7 @@ declare(strict_types=1);
 namespace OCA\Deck\Controller;
 
 use OCA\Deck\Db\Card;
+use OCA\Deck\Model\CardDetails;
 use OCA\Deck\Service\SearchService;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCSController;
@@ -50,9 +51,12 @@ class SearchController extends OCSController {
 	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();
+			$board = $card->getRelatedBoard();
+			$json = (new CardDetails($card, $board))->jsonSerialize();
+
+			$json['relatedBoard'] = $board;
 			$json['relatedStack'] = $card->getRelatedStack();
-			$json['relatedBoard'] = $card->getRelatedBoard();
+
 			return $json;
 		}, $cards));
 	}

lib/Dashboard/DeckWidget.php

@@ -26,18 +26,34 @@ declare(strict_types=1);
 
 namespace OCA\Deck\Dashboard;
 
-use OCP\Dashboard\IWidget;
+use DateTime;
+use OCA\Deck\AppInfo\Application;
+use OCA\Deck\Db\Label;
+use OCA\Deck\Service\OverviewService;
+use OCP\Dashboard\IAPIWidget;
+use OCP\Dashboard\IButtonWidget;
+use OCP\Dashboard\IIconWidget;
+use OCP\Dashboard\Model\WidgetButton;
+use OCP\Dashboard\Model\WidgetItem;
+use OCP\IDateTimeFormatter;
 use OCP\IL10N;
+use OCP\IURLGenerator;
+use OCP\Util;
 
-class DeckWidget implements IWidget {
+class DeckWidget implements IAPIWidget, IButtonWidget, IIconWidget {
+	private IL10N $l10n;
+	private OverviewService $dashboardService;
+	private IURLGenerator $urlGenerator;
+	private IDateTimeFormatter $dateTimeFormatter;
 
-	/**
-	 * @var IL10N
-	 */
-	private $l10n;
-
-	public function __construct(IL10N $l10n) {
+	public function __construct(IL10N $l10n,
+		OverviewService $dashboardService,
+		IDateTimeFormatter $dateTimeFormatter,
+		IURLGenerator $urlGenerator) {
 		$this->l10n = $l10n;
+		$this->dashboardService = $dashboardService;
+		$this->urlGenerator = $urlGenerator;
+		$this->dateTimeFormatter = $dateTimeFormatter;
 	}
 
 	/**
@@ -68,17 +84,88 @@ class DeckWidget implements IWidget {
 		return 'icon-deck';
 	}
 
+	/**
+	 * @inheritDoc
+	 */
+	public function getIconUrl(): string {
+		return $this->urlGenerator->getAbsoluteURL(
+			$this->urlGenerator->imagePath(Application::APP_ID, 'deck-dark.svg')
+		);
+	}
+
 	/**
 	 * @inheritDoc
 	 */
 	public function getUrl(): ?string {
-		return null;
+		return $this->urlGenerator->getAbsoluteURL(
+			$this->urlGenerator->linkToRoute(Application::APP_ID . '.page.index')
+		);
 	}
 
 	/**
 	 * @inheritDoc
 	 */
 	public function load(): void {
-		\OCP\Util::addScript('deck', 'deck-dashboard');
+		Util::addScript('deck', 'deck-dashboard');
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getItems(string $userId, ?string $since = null, int $limit = 7): array {
+		$upcomingCards = $this->dashboardService->findUpcomingCards($userId);
+		$nowTimestamp = (new Datetime())->getTimestamp();
+		$sinceTimestamp = $since !== null ? (new Datetime($since))->getTimestamp() : null;
+		$upcomingCards = array_filter($upcomingCards, static function (array $card) use ($nowTimestamp, $sinceTimestamp) {
+			if ($card['duedate']) {
+				$ts = (new Datetime($card['duedate']))->getTimestamp();
+				return $ts > $nowTimestamp && ($sinceTimestamp === null || $ts > $sinceTimestamp);
+			}
+			return false;
+		});
+		usort($upcomingCards, static function ($a, $b) {
+			$a = new Datetime($a['duedate']);
+			$ta = $a->getTimestamp();
+			$b = new Datetime($b['duedate']);
+			$tb = $b->getTimestamp();
+			return ($ta > $tb) ? 1 : -1;
+		});
+		$upcomingCards = array_slice($upcomingCards, 0, $limit);
+		$urlGenerator = $this->urlGenerator;
+		$dateTimeFormatter = $this->dateTimeFormatter;
+		return array_map(static function (array $card) use ($urlGenerator, $dateTimeFormatter) {
+			$formattedDueDate = $dateTimeFormatter->formatDateTime(new DateTime($card['duedate']));
+			return new WidgetItem(
+				$card['title'] . ' (' . $formattedDueDate . ')',
+				implode(
+					', ',
+					array_map(static function (Label $label) {
+						return $label->jsonSerialize()['title'];
+					}, $card['labels'])
+				),
+				$urlGenerator->getAbsoluteURL(
+					$urlGenerator->linkToRoute(Application::APP_ID . '.page.redirectToCard', ['cardId' => $card['id']])
+				),
+				$urlGenerator->getAbsoluteURL(
+					$urlGenerator->imagePath(Application::APP_ID, 'deck-dark.svg')
+				),
+				$card['duedate']
+			);
+		}, $upcomingCards);
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getWidgetButtons(string $userId): array {
+		return [
+			new WidgetButton(
+				WidgetButton::TYPE_MORE,
+				$this->urlGenerator->getAbsoluteURL(
+					$this->urlGenerator->linkToRoute(Application::APP_ID . '.page.index')
+				),
+				$this->l10n->t('Load more')
+			),
+		];
 	}
 }

lib/Db/AclMapper.php

@@ -33,18 +33,46 @@ class AclMapper extends DeckMapper implements IPermissionMapper {
 		parent::__construct($db, 'deck_board_acl', Acl::class);
 	}
 
+	/**
+	 * @param numeric $boardId
+	 * @param int|null $limit
+	 * @param int|null $offset
+	 * @return Acl[]
+	 * @throws \OCP\DB\Exception
+	 */
 	public function findAll($boardId, $limit = null, $offset = null) {
-		$sql = 'SELECT id, board_id, type, participant, permission_edit, permission_share, permission_manage FROM `*PREFIX*deck_board_acl` WHERE `board_id` = ? ';
-		return $this->findEntities($sql, [$boardId], $limit, $offset);
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('id', 'board_id', 'type', 'participant', 'permission_edit', 'permission_share', 'permission_manage')
+			->from('deck_board_acl')
+			->where($qb->expr()->eq('board_id', $qb->createNamedParameter($boardId, IQueryBuilder::PARAM_INT)))
+			->setMaxResults($limit)
+			->setFirstResult($offset);
+
+		return $this->findEntities($qb);
 	}
 
-	public function isOwner($userId, $aclId): bool {
-		$sql = 'SELECT owner FROM `*PREFIX*deck_boards` WHERE `id` IN (SELECT board_id FROM `*PREFIX*deck_board_acl` WHERE id = ?)';
-		$stmt = $this->execute($sql, [$aclId]);
-		$row = $stmt->fetch();
-		return ($row['owner'] === $userId);
+	/**
+	 * @param numeric $userId
+	 * @param numeric $id
+	 * @return bool
+	 * @throws \OCP\DB\Exception
+	 */
+	public function isOwner($userId, $id): bool {
+		$aclId = $id;
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('acl.id')
+			->from($this->getTableName(), 'acl')
+			->innerJoin('acl', 'deck_boards', 'b', 'acl.board_id = b.id')
+			->where($qb->expr()->eq('owner', $qb->createNamedParameter($userId, IQueryBuilder::PARAM_STR)))
+			->andWhere($qb->expr()->eq('acl.id', $qb->createNamedParameter($aclId, IQueryBuilder::PARAM_INT)));
+
+		return count($qb->executeQuery()->fetchAll()) > 0;
 	}
 
+	/**
+	 * @param numeric $id
+	 * @return int|null
+	 */
 	public function findBoardId($id): ?int {
 		try {
 			$entity = $this->find($id);
@@ -54,9 +82,21 @@ class AclMapper extends DeckMapper implements IPermissionMapper {
 		return null;
 	}
 
+	/**
+	 * @param int $type
+	 * @param string $participant
+	 * @return Acl[]
+	 * @throws \OCP\DB\Exception
+	 */
 	public function findByParticipant($type, $participant): array {
-		$sql = 'SELECT * from *PREFIX*deck_board_acl WHERE type = ? AND participant = ?';
-		return $this->findEntities($sql, [$type, $participant]);
+		$qb = $this->db->getQueryBuilder();
+
+		$qb->select('*')
+			->from($this->getTableName())
+			->where($qb->expr()->eq('type', $qb->createNamedParameter($type, IQueryBuilder::PARAM_INT)))
+			->andWhere($qb->expr()->eq('participant', $qb->createNamedParameter($participant, IQueryBuilder::PARAM_STR)));
+
+		return $this->findEntities($qb);
 	}
 
 	/**

lib/Db/AssignmentMapper.php

@@ -55,9 +55,6 @@ class AssignmentMapper extends QBMapper implements IPermissionMapper {
 		$this->circleService = $circleService;
 	}
 
-	/**
-	 * @return Assignment[]
-	 */
 	public function findAll(int $cardId): array {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('*')
@@ -80,8 +77,8 @@ class AssignmentMapper extends QBMapper implements IPermissionMapper {
 	}
 
 
-	public function isOwner($userId, $cardId): bool {
-		return $this->cardMapper->isOwner($userId, $cardId);
+	public function isOwner($userId, $id): bool {
+		return $this->cardMapper->isOwner($userId, $id);
 	}
 
 	public function findBoardId($id): ?int {

lib/Db/AttachmentMapper.php

@@ -30,7 +30,6 @@ use OCP\AppFramework\Db\MultipleObjectsReturnedException;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 use OCP\IUserManager;
-use PDO;
 
 class AttachmentMapper extends DeckMapper implements IPermissionMapper {
 	private $cardMapper;
@@ -52,70 +51,53 @@ class AttachmentMapper extends DeckMapper implements IPermissionMapper {
 	}
 
 	/**
-	 * @param $id
-	 * @return Entity|Attachment
-	 * @throws \OCP\AppFramework\Db\DoesNotExistException
-	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
+	 * @param int $id
+	 * @return Attachment
+	 * @throws DoesNotExistException
+	 * @throws MultipleObjectsReturnedException
+	 * @throws \OCP\DB\Exception
 	 */
 	public function find($id) {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('*')
-			->from('deck_attachment')
+			->from($this->getTableName())
 			->where($qb->expr()->eq('id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
 
-		$cursor = $qb->execute();
-		$row = $cursor->fetch(PDO::FETCH_ASSOC);
-		if ($row === false) {
-			$cursor->closeCursor();
-			throw new DoesNotExistException('Did expect one result but found none when executing query: ' . $qb->getSQL());
-		}
-
-		$row2 = $cursor->fetch();
-		$cursor->closeCursor();
-		if ($row2 !== false) {
-			throw new MultipleObjectsReturnedException('Did not expect more than one result when executing query: ' . $qb->getSQL());
-		}
-
-		return $this->mapRowToEntity($row);
-	}
-
-	public function findByData($cardId, $data) {
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('*')
-				->from('deck_attachment')
-				->where($qb->expr()->eq('card_id', $qb->createNamedParameter($cardId, IQueryBuilder::PARAM_INT)))
-				->andWhere($qb->expr()->eq('data', $qb->createNamedParameter($data, IQueryBuilder::PARAM_STR)));
-		$cursor = $qb->execute();
-		$row = $cursor->fetch(PDO::FETCH_ASSOC);
-		if ($row === false) {
-			$cursor->closeCursor();
-			throw new DoesNotExistException('Did expect one result but found none when executing query: ' . $qb->getSQL());
-		}
-		$cursor->closeCursor();
-		return $this->mapRowToEntity($row);
+		return $this->findEntity($qb);
+	}
+
+	/**
+	 * @param int $cardId
+	 * @param string $data
+	 * @return Attachment
+	 * @throws DoesNotExistException
+	 * @throws MultipleObjectsReturnedException
+	 * @throws \OCP\DB\Exception
+	 */
+	public function findByData($cardId, $data) {
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('*')
+				->from($this->getTableName())
+				->where($qb->expr()->eq('card_id', $qb->createNamedParameter($cardId, IQueryBuilder::PARAM_INT)))
+				->andWhere($qb->expr()->eq('data', $qb->createNamedParameter($data, IQueryBuilder::PARAM_STR)));
+
+		return $this->findEntity($qb);
 	}
 
 	/**
-	 * Find all attachments for a card
-	 *
 	 * @param $cardId
-	 * @return array
+	 * @return Entity[]
+	 * @throws \OCP\DB\Exception
 	 */
 	public function findAll($cardId) {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('*')
-			->from('deck_attachment')
+			->from($this->getTableName())
 			->where($qb->expr()->eq('card_id', $qb->createNamedParameter($cardId, IQueryBuilder::PARAM_INT)))
 			->andWhere($qb->expr()->eq('deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)));
 
 
-		$entities = [];
-		$cursor = $qb->execute();
-		while ($row = $cursor->fetch()) {
-			$entities[] = $this->mapRowToEntity($row);
-		}
-		$cursor->closeCursor();
-		return $entities;
+		return $this->findEntities($qb);
 	}
 
 	/**
@@ -128,7 +110,7 @@ class AttachmentMapper extends DeckMapper implements IPermissionMapper {
 		$timeLimit = time() - (60 * 5);
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('*')
-			->from('deck_attachment')
+			->from($this->getTableName())
 			->where($qb->expr()->gt('deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)));
 		if ($withOffset) {
 			$qb
@@ -139,13 +121,7 @@ class AttachmentMapper extends DeckMapper implements IPermissionMapper {
 				->andWhere($qb->expr()->eq('card_id', $qb->createNamedParameter($cardId, IQueryBuilder::PARAM_INT)));
 		}
 
-		$entities = [];
-		$cursor = $qb->execute();
-		while ($row = $cursor->fetch()) {
-			$entities[] = $this->mapRowToEntity($row);
-		}
-		$cursor->closeCursor();
-		return $entities;
+		return $this->findEntities($qb);
 	}
 
 

lib/Db/Board.php

@@ -23,6 +23,14 @@
 
 namespace OCA\Deck\Db;
 
+/**
+ * @method int getId()
+ * @method string getTitle()
+ * @method int getShared()
+ * @method bool getArchived()
+ * @method int getDeletedAt()
+ * @method int getLastModified()
+ */
 class Board extends RelationalEntity {
 	protected $title;
 	protected $owner;

lib/Db/BoardMapper.php

@@ -42,9 +42,9 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
 	private $circlesService;
 	private $logger;
 
-	/** @var CappedMemoryCache */
+	/** @var CappedMemoryCache<Board[]> */
 	private $userBoardCache;
-	/** @var CappedMemoryCache */
+	/** @var CappedMemoryCache<Board> */
 	private $boardCache;
 
 	public function __construct(
@@ -107,6 +107,47 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
 		return $this->boardCache[$id];
 	}
 
+	public function findBoardIds(string $userId): array {
+		$qb = $this->db->getQueryBuilder();
+		$qb->selectDistinct('b.id')
+			->from($this->getTableName(), 'b')
+			->leftJoin('b', 'deck_board_acl', 'acl', $qb->expr()->eq('b.id', 'acl.board_id'));
+
+		// Owned by the user
+		$qb->where($qb->expr()->andX(
+			$qb->expr()->eq('owner', $qb->createNamedParameter($userId, IQueryBuilder::PARAM_STR)),
+		));
+
+		// Shared to the user
+		$qb->orWhere($qb->expr()->andX(
+			$qb->expr()->eq('acl.participant', $qb->createNamedParameter($userId, IQueryBuilder::PARAM_STR)),
+			$qb->expr()->eq('acl.type', $qb->createNamedParameter(Acl::PERMISSION_TYPE_USER, IQueryBuilder::PARAM_INT)),
+		));
+
+		// Shared to user groups of the user
+		$groupIds = $this->groupManager->getUserGroupIds($this->userManager->get($userId));
+		if (count($groupIds) !== 0) {
+			$qb->orWhere($qb->expr()->andX(
+					$qb->expr()->in('acl.participant', $qb->createNamedParameter($groupIds, IQueryBuilder::PARAM_STR_ARRAY)),
+					$qb->expr()->eq('acl.type', $qb->createNamedParameter(Acl::PERMISSION_TYPE_GROUP, IQueryBuilder::PARAM_INT)),
+				));
+		}
+
+		// Shared to circles of the user
+		$circles = $this->circlesService->getUserCircles($userId);
+		if (count($circles) !== 0) {
+			$qb->orWhere($qb->expr()->andX(
+				$qb->expr()->in('acl.participant', $qb->createNamedParameter($circles, IQueryBuilder::PARAM_STR_ARRAY)),
+				$qb->expr()->eq('acl.type', $qb->createNamedParameter(Acl::PERMISSION_TYPE_CIRCLE, IQueryBuilder::PARAM_INT)),
+			));
+		}
+
+		$result = $qb->executeQuery();
+		return array_map(function (string $id) {
+			return (int)$id;
+		}, $result->fetchAll(\PDO::FETCH_COLUMN));
+	}
+
 	public function findAllForUser(string $userId, ?int $since = null, bool $includeArchived = true, ?int $before = null,
 								   ?string $term = null): array {
 		$useCache = ($since === -1 && $includeArchived === true && $before === null && $term === null);
@@ -131,14 +172,9 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
 
 	/**
 	 * Find all boards for a given user
-	 *
-	 * @param $userId
-	 * @param null $limit
-	 * @param null $offset
-	 * @return array
 	 */
 	public function findAllByUser(string $userId, ?int $limit = null, ?int $offset = null, ?int $since = null,
-								  bool $includeArchived = true, ?int $before = null, ?string $term = null) {
+								  bool $includeArchived = true, ?int $before = null, ?string $term = null): array {
 		// FIXME this used to be a UNION to get boards owned by $userId and the user shares in one single query
 		// Is it possible with the query builder?
 		$qb = $this->db->getQueryBuilder();
@@ -247,15 +283,9 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
 
 	/**
 	 * Find all boards for a given user
-	 *
-	 * @param $userId
-	 * @param $groups
-	 * @param null $limit
-	 * @param null $offset
-	 * @return array
 	 */
 	public function findAllByGroups(string $userId, array $groups, ?int $limit = null, ?int $offset = null, ?int $since = null,
-									bool $includeArchived = true, ?int $before = null, ?string $term = null) {
+									bool $includeArchived = true, ?int $before = null, ?string $term = null): array {
 		if (count($groups) <= 0) {
 			return [];
 		}
@@ -414,8 +444,8 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
 		return parent::delete($entity);
 	}
 
-	public function isOwner($userId, $boardId): bool {
-		$board = $this->find($boardId);
+	public function isOwner($userId, $id): bool {
+		$board = $this->find($id);
 		return ($board->getOwner() === $userId);
 	}
 

lib/Db/Card.php

@@ -27,6 +27,44 @@ use DateTime;
 use DateTimeZone;
 use Sabre\VObject\Component\VCalendar;
 
+/**
+ * @method string getTitle()
+ * @method string getDescription()
+ * @method string getDescriptionPrev()
+ * @method int getStackId()
+ * @method int getOrder()
+ * @method int getLastModified()
+ * @method int getCreatedAt()
+ * @method bool getArchived()
+ * @method bool getNotified()
+ *
+ * @method void setLabels(Label[] $labels)
+ * @method null|Label[] getLabels()
+ *
+ * @method void setAssignedUsers(Assignment[] $users)
+ * @method null|User[] getAssignedUsers()
+ *
+ * @method void setAttachments(Attachment[] $attachments)
+ * @method null|Attachment[] getAttachments()
+ *
+ * @method void setAttachmentCount(int $count)
+ * @method null|int getAttachmentCount()
+ *
+ * @method void setCommentsUnread(int $count)
+ * @method null|int getCommentsUnread()
+ *
+ * @method void setCommentsCount(int $count)
+ * @method null|int getCommentsCount()
+ *
+ * @method void setOwner(string $user)
+ * @method null|string getOwner()
+ *
+ * @method void setRelatedStack(Stack $stack)
+ * @method null|Stack getRelatedStack()
+ *
+ * @method void setRelatedBoard(Board $board)
+ * @method null|Board getRelatedBoard()
+ */
 class Card extends RelationalEntity {
 	public const TITLE_MAX_LENGTH = 255;
 
@@ -70,6 +108,7 @@ class Card extends RelationalEntity {
 		$this->addType('archived', 'boolean');
 		$this->addType('notified', 'boolean');
 		$this->addType('deletedAt', 'integer');
+		$this->addType('duedate', 'datetime');
 		$this->addRelation('labels');
 		$this->addRelation('assignedUsers');
 		$this->addRelation('attachments');
@@ -87,50 +126,6 @@ class Card extends RelationalEntity {
 		$this->databaseType = $type;
 	}
 
-	public function getDuedate($isoFormat = false) {
-		if ($this->duedate === null) {
-			return null;
-		}
-		$dt = new DateTime($this->duedate);
-		if (!$isoFormat && $this->databaseType === 'mysql') {
-			return $dt->format('Y-m-d H:i:s');
-		}
-		return $dt->format('c');
-	}
-
-	public function jsonSerialize(): array {
-		$json = parent::jsonSerialize();
-		$json['overdue'] = self::DUEDATE_FUTURE;
-		$due = $this->duedate ? strtotime($this->duedate) : false;
-		if ($due !== false) {
-			$today = new DateTime();
-			$today->setTime(0, 0);
-
-			$match_date = new DateTime($this->duedate);
-
-			$match_date->setTime(0, 0);
-
-			$diff = $today->diff($match_date);
-			$diffDays = (integer) $diff->format('%R%a'); // Extract days count in interval
-
-			if ($diffDays === 1) {
-				$json['overdue'] = self::DUEDATE_NEXT;
-			}
-			if ($diffDays === 0) {
-				$json['overdue'] = self::DUEDATE_NOW;
-			}
-			if ($diffDays < 0) {
-				$json['overdue'] = self::DUEDATE_OVERDUE;
-			}
-		}
-		$json['duedate'] = $this->getDuedate(true);
-		unset($json['notified']);
-		unset($json['descriptionPrev']);
-		unset($json['relatedStack']);
-		unset($json['relatedBoard']);
-		return $json;
-	}
-
 	public function getCalendarObject(): VCalendar {
 		$calendar = new VCalendar();
 		$event = $calendar->createComponent('VTODO');
@@ -139,7 +134,7 @@ class Card extends RelationalEntity {
 			$creationDate = new DateTime();
 			$creationDate->setTimestamp($this->createdAt);
 			$event->DTSTAMP = $creationDate;
-			$event->DUE = new DateTime($this->getDuedate(true), new DateTimeZone('UTC'));
+			$event->DUE = new DateTime($this->getDuedate()->format('c'), new DateTimeZone('UTC'));
 		}
 		$event->add('RELATED-TO', 'deck-stack-' . $this->getStackId());
 

lib/Db/CardMapper.php

@@ -227,6 +227,21 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 		return $this->findEntities($qb);
 	}
 
+	public function findAllByBoardId(int $boardId, ?int $limit = null, ?int $offset = null): array {
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('c.*')
+			->from('deck_cards', 'c')
+			->innerJoin('c', 'deck_stacks', 's', 's.id = c.stack_id')
+			->innerJoin('s', 'deck_boards', 'b', 'b.id = s.board_id')
+			->where($qb->expr()->eq('board_id', $qb->createNamedParameter($boardId, IQueryBuilder::PARAM_INT)))
+			->andWhere($qb->expr()->eq('archived', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL)))
+			->setMaxResults($limit)
+			->setFirstResult($offset)
+			->orderBy('c.lastmodified')
+			->addOrderBy('c.id');
+		return $this->findEntities($qb);
+	}
+
 	public function findAllWithDue($boardId) {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('c.*')
@@ -549,10 +564,10 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 		$qb->execute();
 	}
 
-	public function isOwner($userId, $cardId): bool {
+	public function isOwner($userId, $id): bool {
 		$sql = 'SELECT owner FROM `*PREFIX*deck_boards` WHERE `id` IN (SELECT board_id FROM `*PREFIX*deck_stacks` WHERE id IN (SELECT stack_id FROM `*PREFIX*deck_cards` WHERE id = ?))';
 		$stmt = $this->db->prepare($sql);
-		$stmt->bindParam(1, $cardId, \PDO::PARAM_INT, 0);
+		$stmt->bindParam(1, $id, \PDO::PARAM_INT, 0);
 		$stmt->execute();
 		$row = $stmt->fetch();
 		return ($row['owner'] === $userId);

lib/Db/ChangeHelper.php

@@ -24,6 +24,7 @@
 namespace OCA\Deck\Db;
 
 use OCP\ICacheFactory;
+use OCP\ICache;
 use OCP\IDBConnection;
 use OCP\IRequest;
 
@@ -31,13 +32,16 @@ class ChangeHelper {
 	public const TYPE_BOARD = 'boardChanged';
 	public const TYPE_CARD = 'cardChanged';
 
-	private $db;
+	private IDBConnection $db;
+	private ICache $cache;
+	private IRequest $request;
+	private ?string $userId;
 
 	public function __construct(
 		IDBConnection $db,
 		ICacheFactory $cacheFactory,
 		IRequest $request,
-		$userId
+		?string $userId
 	) {
 		$this->db = $db;
 		$this->cache = $cacheFactory->createDistributed('deck_changes');

lib/Db/DeckMapper.php

@@ -23,17 +23,15 @@
 
 namespace OCA\Deck\Db;
 
-use OCP\AppFramework\Db\Mapper;
+use OCP\AppFramework\Db\QBMapper;
+use OCP\DB\QueryBuilder\IQueryBuilder;
 
 /**
  * Class DeckMapper
  *
  * @package OCA\Deck\Db
- * @deprecated use QBMapper
- *
- * TODO: Move to QBMapper once Nextcloud 14 is a minimum requirement
  */
-class DeckMapper extends Mapper {
+class DeckMapper extends QBMapper {
 
 	/**
 	 * @param $id
@@ -42,11 +40,11 @@ class DeckMapper extends Mapper {
 	 * @throws \OCP\AppFramework\Db\DoesNotExistException
 	 */
 	public function find($id) {
-		$sql = 'SELECT * FROM `' . $this->tableName . '` ' . 'WHERE `id` = ?';
-		return $this->findEntity($sql, [$id]);
-	}
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('*')
+			->from($this->getTableName())
+			->where($qb->expr()->eq('id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
 
-	protected function execute($sql, array $params = [], $limit = null, $offset = null) {
-		return parent::execute($sql, $params, $limit, $offset);
+		return $this->findEntity($qb);
 	}
 }

lib/Db/LabelMapper.php

@@ -26,6 +26,7 @@ namespace OCA\Deck\Db;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\Entity;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
+use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 
 class LabelMapper extends DeckMapper implements IPermissionMapper {
@@ -33,41 +34,105 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
 		parent::__construct($db, 'deck_labels', Label::class);
 	}
 
-	public function findAll($boardId, $limit = null, $offset = null) {
-		$sql = 'SELECT * FROM `*PREFIX*deck_labels` WHERE `board_id` = ? ORDER BY `id`';
-		return $this->findEntities($sql, [$boardId], $limit, $offset);
+	/**
+	 * @param numeric $boardId
+	 * @param int|null $limit
+	 * @param int|null $offset
+	 * @return Label[]
+	 * @throws \OCP\DB\Exception
+	 */
+	public function findAll($boardId, $limit = null, $offset = null): array {
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('*')
+			->from($this->getTableName())
+			->where($qb->expr()->eq('board_id', $qb->createNamedParameter($boardId, IQueryBuilder::PARAM_INT)))
+			->setMaxResults($limit)
+			->setFirstResult($offset);
+		return $this->findEntities($qb);
 	}
 
-	public function delete(\OCP\AppFramework\Db\Entity $entity) {
+	/**
+	 * @param Entity $entity
+	 * @return Entity
+	 * @throws \OCP\DB\Exception
+	 */
+	public function delete(Entity $entity): Entity {
 		// delete assigned labels
 		$this->deleteLabelAssignments($entity->getId());
 		// delete label
 		return parent::delete($entity);
 	}
 
-	public function findAssignedLabelsForCard($cardId, $limit = null, $offset = null) {
-		$sql = 'SELECT l.*,card_id FROM `*PREFIX*deck_assigned_labels` as al INNER JOIN *PREFIX*deck_labels as l ON l.id = al.label_id WHERE `card_id` = ? ORDER BY l.id';
-		return $this->findEntities($sql, [$cardId], $limit, $offset);
-	}
-	public function findAssignedLabelsForBoard($boardId, $limit = null, $offset = null) {
-		$sql = 'SELECT c.id as card_id, l.id as id, l.title as title, l.color as color FROM `*PREFIX*deck_cards` as c ' .
-			' INNER JOIN `*PREFIX*deck_assigned_labels` as al ON al.card_id = c.id INNER JOIN `*PREFIX*deck_labels` as l ON  al.label_id = l.id WHERE board_id=? ORDER BY l.id';
-		return $this->findEntities($sql, [$boardId], $limit, $offset);
+	/**
+	 * @param numeric $cardId
+	 * @param int|null $limit
+	 * @param int|null $offset
+	 * @return Label[]
+	 * @throws \OCP\DB\Exception
+	 */
+	public function findAssignedLabelsForCard($cardId, $limit = null, $offset = null): array {
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('l.*', 'card_id')
+			->from($this->getTableName(), 'l')
+			->innerJoin('l', 'deck_assigned_labels', 'al', 'l.id = al.label_id')
+			->where($qb->expr()->eq('card_id', $qb->createNamedParameter($cardId, IQueryBuilder::PARAM_INT)))
+			->orderBy('l.id')
+			->setMaxResults($limit)
+			->setFirstResult($offset);
+
+		return $this->findEntities($qb);
 	}
 
-	public function insert(Entity $entity) {
+	/**
+	 * @param numeric $boardId
+	 * @param int|null $limit
+	 * @param int|null $offset
+	 * @return Label[]
+	 * @throws \OCP\DB\Exception
+	 */
+	public function findAssignedLabelsForBoard($boardId, $limit = null, $offset = null): array {
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('l.id as id', 'l.title as title', 'l.color as color')
+			->selectAlias('c.id', 'card_id')
+			->from($this->getTableName(), 'l')
+			->innerJoin('l', 'deck_assigned_labels', 'al', 'al.label_id = l.id')
+			->innerJoin('l', 'deck_cards', 'c', 'al.card_id = c.id')
+			->where($qb->expr()->eq('board_id', $qb->createNamedParameter($boardId, IQueryBuilder::PARAM_INT)))
+			->orderBy('l.id')
+			->setMaxResults($limit)
+			->setFirstResult($offset);
+
+		return $this->findEntities($qb);
+	}
+
+	/**
+	 * @param Entity $entity
+	 * @return Entity
+	 * @throws \OCP\DB\Exception
+	 */
+	public function insert(Entity $entity): Entity {
 		$entity->setLastModified(time());
 		return parent::insert($entity);
 	}
 
-	public function update(Entity $entity, $updateModified = true) {
+	/**
+	 * @param Entity $entity
+	 * @param bool $updateModified
+	 * @return Entity
+	 * @throws \OCP\DB\Exception
+	 */
+	public function update(Entity $entity, $updateModified = true): Entity {
 		if ($updateModified) {
 			$entity->setLastModified(time());
 		}
 		return parent::update($entity);
 	}
 
-
+	/**
+	 * @param numeric $boardId
+	 * @return array
+	 * @throws \OCP\DB\Exception
+	 */
 	public function getAssignedLabelsForBoard($boardId) {
 		$labels = $this->findAssignedLabelsForBoard($boardId);
 		$result = [];
@@ -80,27 +145,51 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
 		return $result;
 	}
 
+	/**
+	 * @param numeric $labelId
+	 * @return void
+	 * @throws \OCP\DB\Exception
+	 */
 	public function deleteLabelAssignments($labelId) {
-		$sql = 'DELETE FROM `*PREFIX*deck_assigned_labels` WHERE label_id = ?';
-		$stmt = $this->db->prepare($sql);
-		$stmt->bindParam(1, $labelId, \PDO::PARAM_INT, 0);
-		$stmt->execute();
+		$qb = $this->db->getQueryBuilder();
+		$qb->delete('deck_assigned_labels')
+			->where($qb->expr()->eq('label_id', $qb->createNamedParameter($labelId, IQueryBuilder::PARAM_INT)));
+		$qb->executeStatement();
 	}
 
+	/**
+	 * @param numeric $cardId
+	 * @return void
+	 * @throws \OCP\DB\Exception
+	 */
 	public function deleteLabelAssignmentsForCard($cardId) {
-		$sql = 'DELETE FROM `*PREFIX*deck_assigned_labels` WHERE card_id = ?';
-		$stmt = $this->db->prepare($sql);
-		$stmt->bindParam(1, $cardId, \PDO::PARAM_INT, 0);
-		$stmt->execute();
+		$qb = $this->db->getQueryBuilder();
+		$qb->delete('deck_assigned_labels')
+			->where($qb->expr()->eq('card_id', $qb->createNamedParameter($cardId, IQueryBuilder::PARAM_INT)));
+		$qb->executeStatement();
 	}
 
+	/**
+	 * @param string $userId
+	 * @param numeric $labelId
+	 * @return bool
+	 * @throws \OCP\DB\Exception
+	 */
 	public function isOwner($userId, $labelId): bool {
-		$sql = 'SELECT owner FROM `*PREFIX*deck_boards` WHERE `id` IN (SELECT board_id FROM `*PREFIX*deck_labels` WHERE id = ?)';
-		$stmt = $this->execute($sql, [$labelId]);
-		$row = $stmt->fetch();
-		return ($row['owner'] === $userId);
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('l.id')
+			->from($this->getTableName(), 'l')
+			->innerJoin('l', 'deck_boards', 'b', 'l.board_id = b.id')
+			->where($qb->expr()->eq('l.id', $qb->createNamedParameter($labelId, IQueryBuilder::PARAM_INT)))
+			->andWhere($qb->expr()->eq('b.owner', $qb->createNamedParameter($userId, IQueryBuilder::PARAM_STR)));
+
+		return count($qb->executeQuery()->fetchAll()) > 0;
 	}
 
+	/**
+	 * @param numeric $id
+	 * @return int|null
+	 */
 	public function findBoardId($id): ?int {
 		try {
 			$entity = $this->find($id);

lib/Db/RelationalEntity.php

@@ -72,6 +72,9 @@ class RelationalEntity extends Entity implements \JsonSerializable {
 				$propertyReflection = $reflection->getProperty($property);
 				if (!$propertyReflection->isPrivate() && !in_array($property, $this->_resolvedProperties, true)) {
 					$json[$property] = $this->getter($property);
+					if ($json[$property] instanceof \DateTimeInterface) {
+						$json[$property] = $json[$property]->format('c');
+					}
 				}
 			}
 		}

lib/Db/StackMapper.php

@@ -26,6 +26,7 @@ namespace OCA\Deck\Db;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\Entity;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
+use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 
 class StackMapper extends DeckMapper implements IPermissionMapper {
@@ -38,62 +39,112 @@ class StackMapper extends DeckMapper implements IPermissionMapper {
 
 
 	/**
-	 * @param $id
-	 * @throws MultipleObjectsReturnedException
+	 * @param numeric $id
+	 * @return Stack
 	 * @throws DoesNotExistException
+	 * @throws MultipleObjectsReturnedException
+	 * @throws \OCP\DB\Exception
 	 */
 	public function find($id): Stack {
-		$sql = 'SELECT * FROM `*PREFIX*deck_stacks` ' .
-			'WHERE `id` = ?';
-		return $this->findEntity($sql, [$id]);
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('*')
+			->from($this->getTableName())
+			->where($qb->expr()->eq('id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
+
+		return $this->findEntity($qb);
 	}
 
 	/**
 	 * @param $cardId
 	 * @return Stack|null
+	 * @throws \OCP\DB\Exception
 	 */
 	public function findStackFromCardId($cardId): ?Stack {
-		$sql = <<<SQL
-SELECT s.* 
-FROM `*PREFIX*deck_stacks` as `s`
-INNER JOIN `*PREFIX*deck_cards` as `c` ON s.id = c.stack_id
-WHERE c.id = ?
-SQL;
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('s.*')
+			->from($this->getTableName(), 's')
+			->innerJoin('s', 'deck_cards', 'c', 's.id = c.stack_id')
+			->where($qb->expr()->eq('c.id', $qb->createNamedParameter($cardId, IQueryBuilder::PARAM_INT)));
+
 		try {
-			return $this->findEntity($sql, [$cardId]);
+			return $this->findEntity($qb);
 		} catch (MultipleObjectsReturnedException|DoesNotExistException $e) {
 		}
 
 		return null;
 	}
 
+	/**
+	 * @param numeric $boardId
+	 * @param int|null $limit
+	 * @param int|null $offset
+	 * @return Stack[]
+	 * @throws \OCP\DB\Exception
+	 */
+	public function findAll($boardId, $limit = null, $offset = null): array {
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('*')
+			->from($this->getTableName())
+			->where($qb->expr()->eq('board_id', $qb->createNamedParameter($boardId, IQueryBuilder::PARAM_INT)))
+			->andWhere($qb->expr()->eq('deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)))
+			->setFirstResult($offset)
+			->setMaxResults($limit);
 
-	public function findAll($boardId, $limit = null, $offset = null) {
-		$sql = 'SELECT * FROM `*PREFIX*deck_stacks` WHERE `board_id` = ? AND deleted_at = 0 ORDER BY `order`, `id`';
-		return $this->findEntities($sql, [$boardId], $limit, $offset);
+		return $this->findEntities($qb);
 	}
 
-
+	/**
+	 * @param numeric $boardId
+	 * @param int|null $limit
+	 * @param int|null $offset
+	 * @return Stack[]
+	 * @throws \OCP\DB\Exception
+	 */
 	public function findDeleted($boardId, $limit = null, $offset = null) {
-		$sql = 'SELECT * FROM `*PREFIX*deck_stacks` s
-	  WHERE `s`.`board_id` = ? AND NOT s.deleted_at = 0';
-		return $this->findEntities($sql, [$boardId], $limit, $offset);
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('*')
+			->from($this->getTableName())
+			->where($qb->expr()->eq('board_id', $qb->createNamedParameter($boardId, IQueryBuilder::PARAM_INT)))
+			->andWhere($qb->expr()->neq('deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)))
+			->setFirstResult($offset)
+			->setMaxResults($limit);
+
+		return $this->findEntities($qb);
 	}
 
-
-	public function delete(Entity $entity) {
+	/**
+	 * @param Entity $entity
+	 * @return Entity
+	 * @throws \OCP\DB\Exception
+	 */
+	public function delete(Entity $entity): Entity {
 		// delete cards on stack
 		$this->cardMapper->deleteByStack($entity->getId());
 		return parent::delete($entity);
 	}
 
-	public function isOwner($userId, $stackId): bool {
-		$sql = 'SELECT owner FROM `*PREFIX*deck_boards` WHERE `id` IN (SELECT board_id FROM `*PREFIX*deck_stacks` WHERE id = ?)';
-		$stmt = $this->execute($sql, [$stackId]);
-		$row = $stmt->fetch();
-		return ($row['owner'] === $userId);
+	/**
+	 * @param numeric $userId
+	 * @param numeric $stackId
+	 * @return bool
+	 * @throws \OCP\DB\Exception
+	 */
+	public function isOwner($userId, $id): bool {
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('s.id')
+			->from($this->getTableName(), 's')
+			->innerJoin('s', 'deck_boards', 'b', 'b.id = s.board_id')
+			->where($qb->expr()->eq('s.id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)))
+			->andWhere($qb->expr()->eq('owner', $qb->createNamedParameter($userId, IQueryBuilder::PARAM_STR)));
+
+		return count($qb->executeQuery()->fetchAll()) > 0;
 	}
 
+	/**
+	 * @param numeric $id
+	 * @return int|null
+	 * @throws \OCP\DB\Exception
+	 */
 	public function findBoardId($id): ?int {
 		try {
 			$entity = $this->find($id);

lib/Model/BoardSummary.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * @copyright Copyright (c) 2022 Raul Ferreira Fuentes <raul@nextcloud.com>
+ *
+ * @author Raul Ferreira Fuentes <raul@nextcloud.com>
+ *
+ * @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\Model;
+
+use OCA\Deck\Db\Board;
+
+class BoardSummary extends Board {
+	private Board $board;
+
+	public function __construct(Board $board) {
+		parent::__construct();
+		$this->board = $board;
+	}
+
+	public function jsonSerialize(): array {
+		return [
+			'id' => $this->getId(),
+			'title' => $this->getTitle()
+		];
+	}
+
+	public function __call($name, $arguments) {
+		return $this->board->__call($name, $arguments);
+	}
+}

lib/Model/CardDetails.php

@@ -0,0 +1,92 @@
+<?php
+/**
+ * @copyright Copyright (c) 2022 Raul Ferreira Fuentes <raul@nextcloud.com>
+ *
+ * @author Raul Ferreira Fuentes <raul@nextcloud.com>
+ *
+ * @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\Model;
+
+use DateTime;
+use OCA\Deck\Db\Board;
+use OCA\Deck\Db\Card;
+
+class CardDetails extends Card {
+	private Card $card;
+	private ?Board $board;
+
+	public function __construct(Card $card, ?Board $board = null) {
+		parent::__construct();
+		$this->card = $card;
+		$this->board = $board;
+	}
+
+	public function setBoard(?Board $board): void {
+		$this->board = $board;
+	}
+
+	public function jsonSerialize(array $extras = []): array {
+		$array = $this->card->jsonSerialize();
+		unset($array['notified'], $array['descriptionPrev'], $array['relatedStack'], $array['relatedBoard']);
+
+		$array['overdue'] = $this->getDueStatus();
+		$this->appendBoardDetails($array);
+
+		return $array;
+	}
+
+	private function getDueStatus(): int {
+		$today = new DateTime();
+		$today->setTime(0, 0);
+
+		$match_date = $this->card->getDuedate();
+		if (!$match_date) {
+			return Card::DUEDATE_FUTURE;
+		}
+		$match_date->setTime(0, 0);
+
+		$diff = $today->diff($match_date);
+		$diffDays = (int) $diff->format('%R%a'); // Extract days count in interval
+
+
+		if ($diffDays === 1) {
+			return Card::DUEDATE_NEXT;
+		}
+		if ($diffDays === 0) {
+			return Card::DUEDATE_NOW;
+		}
+		if ($diffDays < 0) {
+			return Card::DUEDATE_OVERDUE;
+		}
+
+		return Card::DUEDATE_FUTURE;
+	}
+
+	private function appendBoardDetails(&$array): void {
+		if (!$this->board) {
+			return;
+		}
+
+		$array['boardId'] = $this->board->id;
+		$array['board'] = (new BoardSummary($this->board))->jsonSerialize();
+	}
+
+	public function __call($name, $arguments) {
+		return $this->card->__call($name, $arguments);
+	}
+}

lib/Notification/NotificationHelper.php

@@ -129,7 +129,7 @@ class NotificationHelper {
 					->setSubject('card-overdue', [
 						$card->getTitle(), $board->getTitle()
 					])
-					->setDateTime(new DateTime($card->getDuedate()));
+					->setDateTime($card->getDuedate());
 				$this->notificationManager->notify($notification);
 			}
 		}
@@ -242,7 +242,7 @@ class NotificationHelper {
 		}
 		return $this->boards[$boardId];
 	}
-	
+
 	private function generateBoardShared(Board $board, string $userId): INotification {
 		$notification = $this->notificationManager->createNotification();
 		$notification

lib/Notification/Notifier.php

@@ -114,7 +114,7 @@ class Notifier implements INotifier {
 					$dn = $params[2];
 				}
 				$notification->setParsedSubject(
-					(string) $l->t('The card "%s" on "%s" has been assigned to you by %s.', [$params[0], $params[1], $dn])
+					$l->t('The card "%s" on "%s" has been assigned to you by %s.', [$params[0], $params[1], $dn])
 				);
 				$notification->setRichSubject(
 					$l->t('{user} has assigned the card {deck-card} on {deck-board} to you.'),
@@ -151,7 +151,7 @@ class Notifier implements INotifier {
 				}
 
 				$notification->setParsedSubject(
-					(string) $l->t('The card "%s" on "%s" has reached its due date.', $params)
+					$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.'),
@@ -189,7 +189,7 @@ class Notifier implements INotifier {
 					$dn = $params[2];
 				}
 				$notification->setParsedSubject(
-					(string) $l->t('%s has mentioned you in a comment on "%s".', [$dn, $params[0]])
+					$l->t('%s has mentioned you in a comment on "%s".', [$dn, $params[0]])
 				);
 				$notification->setRichSubject(
 					$l->t('{user} has mentioned you in a comment on {deck-card}.'),
@@ -226,7 +226,7 @@ class Notifier implements INotifier {
 					$dn = $params[1];
 				}
 				$notification->setParsedSubject(
-					(string) $l->t('The board "%s" has been shared with you by %s.', [$params[0], $dn])
+					$l->t('The board "%s" has been shared with you by %s.', [$params[0], $dn])
 				);
 				$notification->setRichSubject(
 					$l->t('{user} has shared {deck-board} with you.'),

lib/Provider/DeckProvider.php

@@ -54,22 +54,11 @@ use OCP\IURLGenerator;
 class DeckProvider implements IFullTextSearchProvider {
 	public const DECK_PROVIDER_ID = 'deck';
 
-
-	/** @var IL10N */
-	private $l10n;
-
-	/** @var IUrlGenerator */
-	private $urlGenerator;
-
-	/** @var FullTextSearchService */
-	private $fullTextSearchService;
-
-
-	/** @var IRunner */
-	private $runner;
-
-	/** @var IIndexOptions */
-	private $indexOptions = [];
+	private IL10N $l10n;
+	private IUrlGenerator $urlGenerator;
+	private FullTextSearchService $fullTextSearchService;
+	private ?IRunner $runner = null;
+	private ?IIndexOptions $indexOptions = null;
 
 
 	/**

lib/Reference/CardReferenceProvider.php

@@ -0,0 +1,169 @@
+<?php
+/**
+ * @copyright Copyright (c) 2022 Julien Veyssier <eneiluj@posteo.net>
+ *
+ * @author Julien Veyssier <eneiluj@posteo.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\Reference;
+
+use OCA\Deck\AppInfo\Application;
+use OCA\Deck\Db\Assignment;
+use OCA\Deck\Db\Attachment;
+use OCA\Deck\Db\Label;
+use OCA\Deck\Model\CardDetails;
+use OCA\Deck\Service\BoardService;
+use OCA\Deck\Service\CardService;
+use OCA\Deck\Service\StackService;
+use OCP\Collaboration\Reference\IReference;
+use OCP\Collaboration\Reference\IReferenceProvider;
+use OCP\Collaboration\Reference\Reference;
+use OCP\IURLGenerator;
+
+class CardReferenceProvider implements IReferenceProvider {
+	private CardService $cardService;
+	private IURLGenerator $urlGenerator;
+	private BoardService $boardService;
+	private StackService $stackService;
+	private ?string $userId;
+
+	public function __construct(CardService $cardService,
+								BoardService $boardService,
+								StackService $stackService,
+								IURLGenerator $urlGenerator,
+								?string $userId) {
+		$this->cardService = $cardService;
+		$this->urlGenerator = $urlGenerator;
+		$this->boardService = $boardService;
+		$this->stackService = $stackService;
+		$this->userId = $userId;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function matchReference(string $referenceText): bool {
+		$start = $this->urlGenerator->getAbsoluteURL('/apps/' . Application::APP_ID);
+		$startIndex = $this->urlGenerator->getAbsoluteURL('/index.php/apps/' . Application::APP_ID);
+
+		// link example: https://nextcloud.local/index.php/apps/deck/#/board/2/card/11
+		$noIndexMatch = preg_match('/^' . preg_quote($start, '/') . '\/#\/board\/[0-9]+\/card\/[0-9]+$/', $referenceText) === 1;
+		$indexMatch = preg_match('/^' . preg_quote($startIndex, '/') . '\/#\/board\/[0-9]+\/card\/[0-9]+$/', $referenceText) === 1;
+
+		return $noIndexMatch || $indexMatch;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function resolveReference(string $referenceText): ?IReference {
+		if ($this->matchReference($referenceText)) {
+			$ids = $this->getBoardCardId($referenceText);
+			if ($ids !== null) {
+				[$boardId, $cardId] = $ids;
+				$card = $this->cardService->find((int) $cardId)->jsonSerialize();
+				$board = $this->boardService->find((int) $boardId)->jsonSerialize();
+				$stack = $this->stackService->find((int) $card['stackId'])->jsonSerialize();
+
+				$card = $this->sanitizeSerializedCard($card);
+				$board = $this->sanitizeSerializedBoard($board);
+				$stack = $this->sanitizeSerializedStack($stack);
+
+				$reference = new Reference($referenceText);
+				$reference->setRichObject(Application::APP_ID . '-card', [
+					'id' => $boardId . '/' . $cardId,
+					'card' => $card,
+					'board' => $board,
+					'stack' => $stack,
+				]);
+				return $reference;
+			}
+		}
+
+		return null;
+	}
+
+	private function sanitizeSerializedStack(array $stack): array {
+		$stack['cards'] = array_map(function (CardDetails $cardDetails) {
+			$result = $cardDetails->jsonSerialize();
+			unset($result['assignedUsers']);
+			return $result;
+		}, $stack['cards']);
+
+		return $stack;
+	}
+
+	private function sanitizeSerializedBoard(array $board): array {
+		unset($board['labels']);
+		$board['owner'] = $board['owner']->jsonSerialize();
+		unset($board['acl']);
+		unset($board['users']);
+
+		return $board;
+	}
+
+	private function sanitizeSerializedCard(array $card): array {
+		$card['labels'] = array_map(function (Label $label) {
+			return $label->jsonSerialize();
+		}, $card['labels']);
+		$card['assignedUsers'] = array_map(function (Assignment $assignment) {
+			$result = $assignment->jsonSerialize();
+			$result['participant'] = $result['participant']->jsonSerialize();
+			return $result;
+		}, $card['assignedUsers']);
+		$card['owner'] = $card['owner']->jsonSerialize();
+		unset($card['relatedStack']);
+		unset($card['relatedBoard']);
+		$card['attachments'] = array_map(function (Attachment $attachment) {
+			return $attachment->jsonSerialize();
+		}, $card['attachments']);
+
+		return $card;
+	}
+
+	private function getBoardCardId(string $url): ?array {
+		$start = $this->urlGenerator->getAbsoluteURL('/apps/' . Application::APP_ID);
+		$startIndex = $this->urlGenerator->getAbsoluteURL('/index.php/apps/' . Application::APP_ID);
+
+		preg_match('/^' . preg_quote($start, '/') . '\/#\/board\/([0-9]+)\/card\/([0-9]+)$/', $url, $matches);
+		if ($matches && count($matches) > 2) {
+			return [$matches[1], $matches[2]];
+		}
+
+		preg_match('/^' . preg_quote($startIndex, '/') . '\/#\/board\/([0-9]+)\/card\/([0-9]+)$/', $url, $matches2);
+		if ($matches2 && count($matches2) > 2) {
+			return [$matches2[1], $matches2[2]];
+		}
+
+		return null;
+	}
+
+	public function getCachePrefix(string $referenceId): string {
+		$ids = $this->getBoardCardId($referenceId);
+		if ($ids !== null) {
+			[$boardId, $cardId] = $ids;
+			return $boardId . '/' . $cardId;
+		}
+
+		return $referenceId;
+	}
+
+	public function getCacheKey(string $referenceId): ?string {
+		return $this->userId ?? '';
+	}
+}

lib/Service/AssignmentService.php

@@ -35,6 +35,7 @@ use OCA\Deck\Event\CardUpdatedEvent;
 use OCA\Deck\NoPermissionException;
 use OCA\Deck\NotFoundException;
 use OCA\Deck\Notification\NotificationHelper;
+use OCA\Deck\Validators\AssignmentServiceValidator;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\Entity;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
@@ -76,6 +77,11 @@ class AssignmentService {
 	private $eventDispatcher;
 	/** @var string|null */
 	private $currentUser;
+	/**
+	 * @var AssignmentServiceValidator
+	 */
+	private $assignmentServiceValidator;
+
 
 	public function __construct(
 		PermissionService $permissionService,
@@ -86,8 +92,10 @@ class AssignmentService {
 		ActivityManager $activityManager,
 		ChangeHelper $changeHelper,
 		IEventDispatcher $eventDispatcher,
+		AssignmentServiceValidator $assignmentServiceValidator,
 		$userId
 	) {
+		$this->assignmentServiceValidator = $assignmentServiceValidator;
 		$this->permissionService = $permissionService;
 		$this->cardMapper = $cardMapper;
 		$this->assignedUsersMapper = $assignedUsersMapper;
@@ -96,6 +104,8 @@ class AssignmentService {
 		$this->changeHelper = $changeHelper;
 		$this->activityManager = $activityManager;
 		$this->eventDispatcher = $eventDispatcher;
+
+		$this->assignmentServiceValidator->check(compact('userId'));
 		$this->currentUser = $userId;
 	}
 
@@ -109,13 +119,7 @@ class AssignmentService {
 	 * @throws DoesNotExistException
 	 */
 	public function assignUser($cardId, $userId, int $type = Assignment::TYPE_USER) {
-		if (is_numeric($cardId) === false) {
-			throw new BadRequestException('card id must be a number');
-		}
-
-		if ($userId === false || $userId === null) {
-			throw new BadRequestException('user id must be provided');
-		}
+		$this->assignmentServiceValidator->check(compact('cardId', 'userId'));
 
 		if ($type !== Assignment::TYPE_USER && $type !== Assignment::TYPE_GROUP) {
 			throw new BadRequestException('Invalid type provided for assignemnt');
@@ -168,16 +172,9 @@ class AssignmentService {
 	 * @throws MultipleObjectsReturnedException
 	 */
 	public function unassignUser($cardId, $userId, $type = 0) {
+		$this->assignmentServiceValidator->check(compact('cardId', 'userId'));
 		$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_EDIT);
 
-		if (is_numeric($cardId) === false) {
-			throw new BadRequestException('card id must be a number');
-		}
-
-		if ($userId === false || $userId === null) {
-			throw new BadRequestException('user must be provided');
-		}
-
 		$assignments = $this->assignedUsersMapper->findAll($cardId);
 		foreach ($assignments as $assignment) {
 			if ($assignment->getParticipant() === $userId && $assignment->getType() === $type) {

lib/Service/AttachmentService.php

@@ -36,6 +36,7 @@ use OCA\Deck\NoPermissionException;
 use OCA\Deck\NotFoundException;
 use OCA\Deck\Cache\AttachmentCacheHelper;
 use OCA\Deck\StatusException;
+use OCA\Deck\Validators\AttachmentServiceValidator;
 use OCP\AppFramework\Db\IMapperException;
 use OCP\AppFramework\Http\Response;
 use OCP\IL10N;
@@ -60,17 +61,22 @@ class AttachmentService {
 	/** @var ChangeHelper */
 	private $changeHelper;
 	private IUserManager $userManager;
+	/** @var AttachmentServiceValidator */
+	private AttachmentServiceValidator $attachmentServiceValidator;
 
-	public function __construct(AttachmentMapper $attachmentMapper,
-								CardMapper $cardMapper,
-								IUserManager $userManager,
-								ChangeHelper $changeHelper,
-								PermissionService $permissionService,
-								Application $application,
-								AttachmentCacheHelper $attachmentCacheHelper,
-								$userId,
-								IL10N $l10n,
-								ActivityManager $activityManager) {
+	public function __construct(
+		AttachmentMapper $attachmentMapper,
+		CardMapper $cardMapper,
+		IUserManager $userManager,
+		ChangeHelper $changeHelper,
+		PermissionService $permissionService,
+		Application $application,
+		AttachmentCacheHelper $attachmentCacheHelper,
+		$userId,
+		IL10N $l10n,
+		ActivityManager $activityManager,
+		AttachmentServiceValidator $attachmentServiceValidator
+	) {
 		$this->attachmentMapper = $attachmentMapper;
 		$this->cardMapper = $cardMapper;
 		$this->permissionService = $permissionService;
@@ -81,6 +87,7 @@ class AttachmentService {
 		$this->activityManager = $activityManager;
 		$this->changeHelper = $changeHelper;
 		$this->userManager = $userManager;
+		$this->attachmentServiceValidator = $attachmentServiceValidator;
 
 		// Register shipped attachment services
 		// TODO: move this to a plugin based approach once we have different types of attachments
@@ -187,17 +194,7 @@ class AttachmentService {
 	 * @throws BadRequestException
 	 */
 	public function create($cardId, $type, $data) {
-		if (is_numeric($cardId) === false) {
-			throw new BadRequestException('card id must be a number');
-		}
-
-		if ($type === false || $type === null) {
-			throw new BadRequestException('type must be provided');
-		}
-
-		if ($data === false || $data === null) {
-			//throw new BadRequestException('data must be provided');
-		}
+		$this->attachmentServiceValidator->check(compact('cardId', 'type'));
 
 		$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_EDIT);
 
@@ -283,6 +280,8 @@ class AttachmentService {
 	 * @throws NoPermissionException
 	 */
 	public function update($cardId, $attachmentId, $data, $type = 'deck_file') {
+		$this->attachmentServiceValidator->check(compact('cardId', 'type', 'data'));
+
 		try {
 			$service = $this->getService($type);
 		} catch (InvalidAttachmentType $e) {
@@ -304,9 +303,6 @@ class AttachmentService {
 			}
 		}
 
-		if ($data === false || $data === null) {
-			//throw new BadRequestException('data must be provided');
-		}
 		try {
 			$attachment = $this->attachmentMapper->find($attachmentId);
 		} catch (\Exception $e) {

lib/Service/BoardService.php

@@ -24,7 +24,6 @@
 
 namespace OCA\Deck\Service;
 
-use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
 use OCA\Deck\Activity\ActivityManager;
 use OCA\Deck\Activity\ChangeSet;
 use OCA\Deck\AppInfo\Application;
@@ -45,37 +44,40 @@ use OCA\Deck\Notification\NotificationHelper;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IConfig;
+use OCP\IDBConnection;
 use OCP\IGroupManager;
 use OCP\IL10N;
+use OCP\DB\Exception as DbException;
 use OCA\Deck\Db\Board;
 use OCA\Deck\Db\BoardMapper;
 use OCA\Deck\Db\LabelMapper;
 use OCP\IUserManager;
 use OCA\Deck\BadRequestException;
+use OCA\Deck\Validators\BoardServiceValidator;
 use OCP\IURLGenerator;
+use OCP\Server;
 
 class BoardService {
-	private $boardMapper;
-	private $stackMapper;
-	private $labelMapper;
-	private $aclMapper;
-	/** @var IConfig */
-	private $config;
-	private $l10n;
-	private $permissionService;
-	private $notificationHelper;
-	private $assignedUsersMapper;
-	private $userManager;
-	private $groupManager;
-	private $userId;
-	private $activityManager;
-	private $eventDispatcher;
-	private $changeHelper;
-	private $cardMapper;
-
-	private $boardsCache = null;
-	private $urlGenerator;
-
+	private BoardMapper $boardMapper;
+	private StackMapper $stackMapper;
+	private LabelMapper $labelMapper;
+	private AclMapper $aclMapper;
+	private IConfig $config;
+	private IL10N $l10n;
+	private PermissionService $permissionService;
+	private NotificationHelper $notificationHelper;
+	private AssignmentMapper $assignedUsersMapper;
+	private IUserManager $userManager;
+	private IGroupManager $groupManager;
+	private ?string $userId;
+	private ActivityManager $activityManager;
+	private IEventDispatcher $eventDispatcher;
+	private ChangeHelper $changeHelper;
+	private CardMapper $cardMapper;
+	private ?array $boardsCache = null;
+	private IURLGenerator $urlGenerator;
+	private IDBConnection $connection;
+	private BoardServiceValidator $boardServiceValidator;
 
 	public function __construct(
 		BoardMapper $boardMapper,
@@ -94,7 +96,9 @@ class BoardService {
 		IEventDispatcher $eventDispatcher,
 		ChangeHelper $changeHelper,
 		IURLGenerator $urlGenerator,
-		$userId
+		IDBConnection $connection,
+		BoardServiceValidator $boardServiceValidator,
+		?string $userId
 	) {
 		$this->boardMapper = $boardMapper;
 		$this->stackMapper = $stackMapper;
@@ -113,6 +117,8 @@ class BoardService {
 		$this->userId = $userId;
 		$this->urlGenerator = $urlGenerator;
 		$this->cardMapper = $cardMapper;
+		$this->connection = $connection;
+		$this->boardServiceValidator = $boardServiceValidator;
 	}
 
 	/**
@@ -177,6 +183,7 @@ class BoardService {
 	 * @throws BadRequestException
 	 */
 	public function find($boardId) {
+		$this->boardServiceValidator->check(compact('boardId'));
 		if ($this->boardsCache && isset($this->boardsCache[$boardId])) {
 			return $this->boardsCache[$boardId];
 		}
@@ -231,9 +238,7 @@ class BoardService {
 	 * @throws BadRequestException
 	 */
 	public function isArchived($mapper, $id) {
-		if (is_numeric($id) === false) {
-			throw new BadRequestException('id must be a number');
-		}
+		$this->boardServiceValidator->check(compact('id'));
 
 		try {
 			$boardId = $id;
@@ -260,13 +265,7 @@ class BoardService {
 	 * @throws BadRequestException
 	 */
 	public function isDeleted($mapper, $id) {
-		if ($mapper === false || $mapper === null) {
-			throw new BadRequestException('mapper must be provided');
-		}
-
-		if (is_numeric($id) === false) {
-			throw new BadRequestException('id must be a number');
-		}
+		$this->boardServiceValidator->check(compact('mapper', 'id'));
 
 		try {
 			$boardId = $id;
@@ -292,17 +291,7 @@ class BoardService {
 	 * @throws BadRequestException
 	 */
 	public function create($title, $userId, $color) {
-		if ($title === false || $title === null) {
-			throw new BadRequestException('title must be provided');
-		}
-
-		if ($userId === false || $userId === null) {
-			throw new BadRequestException('userId must be provided');
-		}
-
-		if ($color === false || $color === null) {
-			throw new BadRequestException('color must be provided');
-		}
+		$this->boardServiceValidator->check(compact('title', 'userId', 'color'));
 
 		if (!$this->permissionService->canCreate()) {
 			throw new NoPermissionException('Creating boards has been disabled for your account.');
@@ -353,9 +342,7 @@ class BoardService {
 	 * @throws BadRequestException
 	 */
 	public function delete($id) {
-		if (is_numeric($id) === false) {
-			throw new BadRequestException('board id must be a number');
-		}
+		$this->boardServiceValidator->check(compact('id'));
 
 		$this->permissionService->checkPermission($this->boardMapper, $id, Acl::PERMISSION_MANAGE);
 		$board = $this->find($id);
@@ -378,9 +365,7 @@ class BoardService {
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
 	 */
 	public function deleteUndo($id) {
-		if (is_numeric($id) === false) {
-			throw new BadRequestException('board id must be a number');
-		}
+		$this->boardServiceValidator->check(compact('id'));
 
 		$this->permissionService->checkPermission($this->boardMapper, $id, Acl::PERMISSION_MANAGE);
 		$board = $this->find($id);
@@ -401,9 +386,7 @@ class BoardService {
 	 * @throws BadRequestException
 	 */
 	public function deleteForce($id) {
-		if (is_numeric($id) === false) {
-			throw new BadRequestException('id must be a number');
-		}
+		$this->boardServiceValidator->check(compact('id'));
 
 		$this->permissionService->checkPermission($this->boardMapper, $id, Acl::PERMISSION_MANAGE);
 		$board = $this->find($id);
@@ -424,21 +407,7 @@ class BoardService {
 	 * @throws BadRequestException
 	 */
 	public function update($id, $title, $color, $archived) {
-		if (is_numeric($id) === false) {
-			throw new BadRequestException('board id must be a number');
-		}
-
-		if ($title === false || $title === null) {
-			throw new BadRequestException('title must be provided');
-		}
-
-		if ($color === false || $color === null) {
-			throw new BadRequestException('color must be provided');
-		}
-
-		if (is_bool($archived) === false) {
-			throw new BadRequestException('archived must be a boolean');
-		}
+		$this->boardServiceValidator->check(compact('id', 'title', 'color', 'archived'));
 
 		$this->permissionService->checkPermission($this->boardMapper, $id, Acl::PERMISSION_MANAGE);
 		$board = $this->find($id);
@@ -488,29 +457,7 @@ class BoardService {
 	 * @throws \OCA\Deck\NoPermissionException
 	 */
 	public function addAcl($boardId, $type, $participant, $edit, $share, $manage) {
-		if (is_numeric($boardId) === false) {
-			throw new BadRequestException('board id must be a number');
-		}
-
-		if ($type === false || $type === null) {
-			throw new BadRequestException('type must be provided');
-		}
-
-		if ($participant === false || $participant === null) {
-			throw new BadRequestException('participant must be provided');
-		}
-
-		if ($edit === null) {
-			throw new BadRequestException('edit must be provided');
-		}
-
-		if ($share === null) {
-			throw new BadRequestException('share must be provided');
-		}
-
-		if ($manage === null) {
-			throw new BadRequestException('manage must be provided');
-		}
+		$this->boardServiceValidator->check(compact('boardId', 'type', 'participant', 'edit', 'share', 'manage'));
 
 		$this->permissionService->checkPermission($this->boardMapper, $boardId, Acl::PERMISSION_SHARE);
 		[$edit, $share, $manage] = $this->applyPermissions($boardId, $edit, $share, $manage);
@@ -534,7 +481,7 @@ class BoardService {
 
 		// TODO: use the dispatched event for this
 		try {
-			$resourceProvider = \OC::$server->query(\OCA\Deck\Collaboration\Resources\ResourceProvider::class);
+			$resourceProvider = Server::get(\OCA\Deck\Collaboration\Resources\ResourceProvider::class);
 			$resourceProvider->invalidateAccessCache($boardId);
 		} catch (\Exception $e) {
 		}
@@ -556,21 +503,7 @@ class BoardService {
 	 * @throws BadRequestException
 	 */
 	public function updateAcl($id, $edit, $share, $manage) {
-		if (is_numeric($id) === false) {
-			throw new BadRequestException('id must be a number');
-		}
-
-		if ($edit === null) {
-			throw new BadRequestException('edit must be provided');
-		}
-
-		if ($share === null) {
-			throw new BadRequestException('share must be provided');
-		}
-
-		if ($manage === null) {
-			throw new BadRequestException('manage must be provided');
-		}
+		$this->boardServiceValidator->check(compact('id', 'edit', 'share', 'manage'));
 
 		$this->permissionService->checkPermission($this->aclMapper, $id, Acl::PERMISSION_SHARE);
 
@@ -590,18 +523,12 @@ class BoardService {
 	}
 
 	/**
-	 * @param $id
-	 * @return \OCP\AppFramework\Db\Entity
 	 * @throws DoesNotExistException
 	 * @throws \OCA\Deck\NoPermissionException
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
 	 * @throws BadRequestException
 	 */
-	public function deleteAcl($id) {
-		if (is_numeric($id) === false) {
-			throw new BadRequestException('id must be a number');
-		}
-
+	public function deleteAcl(int $id): bool {
 		$this->permissionService->checkPermission($this->aclMapper, $id, Acl::PERMISSION_SHARE);
 		/** @var Acl $acl */
 		$acl = $this->aclMapper->find($id);
@@ -620,16 +547,14 @@ class BoardService {
 		$version = \OCP\Util::getVersion()[0];
 		if ($version >= 16) {
 			try {
-				$resourceProvider = \OC::$server->query(\OCA\Deck\Collaboration\Resources\ResourceProvider::class);
+				$resourceProvider = Server::get(\OCA\Deck\Collaboration\Resources\ResourceProvider::class);
 				$resourceProvider->invalidateAccessCache($acl->getBoardId());
 			} catch (\Exception $e) {
 			}
 		}
-		$delete = $this->aclMapper->delete($acl);
 
 		$this->eventDispatcher->dispatchTyped(new AclDeletedEvent($acl));
-
-		return $delete;
+		return (bool) $this->aclMapper->delete($acl);
 	}
 
 	/**
@@ -642,9 +567,7 @@ class BoardService {
 	 * @throws BadRequestException
 	 */
 	public function clone($id, $userId) {
-		if (is_numeric($id) === false) {
-			throw new BadRequestException('board id must be a number');
-		}
+		$this->boardServiceValidator->check(compact('id', 'userId'));
 
 		$this->permissionService->checkPermission($this->boardMapper, $id, Acl::PERMISSION_READ);
 
@@ -683,7 +606,7 @@ class BoardService {
 	}
 
 	public function transferBoardOwnership(int $boardId, string $newOwner, bool $changeContent = false): Board {
-		\OC::$server->getDatabaseConnection()->beginTransaction();
+		$this->connection->beginTransaction();
 		try {
 			$board = $this->boardMapper->find($boardId);
 			$previousOwner = $board->getOwner();
@@ -692,7 +615,10 @@ class BoardService {
 			if (!$changeContent) {
 				try {
 					$this->addAcl($boardId, Acl::PERMISSION_TYPE_USER, $previousOwner, true, true, true);
-				} catch (UniqueConstraintViolationException $e) {
+				} catch (DbException $e) {
+					if ($e->getReason() !== DbException::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
+						throw $e;
+					}
 				}
 			}
 			$this->boardMapper->transferOwnership($previousOwner, $newOwner, $boardId);
@@ -702,10 +628,10 @@ class BoardService {
 				$this->assignedUsersMapper->remapAssignedUser($boardId, $previousOwner, $newOwner);
 				$this->cardMapper->remapCardOwner($boardId, $previousOwner, $newOwner);
 			}
-			\OC::$server->getDatabaseConnection()->commit();
+			$this->connection->commit();
 			return $this->boardMapper->find($boardId);
 		} catch (\Throwable $e) {
-			\OC::$server->getDatabaseConnection()->rollBack();
+			$this->connection->rollBack();
 			throw $e;
 		}
 	}

lib/Service/CardService.php

@@ -43,28 +43,34 @@ use OCA\Deck\Db\BoardMapper;
 use OCA\Deck\Db\LabelMapper;
 use OCA\Deck\StatusException;
 use OCA\Deck\BadRequestException;
+use OCA\Deck\Validators\CardServiceValidator;
 use OCP\Comments\ICommentsManager;
 use OCP\EventDispatcher\IEventDispatcher;
+use OCP\IRequest;
 use OCP\IUserManager;
 use OCP\IURLGenerator;
+use Psr\Log\LoggerInterface;
 
 class CardService {
-	private $cardMapper;
-	private $stackMapper;
-	private $boardMapper;
-	private $labelMapper;
-	private $permissionService;
-	private $boardService;
-	private $notificationHelper;
-	private $assignedUsersMapper;
-	private $attachmentService;
-	private $currentUser;
-	private $activityManager;
-	private $commentsManager;
-	private $changeHelper;
-	private $eventDispatcher;
-	private $userManager;
-	private $urlGenerator;
+	private CardMapper $cardMapper;
+	private StackMapper $stackMapper;
+	private BoardMapper $boardMapper;
+	private LabelMapper $labelMapper;
+	private PermissionService $permissionService;
+	private BoardService $boardService;
+	private NotificationHelper $notificationHelper;
+	private AssignmentMapper $assignedUsersMapper;
+	private AttachmentService $attachmentService;
+	private ?string $currentUser;
+	private ActivityManager $activityManager;
+	private ICommentsManager $commentsManager;
+	private ChangeHelper $changeHelper;
+	private IEventDispatcher $eventDispatcher;
+	private IUserManager $userManager;
+	private IURLGenerator $urlGenerator;
+	private LoggerInterface $logger;
+	private IRequest $request;
+	private CardServiceValidator $cardServiceValidator;
 
 	public function __construct(
 		CardMapper $cardMapper,
@@ -82,7 +88,10 @@ class CardService {
 		ChangeHelper $changeHelper,
 		IEventDispatcher $eventDispatcher,
 		IURLGenerator $urlGenerator,
-		$userId
+		LoggerInterface $logger,
+		IRequest $request,
+		CardServiceValidator $cardServiceValidator,
+		?string $userId
 	) {
 		$this->cardMapper = $cardMapper;
 		$this->stackMapper = $stackMapper;
@@ -100,6 +109,9 @@ class CardService {
 		$this->eventDispatcher = $eventDispatcher;
 		$this->currentUser = $userId;
 		$this->urlGenerator = $urlGenerator;
+		$this->logger = $logger;
+		$this->request = $request;
+		$this->cardServiceValidator = $cardServiceValidator;
 	}
 
 	public function enrich($card) {
@@ -122,6 +134,7 @@ class CardService {
 	}
 
 	public function fetchDeleted($boardId) {
+		$this->cardServiceValidator->check(compact('boardId'));
 		$this->permissionService->checkPermission($this->boardMapper, $boardId, Acl::PERMISSION_READ);
 		$cards = $this->cardMapper->findDeleted($boardId);
 		foreach ($cards as $card) {
@@ -131,23 +144,18 @@ class CardService {
 	}
 
 	/**
-	 * @param $cardId
 	 * @return \OCA\Deck\Db\RelationalEntity
 	 * @throws \OCA\Deck\NoPermissionException
 	 * @throws \OCP\AppFramework\Db\DoesNotExistException
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
 	 * @throws BadRequestException
 	 */
-	public function find($cardId) {
-		if (is_numeric($cardId) === false) {
-			throw new BadRequestException('card id must be a number');
-		}
-
+	public function find(int $cardId) {
 		$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_READ);
 		$card = $this->cardMapper->find($cardId);
 		$assignedUsers = $this->assignedUsersMapper->findAll($card->getId());
 		$attachments = $this->attachmentService->findAll($cardId, true);
-		if (\OC::$server->getRequest()->getParam('apiVersion') === '1.0') {
+		if ($this->request->getParam('apiVersion') === '1.0') {
 			$attachments = array_filter($attachments, function ($attachment) {
 				return $attachment->getType() === 'deck_file';
 			});
@@ -162,7 +170,7 @@ class CardService {
 		try {
 			$this->permissionService->checkPermission($this->boardMapper, $boardId, Acl::PERMISSION_READ);
 		} catch (NoPermissionException $e) {
-			\OC::$server->getLogger()->error('Unable to check permission for a previously obtained board ' . $boardId, ['exception' => $e]);
+			$this->logger->error('Unable to check permission for a previously obtained board ' . $boardId, ['exception' => $e]);
 			return [];
 		}
 		$cards = $this->cardMapper->findCalendarEntries($boardId);
@@ -187,29 +195,7 @@ class CardService {
 	 * @throws BadrequestException
 	 */
 	public function create($title, $stackId, $type, $order, $owner, $description = '', $duedate = null) {
-		if ($title === 'false' || $title === null) {
-			throw new BadRequestException('title must be provided');
-		}
-
-		if (mb_strlen($title) > Card::TITLE_MAX_LENGTH) {
-			throw new BadRequestException('The title cannot exceed 255 characters');
-		}
-
-		if (is_numeric($stackId) === false) {
-			throw new BadRequestException('stack id must be a number');
-		}
-
-		if ($type === 'false' || $type === null) {
-			throw new BadRequestException('type must be provided');
-		}
-
-		if (is_numeric($order) === false) {
-			throw new BadRequestException('order must be a number');
-		}
-
-		if ($owner === false || $owner === null) {
-			throw new BadRequestException('owner must be provided');
-		}
+		$this->cardServiceValidator->check(compact('title', 'stackId', 'type', 'order', 'owner'));
 
 		$this->permissionService->checkPermission($this->stackMapper, $stackId, Acl::PERMISSION_EDIT);
 		if ($this->boardService->isArchived($this->stackMapper, $stackId)) {
@@ -279,29 +265,7 @@ class CardService {
 	 * @throws BadRequestException
 	 */
 	public function update($id, $title, $stackId, $type, $owner, $description = '', $order = 0, $duedate = null, $deletedAt = null, $archived = null) {
-		if (is_numeric($id) === false) {
-			throw new BadRequestException('card id must be a number');
-		}
-
-		if ($title === false || $title === null) {
-			throw new BadRequestException('title must be provided');
-		}
-
-		if (mb_strlen($title) > Card::TITLE_MAX_LENGTH) {
-			throw new BadRequestException('The title cannot exceed 255 characters');
-		}
-
-		if (is_numeric($stackId) === false) {
-			throw new BadRequestException('stack id must be a number $$$');
-		}
-
-		if ($type === false || $type === null) {
-			throw new BadRequestException('type must be provided');
-		}
-
-		if ($owner === false || $owner === null) {
-			throw new BadRequestException('owner must be provided');
-		}
+		$this->cardServiceValidator->check(compact('id', 'title', 'stackId', 'type', 'owner', 'order'));
 
 		$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
 		$this->permissionService->checkPermission($this->stackMapper, $stackId, Acl::PERMISSION_EDIT);
@@ -334,11 +298,11 @@ class CardService {
 		$card->setType($type);
 		$card->setOrder($order);
 		$card->setOwner($owner);
-		$card->setDuedate($duedate);
+		$card->setDuedate($duedate ? new \DateTime($duedate) : null);
 		$resetDuedateNotification = false;
 		if (
 			$card->getDuedate() === null ||
-			(new \DateTime($card->getDuedate())) != (new \DateTime($changes->getBefore()->getDuedate() ?? ''))
+			($card->getDuedate()) != ($changes->getBefore()->getDuedate())
 		) {
 			$card->setNotified(false);
 			$resetDuedateNotification = true;
@@ -384,17 +348,7 @@ class CardService {
 	 * @throws BadRequestException
 	 */
 	public function rename($id, $title) {
-		if (is_numeric($id) === false) {
-			throw new BadRequestException('id must be a number');
-		}
-
-		if ($title === false || $title === null) {
-			throw new BadRequestException('title must be provided');
-		}
-
-		if (mb_strlen($title) > Card::TITLE_MAX_LENGTH) {
-			throw new BadRequestException('The title cannot exceed 255 characters');
-		}
+		$this->cardServiceValidator->check(compact('id', 'title'));
 
 		$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
 		if ($this->boardService->isArchived($this->cardMapper, $id)) {
@@ -425,17 +379,8 @@ class CardService {
 	 * @throws BadRequestException
 	 */
 	public function reorder($id, $stackId, $order) {
-		if (is_numeric($id) === false) {
-			throw new BadRequestException('card id must be a number');
-		}
+		$this->cardServiceValidator->check(compact('id', 'stackId', 'order'));
 
-		if (is_numeric($stackId) === false) {
-			throw new BadRequestException('stack id must be a number');
-		}
-
-		if (is_numeric($order) === false) {
-			throw new BadRequestException('order must be a number');
-		}
 
 		$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
 		$this->permissionService->checkPermission($this->stackMapper, $stackId, Acl::PERMISSION_EDIT);
@@ -486,13 +431,12 @@ class CardService {
 	 * @throws StatusException
 	 * @throws \OCA\Deck\NoPermissionException
 	 * @throws \OCP\AppFramework\Db\DoesNotExistException
-	 * @throws \OCP\AppFramework\Db\
+	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
 	 * @throws BadRequestException
 	 */
 	public function archive($id) {
-		if (is_numeric($id) === false) {
-			throw new BadRequestException('id must be a number');
-		}
+		$this->cardServiceValidator->check(compact('id'));
+
 
 		$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
 		if ($this->boardService->isArchived($this->cardMapper, $id)) {
@@ -520,9 +464,8 @@ class CardService {
 	 * @throws BadRequestException
 	 */
 	public function unarchive($id) {
-		if (is_numeric($id) === false) {
-			throw new BadRequestException('id must be a number');
-		}
+		$this->cardServiceValidator->check(compact('id'));
+
 
 		$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
 		if ($this->boardService->isArchived($this->cardMapper, $id)) {
@@ -549,13 +492,8 @@ class CardService {
 	 * @throws BadRequestException
 	 */
 	public function assignLabel($cardId, $labelId) {
-		if (is_numeric($cardId) === false) {
-			throw new BadRequestException('card id must be a number');
-		}
+		$this->cardServiceValidator->check(compact('cardId', 'labelId'));
 
-		if (is_numeric($labelId) === false) {
-			throw new BadRequestException('label id must be a number');
-		}
 
 		$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_EDIT);
 		if ($this->boardService->isArchived($this->cardMapper, $cardId)) {
@@ -583,13 +521,8 @@ class CardService {
 	 * @throws BadRequestException
 	 */
 	public function removeLabel($cardId, $labelId) {
-		if (is_numeric($cardId) === false) {
-			throw new BadRequestException('card id must be a number');
-		}
+		$this->cardServiceValidator->check(compact('cardId', 'labelId'));
 
-		if (is_numeric($labelId) === false) {
-			throw new BadRequestException('label id must be a number');
-		}
 
 		$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_EDIT);
 		if ($this->boardService->isArchived($this->cardMapper, $cardId)) {

lib/Service/CirclesService.php

@@ -31,6 +31,7 @@ use OCA\Circles\Model\Circle;
 use OCA\Circles\Model\Member;
 use OCA\Circles\Model\Probes\CircleProbe;
 use OCP\App\IAppManager;
+use OCP\Server;
 use Throwable;
 
 /**
@@ -38,7 +39,7 @@ use Throwable;
  * having the app disabled is properly handled
  */
 class CirclesService {
-	private $circlesEnabled;
+	private bool $circlesEnabled;
 
 	private $userCircleCache = [];
 
@@ -58,8 +59,7 @@ class CirclesService {
 		try {
 
 			// Enforce current user condition since we always want the full list of members
-			/** @var CirclesManager $circlesManager */
-			$circlesManager = \OC::$server->get(CirclesManager::class);
+			$circlesManager = Server::get(CirclesManager::class);
 			$circlesManager->startSuperSession();
 			return $circlesManager->getCircle($circleId);
 		} catch (Throwable $e) {
@@ -77,8 +77,7 @@ class CirclesService {
 		}
 
 		try {
-			/** @var CirclesManager $circlesManager */
-			$circlesManager = \OC::$server->get(CirclesManager::class);
+			$circlesManager = Server::get(CirclesManager::class);
 			$federatedUser = $circlesManager->getFederatedUser($userId, Member::TYPE_USER);
 			$circlesManager->startSession($federatedUser);
 			$circle = $circlesManager->getCircle($circleId);
@@ -106,8 +105,7 @@ class CirclesService {
 		}
 
 		try {
-			/** @var CirclesManager $circlesManager */
-			$circlesManager = \OC::$server->get(CirclesManager::class);
+			$circlesManager = Server::get(CirclesManager::class);
 			$federatedUser = $circlesManager->getFederatedUser($userId, Member::TYPE_USER);
 			$circlesManager->startSession($federatedUser);
 			$probe = new CircleProbe();