chore(webpack): Remove outdated config for hmr

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

.eslintrc.js

@@ -9,6 +9,6 @@ module.exports = {
 		'jsdoc/check-param-names': ['off'],
 		'jsdoc/no-undefined-types': ['off'],
 		'jsdoc/require-property-description': ['off'],
-		'import/no-named-as-default-member': ['off']
+		'import/no-named-as-default-member': ['off'],
 	},
 }

.github/dependabot.yml

@@ -2,7 +2,7 @@ version: 2
 updates:
 - package-ecosystem: npm
   directory: "/"
-  target-branch: "master"
+  target-branch: "main"
   schedule:
     interval: weekly
     day: saturday
@@ -11,6 +11,41 @@ updates:
   open-pull-requests-limit: 10
   reviewers:
   - juliushaertl
+
+- package-ecosystem: npm
+  target-branch: stable25
+  versioning-strategy: lockfile-only
+  directory: "/"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "03:00"
+    timezone: Europe/Paris
+  ignore:
+    - dependency-name: "*"
+      update-types: ["version-update:semver-major"]
+  open-pull-requests-limit: 30
+  labels:
+  - 3. to review
+  - dependencies
+
+- package-ecosystem: npm
+  target-branch: stable24
+  versioning-strategy: lockfile-only
+  directory: "/"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "03:00"
+    timezone: Europe/Paris
+  ignore:
+    - dependency-name: "*"
+      update-types: ["version-update:semver-major"]
+  open-pull-requests-limit: 30
+  labels:
+  - 3. to review
+  - dependencies
+
 - package-ecosystem: composer
   directory: "/"
   schedule:

.github/pull_request_template.md

@@ -1,6 +1,6 @@
 
 * Resolves: # <!-- related github issue -->
-* Target version: master 
+* Target version: main
 
 ### Summary
 

.github/workflows/appbuild.yml

@@ -24,14 +24,14 @@ jobs:
     - name: Set up npm7
       run: npm i -g npm@7
     - name: Setup PHP
-      uses: shivammathur/setup-php@2.21.2
+      uses: shivammathur/setup-php@2.24.0
       with:
         php-version: '7.4'
         tools: composer
     - name: install dependencies
       run: |
-        wget https://github.com/ChristophWurst/krankerl/releases/download/v0.12.2/krankerl_0.12.2_amd64.deb
-        sudo dpkg -i krankerl_0.12.2_amd64.deb
+        wget https://github.com/ChristophWurst/krankerl/releases/download/v0.14.0/krankerl_0.14.0_amd64.deb
+        sudo dpkg -i krankerl_0.14.0_amd64.deb
     - name: package
       run: |
         uname -a

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

@@ -10,7 +10,7 @@ on:
     types: [published]
 
 env:
-  PHP_VERSION: 7.4
+  PHP_VERSION: 8.1
 
 jobs:
   build_and_publish:
@@ -21,42 +21,42 @@ jobs:
 
     steps:
       - name: Check actor permission
-        uses: skjnldsv/check-actor-permission@v2
+        uses: skjnldsv/check-actor-permission@e591dbfe838300c007028e1219ca82cc26e8d7c5 # v2.1
         with:
           require: write
 
       - name: Set app env
         run: |
-          # Split and keep last 
+          # Split and keep last
           echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
           echo "APP_VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
         with:
           path: ${{ env.APP_NAME }}
 
       - name: Get appinfo data
         id: appinfo
-        uses: skjnldsv/xpath-action@master
+        uses: skjnldsv/xpath-action@7e6a7c379d0e9abc8acaef43df403ab4fc4f770c # master
         with:
           filename: ${{ env.APP_NAME }}/appinfo/info.xml
           expression: "//info//dependencies//nextcloud/@min-version"
 
       - name: Read package.json node and npm engines version
-        uses: skjnldsv/read-package-engines-version-actions@v1.2
+        uses: skjnldsv/read-package-engines-version-actions@1bdcee71fa343c46b18dc6aceffb4cd1e35209c6 # v1.2
         id: versions
         # Continue if no package.json
         continue-on-error: true
         with:
           path: ${{ env.APP_NAME }}
-          fallbackNode: "^12"
-          fallbackNpm: "^6"
+          fallbackNode: "^16"
+          fallbackNpm: "^7"
 
       - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
         # Skip if no package.json
         if: ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516 # v3
         with:
           node-version: ${{ steps.versions.outputs.nodeVersion }}
 
@@ -66,14 +66,16 @@ jobs:
         run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"
 
       - name: Set up php ${{ env.PHP_VERSION }}
-        uses: shivammathur/setup-php@2.21.2
+        uses: shivammathur/setup-php@2.24.0 # v2
         with:
           php-version: ${{ env.PHP_VERSION }}
           coverage: none
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Check composer.json
         id: check_composer
-        uses: andstor/file-existence-action@v1
+        uses: andstor/file-existence-action@20b4d2e596410855db8f9ca21e96fbe18e12930b # v2
         with:
           files: "${{ env.APP_NAME }}/composer.json"
 
@@ -91,16 +93,29 @@ jobs:
           npm ci
           npm run build
 
-      - name: Install Krankerl
-        run: |
-          wget https://github.com/ChristophWurst/krankerl/releases/download/v0.13.0/krankerl_0.13.0_amd64.deb
-          sudo dpkg -i krankerl_0.13.0_amd64.deb
+      - name: Check Krankerl config
+        id: krankerl
+        uses: andstor/file-existence-action@20b4d2e596410855db8f9ca21e96fbe18e12930b # v2
+        with:
+          files: ${{ env.APP_NAME }}/krankerl.toml
 
-      - name: Package ${{ env.APP_NAME }} ${{ env.APP_VERSION }}
-        # Try krankerl, fallback to makefile
+      - name: Install Krankerl
+        if: steps.krankerl.outputs.files_exists == 'true'
+        run: |
+          wget https://github.com/ChristophWurst/krankerl/releases/download/v0.14.0/krankerl_0.14.0_amd64.deb
+          sudo dpkg -i krankerl_0.14.0_amd64.deb
+
+      - name: Package ${{ env.APP_NAME }} ${{ env.APP_VERSION }} with krankerl
+        if: steps.krankerl.outputs.files_exists == 'true'
         run: |
           cd ${{ env.APP_NAME }}
-          krankerl package || make appstore
+          krankerl package
+
+      - name: Package ${{ env.APP_NAME }} ${{ env.APP_VERSION }} with makefile
+        if: steps.krankerl.outputs.files_exists != 'true'
+        run: |
+          cd ${{ env.APP_NAME }}
+          make appstore
 
       - name: Checkout server ${{ fromJSON(steps.appinfo.outputs.result).nextcloud.min-version }}
         continue-on-error: true
@@ -111,7 +126,7 @@ jobs:
           unzip latest-$NCVERSION.zip
 
       - name: Checkout server master fallback
-        uses: actions/checkout@v3
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
         if: ${{ steps.server-checkout.outcome != 'success' }}
         with:
           repository: nextcloud/server
@@ -133,7 +148,7 @@ jobs:
           tar -zcvf ${{ env.APP_NAME }}.tar.gz ${{ env.APP_NAME }}
 
       - name: Attach tarball to github release
-        uses: svenstaro/upload-release-action@v2
+        uses: svenstaro/upload-release-action@7319e4733ec7a184d739a6f412c40ffc339b69c7 # v2
         id: attach_to_release
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
@@ -143,7 +158,7 @@ jobs:
           overwrite: true
 
       - name: Upload app to Nextcloud appstore
-        uses: nextcloud-releases/nextcloud-appstore-push-action@v1
+        uses: nextcloud-releases/nextcloud-appstore-push-action@a011fe619bcf6e77ddebc96f9908e1af4071b9c1 # v1
         with:
           app_name: ${{ env.APP_NAME }}
           appstore_token: ${{ secrets.APPSTORE_TOKEN }}

.github/workflows/command-rebase.yml

@@ -9,8 +9,8 @@ on:
   issue_comment:
     types: created
 
-permissions:	
-  contents: read	
+permissions:
+  contents: read
 
 jobs:
   rebase:
@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Add reaction on start
-        uses: peter-evans/create-or-update-comment@v2
+        uses: peter-evans/create-or-update-comment@67dcc547d311b736a8e6c5c236542148a47adc3d # v2.1.1
         with:
           token: ${{ secrets.COMMAND_BOT_PAT }}
           repository: ${{ github.event.repository.full_name }}
@@ -31,18 +31,18 @@ jobs:
           reaction-type: "+1"
 
       - name: Checkout the latest code
-        uses: actions/checkout@v3
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
         with:
           fetch-depth: 0
           token: ${{ secrets.COMMAND_BOT_PAT }}
 
       - name: Automatic Rebase
-        uses: cirrus-actions/rebase@1.7
+        uses: cirrus-actions/rebase@6e572f08c244e2f04f9beb85a943eb618218714d # 1.7
         env:
           GITHUB_TOKEN: ${{ secrets.COMMAND_BOT_PAT }}
 
       - name: Add reaction on failure
-        uses: peter-evans/create-or-update-comment@v2
+        uses: peter-evans/create-or-update-comment@67dcc547d311b736a8e6c5c236542148a47adc3d # v2.1.1
         if: failure()
         with:
           token: ${{ secrets.COMMAND_BOT_PAT }}

.github/workflows/cypress.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
   push:
     branches:
-      - master
+      - main
       - stable*
 
 env:
@@ -21,9 +21,9 @@ jobs:
       matrix:
         node-version: [14.x]
         # containers: [1, 2, 3]
-        php-versions: [ '7.4' ]
+        php-versions: [ '8.0' ]
         databases: [ 'sqlite' ]
-        server-versions: [ 'stable25' ]
+        server-versions: [ 'stable26' ]
 
     steps:
       - name: Use Node.js ${{ matrix.node-version }}
@@ -33,6 +33,11 @@ jobs:
       - name: Set up npm7
         run: npm i -g npm@7
 
+      - name: Register text Git reference
+        run: |
+          text_app_ref="$(if [ "${{ matrix.server-versions }}" = "master" ]; then echo -n "main"; else echo -n "${{ matrix.server-versions }}"; fi)"
+          echo "text_app_ref=$text_app_ref" >> $GITHUB_ENV
+
       - name: Checkout server
         uses: actions/checkout@v3
         with:
@@ -51,8 +56,15 @@ jobs:
         with:
           path: apps/${{ env.APP_NAME }}
 
+      - name: Checkout text
+        uses: actions/checkout@v3
+        with:
+          repository: nextcloud/text
+          ref: ${{ env.text_app_ref }}
+          path: apps/text
+
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@2.21.2
+        uses: shivammathur/setup-php@2.24.0
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, zip, gd, apcu
@@ -84,7 +96,7 @@ jobs:
           curl -v http://localhost:8081/index.php/login
 
       - name: Cypress run
-        uses: cypress-io/github-action@v4
+        uses: cypress-io/github-action@v5
         with:
           record: true
           parallel: false
@@ -96,7 +108,7 @@ jobs:
           npm_package_name: ${{ env.APP_NAME }}
 
       - name: Upload test failure screenshots
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         if: failure()
         with:
           name: Upload screenshots
@@ -104,7 +116,7 @@ jobs:
           retention-days: 5
 
       - name: Upload nextcloud logs
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         if: failure()
         with:
           name: Upload nextcloud log

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

@@ -15,22 +15,26 @@ on:
 permissions:
   contents: read
 
+concurrency:
+  group: dependabot-approve-merge-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 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 
+      pull-requests: write
 
     steps:
       # Github actions bot approve
-      - uses: hmarr/auto-approve-action@v2
+      - uses: hmarr/auto-approve-action@b40d6c9ed2fa10c9a2749eca7eb004418a705501 # v2
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
       # Nextcloud bot approve and merge request
-      - uses: ahmadnassri/action-dependabot-auto-merge@v2
+      - uses: ahmadnassri/action-dependabot-auto-merge@45fc124d949b19b6b8bf6645b6c9d55f4f9ac61a # v2
         with:
           target: minor
           github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }}

.github/workflows/fixup.yml

@@ -5,16 +5,29 @@
 
 name: Pull request checks
 
-on: pull_request
+on:
+    pull_request:
+        types: [opened, ready_for_review, reopened, synchronize]
+
+permissions:
+    contents: read
+
+concurrency:
+    group: fixup-${{ github.head_ref || github.run_id }}
+    cancel-in-progress: true
 
 jobs:
-  commit-message-check:
-    name: Block fixup and squash commits
+    commit-message-check:
+        if: github.event.pull_request.draft == false
 
-    runs-on: ubuntu-latest
+        permissions:
+            pull-requests: write
+        name: Block fixup and squash commits
 
-    steps:
-      - name: Run check
-        uses: xt0rted/block-autosquash-commits-action@v2
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Run check
+              uses: xt0rted/block-autosquash-commits-action@79880c36b4811fe549cfffe20233df88876024e7 # v2
+              with:
+                  repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/integration.yml

@@ -12,6 +12,7 @@ on:
       - 'composer.lock'
   push:
     branches:
+      - main
       - master
       - stable*
 
@@ -25,9 +26,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.4']
+        php-versions: ['8.1']
         databases: ['sqlite', 'mysql', 'pgsql']
-        server-versions: ['stable25']
+        server-versions: ['stable26']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 
@@ -70,16 +71,17 @@ jobs:
           path: apps/${{ env.APP_NAME }}
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@2.21.2
+        uses: shivammathur/setup-php@2.24.0
         with:
           php-version: ${{ matrix.php-versions }}
-          tools: phpunit
-          extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, mysql, pdo_mysql, pgsql, pdo_pgsql,
+          extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, mysql, pdo_mysql, pgsql, pdo_pgsql, apcu
+          ini-values:
+            apc.enable_cli=on
           coverage: none
 
-      - name: Set up PHPUnit
+      - name: Set up dependencies
         working-directory: apps/${{ env.APP_NAME }}
-        run: composer i
+        run: composer i --no-dev
 
       - name: Set up Nextcloud
         run: |
@@ -90,11 +92,63 @@ jobs:
           fi
           mkdir data
           ./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin
+          ./occ config:system:set hashing_default_password --value=true --type=boolean
+          ./occ config:system:set memcache.local --value="\\OC\\Memcache\\APCu"
+          ./occ config:system:set memcache.distributed --value="\\OC\\Memcache\\APCu"
           cat config/config.php
           ./occ user:list
           ./occ app:enable --force ${{ env.APP_NAME }}
+          ./occ config:system:set query_log_file --value '/home/runner/work/${{ env.APP_NAME }}/${{ env.APP_NAME }}/query.log'
           php -S localhost:8080 &
 
       - name: Run behat
         working-directory: apps/${{ env.APP_NAME }}/tests/integration
         run: ./run.sh
+
+      - name: Query count
+        if: ${{ matrix.databases == 'mysql' }}
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            let myOutput = ''
+            let myError = ''
+
+            const options = {}
+            options.listeners = {
+              stdout: (data) => {
+                myOutput += data.toString()
+              },
+              stderr: (data) => {
+                myError += data.toString()
+              }
+            }
+            await exec.exec(`/bin/bash -c "cat /home/runner/work/${{ env.APP_NAME }}/${{ env.APP_NAME }}/query.log | wc -l"`, [], options)
+            msg = myOutput
+            const queryCount = parseInt(myOutput, 10)
+
+            myOutput = ''
+            await exec.exec('cat', ['/home/runner/work/${{ env.APP_NAME }}/${{ env.APP_NAME }}/apps/${{ env.APP_NAME }}/tests/integration/base-query-count.txt'], options)
+            const baseCount = parseInt(myOutput, 10)
+
+            const absoluteIncrease = queryCount - baseCount
+            const relativeIncrease = baseCount <= 0 ? 100 : (parseInt((absoluteIncrease / baseCount * 10000), 10) / 100)
+
+            if (absoluteIncrease >= 100 || relativeIncrease > 5) {
+              const comment = `🐢 Performance warning.\nIt looks like the query count of the integration tests increased with this PR.\nDatabase query count is now ` + queryCount + ' was ' + baseCount + ' (+' + relativeIncrease + '%)\nPlease check your code again. If you added a new test this can be expected and the base value in tests/integration/base-query-count.txt can be increased.'
+              github.rest.issues.createComment({
+                issue_number: context.issue.number,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                body: comment
+              })
+            }
+            if (queryCount < 100) {
+              const comment = `🐈 Performance messuring seems broken. Failed to get query count.`
+              github.rest.issues.createComment({
+                issue_number: context.issue.number,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                body: comment
+              })
+            }

.github/workflows/lint-eslint.yml

@@ -0,0 +1,62 @@
+# This workflow is provided via the organization template repository
+#
+# https://github.com/nextcloud/.github
+# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
+#
+# Use lint-eslint together with lint-eslint-when-unrelated to make eslint a required check for GitHub actions
+# https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks#handling-skipped-but-required-checks
+
+name: Lint
+
+on:
+  pull_request:
+    paths:
+      - '.github/workflows/**'
+      - 'src/**'
+      - 'appinfo/info.xml'
+      - 'package.json'
+      - 'package-lock.json'
+      - 'tsconfig.json'
+      - '.eslintrc.*'
+      - '.eslintignore'
+      - '**.js'
+      - '**.ts'
+      - '**.vue'
+
+permissions:
+  contents: read
+
+concurrency:
+  group: lint-eslint-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    name: eslint
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
+
+      - name: Read package.json node and npm engines version
+        uses: skjnldsv/read-package-engines-version-actions@1bdcee71fa343c46b18dc6aceffb4cd1e35209c6 # v1.2
+        id: versions
+        with:
+          fallbackNode: '^16'
+          fallbackNpm: '^7'
+
+      - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
+        uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516 # v3
+        with:
+          node-version: ${{ steps.versions.outputs.nodeVersion }}
+
+      - name: Set up npm ${{ steps.versions.outputs.npmVersion }}
+        run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Lint
+        run: npm run lint

.github/workflows/lint-php-cs.yml

@@ -0,0 +1,39 @@
+# This workflow is provided via the organization template repository
+#
+# https://github.com/nextcloud/.github
+# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
+
+name: Lint
+
+on: pull_request
+
+permissions:
+  contents: read
+
+concurrency:
+  group: lint-php-cs-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    name: php-cs
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
+
+      - name: Set up php
+        uses: shivammathur/setup-php@2.24.0 # v2
+        with:
+          php-version: 8.1
+          coverage: none
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Install dependencies
+        run: composer i
+
+      - name: Lint
+        run: composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 )

.github/workflows/lint-php.yml

@@ -0,0 +1,59 @@
+# This workflow is provided via the organization template repository
+#
+# https://github.com/nextcloud/.github
+# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
+
+name: Lint
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+      - master
+      - stable*
+
+permissions:
+  contents: read
+
+concurrency:
+  group: lint-php-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  php-lint:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php-versions: [ "8.0", "8.1", "8.2" ]
+
+    name: php-lint
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
+
+      - name: Set up php ${{ matrix.php-versions }}
+        uses: shivammathur/setup-php@2.24.0 # v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          coverage: none
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Lint
+        run: composer run lint
+
+  summary:
+    permissions:
+      contents: none
+    runs-on: ubuntu-latest
+    needs: php-lint
+
+    if: always()
+
+    name: php-lint-summary
+
+    steps:
+      - name: Summary status
+        run: if ${{ needs.php-lint.result != 'success' && needs.php-lint.result != 'skipped' }}; then exit 1; fi

.github/workflows/lint-stylelint.yml

@@ -0,0 +1,46 @@
+# This workflow is provided via the organization template repository
+#
+# https://github.com/nextcloud/.github
+# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
+
+name: Lint
+
+on: pull_request
+
+permissions:
+  contents: read
+
+concurrency:
+  group: lint-stylelint-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    name: stylelint
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
+
+      - name: Read package.json node and npm engines version
+        uses: skjnldsv/read-package-engines-version-actions@1bdcee71fa343c46b18dc6aceffb4cd1e35209c6 # v1.2
+        id: versions
+        with:
+          fallbackNode: '^16'
+          fallbackNpm: '^7'
+
+      - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
+        uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516 # v3
+        with:
+          node-version: ${{ steps.versions.outputs.nodeVersion }}
+
+      - name: Set up npm ${{ steps.versions.outputs.npmVersion }}
+        run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Lint
+        run: npm run stylelint

.github/workflows/lint.yml

@@ -1,88 +0,0 @@
-name: Lint
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - stable*
-
-jobs:
-  php:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        php-versions: ['7.4', '8.0', '8.1']
-
-    name: php${{ matrix.php-versions }} lint
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up php${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@2.21.2
-        with:
-          php-version: ${{ matrix.php-versions }}
-          coverage: none
-      - name: Lint
-        run: composer run lint
-
-  php-cs-fixer:
-    name: php-cs check
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-    - name: Set up php
-      uses: shivammathur/setup-php@2.21.2
-      with:
-        php-version: 7.4
-        coverage: none
-    - name: Install dependencies
-      run: composer i
-    - name: Run coding standards check
-      run: composer run cs:check
-
-  node:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [14.x]
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Use node ${{ 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: Install dependencies
-        run: npm ci
-      - name: ESLint
-        run: npm run lint
-
-  stylelint:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [14.x]
-
-    name: stylelint node${{ matrix.node-version }}
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Set up node ${{ 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: Install dependencies
-        run: npm ci
-
-      - name: Lint
-        run: npm run stylelint

.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.21.2
+      uses: shivammathur/setup-php@2.24.0
       with:
         php-version: '7.4'
         tools: composer
@@ -44,14 +44,14 @@ jobs:
         git config --local user.name "GitHub Action"
         git tag -f nightly
     - name: Push tag
-      uses: juliushaertl/github-push-action@master
+      uses: juliushaertl/github-push-action@main
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
         tags: true
         force: true
     - name: Create Release
       id: create_release
-      uses: juliushaertl/action-release@master
+      uses: juliushaertl/action-release@main
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         tag: nightly

.github/workflows/phpunit.yml

@@ -26,9 +26,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.4', '8.0', '8.1']
+        php-versions: ['8.0', '8.1', '8.2']
         databases: ['sqlite', 'mysql', 'pgsql']
-        server-versions: ['stable25']
+        server-versions: ['stable26']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 
@@ -70,7 +70,7 @@ jobs:
           path: apps/${{ env.APP_NAME }}
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@2.21.2
+        uses: shivammathur/setup-php@2.24.0
         with:
           php-version: ${{ matrix.php-versions }}
           tools: phpunit

.github/workflows/psalm.yml

@@ -13,6 +13,10 @@ on:
       - main
       - stable*
 
+concurrency:
+  group: psalm-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   static-analysis:
     runs-on: ubuntu-latest
@@ -20,13 +24,15 @@ jobs:
     name: Nextcloud
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
 
       - name: Set up php
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@2.24.0 # v2
         with:
-          php-version: 7.4
+          php-version: 8.1
           coverage: none
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install dependencies
         run: composer i

.github/workflows/update-nextcloud-ocp.yml

@@ -17,22 +17,24 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branches: ["master", "stable25", "stable24", "stable23"]
+        branches: ["master", "stable25", "stable24"]
 
     name: update-nextcloud-ocp-${{ matrix.branches }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
         with:
           ref: ${{ matrix.branches }}
           submodules: true
 
-      - name: Set up php7.4
-        uses: shivammathur/setup-php@v2
+      - name: Set up php8.1
+        uses: shivammathur/setup-php@2.24.0 # v2
         with:
-          php-version: 7.4
+          php-version: 8.1
           extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
           coverage: none
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Composer install
         run: composer install
@@ -45,14 +47,15 @@ jobs:
         run: |
           git clean -f 3rdparty
           git clean -f vendor
-          git checkout 3rdparty vendor
+          git clean -f vendor-bin
+          git checkout 3rdparty vendor vendor-bin
         continue-on-error: true
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v3
+        uses: peter-evans/create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04 # v3
         with:
           token: ${{ secrets.COMMAND_BOT_PAT }}
-          commit-message: Update psalm baseline
+          commit-message: "chore(dev-deps): Bump nextcloud/ocp package"
           committer: GitHub <noreply@github.com>
           author: nextcloud-command <nextcloud-command@users.noreply.github.com>
           signoff: true

.gitignore

@@ -3,9 +3,11 @@ js/
 build/
 css/style.css
 css/vendor.css
+cypress/videos/
 tests/integration/vendor/
 tests/integration/composer.lock
 tests/.phpunit.result.cache
 vendor/
 .php_cs.cache
 \.idea/
+settings.json

.tx/config

@@ -1,6 +1,6 @@
 [main]
 host     = https://www.transifex.com
-lang_map = bg_BG: bg, cs_CZ: cs, fi_FI: fi, hu_HU: hu, nb_NO: nb, sk_SK: sk, th_TH: th, ja_JP: ja
+lang_map = hu_HU: hu, nb_NO: nb, sk_SK: sk, th_TH: th, ja_JP: ja, bg_BG: bg, cs_CZ: cs, fi_FI: fi
 
 [o:nextcloud:p:nextcloud:r:deck]
 file_filter = translationfiles/<lang>/deck.po

CHANGELOG.md

@@ -1,47 +1,66 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## 1.8.4
+## 1.9.2
 
 ### Fixed
 
-- fix: Use passed userid when getting attachment folder [#4540](https://github.com/nextcloud/deck/pull/4540)
-- fix: Adapt NcEmptyContent usages to new slots [#4563](https://github.com/nextcloud/deck/pull/4563)
-- Gracefully handle not found card for a share [#4568](https://github.com/nextcloud/deck/pull/4568)
-- allow user to toggle visibility of the calendar for a deck board [#4626](https://github.com/nextcloud/deck/pull/4626)
-- fix: Append datetime picker to body to avoid cut off [#4645](https://github.com/nextcloud/deck/pull/4645)
-- Fix : Overlapping expiry dates on tags [#4536](https://github.com/nextcloud/deck/pull/4536)
-- Better display of card dates (creation and change dates) [#4620](https://github.com/nextcloud/deck/pull/4620)
-- Dependency updates
+- fix: Properly overwrite z-index of datepicker above modal [#4665](https://github.com/nextcloud/deck/pull/4665)
 
-## 1.8.3
+
+## 1.9.1
 
 ### Fixed
 
-- Fix component renaming so that acl works on shares again [#4328](https://github.com/nextcloud/deck/pull/4328)
-- Permanently delete deck cards marked as deleted after 5 min in a cron job [#4301](https://github.com/nextcloud/deck/pull/4301)
-- Dependency updates
+- Gracefully handle not found card for a share [#4567](https://github.com/nextcloud/deck/pull/4567)
+- fix: Adapt NcEmptyContent usages to new slots [#4562](https://github.com/nextcloud/deck/pull/4562)
+- allow user to toggle visibility of the calendar for a deck board [#4625](https://github.com/nextcloud/deck/pull/4625)
+- fix: Append datetime picker to body to avoid cut off [#4644](https://github.com/nextcloud/deck/pull/4644)
+- chore: Remove unused @nextcloud/vue-dashboard @juliushaertl [#4650](https://github.com/nextcloud/deck/pull/4650)
+- fix: Bring back overdue column by removing faulty condition [#4662](https://github.com/nextcloud/deck/pull/4662)
+- Fix : Overlapping expiry dates on tags [#4537](https://github.com/nextcloud/deck/pull/4537)
+- Better display of card dates (creation and change dates) [#4619](https://github.com/nextcloud/deck/pull/4619)
+- Update dependencies
 
-
-## 1.8.2
-
-### Fixed
-
-- 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.8.1
-
-### Fixed
-
- - Fix Duedate activity @nickvergessen [#4155](https://github.com/nextcloud/deck/pull/4155)
-
-## 1.8.0
+## 1.9.0
 
 ### Added
 
+- Live updates on board collaboration using notify_push  @alangecker [#4273](https://github.com/nextcloud/deck/pull/4273)
+- Basic notify_push usage with session handling @alangecker [#3876](https://github.com/nextcloud/deck/pull/3876)
+- Use text as editor if available [#4399](https://github.com/nextcloud/deck/pull/4399)
+- Improve reference provider and add reference widgets @julien-nc [#4422](https://github.com/nextcloud/deck/pull/4422)
+- Tag creation from card view @juliushaertl [#4344](https://github.com/nextcloud/deck/pull/4344)
+- Optimize query performance with larger board or card count @[#4452](https://github.com/nextcloud/deck/pull/4452)
+- Export Board as CSV @david-loe [#3065](https://github.com/nextcloud/deck/pull/3065)
+
+
+### Fixed
+
+- fix(cards): Fix card sizing by limiting too wide style rules [#4521](https://github.com/nextcloud/deck/pull/4521)
+- fix(references): Mute NoPermissionException as it is expected to happen for references [#4516](https://github.com/nextcloud/deck/pull/4516)
+- fix(API): Fix board API details parameter to work as expected [#4519](https://github.com/nextcloud/deck/pull/4519)
+- fix(sessions): Do not send close request without token [#4525](https://github.com/nextcloud/deck/pull/4525)
+- fix: Avoid mutating the due date when calculating days @juliushaertl [#4488](https://github.com/nextcloud/deck/pull/4488)
+- fix: Pass user id along to properly check permissions in background jobs @juliushaertl [#4485](https://github.com/nextcloud/deck/pull/4485)
+- fix: Use passed userid when getting attachment folder @juliushaertl [#4487](https://github.com/nextcloud/deck/pull/4487)
+- fix: Use proper z-index for text menubar @juliushaertl [#4490](https://github.com/nextcloud/deck/pull/4490)
+- fix(dashboard): Fix undefined array index @marcelklehr [#4492](https://github.com/nextcloud/deck/pull/4492)
+- fix: Always return sorted index array to make sure a json array is the result @juliushaertl [#4493](https://github.com/nextcloud/deck/pull/4493)
+- Fix component renaming so that acl works on shares again @small1 [#4315](https://github.com/nextcloud/deck/pull/4315)
+- fix(Sidebar): Only close sidebar on v-click-outside for specific targets @juliushaertl [#4350](https://github.com/nextcloud/deck/pull/4350)
+- add basic e2e tests for stack title @shoetten [#4206](https://github.com/nextcloud/deck/pull/4206)
+- App metadata: add links to user and developer documentation @p-bo [#4356](https://github.com/nextcloud/deck/pull/4356)
+- Update signature of Entity::markFieldUpdated @nickvergessen [#4398](https://github.com/nextcloud/deck/pull/4398)
+- Remove updated nightly information @xf- [#4419](https://github.com/nextcloud/deck/pull/4419)
+- perf: Register notifier and resource listener lazy @juliushaertl [#4439](https://github.com/nextcloud/deck/pull/4439)
+- perf: Lazy load dashboard components @juliushaertl [#4440](https://github.com/nextcloud/deck/pull/4440)
+- Optimise upcomming overview creation @Raudius [#3793](https://github.com/nextcloud/deck/pull/3793)
+
+
+## 1.8.0-beta.1
+### Enhancements
+
 - Nextcloud 25 compatibility
 - Performance improvements
   - Use capped memory cache for board permissions @juliushaertl [#3980](https://github.com/nextcloud/deck/pull/3980)
@@ -52,26 +71,10 @@ All notable changes to this project will be documented in this file.
   - 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)
+- Bump dependencies
 
 ### 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)
@@ -516,7 +519,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
@@ -643,7 +646,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
@@ -717,7 +720,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
 
@@ -725,9 +728,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 
 

Makefile

@@ -30,6 +30,16 @@ build: clean-dist install-deps build-js
 
 release: clean-dist install-deps-nodev build-js
 
+lint: lint-js lint-php
+
+lint-js:
+	npm run lint
+	npm run stylelint
+
+lint-php:
+	composer run lint 1>/dev/null
+	composer run cs:check
+
 build-js: install-deps-js
 	npm run build
 

README.md

@@ -1,6 +1,6 @@
 # Deck
 
-[![Build Status](https://travis-ci.org/nextcloud/deck.svg?branch=master)](https://travis-ci.org/nextcloud/deck) [![CodeCov](https://codecov.io/github/nextcloud/deck/coverage.svg?branch=master)](https://codecov.io/github/nextcloud/deck) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/e403f723f42a4abd93b2cfe36cbd7eee)](https://www.codacy.com/app/juliushaertl/deck?utm_source=github.com&utm_medium=referral&utm_content=nextcloud/deck&utm_campaign=Badge_Grade) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nextcloud/deck/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/nextcloud/deck/?branch=master) [![#nextcloud-deck](https://img.shields.io/badge/IRC-%23nextcloud--deck%20on%20freenode-blue.svg)](https://webchat.freenode.net/?channels=nextcloud-deck)
+[![Build Status](https://travis-ci.org/nextcloud/deck.svg?branch=main)](https://travis-ci.org/nextcloud/deck) [![CodeCov](https://codecov.io/github/nextcloud/deck/coverage.svg?branch=main)](https://codecov.io/github/nextcloud/deck) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/e403f723f42a4abd93b2cfe36cbd7eee)](https://www.codacy.com/app/juliushaertl/deck?utm_source=github.com&utm_medium=referral&utm_content=nextcloud/deck&utm_campaign=Badge_Grade) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nextcloud/deck/badges/quality-score.png?b=main)](https://scrutinizer-ci.com/g/nextcloud/deck/?branch=main) [![#nextcloud-deck](https://img.shields.io/badge/IRC-%23nextcloud--deck%20on%20freenode-blue.svg)](https://webchat.freenode.net/?channels=nextcloud-deck)
 
 
 Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.
@@ -20,6 +20,7 @@ Deck is a kanban style organization tool aimed at personal planning and project
 ### Mobile apps
 
 - [Nextcloud Deck app for Android](https://github.com/stefan-niedermann/nextcloud-deck) - It is available in [F-Droid](https://f-droid.org/de/packages/it.niedermann.nextcloud.deck/) and the [Google Play Store](https://play.google.com/store/apps/details?id=it.niedermann.nextcloud.deck.play)
+- [deck NG for Android and iOS](https://github.com/meltzow/deck-ng) - It is available in [Google Play Store](https://play.google.com/store/apps/details?id=net.meltzow.deckng) and [Apple App Store](https://apps.apple.com/us/app/deck-ng/id6443334702)
 
 ### 3rd-Party Integrations
 
@@ -48,10 +49,6 @@ make build
 
 Please make sure you have installed the following dependencies: `make, which, tar, npm, curl, composer`
 
-### Install the nightly builds
-
-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.
@@ -65,13 +62,18 @@ Improvements on Nextcloud server and Deck itself will improve the situation.
 
 ## Developing
 
+### Nextcloud environment
+
+You need to setup a [development environment](https://docs.nextcloud.com/server/latest/developer_manual//getting_started/devenv.html) of the current nextcloud version. You can also alternatively install & run the [nextcloud docker container](https://github.com/juliushaertl/nextcloud-docker-dev).
+After the finished installation, you can clone the deck project directly in the `/[nextcloud-docker-dev-dir]/workspace/server/apps/` folder. 
+
 ### PHP
 
 Nothing to prepare, just dig into the code.
 
 ### JavaScript
 
-This requires at least Node 14 and npm 7 to be installed.
+This requires at least Node 16 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.
 

SECURITY.md

@@ -20,7 +20,7 @@ Your report should include:
 - Reproduction steps
 
 A member of the security team will confirm the vulnerability, determine its impact, and develop a fix.
-The fix will be applied to the master branch, tested, and packaged in the next security release.
+The fix will be applied to the main branch, tested, and packaged in the next security release.
 The vulnerability will be publicly announced after the release. Finally, your name will be added
 to the [hall of fame](https://hackerone.com/nextcloud/thanks) as a thank you from the entire Nextcloud community. Note our 
 [threat model](https://nextcloud.com/security/threat-model) to know what is expected behavior.

appinfo/info.xml

@@ -16,9 +16,13 @@
 - 🚀 Get your project organized
 
 </description>
-    <version>1.8.4</version>
+    <version>1.9.2</version>
     <licence>agpl</licence>
     <author>Julius Härtl</author>
+    <documentation>
+        <user>https://deck.readthedocs.io/en/latest/User_documentation_en/</user>
+        <developer>https://deck.readthedocs.io/en/latest/API/</developer>
+    </documentation>
     <namespace>Deck</namespace>
     <types>
         <dav/>
@@ -34,13 +38,19 @@
         <database min-version="9.4">pgsql</database>
         <database>sqlite</database>
         <database min-version="8.0">mysql</database>
-        <nextcloud min-version="25" max-version="25"/>
+        <nextcloud min-version="26" max-version="26"/>
     </dependencies>
     <background-jobs>
         <job>OCA\Deck\Cron\DeleteCron</job>
         <job>OCA\Deck\Cron\ScheduledNotifications</job>
         <job>OCA\Deck\Cron\CardDescriptionActivity</job>
+        <job>OCA\Deck\Cron\SessionsCleanup</job>
     </background-jobs>
+    <repair-steps>
+        <live-migration>
+            <step>OCA\Deck\Migration\DeletedCircleCleanup</step>
+        </live-migration>
+    </repair-steps>
     <commands>
         <command>OCA\Deck\Command\UserExport</command>
         <command>OCA\Deck\Command\BoardImport</command>

appinfo/routes.php

@@ -40,6 +40,7 @@ return [
 		['name' => 'board#deleteAcl', 'url' => '/boards/{boardId}/acl/{aclId}', 'verb' => 'DELETE'],
 		['name' => 'board#clone', 'url' => '/boards/{boardId}/clone', 'verb' => 'POST'],
 		['name' => 'board#transferOwner', 'url' => '/boards/{boardId}/transferOwner', 'verb' => 'PUT'],
+		['name' => 'board#export', 'url' => '/boards/{boardId}/export', 'verb' => 'GET'],
 
 		// stacks
 		['name' => 'stack#index', 'url' => '/stacks/{boardId}', 'verb' => 'GET'],
@@ -149,5 +150,10 @@ return [
 		['name' => 'overview_api#upcomingCards', 'url' => '/api/v{apiVersion}/overview/upcoming', 'verb' => 'GET'],
 
 		['name' => 'search#search', 'url' => '/api/v{apiVersion}/search', 'verb' => 'GET'],
+
+		// sessions
+		['name' => 'Session#create', 'url' => '/api/v{apiVersion}/session/create', 'verb' => 'PUT'],
+		['name' => 'Session#sync', 'url' => '/api/v{apiVersion}/session/sync', 'verb' => 'POST'],
+		['name' => 'Session#close', 'url' => '/api/v{apiVersion}/session/close', 'verb' => 'POST'],
 	]
 ];

composer.json

@@ -17,9 +17,9 @@
 		"phpunit/phpunit": "^9",
 		"nextcloud/coding-standard": "^1.0.0",
 		"symfony/event-dispatcher": "^4.0",
-		"vimeo/psalm": "^4.3",
+		"vimeo/psalm": "^5.4",
 		"php-parallel-lint/php-parallel-lint": "^1.2",
-		"nextcloud/ocp": "dev-stable25"
+		"nextcloud/ocp": "dev-stable26"
 	},
 	"config": {
 		"optimize-autoloader": true,
@@ -28,7 +28,7 @@
 			"composer/package-versions-deprecated": true
 		},
 		"platform": {
-			"php": "7.4"
+			"php": "8.0"
 		}
 	},
 	"scripts": {
@@ -42,8 +42,8 @@
 			"@test:unit",
 			"@test:integration"
 		],
-		"test:unit": "phpunit -c tests/phpunit.xml",
-		"test:integration": "phpunit -c tests/phpunit.integration.xml && cd tests/integration && ./run.sh"
+		"test:unit": "vendor/bin/phpunit -c tests/phpunit.xml",
+		"test:integration": "vendor/bin/phpunit -c tests/phpunit.integration.xml && cd tests/integration && ./run.sh"
 	},
 	"autoload-dev": {
 		"psr-4": {

cypress.config.js

@@ -1,17 +1,16 @@
 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}',
-  },
+	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',
+		specPattern: 'cypress/e2e/**/*.{js,jsx,ts,tsx}',
+	},
 })

cypress/.eslintrc.js

@@ -0,0 +1,5 @@
+module.exports = {
+	extends: [
+		'plugin:cypress/recommended',
+	],
+}

cypress/e2e/boardFeatures.js

@@ -1,15 +1,17 @@
-import { randHash } from '../utils'
-const randUser = randHash()
+import { randUser } from '../utils/index.js'
+const user = randUser()
+const recipient = randUser()
 
 describe('Board', function() {
-	const password = 'pass123'
 
 	before(function() {
-		cy.nextcloudCreateUser(randUser, password)
+		cy.createUser(user)
+		cy.createUser(recipient)
 	})
 
 	beforeEach(function() {
-		cy.login(randUser, password)
+		cy.login(user)
+		cy.visit('/apps/deck')
 	})
 
 	it('Can create a board', function() {
@@ -21,7 +23,6 @@ describe('Board', function() {
 		}).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 })
 
@@ -38,4 +39,18 @@ describe('Board', function() {
 		cy.get('.app-navigation__list .app-navigation-entry__children .app-navigation-entry')
 			.contains(board).should('be.visible')
 	})
+
+	it('Shows and hides the navigation', () => {
+		cy.get('#app-navigation-vue .app-navigation__list .app-navigation-entry')
+			.contains('Upcoming cards')
+			.should('be.visible')
+		cy.openLeftSidebar()
+		cy.get('#app-navigation-vue .app-navigation__list .app-navigation-entry')
+			.contains('Upcoming cards')
+			.should('not.be.visible')
+		cy.openLeftSidebar()
+		cy.get('#app-navigation-vue .app-navigation__list .app-navigation-entry')
+			.contains('Upcoming cards')
+			.should('be.visible')
+	})
 })

cypress/e2e/cardFeatures.js

@@ -1,53 +1,47 @@
-import { randHash } from '../utils'
-const randUser = randHash()
+import { randUser } from '../utils/index.js'
+import { sampleBoard } from '../utils/sampleBoard'
 
-const testBoardData = {
-	title: 'MyBoardTest',
-	color: '00ff00',
-	stacks: [
-		{
-			title: 'TestList',
-			cards: [
-				{
-					title: 'Hello world',
-				},
-			],
-		},
-	],
+const user = randUser()
+const boardData = sampleBoard()
+
+const auth = {
+	user: user.userId,
+	password: user.password,
+}
+
+const useModal = (useModal) => {
+	return cy.request({
+		method: 'POST',
+		url: `${Cypress.env('baseUrl')}/ocs/v2.php/apps/deck/api/v1.0/config/cardDetailsInModal?format=json`,
+		auth,
+		body: { value: useModal },
+	}).then((response) => {
+		expect(response.status).to.eq(200)
+	})
 }
 
 describe('Card', function() {
+	let boardId
 	before(function() {
-		cy.nextcloudCreateUser(randUser, randUser)
+		cy.createUser(user)
+		cy.login(user)
 		cy.createExampleBoard({
-			user: randUser,
-			password: randUser,
-			board: testBoardData,
+			user,
+			board: boardData,
+		}).then((board) => {
+			boardId = board.id
 		})
 	})
 
 	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')
+		cy.login(user)
 	})
 
 	it('Can add a card', function() {
+		cy.visit(`/apps/deck/#/board/${boardId}`)
 		const newCardTitle = 'Write some cypress tests'
 
-		cy.openLeftSidebar()
-		cy.getNavigationEntry(testBoardData.title)
+		cy.getNavigationEntry(boardData.title)
 			.first().click({ force: true })
 
 		cy.get('.board .stack').eq(0).within(() => {
@@ -64,4 +58,72 @@ describe('Card', function() {
 		})
 	})
 
+	describe('Modal', () => {
+		beforeEach(function() {
+			cy.login(user)
+			useModal(true).then(() => {
+				cy.visit(`/apps/deck/#/board/${boardId}`)
+			})
+		})
+
+		it('Can show card details modal', function() {
+			cy.getNavigationEntry(boardData.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('Attachment from files app', () => {
+			cy.get('.card:contains("Hello world")').should('be.visible').click()
+			cy.get('.modal__card').should('be.visible')
+			cy.get('.app-sidebar-tabs__tab [data-id="attachments"]').click()
+			cy.get('button.icon-upload').should('be.visible')
+			cy.get('button.icon-folder').should('be.visible')
+				.click()
+			cy.get('.oc-dialog #picker-filestable tr[data-entryname="welcome.txt"] td.filename').should('be.visible')
+				.click()
+			cy.get('.oc-dialog button.primary').click()
+			cy.get('.attachment-list .basename').contains('welcome.txt')
+		})
+
+		it('Shows the modal with the editor', () => {
+			cy.get('.card:contains("Hello world")').should('be.visible').click()
+			cy.intercept({ method: 'PUT', url: '**/apps/deck/cards/*' }).as('save')
+			cy.get('.modal__card').should('be.visible')
+			cy.get('.app-sidebar-header__maintitle').contains('Hello world')
+			cy.get('.modal__card .ProseMirror h1').contains('Hello world').should('be.visible')
+			cy.get('.modal__card .ProseMirror h1')
+				.click()
+				.type(' writing more text{enter}- List item{enter}with entries{enter}{enter}Paragraph')
+			cy.wait('@save', { timeout: 7000 })
+
+			cy.reload()
+			cy.get('.modal__card').should('be.visible')
+			cy.get('.modal__card .ProseMirror h1').contains('Hello world writing more text').should('be.visible')
+			cy.get('.modal__card .ProseMirror li').eq(0).contains('List item').should('be.visible')
+			cy.get('.modal__card .ProseMirror li').eq(1).contains('with entries').should('be.visible')
+			cy.get('.modal__card .ProseMirror p').contains('Paragraph').should('be.visible')
+		})
+	})
+
+	describe('Sidebar', () => {
+		beforeEach(function() {
+			cy.login(user)
+			useModal(false).then(() => {
+				cy.visit(`/apps/deck/#/board/${boardId}`)
+			})
+		})
+
+		it('Show the sidebar', () => {
+			cy.get('.card:contains("Hello world")').should('be.visible').click()
+			cy.get('#app-sidebar-vue')
+				.find('.ProseMirror h1').contains('Hello world writing more text').should('be.visible')
+		})
+	})
+
 })

cypress/e2e/deckDashboard.js

@@ -1,27 +1,25 @@
-import { randHash } from '../utils'
-const randUser = randHash()
+import { randUser } from '../utils/index.js'
+const user = randUser()
 
 describe('Deck dashboard', function() {
-	const password = 'pass123'
-
 	before(function() {
-		cy.nextcloudCreateUser(randUser, password)
+		cy.createUser(user)
 	})
 
 	beforeEach(function() {
-		cy.login(randUser, password)
+		cy.login(user)
+		cy.visit('/apps/deck')
 	})
 
 	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')
+			.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()

cypress/e2e/sharingFeatures.js

@@ -0,0 +1,50 @@
+import { randUser } from '../utils/index.js'
+import { sampleBoard } from '../utils/sampleBoard'
+const user = randUser()
+const recipient = randUser()
+
+describe('Board', function() {
+	before(function() {
+		cy.createUser(user)
+		cy.createUser(recipient)
+	})
+
+	beforeEach(function() {
+		cy.login(user)
+	})
+
+	it('Share a board to a user', function() {
+		const board = sampleBoard('Read only board')
+		cy.createExampleBoard({ user, board }).then((board) => {
+			const boardId = board.id
+			cy.visit(`/apps/deck/#/board/${boardId}`)
+			cy.get('.board-title').contains(board.title)
+
+			cy.shareBoardWithUi(recipient.userId)
+
+			cy.login(recipient)
+			cy.visit(`/apps/deck/#/board/${boardId}`)
+			cy.get('.board-title').contains(board.title)
+			cy.get('.button-vue[aria-label*="Add card"]')
+				.should('not.exist')
+		})
+	})
+
+	it('Share a board to a user as writable', function() {
+		const board = sampleBoard('Editable board')
+		cy.createExampleBoard({ user, board }).then((board) => {
+			const boardId = board.id
+			cy.visit(`/apps/deck/#/board/${boardId}`)
+			cy.get('.board-title').contains(board.title)
+
+			cy.shareBoardWithUi(recipient.userId)
+			cy.get(`[data-cy="acl-participant:${recipient.userId}"]`).find('[data-cy="action:permission-edit"]').click()
+
+			cy.login(recipient)
+			cy.visit(`/apps/deck/#/board/${boardId}`)
+			cy.get('.board-title').contains(board.title)
+			cy.get('.button-vue[aria-label*="Add card"]')
+				.first().click()
+		})
+	})
+})

cypress/e2e/stackFeatures.js

@@ -1,30 +1,68 @@
-import { randHash } from '../utils'
-const randUser = randHash()
+import { randUser } from '../utils/index.js'
+const user = randUser()
+
+const boardTitle = 'TestBoard'
+const testBoardData = {
+	title: boardTitle,
+	stacks: [
+		{ title: 'Existing Stack1' },
+		{ title: 'Existing Stack2' },
+	],
+}
 
 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)
+		cy.createUser(user)
+		cy.login(user)
+		cy.createExampleBoard({
+			user,
+			board: testBoardData,
+		})
 	})
 
 	beforeEach(function() {
-		cy.logout()
-		cy.login(randUser, password)
+		cy.login(user)
+		cy.visit('/apps/deck')
+
+		cy.openLeftSidebar()
+		cy.getNavigationEntry(boardTitle)
+			.click({ force: true })
 	})
 
 	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.focused().type('List 1')
 		cy.get('#stack-add form input[type=submit]').first().click()
 
-		cy.get('.board .stack').eq(0).contains(stack).should('be.visible')
+		cy.contains('List 1').should('be.visible')
+	})
+
+	it('Can edit a stack title', function() {
+		cy.contains('Existing Stack1')
+		cy.get('[data-cy-stack="Existing Stack1"]').within(() => {
+			cy.contains('Existing Stack1').click()
+			cy.focused().type(' renamed')
+			cy.get('[data-cy="editStackTitleForm"] input[type="submit"]').click()
+		})
+		cy.contains('Existing Stack1 renamed').should('be.visible')
+	})
+
+	it('Can abort a stack title edit via esc', function() {
+		cy.contains('Existing Stack2').click()
+		cy.focused().type(' with a new title, maybe?')
+		cy.focused().type('{esc}')
+
+		cy.contains('Existing Stack2').should('be.visible')
+		cy.contains('Existing Stack2 with a new title, maybe?').should('not.exist')
+	})
+
+	it('Can abort a stack title edit via click outside', function() {
+		cy.contains('Existing Stack2').click()
+		cy.focused().type(' with a new title, maybe?')
+		cy.get('[data-cy-stack="Existing Stack2"]').click('bottom')
+
+		cy.contains('Existing Stack2').should('be.visible')
+		cy.contains('Existing Stack2 with a new title, maybe?').should('not.exist')
 	})
 })

cypress/support/commands.js

@@ -20,61 +20,13 @@
  *
  */
 
+import { addCommands } from '@nextcloud/cypress'
+
+addCommands()
+
 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()
 })
@@ -111,14 +63,15 @@ Cypress.Commands.add('deckCreateList', ({ user, password }, title) => {
 	cy.get('#stack-add form input[type=submit]').first().click()
 })
 
-Cypress.Commands.add('createExampleBoard', ({ user, password, board }) => {
+Cypress.Commands.add('createExampleBoard', ({ user, board }) => {
+	const auth = {
+		user: user.userId,
+		password: user.password,
+	}
 	cy.request({
 		method: 'POST',
 		url: `${Cypress.env('baseUrl')}/index.php/apps/deck/api/v1.0/boards`,
-		auth: {
-			user,
-			password,
-		},
+		auth,
 		body: { title: board.title, color: board.color ?? 'ff0000' },
 	}).then((boardResponse) => {
 		expect(boardResponse.status).to.eq(200)
@@ -128,10 +81,7 @@ Cypress.Commands.add('createExampleBoard', ({ user, password, board }) => {
 			cy.request({
 				method: 'POST',
 				url: `${Cypress.env('baseUrl')}/index.php/apps/deck/api/v1.0/boards/${boardData.id}/stacks`,
-				auth: {
-					user,
-					password,
-				},
+				auth,
 				body: { title: stack.title, order: 0 },
 			}).then((stackResponse) => {
 				const stackData = stackResponse.body
@@ -140,15 +90,13 @@ Cypress.Commands.add('createExampleBoard', ({ user, password, board }) => {
 					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 },
+						auth,
+						body: { title: card.title, description: card.description ?? '' },
 					})
 				}
 			})
 		}
+		cy.wrap(boardData)
 	})
 })
 
@@ -157,3 +105,13 @@ Cypress.Commands.add('getNavigationEntry', (boardTitle) => {
 		.find('ul.app-navigation-entry__children .app-navigation-entry:contains(' + boardTitle + ')')
 		.find('a.app-navigation-entry-link')
 })
+
+Cypress.Commands.add('shareBoardWithUi', (userId) => {
+	cy.get('[aria-label="Open details"]').click()
+	cy.get('.app-sidebar').should('be.visible')
+	cy.get('.multiselect__input').type(`${userId}`)
+	cy.get('.multiselect__content .multiselect__element').first().contains(userId)
+	cy.get('.multiselect__input').type('{enter}')
+
+	cy.get('.shareWithList').contains(userId)
+})

cypress/support/component-index.html

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <title>Components App</title>
+  </head>
+  <body>
+    <div data-cy-root></div>
+  </body>
+</html>

cypress/support/component.js

@@ -0,0 +1,27 @@
+// ***********************************************************
+// This example support/component.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')
+
+import { mount } from 'cypress/vue2'
+
+Cypress.Commands.add('mount', mount)
+
+// Example use:
+// cy.mount(MyComponent)

cypress/support/e2e.js

@@ -14,7 +14,7 @@
 // ***********************************************************
 
 // Import commands.js using ES2015 syntax:
-import './commands'
+import './commands.js'
 
 // Alternatively you can use CommonJS syntax:
 // require('./commands')

cypress/utils/index.js

@@ -1 +1,4 @@
+import { User } from '@nextcloud/cypress'
+
 export const randHash = () => Math.random().toString(36).replace(/[^a-z]+/g, '').slice(0, 10)
+export const randUser = () => new User(randHash(), randHash())

cypress/utils/sampleBoard.js

@@ -0,0 +1,38 @@
+/*
+ * @copyright Copyright (c) 2022 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+export const sampleBoard = (title = 'MyTestBoard') => {
+	return {
+		title: title,
+		color: '00ff00',
+		stacks: [
+			{
+				title: 'TestList',
+				cards: [
+					{
+						title: 'Hello world',
+						description: '# Hello world',
+					},
+				],
+			},
+		],
+	}
+}

docs/API.md

@@ -1066,6 +1066,7 @@ Deck stores user and app configuration values globally and per board. The GET en
 | --- | --- |
 | calendar | Determines if the calendar/tasks integration through the CalDAV backend is enabled for the user (boolean) | 
 | cardDetailsInModal | Determines if the bigger view is used (boolean) | 
+| cardIdBadge | Determines if the ID badges are displayed on cards (boolean) | 
 | groupLimit | Determines if creating new boards is limited to certain groups of the instance. The resulting output is an array of group objects with the id and the displayname (Admin only)|  
 
 ```
@@ -1079,6 +1080,7 @@ Deck stores user and app configuration values globally and per board. The GET en
     "data": {
       "calendar": true,
       "cardDetailsInModal": true,
+      "cardIdBadge": true,
       "groupLimit": [
         {
           "id": "admin",
@@ -1109,6 +1111,7 @@ Deck stores user and app configuration values globally and per board. The GET en
 | notify-due | `off`, `assigned` or `all` |
 | calendar | Boolean |
 | cardDetailsInModal | Boolean |
+| cardIdBadge | Boolean |
  
 #### Example request
 
@@ -1391,3 +1394,110 @@ A bad request response is returned if invalid input values are provided. The res
 A not found response might be returned if:
 - The card for the given cardId could not be found
 - The comment could not be found
+
+
+## Sessions
+
+### PUT /session/create - creates a new session
+
+#### Request parameters
+
+| Parameter | Type    | Description                                          |
+| --------- | ------- | ---------------------------------------------------- |
+| boardId   | Integer | The id of the opened board |
+
+```
+curl -X PUT 'https://admin:admin@nextcloud/ocs/v2.php/apps/deck/api/v1.0/session/create' \
+    -H 'Accept: application/json' -H 'OCS-APIRequest: true' \
+    -H 'Content-Type: application/json;charset=utf-8' \
+    --data '{"boardId":1}'
+```
+
+#### Response
+
+##### 200 Success
+
+```json
+{
+  "ocs": {
+    "meta": {
+      "status": "ok",
+      "statuscode": 200,
+      "message": "OK"
+    },
+    "data": {
+      "token": "+zcJHf4rC6dobVSbuNa3delkCSfTW8OvYWTyLFvSpIv80FjtgLIj0ARlxspsazNQ"
+    }
+  }
+}
+```
+
+
+### POST /session/sync - notifies the server, that the session is still open
+
+#### Request body
+
+| Parameter | Type    | Description                                          |
+| --------- | ------- | ---------------------------------------------------- |
+| boardId   | Integer | The id of the opened board |
+| token     | String  | The session token from the /sessions/create response |
+
+
+```
+curl -X POST 'https://admin:admin@nextcloud/ocs/v2.php/apps/deck/api/v1.0/session/create' \
+    -H 'Accept: application/json' -H 'OCS-APIRequest: true' \
+    -H 'Content-Type: application/json;charset=utf-8' \
+    --data '{"boardId":1, "token":"X3DyyoFslArF0t0NBZXzZXzcy8feoX/OEytSNXZtPg9TpUgO5wrkJ38IW3T/FfpV"}'
+```
+
+#### Response
+
+##### 200 Success
+```json
+{
+  "ocs": {
+    "meta": {
+      "status": "ok",
+      "statuscode": 200,
+      "message": "OK"
+    },
+    "data": []
+  }
+}
+```
+
+##### 404 Not Found
+the provided token is invalid or expired
+
+
+### POST /session/close - closes the session
+
+#### Request body
+
+| Parameter | Type    | Description                                          |
+| --------- | ------- | ---------------------------------------------------- |
+| boardId   | Integer | The id of the opened board                           |
+| token     | String  | The session token from the /sessions/create response |
+
+```
+curl -X POST 'https://admin:admin@nextcloud/ocs/v2.php/apps/deck/api/v1.0/session/close' \
+    -H 'Accept: application/json' -H 'OCS-APIRequest: true' \
+    -H 'Content-Type: application/json;charset=utf-8' \
+    --data '{"boardId":1, "token":"X3DyyoFslArF0t0NBZXzZXzcy8feoX/OEytSNXZtPg9TpUgO5wrkJ38IW3T/FfpV"}'
+```
+
+#### Response
+
+##### 200 Success
+```json
+{
+  "ocs": {
+    "meta": {
+      "status": "ok",
+      "statuscode": 200,
+      "message": "OK"
+    },
+    "data": []
+  }
+}
+```

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/Importer/fixtures/config-trelloJson-schema.json) for import `Trello JSON`
+Create the configuration file respecting the [JSON Schema](https://github.com/nextcloud/deck/blob/main/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/Importer/fixtures/config-trelloApi-schema.json) for import `Trello JSON`
+Create the configuration file respecting the [JSON Schema](https://github.com/nextcloud/deck/blob/main/lib/Service/Importer/fixtures/config-trelloApi-schema.json) for import `Trello JSON`
 
 Example configuration file:
 ```json

img/card.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" style="height: 240px; width: 240px;" viewBox="0 0 24 24">
+	<path fill="currentColor" d="M12,15H10V13H12V15M18,15H14V13H18V15M8,11H6V9H8V11M18,11H10V9H18V11M20,20H4A2,2 0 0,1 2,18V6A2,2 0 0,1 4,4H20A2,2 0 0,1 22,6V18A2,2 0 0,1 20,20M4,6V18H20V6H4Z" />
+</svg>

l10n/ast.js

@@ -1,50 +0,0 @@
-OC.L10N.register(
-    "deck",
-    {
-    "Deck" : "Deck",
-    "Personal" : "Personal",
-    "%s on %s" : "%s en %s",
-    "Finished" : "Finó",
-    "Action needed" : "Precísase aición",
-    "Later" : "Más sero",
-    "Done" : "Fecho",
-    "The file was uploaded" : "Xubióse'l ficheru",
-    "The uploaded file exceeds the upload_max_filesize directive in php.ini" : "El ficheru xubíu perpasa la direutiva de xuba upload_max_filesize en php.ini",
-    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "El ficheru xubíu perpasa la direutiva \"MAX_FILE_SIZE\" especificada nel formulariu HTML",
-    "No file was uploaded" : "Nun se xubieron fichjeros",
-    "Missing a temporary folder" : "Falta un direutoriu temporal",
-    "Could not write file to disk" : "Nun pudo escribise nel discu'l ficheru",
-    "A PHP extension stopped the file upload" : "Una estensión de PHP paró la xuba de ficheros",
-    "Invalid date, date format must be YYYY-MM-DD" : "Data non válida, el formatu ha ser AAAA-MM-DD",
-    "Cancel" : "Encaboxar",
-    "Close" : "Zarrar",
-    "File already exists" : "Yá esiste'l ficheru",
-    "Show archived cards" : "Amosar tarxetes archivaes",
-    "Details" : "Detalles",
-    "Sharing" : "Compartiendo",
-    "Tags" : "Etiquetes",
-    "Undo" : "Desfacer",
-    "Can edit" : "Can edit",
-    "Can share" : "Can share",
-    "Owner" : "Owner",
-    "Delete" : "Desaniciar",
-    "Edit" : "Editar",
-    "Members" : "Miembros",
-    "Download" : "Baxar",
-    "Attachments" : "Axuntos",
-    "Comments" : "Comentarios",
-    "Modified" : "Modificóse'l",
-    "Created" : "Creóse",
-    "Today" : "Güei",
-    "Tomorrow" : "Mañana",
-    "Save" : "Guardar",
-    "Reply" : "Rempuesta",
-    "Update" : "Anovar",
-    "Description" : "Descripción",
-    "(group)" : "(grupu)",
-    "seconds ago" : "hai segundos",
-    "Shared with you" : "Shared with you",
-    "No notifications" : "Ensin avisos",
-    "Share" : "Share"
-},
-"nplurals=2; plural=(n != 1);");

l10n/ast.json

@@ -1,48 +0,0 @@
-{ "translations": {
-    "Deck" : "Deck",
-    "Personal" : "Personal",
-    "%s on %s" : "%s en %s",
-    "Finished" : "Finó",
-    "Action needed" : "Precísase aición",
-    "Later" : "Más sero",
-    "Done" : "Fecho",
-    "The file was uploaded" : "Xubióse'l ficheru",
-    "The uploaded file exceeds the upload_max_filesize directive in php.ini" : "El ficheru xubíu perpasa la direutiva de xuba upload_max_filesize en php.ini",
-    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "El ficheru xubíu perpasa la direutiva \"MAX_FILE_SIZE\" especificada nel formulariu HTML",
-    "No file was uploaded" : "Nun se xubieron fichjeros",
-    "Missing a temporary folder" : "Falta un direutoriu temporal",
-    "Could not write file to disk" : "Nun pudo escribise nel discu'l ficheru",
-    "A PHP extension stopped the file upload" : "Una estensión de PHP paró la xuba de ficheros",
-    "Invalid date, date format must be YYYY-MM-DD" : "Data non válida, el formatu ha ser AAAA-MM-DD",
-    "Cancel" : "Encaboxar",
-    "Close" : "Zarrar",
-    "File already exists" : "Yá esiste'l ficheru",
-    "Show archived cards" : "Amosar tarxetes archivaes",
-    "Details" : "Detalles",
-    "Sharing" : "Compartiendo",
-    "Tags" : "Etiquetes",
-    "Undo" : "Desfacer",
-    "Can edit" : "Can edit",
-    "Can share" : "Can share",
-    "Owner" : "Owner",
-    "Delete" : "Desaniciar",
-    "Edit" : "Editar",
-    "Members" : "Miembros",
-    "Download" : "Baxar",
-    "Attachments" : "Axuntos",
-    "Comments" : "Comentarios",
-    "Modified" : "Modificóse'l",
-    "Created" : "Creóse",
-    "Today" : "Güei",
-    "Tomorrow" : "Mañana",
-    "Save" : "Guardar",
-    "Reply" : "Rempuesta",
-    "Update" : "Anovar",
-    "Description" : "Descripción",
-    "(group)" : "(grupu)",
-    "seconds ago" : "hai segundos",
-    "Shared with you" : "Shared with you",
-    "No notifications" : "Ensin avisos",
-    "Share" : "Share"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}

l10n/ru.js

@@ -81,6 +81,7 @@ OC.L10N.register(
     "Deck board" : "Доска",
     "Owned by %1$s" : "Владелец: %1$s",
     "Deck boards, cards and comments" : "Доски, карточки и комментарии",
+    "From %1$s, in %2$s/%3$s, owned by %4$s" : "Из %1$s, в %2$s/%3$s, принадлежит %4$s",
     "Card comments" : "Комментарии карточки",
     "%s on %s" : "%s на %s",
     "Deck boards and cards" : "Доски и карточки",
@@ -156,6 +157,7 @@ OC.L10N.register(
     "Toggle compact mode" : "Выбор компактного или обычного режима просмотра",
     "Open details" : "Открыть подробности",
     "Details" : "Свойства",
+    "Currently present people" : "Присутствующие в настоящее время люди",
     "Loading board" : "Загрузка доски",
     "No lists available" : "Нет ни одного списка",
     "Create a new list to add cards to this board" : "Создайте список чтобы добавить карточки на эту доску",
@@ -296,10 +298,12 @@ OC.L10N.register(
     "Deck board {name}\n* Last modified on {lastMod}" : "Доска «{name}»\n* Последнее изменение: {lastMod}",
     "{stack} in {board}" : "«{stack}» с доски «{board}»",
     "Click to expand description" : "Нажмите, чтобы развернуть поле описания",
+    "* Created on {created}\n* Last modified on {lastMod}\n* {nbAttachments} attachments\n* {nbComments} comments" : "* Создано {created}\n* Последнее изменение {lastMod}\n* {nbAttachments} вложений\n* {nbComments} комментариев",
     "{nbCards} cards" : "карточек: {nbCards}",
     "Click to expand comment" : "Нажмите, чтобы развернуть комментарии",
     "No upcoming cards" : "Отсутствуют карточки, ожидающие выполнения",
     "upcoming cards" : "карточки, ожидающие выполнения",
+    "New card" : "Новая карточка",
     "Due on {date}" : "Дата исполнения: {date}",
     "Link to a board" : "Ссылка на доску",
     "Link to a card" : "Ссылка на карточку",

l10n/ru.json

@@ -79,6 +79,7 @@
     "Deck board" : "Доска",
     "Owned by %1$s" : "Владелец: %1$s",
     "Deck boards, cards and comments" : "Доски, карточки и комментарии",
+    "From %1$s, in %2$s/%3$s, owned by %4$s" : "Из %1$s, в %2$s/%3$s, принадлежит %4$s",
     "Card comments" : "Комментарии карточки",
     "%s on %s" : "%s на %s",
     "Deck boards and cards" : "Доски и карточки",
@@ -154,6 +155,7 @@
     "Toggle compact mode" : "Выбор компактного или обычного режима просмотра",
     "Open details" : "Открыть подробности",
     "Details" : "Свойства",
+    "Currently present people" : "Присутствующие в настоящее время люди",
     "Loading board" : "Загрузка доски",
     "No lists available" : "Нет ни одного списка",
     "Create a new list to add cards to this board" : "Создайте список чтобы добавить карточки на эту доску",
@@ -294,10 +296,12 @@
     "Deck board {name}\n* Last modified on {lastMod}" : "Доска «{name}»\n* Последнее изменение: {lastMod}",
     "{stack} in {board}" : "«{stack}» с доски «{board}»",
     "Click to expand description" : "Нажмите, чтобы развернуть поле описания",
+    "* Created on {created}\n* Last modified on {lastMod}\n* {nbAttachments} attachments\n* {nbComments} comments" : "* Создано {created}\n* Последнее изменение {lastMod}\n* {nbAttachments} вложений\n* {nbComments} комментариев",
     "{nbCards} cards" : "карточек: {nbCards}",
     "Click to expand comment" : "Нажмите, чтобы развернуть комментарии",
     "No upcoming cards" : "Отсутствуют карточки, ожидающие выполнения",
     "upcoming cards" : "карточки, ожидающие выполнения",
+    "New card" : "Новая карточка",
     "Due on {date}" : "Дата исполнения: {date}",
     "Link to a board" : "Ссылка на доску",
     "Link to a card" : "Ссылка на карточку",

l10n/sv.js

@@ -78,7 +78,7 @@ OC.L10N.register(
     "{user} has mentioned you in a comment on {deck-card}." : "{user} har nämnt dig i en kommentar i {deck-card}.",
     "The board \"%s\" has been shared with you by %s." : "Tavlan \"%s\" har delats med dig av %s.",
     "{user} has shared {deck-board} with you." : "{user} har delat {deck-board} med dig.",
-    "Deck board" : "Deck-plank",
+    "Deck board" : "Deck-tavla",
     "Owned by %1$s" : "Ägd av %1$s",
     "Deck boards, cards and comments" : "Deck tavlor, kort och kommentarer",
     "From %1$s, in %2$s/%3$s, owned by %4$s" : "Från %1$s, i %2$s/%3$s, ägd av %4$s",
@@ -92,7 +92,7 @@ OC.L10N.register(
     "Later" : "Senare",
     "copy" : "kopiera",
     "To do" : "Att göra",
-    "Doing" : "Gör",
+    "Doing" : "Pågående",
     "Done" : "Klart",
     "Example Task 3" : "Exempeluppgift 3",
     "Example Task 2" : "Exempeluppgift 2",
@@ -249,7 +249,7 @@ OC.L10N.register(
     "Write a description …" : "Ange en beskrivning ...",
     "Choose attachment" : "Välj bilaga",
     "(group)" : " (grupp)",
-    "Todo items" : "Todo saker",
+    "Todo items" : "Att göra saker",
     "{count} comments, {unread} unread" : "{count} kommentarer, {unread} olästa",
     "Edit card title" : "Ändra korttitel",
     "Assign to me" : "Tilldela till mig",
@@ -289,7 +289,7 @@ 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.",
+    "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 tavla {title}? Detta kommer radera all data som tillhör tavlan inklusive arkiverade kort.",
     "Delete the board?" : "Ta bort tavlan?",
     "Loading filtered view" : "Laddar filtrerad vy",
     "No due" : "Inget slut",
@@ -316,9 +316,9 @@ OC.L10N.register(
     "Share with a Deck card" : "Dela med ett Deck-kort",
     "Share {file} with a Deck card" : "Dela {file} med ett Deck-kort",
     "Share" : "Dela",
-    "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 transfer the board {title} for {user}?" : "Är du säker på att du vill överföra tavla {title} för {user}?",
+    "Transfer the board for {user} successfully" : "Överförde tavlan för {user}",
+    "Failed to transfer the board for {user}" : "Misslyckades med att överföra tavlan för {user}",
     "Add a new list" : "Lägg till en ny lista",
     "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."
 },

l10n/sv.json

@@ -76,7 +76,7 @@
     "{user} has mentioned you in a comment on {deck-card}." : "{user} har nämnt dig i en kommentar i {deck-card}.",
     "The board \"%s\" has been shared with you by %s." : "Tavlan \"%s\" har delats med dig av %s.",
     "{user} has shared {deck-board} with you." : "{user} har delat {deck-board} med dig.",
-    "Deck board" : "Deck-plank",
+    "Deck board" : "Deck-tavla",
     "Owned by %1$s" : "Ägd av %1$s",
     "Deck boards, cards and comments" : "Deck tavlor, kort och kommentarer",
     "From %1$s, in %2$s/%3$s, owned by %4$s" : "Från %1$s, i %2$s/%3$s, ägd av %4$s",
@@ -90,7 +90,7 @@
     "Later" : "Senare",
     "copy" : "kopiera",
     "To do" : "Att göra",
-    "Doing" : "Gör",
+    "Doing" : "Pågående",
     "Done" : "Klart",
     "Example Task 3" : "Exempeluppgift 3",
     "Example Task 2" : "Exempeluppgift 2",
@@ -247,7 +247,7 @@
     "Write a description …" : "Ange en beskrivning ...",
     "Choose attachment" : "Välj bilaga",
     "(group)" : " (grupp)",
-    "Todo items" : "Todo saker",
+    "Todo items" : "Att göra saker",
     "{count} comments, {unread} unread" : "{count} kommentarer, {unread} olästa",
     "Edit card title" : "Ändra korttitel",
     "Assign to me" : "Tilldela till mig",
@@ -287,7 +287,7 @@
     "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.",
+    "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 tavla {title}? Detta kommer radera all data som tillhör tavlan inklusive arkiverade kort.",
     "Delete the board?" : "Ta bort tavlan?",
     "Loading filtered view" : "Laddar filtrerad vy",
     "No due" : "Inget slut",
@@ -314,9 +314,9 @@
     "Share with a Deck card" : "Dela med ett Deck-kort",
     "Share {file} with a Deck card" : "Dela {file} med ett Deck-kort",
     "Share" : "Dela",
-    "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 transfer the board {title} for {user}?" : "Är du säker på att du vill överföra tavla {title} för {user}?",
+    "Transfer the board for {user} successfully" : "Överförde tavlan för {user}",
+    "Failed to transfer the board for {user}" : "Misslyckades med att överföra tavlan för {user}",
     "Add a new list" : "Lägg till en ny lista",
     "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."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"

l10n/zh_CN.js

@@ -173,7 +173,7 @@ OC.L10N.register(
     "Can manage" : "可以管理",
     "Owner" : "所有者",
     "Delete" : "删除",
-    "Failed to create share with {displayName}" : "用 {displayName} 创建分享失败",
+    "Failed to create share with {displayName}" : "用{displayName}创建分享失败",
     "Transfer" : "传输",
     "Archive all cards" : "归档所有卡片",
     "Delete list" : "删除列表",
@@ -285,7 +285,7 @@ OC.L10N.register(
     "Create a card" : "创建一张卡片",
     "Message from {author} in {conversationName}" : "{conversationName} 会话中来自 {author} 的消息",
     "Something went wrong" : "发生了错误",
-    "Failed to upload {name}" : "未能上传 {name}",
+    "Failed to upload {name}" : "未能上传{name}",
     "Maximum file size of {size} exceeded" : "文件容量已超过 {size} 的上限",
     "Error creating the share" : "创建分享出错",
     "Share with a Deck card" : "分享给一张看板卡片",

l10n/zh_CN.json

@@ -171,7 +171,7 @@
     "Can manage" : "可以管理",
     "Owner" : "所有者",
     "Delete" : "删除",
-    "Failed to create share with {displayName}" : "用 {displayName} 创建分享失败",
+    "Failed to create share with {displayName}" : "用{displayName}创建分享失败",
     "Transfer" : "传输",
     "Archive all cards" : "归档所有卡片",
     "Delete list" : "删除列表",
@@ -283,7 +283,7 @@
     "Create a card" : "创建一张卡片",
     "Message from {author} in {conversationName}" : "{conversationName} 会话中来自 {author} 的消息",
     "Something went wrong" : "发生了错误",
-    "Failed to upload {name}" : "未能上传 {name}",
+    "Failed to upload {name}" : "未能上传{name}",
     "Maximum file size of {size} exceeded" : "文件容量已超过 {size} 的上限",
     "Error creating the share" : "创建分享出错",
     "Share with a Deck card" : "分享给一张看板卡片",

lib/Activity/ActivityManager.php

@@ -325,7 +325,6 @@ class ActivityManager {
 		 */
 		$eventType = 'deck';
 		$subjectParams = [];
-		$message = null;
 		switch ($subject) {
 			// No need to enhance parameters since entity already contains the required data
 			case self::SUBJECT_BOARD_CREATE:
@@ -434,10 +433,6 @@ class ActivityManager {
 			->setSubject($subject, $subjectParams)
 			->setTimestamp(time());
 
-		if ($message !== null) {
-			$event->setMessage($message);
-		}
-
 		// FIXME: We currently require activities for comments even if they are disabled though settings
 		// Get rid of this once the frontend fetches comments/activity individually
 		if ($eventType === 'deck_comment') {

lib/Activity/DeckProvider.php

@@ -77,7 +77,7 @@ class DeckProvider implements IProvider {
 	 * @throws \InvalidArgumentException Should be thrown if your provider does not know this event
 	 * @since 11.0.0
 	 */
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
+	public function parse($language, IEvent $event, IEvent $previousEvent = null): IEvent {
 		if ($event->getApp() !== 'deck') {
 			throw new \InvalidArgumentException();
 		}
@@ -294,7 +294,7 @@ class DeckProvider implements IProvider {
 		if (array_key_exists('comment', $subjectParams)) {
 			/** @var IComment $comment */
 			try {
-				$comment = $this->commentsManager->get((int)$subjectParams['comment']);
+				$comment = $this->commentsManager->get($subjectParams['comment']);
 				$event->setParsedMessage($comment->getMessage());
 				$params['comment'] = [
 					'type' => 'highlight',

lib/Activity/DescriptionSetting.php

@@ -29,7 +29,7 @@ class DescriptionSetting extends Setting {
 	 * @return string Lowercase a-z and underscore only identifier
 	 * @since 11.0.0
 	 */
-	public function getIdentifier() {
+	public function getIdentifier(): string {
 		return 'deck_card_description';
 	}
 
@@ -37,7 +37,7 @@ class DescriptionSetting extends Setting {
 	 * @return string A translated string
 	 * @since 11.0.0
 	 */
-	public function getName() {
+	public function getName(): string {
 		return $this->l->t('A <strong>card description</strong> inside the Deck app has been changed');
 	}
 }

lib/Activity/Filter.php

@@ -42,7 +42,7 @@ class Filter implements \OCP\Activity\IFilter {
 	 * @return string Lowercase a-z and underscore only identifier
 	 * @since 11.0.0
 	 */
-	public function getIdentifier() {
+	public function getIdentifier(): string {
 		return 'deck';
 	}
 
@@ -50,7 +50,7 @@ class Filter implements \OCP\Activity\IFilter {
 	 * @return string A translated string
 	 * @since 11.0.0
 	 */
-	public function getName() {
+	public function getName(): string {
 		return $this->l10n->t('Deck');
 	}
 
@@ -60,7 +60,7 @@ class Filter implements \OCP\Activity\IFilter {
 	 * priority values. It is required to return a value between 0 and 100.
 	 * @since 11.0.0
 	 */
-	public function getPriority() {
+	public function getPriority(): int {
 		return 90;
 	}
 
@@ -68,7 +68,7 @@ class Filter implements \OCP\Activity\IFilter {
 	 * @return string Full URL to an icon, empty string when none is given
 	 * @since 11.0.0
 	 */
-	public function getIcon() {
+	public function getIcon(): string {
 		return $this->urlGenerator->imagePath('deck', 'deck-dark.svg');
 	}
 
@@ -77,7 +77,7 @@ class Filter implements \OCP\Activity\IFilter {
 	 * @return string[] An array of allowed apps from which activities should be displayed
 	 * @since 11.0.0
 	 */
-	public function filterTypes(array $types) {
+	public function filterTypes(array $types): array {
 		return array_merge($types, ['deck_comment']);
 	}
 
@@ -85,7 +85,7 @@ class Filter implements \OCP\Activity\IFilter {
 	 * @return string[] An array of allowed apps from which activities should be displayed
 	 * @since 11.0.0
 	 */
-	public function allowedApps() {
+	public function allowedApps(): array {
 		return ['deck'];
 	}
 }

lib/Activity/Setting.php

@@ -41,7 +41,7 @@ class Setting implements \OCP\Activity\ISetting {
 	 * @return string Lowercase a-z and underscore only identifier
 	 * @since 11.0.0
 	 */
-	public function getIdentifier() {
+	public function getIdentifier(): string {
 		return 'deck';
 	}
 
@@ -49,7 +49,7 @@ class Setting implements \OCP\Activity\ISetting {
 	 * @return string A translated string
 	 * @since 11.0.0
 	 */
-	public function getName() {
+	public function getName(): string {
 		return $this->l->t('Changes in the <strong>Deck app</strong>');
 	}
 
@@ -59,7 +59,7 @@ class Setting implements \OCP\Activity\ISetting {
 	 * priority values. It is required to return a value between 0 and 100.
 	 * @since 11.0.0
 	 */
-	public function getPriority() {
+	public function getPriority(): int {
 		return 90;
 	}
 
@@ -67,7 +67,7 @@ class Setting implements \OCP\Activity\ISetting {
 	 * @return bool True when the option can be changed for the stream
 	 * @since 11.0.0
 	 */
-	public function canChangeStream() {
+	public function canChangeStream(): bool {
 		return true;
 	}
 
@@ -75,7 +75,7 @@ class Setting implements \OCP\Activity\ISetting {
 	 * @return bool True when the option can be changed for the stream
 	 * @since 11.0.0
 	 */
-	public function isDefaultEnabledStream() {
+	public function isDefaultEnabledStream(): bool {
 		return true;
 	}
 
@@ -83,7 +83,7 @@ class Setting implements \OCP\Activity\ISetting {
 	 * @return bool True when the option can be changed for the mail
 	 * @since 11.0.0
 	 */
-	public function canChangeMail() {
+	public function canChangeMail(): bool {
 		return true;
 	}
 
@@ -91,7 +91,7 @@ class Setting implements \OCP\Activity\ISetting {
 	 * @return bool True when the option can be changed for the stream
 	 * @since 11.0.0
 	 */
-	public function isDefaultEnabledMail() {
+	public function isDefaultEnabledMail(): bool {
 		return false;
 	}
 }

lib/Activity/SettingComment.php

@@ -29,7 +29,7 @@ class SettingComment extends Setting {
 	 * @return string Lowercase a-z and underscore only identifier
 	 * @since 11.0.0
 	 */
-	public function getIdentifier() {
+	public function getIdentifier(): string {
 		return 'deck_comment';
 	}
 
@@ -37,7 +37,7 @@ class SettingComment extends Setting {
 	 * @return string A translated string
 	 * @since 11.0.0
 	 */
-	public function getName() {
+	public function getName(): string {
 		return $this->l->t('A <strong>comment</strong> was created on a card');
 	}
 
@@ -45,7 +45,7 @@ class SettingComment extends Setting {
 	 * @return bool True when the option can be changed for the stream
 	 * @since 11.0.0
 	 */
-	public function canChangeStream() {
+	public function canChangeStream(): bool {
 		return false;
 	}
 }

lib/AppInfo/Application.php

@@ -25,29 +25,35 @@ namespace OCA\Deck\AppInfo;
 
 use Closure;
 use Exception;
-use OC\EventDispatcher\SymfonyAdapter;
+use OCA\Circles\Events\CircleDestroyedEvent;
 use OCA\Deck\Activity\CommentEventHandler;
 use OCA\Deck\Capabilities;
 use OCA\Deck\Collaboration\Resources\ResourceProvider;
 use OCA\Deck\Collaboration\Resources\ResourceProviderCard;
 use OCA\Deck\Dashboard\DeckWidget;
 use OCA\Deck\Db\Acl;
-use OCA\Deck\Db\AclMapper;
-use OCA\Deck\Db\AssignmentMapper;
-use OCA\Deck\Db\BoardMapper;
 use OCA\Deck\Db\CardMapper;
 use OCA\Deck\Event\AclCreatedEvent;
 use OCA\Deck\Event\AclDeletedEvent;
 use OCA\Deck\Event\AclUpdatedEvent;
+use OCA\Deck\Event\BoardUpdatedEvent;
 use OCA\Deck\Event\CardCreatedEvent;
 use OCA\Deck\Event\CardDeletedEvent;
 use OCA\Deck\Event\CardUpdatedEvent;
+use OCA\Deck\Event\SessionClosedEvent;
+use OCA\Deck\Event\SessionCreatedEvent;
 use OCA\Deck\Listeners\BeforeTemplateRenderedListener;
+use OCA\Deck\Listeners\ParticipantCleanupListener;
 use OCA\Deck\Listeners\FullTextSearchEventListener;
+use OCA\Deck\Listeners\ResourceAdditionalScriptsListener;
+use OCA\Deck\Listeners\ResourceListener;
+use OCA\Deck\Listeners\LiveUpdateListener;
 use OCA\Deck\Middleware\DefaultBoardMiddleware;
 use OCA\Deck\Middleware\ExceptionMiddleware;
 use OCA\Deck\Notification\Notifier;
+use OCA\Deck\Reference\BoardReferenceProvider;
 use OCA\Deck\Reference\CardReferenceProvider;
+use OCA\Deck\Reference\CommentReferenceProvider;
 use OCA\Deck\Search\CardCommentProvider;
 use OCA\Deck\Search\DeckProvider;
 use OCA\Deck\Service\PermissionService;
@@ -60,18 +66,13 @@ use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
 use OCP\Collaboration\Reference\RenderReferenceEvent;
 use OCP\Collaboration\Resources\IProviderManager;
+use OCP\Collaboration\Resources\LoadAdditionalScriptsEvent;
 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\IGroupManager;
-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;
@@ -90,15 +91,13 @@ class Application extends App implements IBootstrap {
 		$container = $this->getContainer();
 		$eventDispatcher = $container->get(IEventDispatcher::class);
 		$eventDispatcher->addListener(RenderReferenceEvent::class, function () {
-			Util::addScript(self::APP_ID, self::APP_ID . '-card-reference');
+			Util::addScript(self::APP_ID, self::APP_ID . '-reference');
 		});
 	}
 
 	public function boot(IBootContext $context): void {
-		$context->injectFn(Closure::fromCallable([$this, 'registerUserGroupHooks']));
 		$context->injectFn(Closure::fromCallable([$this, 'registerCommentsEntity']));
 		$context->injectFn(Closure::fromCallable([$this, 'registerCommentsEventHandler']));
-		$context->injectFn(Closure::fromCallable([$this, 'registerNotifications']));
 		$context->injectFn(Closure::fromCallable([$this, 'registerCollaborationResources']));
 
 		$context->injectFn(function (IManager $shareManager) {
@@ -132,7 +131,8 @@ class Application extends App implements IBootstrap {
 
 		// reference widget
 		$context->registerReferenceProvider(CardReferenceProvider::class);
-		// $context->registerEventListener(RenderReferenceEvent::class, CardReferenceListener::class);
+		$context->registerReferenceProvider(BoardReferenceProvider::class);
+		$context->registerReferenceProvider(CommentReferenceProvider::class);
 
 		$context->registerEventListener(BeforeTemplateRenderedEvent::class, BeforeTemplateRenderedListener::class);
 
@@ -143,57 +143,28 @@ class Application extends App implements IBootstrap {
 		$context->registerEventListener(AclCreatedEvent::class, FullTextSearchEventListener::class);
 		$context->registerEventListener(AclUpdatedEvent::class, FullTextSearchEventListener::class);
 		$context->registerEventListener(AclDeletedEvent::class, FullTextSearchEventListener::class);
-	}
 
-	public function registerNotifications(NotificationManager $notificationManager): void {
-		$notificationManager->registerNotifierService(Notifier::class);
-	}
+		// Handling cache invalidation for collections
+		$context->registerEventListener(AclCreatedEvent::class, ResourceListener::class);
+		$context->registerEventListener(AclDeletedEvent::class, ResourceListener::class);
 
-	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
-		$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->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->get(AssignmentMapper::class);
-			$assignments = $assignmentMapper->findByParticipant($user->getUID());
-			foreach ($assignments as $assignment) {
-				$assignmentMapper->delete($assignment);
-			}
+		$context->registerEventListener(UserDeletedEvent::class, ParticipantCleanupListener::class);
+		$context->registerEventListener(GroupDeletedEvent::class, ParticipantCleanupListener::class);
+		$context->registerEventListener(CircleDestroyedEvent::class, ParticipantCleanupListener::class);
 
-			/** @var BoardMapper $boardMapper */
-			$boardMapper = $container->get(BoardMapper::class);
-			$boards = $boardMapper->findAllByOwner($user->getUID());
-			foreach ($boards as $board) {
-				$boardMapper->delete($board);
-			}
-		});
+		// Event listening for realtime updates via notify_push
+		$context->registerEventListener(SessionCreatedEvent::class, LiveUpdateListener::class);
+		$context->registerEventListener(SessionClosedEvent::class, LiveUpdateListener::class);
+		$context->registerEventListener(BoardUpdatedEvent::class, LiveUpdateListener::class);
+		$context->registerEventListener(CardCreatedEvent::class, LiveUpdateListener::class);
+		$context->registerEventListener(CardUpdatedEvent::class, LiveUpdateListener::class);
+		$context->registerEventListener(CardDeletedEvent::class, LiveUpdateListener::class);
+		$context->registerEventListener(AclCreatedEvent::class, LiveUpdateListener::class);
+		$context->registerEventListener(AclUpdatedEvent::class, LiveUpdateListener::class);
+		$context->registerEventListener(AclDeletedEvent::class, LiveUpdateListener::class);
 
-		$eventDispatcher->addListener(GroupDeletedEvent::class, static function (Event $event) use ($container): void {
-			if (!($event instanceof GroupDeletedEvent)) {
-				return;
-			}
-			$group = $event->getGroup();
-			/** @var AclMapper $aclMapper */
-			$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) {
-				$aclMapper->delete($acl);
-			}
-		});
+		$context->registerNotifierService(Notifier::class);
+		$context->registerEventListener(LoadAdditionalScriptsEvent::class, ResourceAdditionalScriptsListener::class);
 	}
 
 	public function registerCommentsEntity(IEventDispatcher $eventDispatcher): void {
@@ -219,16 +190,8 @@ class Application extends App implements IBootstrap {
 		});
 	}
 
-	protected function registerCollaborationResources(IProviderManager $resourceManager, SymfonyAdapter $symfonyAdapter): void {
+	protected function registerCollaborationResources(IProviderManager $resourceManager): void {
 		$resourceManager->registerResourceProvider(ResourceProvider::class);
 		$resourceManager->registerResourceProvider(ResourceProviderCard::class);
-
-		$symfonyAdapter->addListener('\OCP\Collaboration\Resources::loadAdditionalScripts', static function () {
-			if (strpos(Server::get(IRequest::class)->getPathInfo(), '/call/') === 0) {
-				// Talk integration has its own entrypoint which already includes collections handling
-				return;
-			}
-			Util::addScript('deck', 'deck-collections');
-		});
 	}
 }

lib/Controller/BoardApiController.php

@@ -60,12 +60,14 @@ class BoardApiController extends ApiController {
 	 * @NoCSRFRequired
 	 *
 	 * Return all of the boards that the current user has access to.
+	 *
+	 * @param bool $details
 	 * @throws StatusException
 	 */
-	public function index($details = null) {
+	public function index(bool $details = false) {
 		$modified = $this->request->getHeader('If-Modified-Since');
 		if ($modified === null || $modified === '') {
-			$boards = $this->boardService->findAll(0, $details);
+			$boards = $this->boardService->findAll(0, $details === true);
 		} else {
 			$date = Util::parseHTTPDate($modified);
 			if (!$date) {

lib/Controller/BoardController.php

@@ -169,4 +169,15 @@ class BoardController extends ApiController {
 
 		return new DataResponse([], HTTP::STATUS_UNAUTHORIZED);
 	}
+
+	/**
+	 * @NoAdminRequired
+	 * @param $boardId
+	 * @return Board
+	 * @throws \OCP\AppFramework\Db\DoesNotExistException
+	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
+	 */
+	public function export($boardId) {
+		return $this->boardService->export($boardId);
+	}
 }

lib/Controller/PageController.php

@@ -27,6 +27,7 @@ use OCA\Deck\AppInfo\Application;
 use OCA\Deck\Service\ConfigService;
 use OCA\Deck\Service\PermissionService;
 use OCA\Files\Event\LoadSidebar;
+use OCA\Text\Event\LoadEditor;
 use OCA\Viewer\Event\LoadViewer;
 use OCP\AppFramework\Http\ContentSecurityPolicy;
 use OCP\Collaboration\Resources\LoadAdditionalScriptsEvent as CollaborationResourcesEvent;
@@ -90,6 +91,9 @@ class PageController extends Controller {
 
 		$this->eventDispatcher->dispatchTyped(new LoadSidebar());
 		$this->eventDispatcher->dispatchTyped(new CollaborationResourcesEvent());
+		if (class_exists(LoadEditor::class)) {
+			$this->eventDispatcher->dispatchTyped(new LoadEditor());
+		}
 		if (class_exists(LoadViewer::class)) {
 			$this->eventDispatcher->dispatchTyped(new LoadViewer());
 		}

lib/Controller/SessionController.php

@@ -0,0 +1,91 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2022, chandi Langecker (git@chandi.it)
+ *
+ * @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\Controller;
+
+use OCA\Deck\Service\SessionService;
+use OCA\Deck\Service\PermissionService;
+use OCA\Deck\Db\BoardMapper;
+use OCP\AppFramework\Db\DoesNotExistException;
+use OCP\AppFramework\Http\DataResponse;
+use OCP\AppFramework\OCSController;
+use OCP\IRequest;
+use OCA\Deck\Db\Acl;
+
+class SessionController extends OCSController {
+	private SessionService $sessionService;
+	private PermissionService $permissionService;
+	private BoardMapper $boardMapper;
+
+	public function __construct($appName,
+		IRequest $request,
+		SessionService $sessionService,
+		PermissionService $permissionService,
+		BoardMapper $boardMapper
+	) {
+		parent::__construct($appName, $request);
+		$this->sessionService = $sessionService;
+		$this->permissionService = $permissionService;
+		$this->boardMapper = $boardMapper;
+	}
+
+	/**
+	 * @NoAdminRequired
+	 */
+	public function create(int $boardId): DataResponse {
+		$this->permissionService->checkPermission($this->boardMapper, $boardId, Acl::PERMISSION_READ);
+
+		$session = $this->sessionService->initSession($boardId);
+		return new DataResponse([
+			'token' => $session->getToken(),
+		]);
+	}
+
+	/**
+	 * notifies the server that the session is still active
+	 * @NoAdminRequired
+	 * @param $boardId
+	 */
+	public function sync(int $boardId, string $token): DataResponse {
+		$this->permissionService->checkPermission($this->boardMapper, $boardId, Acl::PERMISSION_READ);
+		try {
+			$this->sessionService->syncSession($boardId, $token);
+			return new DataResponse([]);
+		} catch (DoesNotExistException $e) {
+			return new DataResponse([], 404);
+		}
+	}
+
+	/**
+	 * delete a session if existing
+	 * @NoAdminRequired
+	 * @NoCSRFRequired
+	 * @param $boardId
+	 */
+	public function close(int $boardId, string $token) {
+		$this->permissionService->checkPermission($this->boardMapper, $boardId, Acl::PERMISSION_READ);
+		$this->sessionService->closeSession($boardId, $token);
+		return new DataResponse();
+	}
+}

lib/Cron/SessionsCleanup.php

@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2022, chandi Langecker (git@chandi.it)
+ *
+ * @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\Cron;
+
+use OCA\Deck\Service\SessionService;
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\BackgroundJob\TimedJob;
+use OCP\ILogger;
+
+class SessionsCleanup extends TimedJob {
+	private $sessionService;
+	private $documentService;
+	private $logger;
+	private $imageService;
+
+
+	public function __construct(ITimeFactory $time,
+								SessionService $sessionService,
+								ILogger $logger) {
+		parent::__construct($time);
+		$this->sessionService = $sessionService;
+		$this->logger = $logger;
+		$this->setInterval(SessionService::SESSION_VALID_TIME);
+	}
+
+	protected function run($argument) {
+		$this->logger->debug('Run cleanup job for deck sessions');
+		
+		$removedSessions = $this->sessionService->removeInactiveSessions();
+		$this->logger->debug('Removed ' . $removedSessions . ' inactive sessions');
+	}
+}

lib/DAV/DeckCalendarBackend.php

@@ -59,7 +59,7 @@ class DeckCalendarBackend {
 	}
 
 	public function getBoards(): array {
-		return $this->boardService->findAll(-1, null, false);
+		return $this->boardService->findAll(-1, false, false);
 	}
 
 	public function getBoard(int $id): Board {

lib/Dashboard/DeckWidget.php

@@ -117,7 +117,7 @@ class DeckWidget implements IAPIWidget, IButtonWidget, IIconWidget {
 		$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']) {
+			if (isset($card['duedate'])) {
 				$ts = (new Datetime($card['duedate']))->getTimestamp();
 				return $ts > $nowTimestamp && ($sinceTimestamp === null || $ts > $sinceTimestamp);
 			}

lib/Db/AclMapper.php

@@ -28,6 +28,7 @@ use OCP\AppFramework\Db\MultipleObjectsReturnedException;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 
+/** @template-extends DeckMapper<Acl> */
 class AclMapper extends DeckMapper implements IPermissionMapper {
 	public function __construct(IDBConnection $db) {
 		parent::__construct($db, 'deck_board_acl', Acl::class);
@@ -51,6 +52,20 @@ class AclMapper extends DeckMapper implements IPermissionMapper {
 		return $this->findEntities($qb);
 	}
 
+	public function findIn(array $boardIds, ?int $limit = null, ?int $offset = null): array {
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('id', 'board_id', 'type', 'participant', 'permission_edit', 'permission_share', 'permission_manage')
+			->from('deck_board_acl')
+			->where($qb->expr()->in('board_id', $qb->createParameter('boardIds')))
+			->setMaxResults($limit)
+			->setFirstResult($offset);
+
+		return iterator_to_array($this->chunkQuery($boardIds, function (array $ids) use ($qb) {
+			$qb->setParameter('boardIds', $ids, IQueryBuilder::PARAM_INT_ARRAY);
+			return $this->findEntities($qb);
+		}));
+	}
+
 	/**
 	 * @param numeric $userId
 	 * @param numeric $id
@@ -110,4 +125,12 @@ class AclMapper extends DeckMapper implements IPermissionMapper {
 			->andWhere($qb->expr()->eq('board_id', $qb->createNamedParameter($boardId, IQueryBuilder::PARAM_INT)));
 		$qb->executeStatement();
 	}
+
+	public function findByType(int $type): array {
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('*')
+			->from('deck_board_acl')
+			->where($qb->expr()->eq('type', $qb->createNamedParameter($type, IQueryBuilder::PARAM_INT)));
+		return $this->findEntities($qb);
+	}
 }

lib/Db/AssignmentMapper.php

@@ -28,14 +28,13 @@ namespace OCA\Deck\Db;
 use OCA\Deck\NotFoundException;
 use OCA\Deck\Service\CirclesService;
 use OCP\AppFramework\Db\Entity;
-use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 use OCP\IGroupManager;
 use OCP\IUserManager;
-use PDO;
 
-class AssignmentMapper extends QBMapper implements IPermissionMapper {
+/** @template-extends DeckMapper<Assignment> */
+class AssignmentMapper extends DeckMapper implements IPermissionMapper {
 
 	/** @var CardMapper */
 	private $cardMapper;
@@ -59,7 +58,7 @@ class AssignmentMapper extends QBMapper implements IPermissionMapper {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('*')
 			->from('deck_assigned_users')
-			->where($qb->expr()->eq('card_id', $qb->createNamedParameter($cardId, PDO::PARAM_INT)));
+			->where($qb->expr()->eq('card_id', $qb->createNamedParameter($cardId, IQueryBuilder::PARAM_INT)));
 		$users = $this->findEntities($qb);
 		foreach ($users as $user) {
 			$this->mapParticipant($user);
@@ -67,12 +66,29 @@ class AssignmentMapper extends QBMapper implements IPermissionMapper {
 		return $users;
 	}
 
+	public function findIn(array $cardIds): array {
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('*')
+			->from('deck_assigned_users')
+			->where($qb->expr()->in('card_id', $qb->createParameter('cardIds')));
+
+		$users = iterator_to_array($this->chunkQuery($cardIds, function (array $ids) use ($qb) {
+			$qb->setParameter('cardIds', $ids, IQueryBuilder::PARAM_INT_ARRAY);
+			return $this->findEntities($qb);
+		}));
+
+		foreach ($users as $user) {
+			$this->mapParticipant($user);
+		}
+		return $users;
+	}
+
 	public function findByParticipant(string $participant, $type = Assignment::TYPE_USER): array {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('*')
 			->from('deck_assigned_users')
-			->where($qb->expr()->eq('participant', $qb->createNamedParameter($participant, PDO::PARAM_STR)))
-			->andWhere($qb->expr()->eq('type', $qb->createNamedParameter($type, PDO::PARAM_INT)));
+			->where($qb->expr()->eq('participant', $qb->createNamedParameter($participant, IQueryBuilder::PARAM_STR)))
+			->andWhere($qb->expr()->eq('type', $qb->createNamedParameter($type, IQueryBuilder::PARAM_INT)));
 		return $this->findEntities($qb);
 	}
 
@@ -131,8 +147,8 @@ class AssignmentMapper extends QBMapper implements IPermissionMapper {
 
 	private function getOrigin(Assignment $assignment) {
 		if ($assignment->getType() === Assignment::TYPE_USER) {
-			$origin = $this->userManager->get($assignment->getParticipant());
-			return $origin ? new User($origin) : null;
+			$origin = $this->userManager->userExists($assignment->getParticipant());
+			return $origin ? new User($assignment->getParticipant(), $this->userManager) : null;
 		}
 		if ($assignment->getType() === Assignment::TYPE_GROUP) {
 			$origin = $this->groupManager->get($assignment->getParticipant());

lib/Db/AttachmentMapper.php

@@ -31,6 +31,7 @@ use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 use OCP\IUserManager;
 
+/** @template-extends DeckMapper<Attachment> */
 class AttachmentMapper extends DeckMapper implements IPermissionMapper {
 	private $cardMapper;
 	private $userManager;

lib/Db/Board.php

@@ -44,6 +44,7 @@ class Board extends RelationalEntity {
 	protected $users = [];
 	protected $shared;
 	protected $stacks = [];
+	protected $activeSessions = [];
 	protected $deletedAt = 0;
 	protected $lastModified = 0;
 
@@ -59,6 +60,7 @@ class Board extends RelationalEntity {
 		$this->addRelation('acl');
 		$this->addRelation('shared');
 		$this->addRelation('users');
+		$this->addRelation('activeSessions');
 		$this->addRelation('permissions');
 		$this->addRelation('stacks');
 		$this->addRelation('settings');

lib/Db/BoardMapper.php

@@ -33,6 +33,7 @@ use OCP\IUserManager;
 use OCP\IGroupManager;
 use Psr\Log\LoggerInterface;
 
+/** @template-extends QBMapper<Board> */
 class BoardMapper extends QBMapper implements IPermissionMapper {
 	private $labelMapper;
 	private $aclMapper;
@@ -89,9 +90,6 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
 			$this->boardCache[$id] = $this->findEntity($qb);
 		}
 
-		// FIXME is this necessary? it was NOT done with the old mapper
-		// $this->mapOwner($board);
-
 		// Add labels
 		if ($withLabels && $this->boardCache[$id]->getLabels() === null) {
 			$labels = $this->labelMapper->findAll($id);
@@ -158,7 +156,21 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
 			$userBoards = $this->findAllByUser($userId, null, null, $since, $includeArchived, $before, $term);
 			$groupBoards = $this->findAllByGroups($userId, $groups, null, null, $since, $includeArchived, $before, $term);
 			$circleBoards = $this->findAllByCircles($userId, null, null, $since, $includeArchived, $before, $term);
-			$allBoards = array_unique(array_merge($userBoards, $groupBoards, $circleBoards));
+			$allBoards = array_values(array_unique(array_merge($userBoards, $groupBoards, $circleBoards)));
+
+			// Could be moved outside
+			$acls = $this->aclMapper->findIn(array_map(function ($board) {
+				return $board->getId();
+			}, $allBoards));
+
+			/* @var Board $entry */
+			foreach ($allBoards as $entry) {
+				$boardAcls = array_values(array_filter($acls, function ($acl) use ($entry) {
+					return $acl->getBoardId() === $entry->getId();
+				}));
+				$entry->setAcl($boardAcls);
+			}
+
 			foreach ($allBoards as $board) {
 				$this->boardCache[$board->getId()] = $board;
 			}
@@ -258,11 +270,7 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
 			$entry->setShared(1);
 		}
 		$entries = array_merge($entries, $sharedEntries);
-		/* @var Board $entry */
-		foreach ($entries as $entry) {
-			$acl = $this->aclMapper->findAll($entry->id);
-			$entry->setAcl($acl);
-		}
+
 		return $entries;
 	}
 
@@ -335,11 +343,6 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
 		foreach ($entries as $entry) {
 			$entry->setShared(2);
 		}
-		/* @var Board $entry */
-		foreach ($entries as $entry) {
-			$acl = $this->aclMapper->findAll($entry->id);
-			$entry->setAcl($acl);
-		}
 		return $entries;
 	}
 
@@ -396,11 +399,6 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
 		foreach ($entries as $entry) {
 			$entry->setShared(2);
 		}
-		/* @var Board $entry */
-		foreach ($entries as $entry) {
-			$acl = $this->aclMapper->findAll($entry->id);
-			$entry->setAcl($acl);
-		}
 		return $entries;
 	}
 
@@ -454,13 +452,11 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
 	}
 
 	public function mapAcl(Acl &$acl) {
-		$userManager = $this->userManager;
 		$groupManager = $this->groupManager;
 		$acl->resolveRelation('participant', function ($participant) use (&$acl, &$userManager, &$groupManager) {
 			if ($acl->getType() === Acl::PERMISSION_TYPE_USER) {
-				$user = $userManager->get($participant);
-				if ($user !== null) {
-					return new User($user);
+				if ($this->userManager->userExists($acl->getParticipant())) {
+					return new User($acl->getParticipant(), $this->userManager);
 				}
 				$this->logger->debug('User ' . $acl->getId() . ' not found when mapping acl ' . $acl->getParticipant());
 				return null;
@@ -498,9 +494,8 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
 	public function mapOwner(Board &$board) {
 		$userManager = $this->userManager;
 		$board->resolveRelation('owner', function ($owner) use (&$userManager) {
-			$user = $userManager->get($owner);
-			if ($user !== null) {
-				return new User($user);
+			if ($this->userManager->userExists($owner)) {
+				return new User($owner, $userManager);
 			}
 			return null;
 		});

lib/Db/Card.php

@@ -158,6 +158,21 @@ class Card extends RelationalEntity {
 		return $calendar;
 	}
 
+	public function getDaysUntilDue(): ?int {
+		if ($this->getDuedate() === null) {
+			return null;
+		}
+
+		$today = new DateTime();
+		$today->setTime(0, 0);
+
+		$matchDate = DateTime::createFromInterface($this->getDuedate());
+		$matchDate->setTime(0, 0);
+
+		$diff = $today->diff($matchDate);
+		return (int) $diff->format('%R%a'); // Extract days count in interval
+	}
+
 	public function getCalendarPrefix(): string {
 		return 'card';
 	}

lib/Db/CardMapper.php

@@ -38,6 +38,7 @@ use OCP\IUser;
 use OCP\IUserManager;
 use OCP\Notification\IManager;
 
+/** @template-extends QBMapper<Card> */
 class CardMapper extends QBMapper implements IPermissionMapper {
 
 	/** @var LabelMapper */
@@ -253,13 +254,13 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 		return $this->findEntities($qb);
 	}
 
-	public function findAllWithDue($boardId) {
+	public function findAllWithDue(array $boardIds) {
 		$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('s.board_id', $qb->createNamedParameter($boardId, IQueryBuilder::PARAM_INT)))
+			->where($qb->expr()->in('s.board_id', $qb->createNamedParameter($boardIds, IQueryBuilder::PARAM_INT_ARRAY)))
 			->andWhere($qb->expr()->isNotNull('c.duedate'))
 			->andWhere($qb->expr()->eq('c.archived', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL)))
 			->andWhere($qb->expr()->eq('c.deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)))
@@ -269,14 +270,14 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 		return $this->findEntities($qb);
 	}
 
-	public function findToMeOrNotAssignedCards($boardId, $username) {
+	public function findToMeOrNotAssignedCards(array $boardIds, string $username) {
 		$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')
 			->leftJoin('c', 'deck_assigned_users', 'u', 'c.id = u.card_id')
-			->where($qb->expr()->eq('s.board_id', $qb->createNamedParameter($boardId, IQueryBuilder::PARAM_INT)))
+			->where($qb->expr()->in('s.board_id', $qb->createNamedParameter($boardIds, IQueryBuilder::PARAM_INT_ARRAY)))
 			->andWhere($qb->expr()->orX(
 				$qb->expr()->eq('u.participant', $qb->createNamedParameter($username, IQueryBuilder::PARAM_STR)),
 				$qb->expr()->isNull('u.participant'))
@@ -606,9 +607,8 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 	public function mapOwner(Card &$card) {
 		$userManager = $this->userManager;
 		$card->resolveRelation('owner', function ($owner) use (&$userManager) {
-			$user = $userManager->get($owner);
-			if ($user !== null) {
-				return new User($user);
+			if ($userManager->userExists($owner)) {
+				return new User($owner, $this->userManager);
 			}
 			return null;
 		});

lib/Db/DeckMapper.php

@@ -23,19 +23,20 @@
 
 namespace OCA\Deck\Db;
 
+use Generator;
+use OCP\AppFramework\Db\Entity;
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 
 /**
- * Class DeckMapper
- *
- * @package OCA\Deck\Db
+ * @template T of Entity
+ * @template-extends QBMapper<T>
  */
-class DeckMapper extends QBMapper {
+abstract class DeckMapper extends QBMapper {
 
 	/**
 	 * @param $id
-	 * @return \OCP\AppFramework\Db\Entity if not found
+	 * @return T
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
 	 * @throws \OCP\AppFramework\Db\DoesNotExistException
 	 */
@@ -47,4 +48,21 @@ class DeckMapper extends QBMapper {
 
 		return $this->findEntity($qb);
 	}
+
+	/**
+	 * Helper function to split passed array into chunks of 1000 elements and
+	 * call a given callback for fetching query results
+	 *
+	 * Can be useful to limit to 1000 results per query for oracle compatiblity
+	 * but still iterate over all results
+	 */
+	public function chunkQuery(array $ids, callable $callback): Generator {
+		$limit = 1000;
+		while (!empty($ids)) {
+			$slice = array_splice($ids, 0, $limit);
+			foreach ($callback($slice) as $item) {
+				yield $item;
+			}
+		}
+	}
 }

lib/Db/LabelMapper.php

@@ -29,6 +29,7 @@ use OCP\AppFramework\Db\MultipleObjectsReturnedException;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 
+/** @template-extends DeckMapper<Label> */
 class LabelMapper extends DeckMapper implements IPermissionMapper {
 	public function __construct(IDBConnection $db) {
 		parent::__construct($db, 'deck_labels', Label::class);
@@ -51,11 +52,6 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
 		return $this->findEntities($qb);
 	}
 
-	/**
-	 * @param Entity $entity
-	 * @return Entity
-	 * @throws \OCP\DB\Exception
-	 */
 	public function delete(Entity $entity): Entity {
 		// delete assigned labels
 		$this->deleteLabelAssignments($entity->getId());
@@ -83,6 +79,19 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
 		return $this->findEntities($qb);
 	}
 
+	public function findAssignedLabelsForCards($cardIds, $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()->in('card_id', $qb->createNamedParameter($cardIds, IQueryBuilder::PARAM_INT_ARRAY)))
+			->orderBy('l.id')
+			->setMaxResults($limit)
+			->setFirstResult($offset);
+
+		return $this->findEntities($qb);
+	}
+
 	/**
 	 * @param numeric $boardId
 	 * @param int|null $limit
@@ -105,23 +114,12 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
 		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);
 	}
 
-	/**
-	 * @param Entity $entity
-	 * @param bool $updateModified
-	 * @return Entity
-	 * @throws \OCP\DB\Exception
-	 */
-	public function update(Entity $entity, $updateModified = true): Entity {
+	public function update(Entity $entity, bool $updateModified = true): Entity {
 		if ($updateModified) {
 			$entity->setLastModified(time());
 		}

lib/Db/RelationalEntity.php

@@ -53,7 +53,7 @@ class RelationalEntity extends Entity implements \JsonSerializable {
 	 * @param string $attribute the name of the attribute
 	 * @since 7.0.0
 	 */
-	protected function markFieldUpdated($attribute) {
+	protected function markFieldUpdated(string $attribute): void {
 		if (!in_array($attribute, $this->_relations, true)) {
 			parent::markFieldUpdated($attribute);
 		}
@@ -127,7 +127,7 @@ class RelationalEntity extends Entity implements \JsonSerializable {
 		}
 	}
 
-	public function __call($methodName, $args) {
+	public function __call(string $methodName, array $args) {
 		$attr = lcfirst(substr($methodName, 7));
 		if (array_key_exists($attr, $this->_resolvedProperties) && strpos($methodName, 'resolve') === 0) {
 			if ($this->_resolvedProperties[$attr] !== null) {

lib/Db/RelationalObject.php

@@ -33,7 +33,7 @@ class RelationalObject implements JsonSerializable {
 	 * RelationalObject constructor.
 	 *
 	 * @param $primaryKey string
-	 * @param $object
+	 * @param callable|mixed $object
 	 */
 	public function __construct($primaryKey, $object) {
 		$this->primaryKey = $primaryKey;
@@ -47,16 +47,24 @@ class RelationalObject implements JsonSerializable {
 		);
 	}
 
+	public function getObject() {
+		if (is_callable($this->object)) {
+			$this->object = call_user_func($this->object, $this);
+		}
+
+		return $this->object;
+	}
+
 	/**
 	 * This method should be overwritten if object doesn't implement \JsonSerializable
 	 *
 	 * @throws \Exception
 	 */
 	public function getObjectSerialization() {
-		if ($this->object instanceof JsonSerializable) {
-			return $this->object->jsonSerialize();
+		if ($this->getObject() instanceof JsonSerializable) {
+			return $this->getObject()->jsonSerialize();
 		} else {
-			throw new \Exception('jsonSerialize is not implemented on ' . get_class($this));
+			throw new \Exception('jsonSerialize is not implemented on ' . get_class($this->getObject()));
 		}
 	}
 

lib/Db/Session.php

@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2022, chandi Langecker (git@chandi.it)
+ *
+ * @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\Db;
+
+use OCP\AppFramework\Db\Entity;
+
+class Session extends Entity implements \JsonSerializable {
+	public $id;
+	protected $userId;
+	protected $token;
+	protected $lastContact;
+	protected $boardId;
+
+	public function __construct() {
+		$this->addType('id', 'integer');
+		$this->addType('boardId', 'integer');
+		$this->addType('lastContact', 'integer');
+	}
+
+	public function jsonSerialize(): array {
+		return [
+			'id' => $this->id,
+			'userId' => $this->userId,
+			'token' => $this->token,
+			'lastContact' => $this->lastContact,
+			'boardId' => $this->boardId,
+		];
+	}
+}

lib/Db/SessionMapper.php

@@ -0,0 +1,74 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2022, chandi Langecker (git@chandi.it)
+ *
+ * @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\Db;
+
+use OCA\Deck\Service\SessionService;
+use OCP\AppFramework\Db\DoesNotExistException;
+use OCP\AppFramework\Db\QBMapper;
+use OCP\IDBConnection;
+
+/** @template-extends QBMapper<Session> */
+class SessionMapper extends QBMapper {
+	public function __construct(IDBConnection $db) {
+		parent::__construct($db, 'deck_sessions', Session::class);
+	}
+
+	public function find(int $boardId, string $userId, string $token): Session {
+		$qb = $this->db->getQueryBuilder();
+		$result = $qb->select('*')
+			->from($this->getTableName())
+			->where($qb->expr()->eq('token', $qb->createNamedParameter($token)))
+			->andWhere($qb->expr()->gt('last_contact', $qb->createNamedParameter(time() - SessionService::SESSION_VALID_TIME)))
+			->executeQuery();
+
+		$data = $result->fetch();
+		$result->closeCursor();
+		if ($data === false) {
+			throw new DoesNotExistException('Session is invalid');
+		}
+		$session = Session::fromRow($data);
+		if ($session->getUserId() != $userId || $session->getBoardId() != $boardId) {
+			throw new DoesNotExistException('Session is invalid');
+		}
+		return $session;
+	}
+
+	public function findAllActive($boardId) {
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('id', 'board_id', 'last_contact', 'user_id', 'token')
+			->from($this->getTableName())
+			->where($qb->expr()->eq('board_id', $qb->createNamedParameter($boardId)))
+			->andWhere($qb->expr()->gt('last_contact', $qb->createNamedParameter(time() - SessionService::SESSION_VALID_TIME)))
+			->executeQuery();
+
+		return $this->findEntities($qb);
+	}
+	public function deleteInactive(): int {
+		$qb = $this->db->getQueryBuilder();
+		$qb->delete($this->getTableName())
+			->where($qb->expr()->lt('last_contact', $qb->createNamedParameter(time() - SessionService::SESSION_VALID_TIME)));
+		return $qb->executeStatement();
+	}
+}

lib/Db/StackMapper.php

@@ -26,15 +26,27 @@ namespace OCA\Deck\Db;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\Entity;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
+use OCP\Cache\CappedMemoryCache;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
+use OCP\ICache;
+use OCP\ICacheFactory;
 
+/** @template-extends DeckMapper<Stack> */
 class StackMapper extends DeckMapper implements IPermissionMapper {
-	private $cardMapper;
+	private CappedMemoryCache $stackCache;
+	private CardMapper $cardMapper;
+	private ICache $cache;
 
-	public function __construct(IDBConnection $db, CardMapper $cardMapper) {
+	public function __construct(
+		IDBConnection $db,
+		CardMapper $cardMapper,
+		ICacheFactory $cacheFactory
+	) {
 		parent::__construct($db, 'deck_stacks', Stack::class);
 		$this->cardMapper = $cardMapper;
+		$this->stackCache = new CappedMemoryCache();
+		$this->cache = $cacheFactory->createDistributed('deck-stackMapper');
 	}
 
 
@@ -46,12 +58,17 @@ class StackMapper extends DeckMapper implements IPermissionMapper {
 	 * @throws \OCP\DB\Exception
 	 */
 	public function find($id): Stack {
+		if (isset($this->stackCache[(string)$id])) {
+			return $this->stackCache[(string)$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);
+		$this->stackCache[(string)$id] = $this->findEntity($qb);
+		return $this->stackCache[(string)$id];
 	}
 
 	/**
@@ -112,14 +129,16 @@ class StackMapper extends DeckMapper implements IPermissionMapper {
 		return $this->findEntities($qb);
 	}
 
-	/**
-	 * @param Entity $entity
-	 * @return Entity
-	 * @throws \OCP\DB\Exception
-	 */
+	public function update(Entity $entity): Entity {
+		$result = parent::update($entity);
+		$this->stackCache[(string)$entity->getId()] = $result;
+		return $result;
+	}
+
 	public function delete(Entity $entity): Entity {
 		// delete cards on stack
 		$this->cardMapper->deleteByStack($entity->getId());
+		unset($this->stackCache[(string)$entity->getId()]);
 		return parent::delete($entity);
 	}
 
@@ -146,12 +165,19 @@ class StackMapper extends DeckMapper implements IPermissionMapper {
 	 * @throws \OCP\DB\Exception
 	 */
 	public function findBoardId($id): ?int {
+		$result = $this->cache->get('findBoardId:' . $id);
+		if ($result !== null) {
+			return $result !== false ? $result : null;
+		}
 		try {
 			$entity = $this->find($id);
-			return $entity->getBoardId();
+			$result = $entity->getBoardId();
 		} catch (DoesNotExistException $e) {
+			$result = false;
 		} catch (MultipleObjectsReturnedException $e) {
 		}
-		return null;
+		$this->cache->set('findBoardId:' . $id, $result);
+
+		return $result !== false ? $result : null;
 	}
 }

lib/Db/User.php

@@ -23,27 +23,30 @@
 
 namespace OCA\Deck\Db;
 
-use OCP\IUser;
+use OCP\IUserManager;
 
 class User extends RelationalObject {
-	public function __construct(IUser $user) {
-		$primaryKey = $user->getUID();
-		parent::__construct($primaryKey, $user);
+	private IUserManager $userManager;
+	public function __construct($uid, IUserManager $userManager) {
+		$this->userManager = $userManager;
+		parent::__construct($uid, function ($object) {
+			return $this->userManager->get($object->getPrimaryKey());
+		});
 	}
 
 	public function getObjectSerialization() {
 		return [
-			'uid' => $this->object->getUID(),
-			'displayname' => $this->object->getDisplayName(),
-			'type' => 0
+			'uid' => $this->getObject()->getUID(),
+			'displayname' => $this->getObject()->getDisplayName(),
+			'type' => Acl::PERMISSION_TYPE_USER
 		];
 	}
 
 	public function getUID() {
-		return $this->object->getUID();
+		return $this->getPrimaryKey();
 	}
 
 	public function getDisplayName() {
-		return $this->object->getDisplayName();
+		return $this->userManager->getDisplayName($this->getPrimaryKey());
 	}
 }

lib/Event/AAclEvent.php

@@ -31,7 +31,7 @@ use OCP\EventDispatcher\Event;
 
 abstract class AAclEvent extends Event {
 	private $acl;
-	
+
 	public function __construct(Acl $acl) {
 		parent::__construct();
 
@@ -41,4 +41,8 @@ abstract class AAclEvent extends Event {
 	public function getAcl(): Acl {
 		return $this->acl;
 	}
+
+	public function getBoardId(): int {
+		return $this->acl->getBoardId();
+	}
 }

lib/Event/BoardUpdatedEvent.php

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

lib/Event/CardUpdatedEvent.php

@@ -26,5 +26,17 @@ declare(strict_types=1);
 
 namespace OCA\Deck\Event;
 
+use OCA\Deck\Db\Card;
+
 class CardUpdatedEvent extends ACardEvent {
+	private $cardBefore;
+
+	public function __construct(Card $card, Card $before = null) {
+		parent::__construct($card);
+		$this->cardBefore = $before;
+	}
+
+	public function getCardBefore() {
+		return $this->cardBefore;
+	}
 }

lib/Event/SessionClosedEvent.php

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

lib/Event/SessionCreatedEvent.php

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

lib/Listeners/BeforeTemplateRenderedListener.php

@@ -32,6 +32,7 @@ use OCP\EventDispatcher\IEventListener;
 use OCP\IRequest;
 use OCP\Util;
 
+/** @template-implements IEventListener<Event|BeforeTemplateRenderedEvent> */
 class BeforeTemplateRenderedListener implements IEventListener {
 	private $request;
 

lib/Listeners/FullTextSearchEventListener.php

@@ -42,8 +42,9 @@ use OCP\FullTextSearch\Model\IIndex;
 use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
 
+/** @template-implements IEventListener<Event|ACardEvent|AAclEvent> */
 class FullTextSearchEventListener implements IEventListener {
-	
+
 	/** @var string|null */
 	private $userId;
 	/** @var IFullTextSearchManager|null */
@@ -52,7 +53,7 @@ class FullTextSearchEventListener implements IEventListener {
 	private $service;
 	/** @var LoggerInterface */
 	private $logger;
-	
+
 	public function __construct(ContainerInterface $container, $userId) {
 		$this->userId = $userId;
 		$this->logger = $container->get(LoggerInterface::class);
@@ -68,7 +69,7 @@ class FullTextSearchEventListener implements IEventListener {
 		if (!$event instanceof ACardEvent && !$event instanceof AAclEvent) {
 			return;
 		}
-		
+
 		try {
 			if ($event instanceof CardCreatedEvent) {
 				$this->manager->createIndex(

lib/Listeners/LiveUpdateListener.php

@@ -0,0 +1,115 @@
+<?php
+/*
+ * @copyright Copyright (c) 2021 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+declare(strict_types=1);
+
+
+namespace OCA\Deck\Listeners;
+
+use OCA\Deck\Db\StackMapper;
+use OCA\Deck\NotifyPushEvents;
+use OCA\Deck\Event\AAclEvent;
+use OCA\Deck\Event\ACardEvent;
+use OCA\Deck\Event\BoardUpdatedEvent;
+use OCA\Deck\Event\CardUpdatedEvent;
+use OCA\Deck\Event\SessionClosedEvent;
+use OCA\Deck\Event\SessionCreatedEvent;
+use OCA\Deck\Service\SessionService;
+use OCA\NotifyPush\Queue\IQueue;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
+use OCP\IRequest;
+use Psr\Container\ContainerInterface;
+use Psr\Log\LoggerInterface;
+
+/** @template-implements IEventListener<Event|SessionCreatedEvent|SessionClosedEvent|AAclEvent|ACardEvent|CardUpdatedEvent|BoardUpdatedEvent> */
+class LiveUpdateListener implements IEventListener {
+	private LoggerInterface $logger;
+	private SessionService $sessionService;
+	private IRequest $request;
+	private StackMapper $stackMapper;
+	private $queue;
+
+	public function __construct(
+		ContainerInterface $container,
+		IRequest $request,
+		LoggerInterface $logger,
+		SessionService $sessionService,
+		StackMapper $stackMapper
+	) {
+		try {
+			$this->queue = $container->get(IQueue::class);
+		} catch (\Exception $e) {
+			// most likely notify_push is not installed.
+			return;
+		}
+		$this->logger = $logger;
+		$this->sessionService = $sessionService;
+		$this->request = $request;
+		$this->stackMapper = $stackMapper;
+	}
+
+	public function handle(Event $event): void {
+		if (!$this->queue) {
+			// notify_push is not active
+			return;
+		}
+
+		try {
+			// the web frontend is adding the Session-ID as a header
+			// TODO: verify the token! this currently allows to spoof a token from someone
+			// else, preventing this person from getting updates
+			$causingSessionToken = $this->request->getHeader('x-nc-deck-session');
+			if (
+				$event instanceof SessionCreatedEvent ||
+				$event instanceof SessionClosedEvent ||
+				$event instanceof BoardUpdatedEvent ||
+				$event instanceof AAclEvent
+			) {
+				$this->sessionService->notifyAllSessions($this->queue, $event->getBoardId(), NotifyPushEvents::DeckBoardUpdate, [
+					'id' => $event->getBoardId()
+				], $causingSessionToken);
+			} elseif ($event instanceof ACardEvent) {
+				$boardId = $this->stackMapper->findBoardId($event->getCard()->getStackId());
+				$this->sessionService->notifyAllSessions($this->queue, $boardId, NotifyPushEvents::DeckCardUpdate, [
+					'boardId' => $boardId,
+					'cardId' => $event->getCard()->getId()
+				], $causingSessionToken);
+
+				// if card got moved to a diferent board, we should notify
+				// also sessions active on the previous board
+				if ($event instanceof CardUpdatedEvent && $event->getCardBefore()) {
+					$previousBoardId = $this->stackMapper->findBoardId($event->getCardBefore()->getStackId());
+					if ($boardId !== $previousBoardId) {
+						$this->sessionService->notifyAllSessions($this->queue, $previousBoardId, NotifyPushEvents::DeckCardUpdate, [
+							'boardId' => $boardId,
+							'cardId' => $event->getCard()->getId()
+						], $causingSessionToken);
+					}
+				}
+			}
+		} catch (\Exception $e) {
+			$this->logger->error('Error when handling live update event', ['exception' => $e]);
+		}
+	}
+}

lib/Listeners/ParticipantCleanupListener.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace OCA\Deck\Listeners;
+
+use OCA\Circles\Events\CircleDestroyedEvent;
+use OCA\Deck\Db\Acl;
+use OCA\Deck\Db\AclMapper;
+use OCA\Deck\Db\AssignmentMapper;
+use OCA\Deck\Db\BoardMapper;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
+use OCP\Group\Events\GroupDeletedEvent;
+use OCP\User\Events\UserDeletedEvent;
+
+/** @template-implements IEventListener<Event|UserDeletedEvent|GroupDeletedEvent|CircleDestroyedEvent> */
+class ParticipantCleanupListener implements IEventListener {
+	private AclMapper $aclMapper;
+	private AssignmentMapper $assignmentMapper;
+	private BoardMapper $boardMapper;
+
+	public function __construct(AclMapper $aclMapper, AssignmentMapper $assignmentMapper, BoardMapper $boardMapper) {
+		$this->aclMapper = $aclMapper;
+		$this->assignmentMapper = $assignmentMapper;
+		$this->boardMapper = $boardMapper;
+	}
+
+	public function handle(Event $event): void {
+		if ($event instanceof UserDeletedEvent) {
+			$boards = $this->boardMapper->findAllByOwner($event->getUser()->getUID());
+			foreach ($boards as $board) {
+				$this->boardMapper->delete($board);
+			}
+
+			$this->cleanupByParticipant(Acl::PERMISSION_TYPE_USER, $event->getUser()->getUID());
+		}
+
+		if ($event instanceof GroupDeletedEvent) {
+			$this->cleanupByParticipant(Acl::PERMISSION_TYPE_GROUP, $event->getGroup()->getGID());
+		}
+
+		if ($event instanceof CircleDestroyedEvent) {
+			$circleId = $event->getCircle()->getSingleId();
+			$this->cleanupByParticipant(Acl::PERMISSION_TYPE_CIRCLE, $circleId);
+		}
+	}
+
+	private function cleanupByParticipant(int $type, string $participant): void {
+		$acls = $this->aclMapper->findByParticipant($type, $participant);
+		foreach ($acls as $acl) {
+			$this->aclMapper->delete($acl);
+		}
+
+		$assignments = $this->assignmentMapper->findByParticipant($participant, $type);
+		foreach ($assignments as $assignment) {
+			$this->assignmentMapper->delete($assignment);
+		}
+	}
+}

lib/Listeners/ResourceAdditionalScriptsListener.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace OCA\Deck\Listeners;
+
+use OCP\Collaboration\Resources\LoadAdditionalScriptsEvent;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
+use OCP\IRequest;
+use OCP\Util;
+
+/** @template-implements IEventListener<Event|LoadAdditionalScriptsEvent> */
+class ResourceAdditionalScriptsListener implements IEventListener {
+	private IRequest $request;
+
+	public function __construct(IRequest $request) {
+		$this->request = $request;
+	}
+
+	public function handle(Event $event): void {
+		if (!$event instanceof LoadAdditionalScriptsEvent) {
+			return;
+		}
+
+		if (strpos($this->request->getPathInfo(), '/call/') === 0) {
+			// Talk integration has its own entrypoint which already includes collections handling
+			return;
+		}
+
+		Util::addScript('deck', 'deck-collections');
+	}
+}

lib/Listeners/ResourceListener.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace OCA\Deck\Listeners;
+
+use OCA\Deck\Collaboration\Resources\ResourceProvider;
+use OCA\Deck\Collaboration\Resources\ResourceProviderCard;
+use OCA\Deck\Event\AclCreatedEvent;
+use OCA\Deck\Event\AclDeletedEvent;
+use OCP\Collaboration\Resources\IManager;
+use OCP\Collaboration\Resources\ResourceException;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
+
+/** @template-implements IEventListener<Event|AclDeletedEvent|AclCreatedEvent> */
+class ResourceListener implements IEventListener {
+
+	/** @var IManager */
+	private $resourceManager;
+	/** @var ResourceProviderCard */
+	private $resourceProviderCard;
+
+	public function __construct(IManager $resourceManager, ResourceProviderCard $resourceProviderCard) {
+		$this->resourceManager = $resourceManager;
+		$this->resourceProviderCard = $resourceProviderCard;
+	}
+
+	public function handle(Event $event): void {
+		if (!$event instanceof AclDeletedEvent && !$event instanceof AclCreatedEvent) {
+			return;
+		}
+
+		$boardId = $event->getAcl()->getBoardId();
+
+		$this->resourceManager->invalidateAccessCacheForProvider($this->resourceProviderCard);
+
+		try {
+			$resource = $this->resourceManager->getResourceForUser(ResourceProvider::RESOURCE_TYPE, $boardId, null);
+			$this->resourceManager->invalidateAccessCacheForResource($resource);
+		} catch (ResourceException $e) {
+			// If there is no resource we don't need to invalidate anything, but this should not happen anyways
+		}
+	}
+}

lib/Middleware/ExceptionMiddleware.php

@@ -33,7 +33,6 @@ use OCP\AppFramework\OCS\OCSException;
 use OCP\AppFramework\OCSController;
 use OCP\ILogger;
 use OCP\IRequest;
-use OCP\Util;
 use OCP\IConfig;
 
 class ExceptionMiddleware extends Middleware {
@@ -85,9 +84,9 @@ class ExceptionMiddleware extends Middleware {
 				'message' => 'Permission denied'
 			], 403);
 		}
-		
+
 		if ($exception instanceof StatusException) {
-			if ($this->config->getSystemValue('loglevel', Util::WARN) === Util::DEBUG) {
+			if ($this->config->getSystemValue('loglevel', ILogger::WARN) === ILogger::DEBUG) {
 				$this->logger->logException($exception);
 			}
 

lib/Migration/DeletedCircleCleanup.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace OCA\Deck\Migration;
+
+use OCA\Deck\Db\Acl;
+use OCA\Deck\Db\AclMapper;
+use OCA\Deck\Service\CirclesService;
+use OCP\Migration\IOutput;
+use OCP\Migration\IRepairStep;
+
+class DeletedCircleCleanup implements IRepairStep {
+	private AclMapper $aclMapper;
+	private CirclesService $circleService;
+
+	public function __construct(AclMapper $aclMapper, CirclesService $circlesService) {
+		$this->aclMapper = $aclMapper;
+		$this->circleService = $circlesService;
+	}
+
+	public function getName() {
+		return 'Cleanup Deck ACL entries for circles which have been already deleted';
+	}
+
+	public function run(IOutput $output) {
+		if (!$this->circleService->isCirclesEnabled()) {
+			return;
+		}
+
+		foreach ($this->aclMapper->findByType(Acl::PERMISSION_TYPE_CIRCLE) as $acl) {
+			if ($this->circleService->getCircle($acl->getParticipant()) === null) {
+				$this->aclMapper->delete($acl);
+				$output->info('Removed circle with id ' . $acl->getParticipant());
+			}
+		}
+	}
+}

lib/Migration/Version10900Date202206151724222.php

@@ -0,0 +1,67 @@
+<?php
+/**
+ * @copyright Copyright (c) 2022, chandi Langecker (git@chandi.it)
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+declare(strict_types=1);
+
+
+namespace OCA\Deck\Migration;
+
+use Closure;
+use OCP\DB\ISchemaWrapper;
+use OCP\DB\Types;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+class Version10900Date202206151724222 extends SimpleMigrationStep {
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+		$schema = $schemaClosure();
+
+		if (!$schema->hasTable('deck_sessions')) {
+			$table = $schema->createTable('deck_sessions');
+			$table->addColumn('id', Types::INTEGER, [
+				'autoincrement' => true,
+				'notnull' => true,
+				'unsigned' => true,
+			]);
+			$table->addColumn('user_id', Types::STRING, [
+				'notnull' => false,
+				'length' => 64,
+			]);
+			$table->addColumn('board_id', Types::INTEGER, [
+				'notnull' => false,
+			]);
+			$table->addColumn('token', Types::STRING, [
+				'notnull' => true,
+				'length' => 64,
+			]);
+			$table->addColumn('last_contact', Types::INTEGER, [
+				'notnull' => true,
+				'length' => 20,
+				'unsigned' => true,
+			]);
+			$table->setPrimaryKey(['id']);
+			$table->addIndex(['board_id'], 'deck_session_board_id_idx');
+			$table->addIndex(['token'], 'deck_session_token_idx');
+			$table->addIndex(['last_contact'], 'deck_session_last_contact_idx');
+		}
+		return $schema;
+	}
+}

lib/Model/BoardSummary.php

@@ -39,6 +39,10 @@ class BoardSummary extends Board {
 		];
 	}
 
+	protected function getter(string $name): mixed {
+		return $this->board->getter($name);
+	}
+
 	public function __call($name, $arguments) {
 		return $this->board->__call($name, $arguments);
 	}

lib/Model/CardDetails.php

@@ -22,7 +22,6 @@
  */
 namespace OCA\Deck\Model;
 
-use DateTime;
 use OCA\Deck\Db\Board;
 use OCA\Deck\Db\Card;
 
@@ -41,6 +40,14 @@ class CardDetails extends Card {
 	}
 
 	public function jsonSerialize(array $extras = []): array {
+		$array = parent::jsonSerialize();
+		$array['overdue'] = $this->getDueStatus();
+
+		unset($array['notified']);
+		unset($array['descriptionPrev']);
+		unset($array['relatedStack']);
+		unset($array['relatedBoard']);
+
 		$array = $this->card->jsonSerialize();
 		unset($array['notified'], $array['descriptionPrev'], $array['relatedStack'], $array['relatedBoard']);
 
@@ -51,30 +58,18 @@ class CardDetails extends Card {
 	}
 
 	private function getDueStatus(): int {
-		$today = new DateTime();
-		$today->setTime(0, 0);
-
-		$match_date = $this->card->getDuedate();
-		if (!$match_date) {
-			return Card::DUEDATE_FUTURE;
+		$diffDays = $this->getDaysUntilDue();
+		if ($diffDays === null || $diffDays > 1) {
+			return static::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;
+			return static::DUEDATE_NEXT;
 		}
 		if ($diffDays === 0) {
-			return Card::DUEDATE_NOW;
-		}
-		if ($diffDays < 0) {
-			return Card::DUEDATE_OVERDUE;
+			return static::DUEDATE_NOW;
 		}
 
-		return Card::DUEDATE_FUTURE;
+		return static::DUEDATE_OVERDUE;
 	}
 
 	private function appendBoardDetails(&$array): void {
@@ -86,7 +81,11 @@ class CardDetails extends Card {
 		$array['board'] = (new BoardSummary($this->board))->jsonSerialize();
 	}
 
-	public function __call($name, $arguments) {
-		return $this->card->__call($name, $arguments);
+	protected function getter(string $name): mixed {
+		return $this->card->getter($name);
+	}
+
+	public function __call(string $methodName, array $args) {
+		return $this->card->__call($methodName, $args);
 	}
 }

lib/NotifyPushEvents.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2022, chandi Langecker (git@chandi.it)
+ *
+ * @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;
+
+class NotifyPushEvents {
+	public const DeckBoardUpdate = 'deck_board_update';
+	public const DeckCardUpdate = 'deck_card_update';
+}

lib/Reference/BoardReferenceProvider.php

@@ -0,0 +1,134 @@
+<?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\NoPermissionException;
+use OCA\Deck\Service\BoardService;
+use OCP\Collaboration\Reference\IReference;
+use OCP\Collaboration\Reference\IReferenceProvider;
+use OCP\Collaboration\Reference\Reference;
+use OCP\IL10N;
+use OCP\IURLGenerator;
+
+class BoardReferenceProvider implements IReferenceProvider {
+	private IURLGenerator $urlGenerator;
+	private BoardService $boardService;
+	private ?string $userId;
+	private IL10N $l10n;
+
+	public function __construct(BoardService $boardService,
+								IURLGenerator $urlGenerator,
+								IL10N $l10n,
+								?string $userId) {
+		$this->urlGenerator = $urlGenerator;
+		$this->boardService = $boardService;
+		$this->userId = $userId;
+		$this->l10n = $l10n;
+	}
+
+	/**
+	 * @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
+		$noIndexMatch = preg_match('/^' . preg_quote($start, '/') . '\/#\/board\/[0-9]+$/', $referenceText) === 1;
+		$indexMatch = preg_match('/^' . preg_quote($startIndex, '/') . '\/#\/board\/[0-9]+$/', $referenceText) === 1;
+
+		return $noIndexMatch || $indexMatch;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function resolveReference(string $referenceText): ?IReference {
+		if ($this->matchReference($referenceText)) {
+			$boardId = $this->getBoardId($referenceText);
+			if ($boardId !== null) {
+				try {
+					$board = $this->boardService->find($boardId)->jsonSerialize();
+				} catch (NoPermissionException $e) {
+					// Skip throwing if user has no permissions
+					return null;
+				}
+				$board = $this->sanitizeSerializedBoard($board);
+				/** @var IReference $reference */
+				$reference = new Reference($referenceText);
+				$reference->setTitle($this->l10n->t('Deck board') . ': ' . $board['title']);
+				$ownerDisplayName = $board['owner']['displayname'] ?? $board['owner']['uid'] ?? '???';
+				$reference->setDescription($this->l10n->t('Owned by %1$s', [$ownerDisplayName]));
+				$imageUrl = $this->urlGenerator->getAbsoluteURL(
+					$this->urlGenerator->imagePath(Application::APP_ID, 'deck-dark.svg')
+				);
+				$reference->setImageUrl($imageUrl);
+				$reference->setRichObject(Application::APP_ID . '-board', [
+					'id' => $boardId,
+					'board' => $board,
+				]);
+				return $reference;
+			}
+		}
+
+		return null;
+	}
+
+	private function sanitizeSerializedBoard(array $board): array {
+		unset($board['labels']);
+		$board['owner'] = $board['owner']->jsonSerialize();
+		unset($board['acl']);
+		unset($board['users']);
+
+		return $board;
+	}
+
+	private function getBoardId(string $url): ?int {
+		$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]+)$/', $url, $matches);
+		if (!$matches) {
+			preg_match('/^' . preg_quote($startIndex, '/') . '\/#\/board\/([0-9]+)$/', $url, $matches);
+		}
+		if ($matches && count($matches) > 1) {
+			return (int) $matches[1];
+		}
+
+		return null;
+	}
+
+	public function getCachePrefix(string $referenceId): string {
+		$boardId = $this->getBoardId($referenceId);
+		if ($boardId !== null) {
+			return (string) $boardId;
+		}
+
+		return $referenceId;
+	}
+
+	public function getCacheKey(string $referenceId): ?string {
+		return $this->userId ?? '';
+	}
+}