test: add test that aborted uploads don't overwrite existing content

Signed-off-by: Robin Appelman <robin@icewind.nl>
fix: fix check if we can use a part file
2025-08-04 17:42:15 +02:00 · 2025-08-04 17:37:49 +02:00 · 2025-08-04 17:34:46 +02:00 · 2025-08-04 17:34:46 +02:00 · 2025-08-04 17:34:44 +02:00
2941 changed files with 35876 additions and 80008 deletions
@@ -49,12 +49,5 @@ module.exports = {
 				'@typescript-eslint/no-explicit-any': 'warn',
 			},
 		},
-		{
-			files: ['*.vue'],
-			rules: {
-				'no-irregular-whitespace': 'off',
-				'vue/no-irregular-whitespace': 'error',
-			},
-		},
 	],
 }
@@ -9,7 +9,6 @@
 # this will override the backend code owners if needed
 /__mocks__                                    @nextcloud/server-frontend
 /__tests__                                    @nextcloud/server-frontend
-/dist                                         @nextcloud/server-frontend
 /cypress                                      @nextcloud/server-frontend
 **/css                                        @nextcloud/server-frontend
 **/js                                         @nextcloud/server-frontend
@@ -20,6 +19,7 @@
 # dependency management
 package.json                                  @nextcloud/server-dependabot @nextcloud/server-frontend
 package-lock.json                             @nextcloud/server-dependabot
+/dist                                         @nextcloud/server-dependabot

 # App maintainers
 /apps/admin_audit/appinfo/info.xml            @luka-nextcloud @blizzz
@@ -56,7 +56,7 @@ package-lock.json                             @nextcloud/server-dependabot
 /apps/webhook_listeners/appinfo/info.xml      @come-nc @julien-nc
 /apps/workflowengine/appinfo/info.xml         @blizzz @juliusknorr

-# Files frontend expertise
+# Frontend expertise
 /apps/files/src*                    @skjnldsv @nextcloud/server-frontend
 /apps/files_external/src*           @skjnldsv @nextcloud/server-frontend
 /apps/files_reminders/src*          @skjnldsv @nextcloud/server-frontend
@@ -91,19 +91,17 @@ ResponseDefinitions.php             @provokateurin @nextcloud/server-backend
 /lib/public/OCM                     @nickvergessen @nextcloud/talk-backend @nextcloud/server-backend
 /lib/public/Talk                    @nickvergessen @nextcloud/talk-backend
 /lib/public/UserStatus              @nickvergessen @nextcloud/talk-backend
-*/Notifications/*                   @nickvergessen @nextcloud/talk-backend

-# Groupware team
-/build/integration/dav_features/caldav.feature            @st3iny @SebastianKrupinski @tcitworld
-/build/integration/dav_features/carddav.feature           @hamza221 @SebastianKrupinski
-/lib/private/Calendar                                     @st3iny @SebastianKrupinski @tcitworld
-/lib/private/Contacts                                     @hamza221 @SebastianKrupinski
-/lib/public/Calendar                                      @st3iny @SebastianKrupinski @tcitworld
-/lib/public/Contacts                                      @hamza221 @SebastianKrupinski
-
-# Desktop client teamn
-/apps/dav/lib/Connector/Sabre/BlockLegacyClientPlugin.php @nextcloud/desktop
+# Groupware
+/build/integration/dav_features/caldav.feature   @st3iny @SebastianKrupinski @tcitworld
+/build/integration/dav_features/carddav.feature  @hamza221 @SebastianKrupinski
+/lib/private/Calendar                            @st3iny @SebastianKrupinski @tcitworld
+/lib/private/Contacts                            @hamza221 @SebastianKrupinski
+/lib/public/Calendar                             @st3iny @SebastianKrupinski @tcitworld
+/lib/public/Contacts                             @hamza221 @SebastianKrupinski

 # Personal interest
 */Activity/*                                     @nickvergessen @nextcloud/server-backend
-/apps/workflowengine/lib                         @nickvergessen @blizzz
+*/Notifications/*                                @nickvergessen @nextcloud/talk-backend
+/apps/workflowengine/lib                         @nickvergessen
+
@@ -71,9 +71,9 @@ body:
        Select Nextcloud Server version.
        _Versions not listed here are not maintained and not supported anymore_
      options:
+        - "29"
        - "30"
        - "31"
-        - "32"
        - "master"
    validations:
      required: true
@@ -54,7 +54,7 @@ updates:
 # Latest stable release
 # Composer dependencies for linting and testing
 - package-ecosystem: composer
-  target-branch: stable32
+  target-branch: stable31
  directories:
    - "/"
    - "/build/integration"
@@ -78,7 +78,7 @@ updates:
 # Latest stable branch
 # frontend dependencies
 - package-ecosystem: npm
-  target-branch: stable32
+  target-branch: stable31
  directory: "/"
  schedule:
    interval: weekly
@@ -99,28 +99,6 @@ updates:
 # Older stable releases

 # Composer dependencies for linting and testing
- package-ecosystem: composer
-  target-branch: stable31
-  directories:
-    - "/"
-    - "/build/integration"
-    - "/vendor-bin/cs-fixer"
-    - "/vendor-bin/openapi-extractor"
-    - "/vendor-bin/phpunit"
-    - "/vendor-bin/psalm"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "04:00"
-    timezone: Europe/Paris
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  ignore:
-    # only patch updates on stable branches
-    - dependency-name: "*"
-      update-types: ["version-update:semver-major", "version-update:semver-minor"]
-
 - package-ecosystem: composer
  target-branch: stable30
  directories:
@@ -144,25 +122,6 @@ updates:
      update-types: ["version-update:semver-major", "version-update:semver-minor"]

 # frontend dependencies
- package-ecosystem: npm
-  target-branch: stable31
-  directory: "/"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "04:00"
-    timezone: Europe/Paris
-  open-pull-requests-limit: 20
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  # Disable automatic rebasing because without a build CI will likely fail anyway
-  rebase-strategy: "disabled"
-  ignore:
-    # no major updates on stable branches
-    - dependency-name: "*"
-      update-types: ["version-update:semver-major"]
-
 - package-ecosystem: npm
  target-branch: stable30
  directory: "/"
@@ -21,5 +21,3 @@
 - [ ] Screenshots before/after for front-end changes
 - [ ] Documentation ([manuals](https://github.com/nextcloud/documentation/) or wiki) has been updated or is not required
 - [ ] [Backports requested](https://github.com/nextcloud/backportbot/#usage) where applicable (ex: critical bugfixes)
- [ ] [Labels added](https://github.com/nextcloud/server/labels) where applicable (ex: bug/enhancement, `3. to review`, feature component)
- [ ] [Milestone added](https://github.com/nextcloud/server/milestones) for target branch/version (ex: 32.x for `stable32`)
@@ -52,13 +52,13 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
+        uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 #v2.35.2
        with:
          php-version: ${{ matrix.php-versions }}
          extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
@@ -81,13 +81,13 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
+        uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 #v2.35.2
        with:
          php-version: ${{ matrix.php-versions }}
          extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
@@ -31,7 +31,7 @@ jobs:
              - 'version.php'

      - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false

@@ -27,7 +27,7 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false

@@ -32,7 +32,7 @@ jobs:
          build-mode: none
    steps:
    - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v4

    - name: Initialize CodeQL
      uses: github/codeql-action/init@v3
@@ -103,7 +103,7 @@ jobs:
          key: git-repo

      - name: Checkout ${{ needs.init.outputs.head_ref }}
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          # Needed to allow force push later
          persist-credentials: true
@@ -124,7 +124,7 @@ jobs:
          fallbackNpm: '^10'

      - name: Set up node ${{ steps.package-engines-versions.outputs.nodeVersion }}
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          node-version: ${{ steps.package-engines-versions.outputs.nodeVersion }}
          cache: npm
@@ -38,7 +38,7 @@ jobs:
        id: comment-branch

      - name: Checkout ${{ steps.comment-branch.outputs.head_ref }}
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          fetch-depth: 0
@@ -48,7 +48,7 @@ jobs:
          exit 1

      - name: Checkout server
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          # We need to checkout submodules for 3rdparty
@@ -72,7 +72,7 @@ jobs:
          fallbackNpm: "^10"

      - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          node-version: ${{ steps.versions.outputs.nodeVersion }}

@@ -102,10 +102,10 @@ jobs:
      matrix:
        # Run multiple copies of the current job in parallel
        # Please increase the number or runners as your tests suite grows (0 based index for e2e tests)
-        containers: ['component', 'setup', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9']
+        containers: ['component', 'setup', '0', '1', '2', '3', '4', '5', '6', '7']
        # Hack as strategy.job-total includes the component and GitHub does not allow math expressions
        # Always align this number with the total of e2e runners (max. index + 1)
-        total-containers: [10]
+        total-containers: [8]

    services:
      mysql:
@@ -163,7 +163,7 @@ jobs:
          path: ./

      - name: Set up node ${{ needs.init.outputs.nodeVersion }}
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          node-version: ${{ needs.init.outputs.nodeVersion }}

@@ -55,7 +55,7 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          submodules: true
@@ -71,7 +71,7 @@ jobs:
          if [[ "${{ matrix.ftpd }}" == 'pure-ftpd' ]]; then docker run --name ftp -d --net host -e "PUBLICHOST=localhost" -e FTP_USER_NAME=test -e FTP_USER_PASS=test -e FTP_USER_HOME=/home/test -v /tmp/ftp:/home/test -v /tmp/ftp:/etc/pure-ftpd/passwd stilliard/pure-ftpd; fi

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
+        uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 #v2.35.2
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -104,7 +104,7 @@ jobs:

      - name: Upload code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
+        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
        with:
          files: ./clover.xml
          flags: phpunit-files-external-ftp
@@ -64,13 +64,13 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
+        uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 #v2.35.2
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -104,7 +104,7 @@ jobs:

      - name: Upload code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
+        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
        with:
          files: ./clover.xml
          flags: phpunit-files-external-s3
@@ -152,13 +152,13 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
+        uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 #v2.35.2
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -185,7 +185,7 @@ jobs:

      - name: Upload code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
+        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
        with:
          files: ./clover.xml
          flags: phpunit-files-external-s3
@@ -55,7 +55,7 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          submodules: true
@@ -67,7 +67,7 @@ jobs:
          if [[ '${{ matrix.sftpd }}' == 'openssh' ]]; then docker run -p 2222:22 --name sftp -d -v /tmp/sftp:/home/test atmoz/sftp 'test:test:::data'; fi

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
+        uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 #v2.35.2
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -93,7 +93,7 @@ jobs:

      - name: Upload code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
+        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
        with:
          files: ./clover.xml
          flags: phpunit-files-external-sftp
@@ -46,13 +46,13 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          submodules: true

      - name: Checkout user_saml
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          repository: nextcloud/user_saml
@@ -60,13 +60,13 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
+        uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 #v2.35.2
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -100,7 +100,7 @@ jobs:

      - name: Upload code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
+        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
        with:
          files: ./clover.xml
          flags: phpunit-files-external-smb
@@ -60,13 +60,13 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
+        uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 #v2.35.2
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -97,7 +97,7 @@ jobs:

      - name: Upload code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
+        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
        with:
          files: ./clover.xml
          flags: phpunit-files-external-webdav
@@ -53,13 +53,13 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
+        uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 #v2.35.2
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -85,7 +85,7 @@ jobs:

      - name: Upload code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
+        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
        with:
          files: ./clover.xml
          flags: phpunit-files-external-generic
@@ -24,14 +24,14 @@ jobs:
          require: write

      - name: Checkout github_helper
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          repository: nextcloud/github_helper
          path: github_helper

      - name: Checkout server
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          path: server
@@ -47,13 +47,8 @@ jobs:
          TAGS=$(git log --decorate --oneline | egrep 'tag: ' | sed -r 's/^.+tag: ([^,\)]+)[,\)].+$/\1/g')
          CURRENT_TAG=$(echo "$TAGS" | head -n 1)

-          # If current tag is the first beta, we use the previous major RC1
-          if echo "$CURRENT_TAG" | grep -q 'beta1'; then
-            MAJOR=$(echo "$CURRENT_TAG" | sed -E 's/^v([0-9]+).*/\1/')
-            PREV=$((MAJOR - 1))
-            PREVIOUS_TAG="v${PREV}.0.0rc1"
          # Get the previous tag - filter pre-releases only if current tag is stable
-          elif echo "$CURRENT_TAG" | grep -q 'rc\|beta\|alpha'; then
+          if echo "$CURRENT_TAG" | grep -q 'rc\|beta\|alpha'; then
            # Current tag is pre-release, don't filter
            PREVIOUS_TAG=$(echo "$TAGS" | sed -n '2p')
          else
@@ -73,7 +68,7 @@ jobs:
         fi

      - name: Set up php 8.2
-        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 # v2.35.4
+        uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 # v2.35.2
        with:
          php-version: 8.2
          coverage: none
@@ -53,13 +53,13 @@ jobs:

    steps:
        - name: Checkout server
-          uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+          uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
          with:
            persist-credentials: false
            submodules: true

        - name: Set up php ${{ matrix.php-versions }}
-          uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
+          uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 #v2.35.2
          with:
            php-version: ${{ matrix.php-versions }}
            # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -70,7 +70,7 @@ jobs:
            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

        - name: Set up Python
-          uses: LizardByte/actions/actions/setup_python@bff0a193747a3ac7930a665fc1d4b23eba583b99 # v2025.814.40518
+          uses: LizardByte/actions/actions/setup_python@eddc8fc8b27048e25040e37e3585bd3ef9a968ed # v2025.715.25226
          with:
            python-version: '2.7'

@@ -52,13 +52,13 @@ jobs:

    steps:
        - name: Checkout server
-          uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+          uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
          with:
            persist-credentials: false
            submodules: true

        - name: Set up php ${{ matrix.php-versions }}
-          uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
+          uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 #v2.35.2
          with:
            php-version: ${{ matrix.php-versions }}
            # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -67,13 +67,13 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
+        uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 #v2.35.2
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -95,14 +95,14 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          submodules: true

      - name: Checkout Talk app
        if: ${{ matrix.test-suite == 'videoverification_features' }}
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          repository: nextcloud/spreed
@@ -111,7 +111,7 @@ jobs:

      - name: Checkout Activity app
        if: ${{ matrix.test-suite == 'sharing_features' }}
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          repository: nextcloud/activity
@@ -119,7 +119,7 @@ jobs:
          ref: ${{ matrix.activity-versions }}

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
+        uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 #v2.35.2
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -56,7 +56,7 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false

@@ -68,7 +68,7 @@ jobs:
          fallbackNpm: '^10'

      - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          node-version: ${{ steps.versions.outputs.nodeVersion }}

@@ -48,12 +48,12 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false

      - name: Set up php8.1
-        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 # v2.35.4
+        uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 # v2.35.2
        with:
          php-version: 8.1
          extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
@@ -53,12 +53,12 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 # v2.35.4
+        uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 # v2.35.2
        with:
          php-version: ${{ matrix.php-versions }}
          coverage: none
@@ -25,7 +25,7 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false

@@ -37,7 +37,7 @@ jobs:
          fallbackNpm: '^10'

      - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          node-version: ${{ steps.versions.outputs.nodeVersion }}

@@ -62,7 +62,7 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false

@@ -85,12 +85,12 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false

      - name: Set up node ${{ needs.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          node-version: ${{ needs.versions.outputs.nodeVersion }}

@@ -106,7 +106,7 @@ jobs:
        run: npm run test:coverage --if-present

      - name: Collect coverage
-        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
+        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
        with:
          files: ./coverage/lcov.info

@@ -125,12 +125,12 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false

      - name: Set up node ${{ needs.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          node-version: ${{ needs.versions.outputs.nodeVersion }}

@@ -155,12 +155,12 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false

      - name: Set up node ${{ needs.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          node-version: ${{ needs.versions.outputs.nodeVersion }}

@@ -56,7 +56,7 @@ jobs:
    name: NPM build
    steps:
      - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false

@@ -68,7 +68,7 @@ jobs:
          fallbackNpm: '^10'

      - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          node-version: ${{ steps.versions.outputs.nodeVersion }}

@@ -24,14 +24,14 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        branches: ['main', 'master', 'stable32', 'stable31', 'stable30']
+        branches: ['main', 'master', 'stable31', 'stable30']

    name: npm-audit-fix-${{ matrix.branches }}

    steps:
      - name: Checkout
        id: checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          ref: ${{ matrix.branches }}
@@ -45,7 +45,7 @@ jobs:
          fallbackNpm: '^10'

      - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          node-version: ${{ steps.versions.outputs.nodeVersion }}

@@ -73,13 +73,13 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
+        uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 #v2.35.2
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -110,7 +110,7 @@ jobs:

      - name: Upload code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
+        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
        with:
          files: ./clover.xml
          flags: phpunit-azure
@@ -74,13 +74,13 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
+        uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 #v2.35.2
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -116,7 +116,7 @@ jobs:

      - name: Upload code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
+        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
        with:
          files: ./clover.xml
          flags: phpunit-s3
@@ -71,13 +71,13 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
+        uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 #v2.35.2
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -106,7 +106,7 @@ jobs:

      - name: Upload code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
+        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
        with:
          files: ./clover.xml
          flags: phpunit-swift
@@ -26,12 +26,12 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false

      - name: Set up php
-        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 # v2.35.4
+        uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 # v2.35.2
        with:
          php-version: '8.1'
          extensions: ctype, curl, dom, fileinfo, gd, json, libxml, mbstring, openssl, pcntl, pdo, posix, session, simplexml, xml, xmlreader, xmlwriter, zip, zlib
@@ -35,14 +35,14 @@ jobs:
          exit 1

      - name: Checkout server before PR
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          submodules: true
          ref: ${{ github.event.pull_request.base.ref }}

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 # v2.35.4
+        uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 # v2.35.2
        with:
          php-version: ${{ matrix.php-versions }}
          extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
@@ -34,7 +34,7 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          submodules: true
@@ -45,7 +45,7 @@ jobs:
          sudo apt-get install -y ffmpeg imagemagick libmagickcore-6.q16-3-extra

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
+        uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 #v2.35.2
        with:
          php-version: ${{ matrix.php-versions }}
          extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, imagick, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite, apcu, ldap
@@ -90,13 +90,13 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 # v2.35.4
+        uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 # v2.35.2
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -129,7 +129,7 @@ jobs:

      - name: Upload db code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
+        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
        with:
          files: ./clover.db.xml
          flags: phpunit-mariadb
@@ -72,13 +72,13 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
+        uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 #v2.35.2
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -103,7 +103,7 @@ jobs:

      - name: Upload code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
+        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
        with:
          files: ./clover.xml
          flags: phpunit-memcached
@@ -121,13 +121,13 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
+        uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 #v2.35.2
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -161,7 +161,7 @@ jobs:

      - name: Upload db code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
+        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
        with:
          files: ./clover.db.xml
          flags: phpunit-mysql
@@ -90,13 +90,13 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 # v2.35.4
+        uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 # v2.35.2
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -129,7 +129,7 @@ jobs:

      - name: Upload db code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
+        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
        with:
          files: ./clover.db.xml
          flags: phpunit-mysql
@@ -75,13 +75,13 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
+        uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 #v2.35.2
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -109,7 +109,7 @@ jobs:

      - name: Upload nodb code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
+        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
        with:
          files: ./clover.nodb.xml
          flags: phpunit-nodb
@@ -72,13 +72,13 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
+        uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 #v2.35.2
        with:
          php-version: ${{ matrix.php-versions }}
          extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
@@ -101,13 +101,13 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 # v2.35.4
+        uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 # v2.35.2
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -133,7 +133,7 @@ jobs:

      - name: Upload db code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
+        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
        with:
          files: ./clover.db.xml
          flags: phpunit-oci
@@ -90,13 +90,13 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 # v2.35.4
+        uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 # v2.35.2
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -124,7 +124,7 @@ jobs:

      - name: Upload db code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
+        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
        with:
          files: ./clover.db.xml
          flags: phpunit-postgres
@@ -75,13 +75,13 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 # v2.35.4
+        uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 # v2.35.2
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -110,7 +110,7 @@ jobs:

      - name: Upload db code coverage
        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
+        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
        with:
          files: ./clover.db.xml
          flags: phpunit-sqlite
@@ -19,7 +19,7 @@ jobs:
    runs-on: ubuntu-latest-low
    steps:
      - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false

@@ -20,7 +20,7 @@ jobs:
      issues: write

    steps:
-    - uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v9
+    - uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9
      with:
        repo-token: ${{ secrets.COMMAND_BOT_PAT }}
        stale-issue-message: >
@@ -28,13 +28,13 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
        with:
          persist-credentials: false
          submodules: true

      - name: Set up php
-        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
+        uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 #v2.35.2
        with:
          php-version: '8.1'
          extensions: apcu,ctype,curl,dom,fileinfo,ftp,gd,imagick,intl,json,ldap,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
@@ -59,13 +59,13 @@ jobs:

    steps:
      - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
        with:
          persist-credentials: false
          submodules: true

      - name: Set up php
-        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
+        uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 #v2.35.2
        with:
          php-version: '8.1'
          extensions: ctype,curl,dom,fileinfo,ftp,gd,imagick,intl,json,ldap,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
@@ -94,13 +94,13 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
        with:
          persist-credentials: false
          submodules: true

      - name: Set up php
-        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
+        uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 #v2.35.2
        with:
          php-version: '8.1'
          extensions: ctype,curl,dom,fileinfo,gd,imagick,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
@@ -125,13 +125,13 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
        with:
          persist-credentials: false
          submodules: true

      - name: Set up php
-        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
+        uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 #v2.35.2
        with:
          php-version: '8.1'
          extensions: ctype,curl,dom,fileinfo,gd,imagick,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
@@ -17,12 +17,12 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        branches: ['master', 'stable32', 'stable31', 'stable30', 'stable29',  'stable28',  'stable27', 'stable26', 'stable25', 'stable24', 'stable23', 'stable22']
+        branches: ['master', 'stable31', 'stable30', 'stable29',  'stable28',  'stable27', 'stable26', 'stable25', 'stable24', 'stable23', 'stable22']

    name: update-ca-certificate-bundle-${{ matrix.branches }}

    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          ref: ${{ matrix.branches }}
@@ -17,12 +17,12 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        branches: ['master', 'stable32', 'stable31', 'stable30', 'stable29',  'stable28',  'stable27', 'stable26', 'stable25', 'stable24', 'stable23', 'stable22']
+        branches: ['master', 'stable31', 'stable30', 'stable29',  'stable28',  'stable27', 'stable26', 'stable25', 'stable24', 'stable23', 'stable22']

    name: update-code-signing-crl-${{ matrix.branches }}

    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          ref: ${{ matrix.branches }}
@@ -1,6 +1,5 @@
-# SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+# SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
 # SPDX-License-Identifier: MIT
-
 name: Update min supported desktop version

 on:
@@ -16,7 +15,7 @@ jobs:
    runs-on: ubuntu-latest-low

    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          submodules: true
@@ -125,4 +124,4 @@ jobs:
            client: 💻 desktop
            automated
            3. to review
-          reviewers: '@nextcloud/desktop'
+          reviewers: tobiasKaminsky, camilasan, claucambra
@@ -60,6 +60,7 @@
 </IfModule>

 <IfModule mod_php.c>
+  php_value mbstring.func_overload 0
  php_value default_charset 'UTF-8'
  php_value output_buffering 0
  <IfModule mod_env.c>
@@ -252,7 +252,6 @@ Michael Monreal <michael.monreal@gmail.com>
 Michael Roitzsch <reactorcontrol@icloud.com>
 michag86 <micha_g@arcor.de>
 Michiel de Jong <michiel@unhosted.org> Michiel@unhosted <michiel@unhosted.org>
-Micke Nordin <kano@sunet.se> Mikael Nordin <mickenordin@users.noreply.github.com>
 Miguel Prokop <miguel.prokop@vtu.com>
 miicha <pfitzner@physik.hu-berlin.de>
 Miquel Rodríguez Telep / Michael Rodríguez-Torrent <miquel@designunbound.co.uk>
@@ -14,14 +14,11 @@ $config = new Config();
 $config
 	->setParallelConfig(ParallelConfigFactory::detect())
 	->getFinder()
-	->in(__DIR__)
-	->exclude([
-		'3rdparty',
-		'build/stubs',
-		'composer',
-	])
-;
-
+	->exclude('config')
+	->exclude('3rdparty')
+	->exclude('build/stubs')
+	->exclude('composer')
+	->in(__DIR__);

 $ignoredEntries = shell_exec('git status --porcelain --ignored ' . escapeshellarg(__DIR__));
 $ignoredEntries = explode("\n", $ignoredEntries);
@@ -1,9 +1,7 @@
 ; SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
 ; SPDX-FileCopyrightText: 2014-2016 ownCloud, Inc.
 ; SPDX-License-Identifier: AGPL-3.0-only
-;
-; NOTE: PHP caches this file for 300 seconds by default
-;
+mbstring.func_overload=0
 always_populate_raw_post_data=-1
 default_charset='UTF-8'
 output_buffering=0
@@ -338,6 +338,7 @@
 - Mickey Knox <mickey@netfreaks.org>
 - Miguel Prokop <miguel.prokop@vtu.com>
 - Mikael Hammarin <mikael@try2.se>
+ - Mikael Nordin <mickenordin@users.noreply.github.com>
 - Mikael Saarinen <mikaels@iki.fi>
 - Mikhail Sazanov <m@sazanof.ru>
 - Mitar <mitar.git@tnode.com>
@@ -14,5 +14,4 @@ export default {
 	get: async () => ({ status: 200, data: {} }),
 	delete: async () => ({ status: 200, data: {} }),
 	post: async () => ({ status: 200, data: {} }),
-	head: async () => ({ status: 200, data: {} }),
 }
@@ -2,13 +2,7 @@
 * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
 * SPDX-License-Identifier: AGPL-3.0-or-later
 */
-window.OC = {
-	...window.OC,
-	config: {
-		version: '32.0.0',
-		...(window.OC?.config ?? {}),
-	},
-}
+window.OC = { ...window.OC }
 window.OCA = { ...window.OCA }
 window.OCP = { ...window.OCP }

@@ -10,7 +10,7 @@
 	<name>Auditing / Logging</name>
 	<summary>Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions.</summary>
 	<description>Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions.</description>
-	<version>1.23.0</version>
+	<version>1.22.0</version>
 	<licence>agpl</licence>
 	<author>Nextcloud</author>
 	<namespace>AdminAudit</namespace>
@@ -20,7 +20,7 @@
 	<category>monitoring</category>
 	<bugs>https://github.com/nextcloud/server/issues</bugs>
 	<dependencies>
-		<nextcloud min-version="33" max-version="33"/>
+		<nextcloud min-version="32" max-version="32"/>
 	</dependencies>
 	<background-jobs>
 		<job>OCA\AdminAudit\BackgroundJobs\Rotate</job>
@@ -1,7 +1,7 @@
 OC.L10N.register(
    "admin_audit",
    {
-    "Auditing / Logging" : "حسابرسی / گزارش‌گیری",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "قابلیت‌های گزارش‌گیری مانند ثبت گزارش دسترسی به پرونده‌ها یا اقدامات حساس دیگر را برای نکست‌کلود فراهم می‌کند."
+    "Auditing / Logging" : "حسابرسی / ورود به سیستم",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "قابلیت‌های ثبت‌نام را برای نکست‌کلود فراهم می‌کند، مانند ثبت دسترسی به فایل‌ها یا اقدامات حساس دیگر."
 },
 "nplurals=2; plural=(n > 1);");
@@ -1,5 +1,5 @@
 { "translations": {
-    "Auditing / Logging" : "حسابرسی / گزارش‌گیری",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "قابلیت‌های گزارش‌گیری مانند ثبت گزارش دسترسی به پرونده‌ها یا اقدامات حساس دیگر را برای نکست‌کلود فراهم می‌کند."
+    "Auditing / Logging" : "حسابرسی / ورود به سیستم",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "قابلیت‌های ثبت‌نام را برای نکست‌کلود فراهم می‌کند، مانند ثبت دسترسی به فایل‌ها یا اقدامات حساس دیگر."
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
@@ -2,7 +2,7 @@

 declare(strict_types=1);

-/**
+/*!
 * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
 * SPDX-License-Identifier: AGPL-3.0-or-later
 */
@@ -9,7 +9,7 @@
 	<name>Cloud Federation API</name>
 	<summary>Enable clouds to communicate with each other and exchange data</summary>
 	<description>The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data.</description>
-	<version>1.17.0</version>
+	<version>1.16.0</version>
 	<licence>agpl</licence>
 	<author>Bjoern Schiessle</author>
 	<namespace>CloudFederationAPI</namespace>
@@ -19,6 +19,6 @@
 	<category>integration</category>
 	<bugs>https://github.com/nextcloud/server/issues</bugs>
 	<dependencies>
-		<nextcloud min-version="33" max-version="33"/>
+		<nextcloud min-version="32" max-version="32"/>
 	</dependencies>
 </info>
@@ -9,14 +9,26 @@ declare(strict_types=1);

 namespace OCA\CloudFederationAPI;

-use OC\OCM\OCMDiscoveryService;
+use NCU\Security\Signature\Exceptions\IdentityNotFoundException;
+use NCU\Security\Signature\Exceptions\SignatoryException;
+use OC\OCM\OCMSignatoryManager;
 use OCP\Capabilities\ICapability;
 use OCP\Capabilities\IInitialStateExcludedCapability;
+use OCP\IAppConfig;
+use OCP\IURLGenerator;
 use OCP\OCM\Exceptions\OCMArgumentException;
+use OCP\OCM\ICapabilityAwareOCMProvider;
+use Psr\Log\LoggerInterface;

 class Capabilities implements ICapability, IInitialStateExcludedCapability {
+	public const API_VERSION = '1.1.0';
+
 	public function __construct(
-		private readonly OCMDiscoveryService $ocmDiscoveryService,
+		private IURLGenerator $urlGenerator,
+		private IAppConfig $appConfig,
+		private ICapabilityAwareOCMProvider $provider,
+		private readonly OCMSignatoryManager $ocmSignatoryManager,
+		private readonly LoggerInterface $logger,
 	) {
 	}

@@ -27,7 +39,40 @@ class Capabilities implements ICapability, IInitialStateExcludedCapability {
 	 * @throws OCMArgumentException
 	 */
 	public function getCapabilities() {
-		$provider = $this->ocmDiscoveryService->getLocalOCMProvider(false);
-		return ['ocm' => $provider->jsonSerialize()];
+		$url = $this->urlGenerator->linkToRouteAbsolute('cloud_federation_api.requesthandlercontroller.addShare');
+		$pos = strrpos($url, '/');
+		if ($pos === false) {
+			throw new OCMArgumentException('generated route should contain a slash character');
+		}
+
+		$this->provider->setEnabled(true);
+		$this->provider->setApiVersion(self::API_VERSION);
+		$this->provider->setCapabilities(['/invite-accepted', '/notifications', '/shares']);
+
+		$this->provider->setEndPoint(substr($url, 0, $pos));
+
+		$resource = $this->provider->createNewResourceType();
+		$resource->setName('file')
+			->setShareTypes(['user', 'group'])
+			->setProtocols(['webdav' => '/public.php/webdav/']);
+
+		$this->provider->addResourceType($resource);
+
+		// Adding a public key to the ocm discovery
+		try {
+			if (!$this->appConfig->getValueBool('core', OCMSignatoryManager::APPCONFIG_SIGN_DISABLED, lazy: true)) {
+				/**
+				 * @experimental 31.0.0
+				 * @psalm-suppress UndefinedInterfaceMethod
+				 */
+				$this->provider->setSignatory($this->ocmSignatoryManager->getLocalSignatory());
+			} else {
+				$this->logger->debug('ocm public key feature disabled');
+			}
+		} catch (SignatoryException|IdentityNotFoundException $e) {
+			$this->logger->warning('cannot generate local signatory', ['exception' => $e]);
+		}
+
+		return ['ocm' => $this->provider->jsonSerialize()];
 	}
 }
@@ -12,11 +12,9 @@ namespace OCA\CloudFederationAPI\Migration;
 use Closure;
 use OCP\DB\ISchemaWrapper;
 use OCP\DB\Types;
-use OCP\Migration\Attributes\CreateTable;
 use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;

-#[CreateTable(table: 'federated_invites', columns: ['id', 'user_id', 'recipient_provider', 'recipient_user_id', 'recipient_name', 'recipient_email', 'token', 'accepted', 'created_at', 'expired_at', 'accepted_at'], description: 'Supporting the OCM Invitation Flow feature')]
 class Version1016Date202502262004 extends SimpleMigrationStep {
 	/**
 	 * @param IOutput $output
@@ -10,7 +10,7 @@
 	<name>Comments</name>
 	<summary>Files app plugin to add comments to files</summary>
 	<description>Files app plugin to add comments to files</description>
-	<version>1.23.0</version>
+	<version>1.22.0</version>
 	<licence>agpl</licence>
 	<author>Arthur Schiwon</author>
 	<author>Vincent Petry</author>
@@ -21,7 +21,7 @@
 	<category>social</category>
 	<bugs>https://github.com/nextcloud/server/issues</bugs>
 	<dependencies>
-		<nextcloud min-version="33" max-version="33"/>
+		<nextcloud min-version="32" max-version="32"/>
 	</dependencies>

 	<activity>
@@ -1,36 +0,0 @@
-OC.L10N.register(
-    "comments",
-    {
-    "Comments" : "Каментарыі",
-    "You commented" : "Вы пракаментавалі",
-    "{author} commented" : "{author} пракаментаваў(-ла)",
-    "You commented on %1$s" : "Вы пракаментавалі %1$s",
-    "You commented on {file}" : "Вы пракаментавалі {file}",
-    "%1$s commented on %2$s" : "%1$s пракаментаваў(-ла) %2$s",
-    "{author} commented on {file}" : "{author} пракаментаваў(-ла) {file}",
-    "<strong>Comments</strong> for files" : "<strong>Каментарыі</strong> да файлаў",
-    "Files" : "Файлы",
-    "You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "Вас згадалі ў каментарыі да \"{file}\" з уліковага запісу, які пазней быў выдалены.",
-    "{user} mentioned you in a comment on \"{file}\"" : "{user} згадаў(-ла) вас у каментарыі да \"{file}\"",
-    "Files app plugin to add comments to files" : "Убудова праграмы Файлы для дадавання каментарыяў да файлаў",
-    "Edit comment" : "Рэдагаваць каментарый",
-    "Delete comment" : "Выдаліць каментарый",
-    "Cancel edit" : "Скасаваць рэдагаванне",
-    "New comment" : "Новы каментарый",
-    "Write a comment …" : "Напішыце каментарый …",
-    "Post comment" : "Апублікаваць каментарый",
-    "@ for mentions, : for emoji, / for smart picker" : "@ - згадкі, : - эмодзі, / - разумны выбар",
-    "Could not reload comments" : "Не ўдалося перазагрузіць каментарыі",
-    "Failed to mark comments as read" : "Не атрымалася пазначыць каментарыі як прачытаныя",
-    "Unable to load the comments list" : "Не ўдалося загрузіць спіс каментарыяў",
-    "No comments yet, start the conversation!" : "Пакуль няма каментарыяў, пачніце размову!",
-    "No more messages" : "Больш паведамленняў няма",
-    "Retry" : "Паўтарыць спробу",
-    "_1 new comment_::_{unread} new comments_" : ["1 новы каментарый","{unread} новыя каментарыі","{unread} новых каментарыяў","{unread} новых каментарыяў"],
-    "Comment" : "Каментарый",
-    "An error occurred while trying to edit the comment" : "Падчас спробы рэдагавання каментарыя ўзнікла памылка",
-    "Comment deleted" : "Каментарый выдалены",
-    "An error occurred while trying to delete the comment" : "Падчас спробы выдалення каментарыя ўзнікла памылка",
-    "An error occurred while trying to create the comment" : "Падчас спробы стварэння каментарыя ўзнікла памылка"
-},
-"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);");
@@ -1,34 +0,0 @@
-{ "translations": {
-    "Comments" : "Каментарыі",
-    "You commented" : "Вы пракаментавалі",
-    "{author} commented" : "{author} пракаментаваў(-ла)",
-    "You commented on %1$s" : "Вы пракаментавалі %1$s",
-    "You commented on {file}" : "Вы пракаментавалі {file}",
-    "%1$s commented on %2$s" : "%1$s пракаментаваў(-ла) %2$s",
-    "{author} commented on {file}" : "{author} пракаментаваў(-ла) {file}",
-    "<strong>Comments</strong> for files" : "<strong>Каментарыі</strong> да файлаў",
-    "Files" : "Файлы",
-    "You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "Вас згадалі ў каментарыі да \"{file}\" з уліковага запісу, які пазней быў выдалены.",
-    "{user} mentioned you in a comment on \"{file}\"" : "{user} згадаў(-ла) вас у каментарыі да \"{file}\"",
-    "Files app plugin to add comments to files" : "Убудова праграмы Файлы для дадавання каментарыяў да файлаў",
-    "Edit comment" : "Рэдагаваць каментарый",
-    "Delete comment" : "Выдаліць каментарый",
-    "Cancel edit" : "Скасаваць рэдагаванне",
-    "New comment" : "Новы каментарый",
-    "Write a comment …" : "Напішыце каментарый …",
-    "Post comment" : "Апублікаваць каментарый",
-    "@ for mentions, : for emoji, / for smart picker" : "@ - згадкі, : - эмодзі, / - разумны выбар",
-    "Could not reload comments" : "Не ўдалося перазагрузіць каментарыі",
-    "Failed to mark comments as read" : "Не атрымалася пазначыць каментарыі як прачытаныя",
-    "Unable to load the comments list" : "Не ўдалося загрузіць спіс каментарыяў",
-    "No comments yet, start the conversation!" : "Пакуль няма каментарыяў, пачніце размову!",
-    "No more messages" : "Больш паведамленняў няма",
-    "Retry" : "Паўтарыць спробу",
-    "_1 new comment_::_{unread} new comments_" : ["1 новы каментарый","{unread} новыя каментарыі","{unread} новых каментарыяў","{unread} новых каментарыяў"],
-    "Comment" : "Каментарый",
-    "An error occurred while trying to edit the comment" : "Падчас спробы рэдагавання каментарыя ўзнікла памылка",
-    "Comment deleted" : "Каментарый выдалены",
-    "An error occurred while trying to delete the comment" : "Падчас спробы выдалення каментарыя ўзнікла памылка",
-    "An error occurred while trying to create the comment" : "Падчас спробы стварэння каментарыя ўзнікла памылка"
-},"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"
-}
@@ -13,9 +13,9 @@ OC.L10N.register(
    "You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "Du blev nævnt på \"{file}\", i en kommentar af en konto, som siden er blevet slettet",
    "{user} mentioned you in a comment on \"{file}\"" : "{user} nævnte dig i en kommentar til \"{file}\"",
    "Files app plugin to add comments to files" : "Files app plugin til at tilføje kommentarer til filer",
-    "Edit comment" : "Redigér kommentar",
+    "Edit comment" : "Rediger kommentar",
    "Delete comment" : "Slet kommentar",
-    "Cancel edit" : "Annullér redigering",
+    "Cancel edit" : "Annuller redigering",
    "New comment" : "Ny kommentar",
    "Write a comment …" : "Skriv kommentar…",
    "Post comment" : "Skriv kommentar",
@@ -11,9 +11,9 @@
    "You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "Du blev nævnt på \"{file}\", i en kommentar af en konto, som siden er blevet slettet",
    "{user} mentioned you in a comment on \"{file}\"" : "{user} nævnte dig i en kommentar til \"{file}\"",
    "Files app plugin to add comments to files" : "Files app plugin til at tilføje kommentarer til filer",
-    "Edit comment" : "Redigér kommentar",
+    "Edit comment" : "Rediger kommentar",
    "Delete comment" : "Slet kommentar",
-    "Cancel edit" : "Annullér redigering",
+    "Cancel edit" : "Annuller redigering",
    "New comment" : "Ny kommentar",
    "Write a comment …" : "Skriv kommentar…",
    "Post comment" : "Skriv kommentar",
@@ -10,18 +10,13 @@ OC.L10N.register(
    "{author} commented on {file}" : "Ο {author} σχολίασε στο {file}",
    "<strong>Comments</strong> for files" : "<strong>Σχόλια</strong> για αρχεία",
    "Files" : "Αρχεία",
-    "You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "Σας ανέφεραν στο \"{file}\", σε σχόλιο από λογαριασμό που έχει πλέον διαγραφεί",
    "{user} mentioned you in a comment on \"{file}\"" : "Ο/η {user} σας ανέφερε σε σχόλιο στο “{file}”",
-    "Files app plugin to add comments to files" : "Πρόσθετο εφαρμογής Αρχεία για προσθήκη σχολίων σε αρχεία",
+    "Files app plugin to add comments to files" : "Επέκταση της εφαρμογής Αρχεία που επιτρέπει την προσθήκη σχολίων σε αρχεία",
    "Edit comment" : "Επεξεργασία σχολίου",
    "Delete comment" : "Διαγραφή σχολίου",
    "Cancel edit" : "Ακύρωση επεξεργασίας",
    "New comment" : "Νέο σχόλιο",
-    "Write a comment …" : "Γράψτε ένα σχόλιο …",
    "Post comment" : "Αναρτήστε σχόλιο",
-    "@ for mentions, : for emoji, / for smart picker" : "@ για αναφορές, : για emoji, / για έξυπνο επιλογέα",
-    "Could not reload comments" : "Αδυναμία επανάφόρτωσης σχολίων",
-    "Failed to mark comments as read" : "Αποτυχία σήμανσης σχολίων ως αναγνωσμένα",
    "Unable to load the comments list" : "Δεν είναι δυνατή η μεταφόρτωση της λίστας σχολίων.",
    "No comments yet, start the conversation!" : "Δεν υπάρχουν σχόλια, ξεκινήστε την συζήτηση!",
    "No more messages" : "Δεν υπάρχουν άλλα μηνύματα",
@@ -8,18 +8,13 @@
    "{author} commented on {file}" : "Ο {author} σχολίασε στο {file}",
    "<strong>Comments</strong> for files" : "<strong>Σχόλια</strong> για αρχεία",
    "Files" : "Αρχεία",
-    "You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "Σας ανέφεραν στο \"{file}\", σε σχόλιο από λογαριασμό που έχει πλέον διαγραφεί",
    "{user} mentioned you in a comment on \"{file}\"" : "Ο/η {user} σας ανέφερε σε σχόλιο στο “{file}”",
-    "Files app plugin to add comments to files" : "Πρόσθετο εφαρμογής Αρχεία για προσθήκη σχολίων σε αρχεία",
+    "Files app plugin to add comments to files" : "Επέκταση της εφαρμογής Αρχεία που επιτρέπει την προσθήκη σχολίων σε αρχεία",
    "Edit comment" : "Επεξεργασία σχολίου",
    "Delete comment" : "Διαγραφή σχολίου",
    "Cancel edit" : "Ακύρωση επεξεργασίας",
    "New comment" : "Νέο σχόλιο",
-    "Write a comment …" : "Γράψτε ένα σχόλιο …",
    "Post comment" : "Αναρτήστε σχόλιο",
-    "@ for mentions, : for emoji, / for smart picker" : "@ για αναφορές, : για emoji, / για έξυπνο επιλογέα",
-    "Could not reload comments" : "Αδυναμία επανάφόρτωσης σχολίων",
-    "Failed to mark comments as read" : "Αποτυχία σήμανσης σχολίων ως αναγνωσμένα",
    "Unable to load the comments list" : "Δεν είναι δυνατή η μεταφόρτωση της λίστας σχολίων.",
    "No comments yet, start the conversation!" : "Δεν υπάρχουν σχόλια, ξεκινήστε την συζήτηση!",
    "No more messages" : "Δεν υπάρχουν άλλα μηνύματα",
@@ -10,7 +10,7 @@ OC.L10N.register(
    "{author} commented on {file}" : "{author} a commenté sur {file}",
    "<strong>Comments</strong> for files" : "<strong>Commentaires</strong> sur les fichiers",
    "Files" : "Fichiers",
-    "You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "Vous avez été mentionné·e dans « {file} », dans un commentaire d'un compte qui a été supprimé depuis",
+    "You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "Vous avez été mentionné dans « {file} », dans un commentaire d'un compte qui a été supprimé depuis",
    "{user} mentioned you in a comment on \"{file}\"" : "{user} vous a mentionné dans un commentaire sur « {file} »",
    "Files app plugin to add comments to files" : "Plugin Fichiers app pour ajouter des commentaires aux fichiers",
    "Edit comment" : "Modifier le commentaire",
@@ -28,9 +28,9 @@ OC.L10N.register(
    "Retry" : "Réessayer",
    "_1 new comment_::_{unread} new comments_" : ["1 nouveau commentaire","{unread} nouveaux commentaires","{unread} nouveaux commentaires"],
    "Comment" : "Commenter",
-    "An error occurred while trying to edit the comment" : "Une erreur est survenue lors de la tentative de modification du commentaire",
+    "An error occurred while trying to edit the comment" : "Une erreur s'est produite lors de la tentative de modification du commentaire",
    "Comment deleted" : "Commentaire supprimé",
-    "An error occurred while trying to delete the comment" : "Une erreur est survenue lors de la tentative de suppression du commentaire",
-    "An error occurred while trying to create the comment" : "Une erreur est survenue lors de la tentative de création du commentaire"
+    "An error occurred while trying to delete the comment" : "Une erreur s'est produite lors de la tentative de suppression du commentaire",
+    "An error occurred while trying to create the comment" : "Une erreur s'est produite lors de la tentative de création du commentaire"
 },
 "nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
@@ -8,7 +8,7 @@
    "{author} commented on {file}" : "{author} a commenté sur {file}",
    "<strong>Comments</strong> for files" : "<strong>Commentaires</strong> sur les fichiers",
    "Files" : "Fichiers",
-    "You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "Vous avez été mentionné·e dans « {file} », dans un commentaire d'un compte qui a été supprimé depuis",
+    "You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "Vous avez été mentionné dans « {file} », dans un commentaire d'un compte qui a été supprimé depuis",
    "{user} mentioned you in a comment on \"{file}\"" : "{user} vous a mentionné dans un commentaire sur « {file} »",
    "Files app plugin to add comments to files" : "Plugin Fichiers app pour ajouter des commentaires aux fichiers",
    "Edit comment" : "Modifier le commentaire",
@@ -26,9 +26,9 @@
    "Retry" : "Réessayer",
    "_1 new comment_::_{unread} new comments_" : ["1 nouveau commentaire","{unread} nouveaux commentaires","{unread} nouveaux commentaires"],
    "Comment" : "Commenter",
-    "An error occurred while trying to edit the comment" : "Une erreur est survenue lors de la tentative de modification du commentaire",
+    "An error occurred while trying to edit the comment" : "Une erreur s'est produite lors de la tentative de modification du commentaire",
    "Comment deleted" : "Commentaire supprimé",
-    "An error occurred while trying to delete the comment" : "Une erreur est survenue lors de la tentative de suppression du commentaire",
-    "An error occurred while trying to create the comment" : "Une erreur est survenue lors de la tentative de création du commentaire"
+    "An error occurred while trying to delete the comment" : "Une erreur s'est produite lors de la tentative de suppression du commentaire",
+    "An error occurred while trying to create the comment" : "Une erreur s'est produite lors de la tentative de création du commentaire"
 },"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
@@ -17,6 +17,7 @@ use OCP\Search\ISearchQuery;
 use OCP\Search\SearchResult;
 use OCP\Search\SearchResultEntry;
 use function array_map;
+use function pathinfo;

 class CommentsSearchProvider implements IProvider {
 	public function __construct(
@@ -48,25 +49,22 @@ class CommentsSearchProvider implements IProvider {
 			$this->l10n->t('Comments'),
 			array_map(function (Result $result) {
 				$path = $result->path;
+				$pathInfo = pathinfo($path);
 				$isUser = $this->userManager->userExists($result->authorId);
 				$avatarUrl = $isUser
 					? $this->urlGenerator->linkToRouteAbsolute('core.avatar.getAvatar', ['userId' => $result->authorId, 'size' => 42])
 					: $this->urlGenerator->linkToRouteAbsolute('core.GuestAvatar.getAvatar', ['guestName' => $result->authorId, 'size' => 42]);
-				$link = $this->urlGenerator->linkToRoute(
-					'files.View.showFile',
-					['fileid' => $result->fileId]
-				);
-				$searchResultEntry = new SearchResultEntry(
+				return new SearchResultEntry(
 					$avatarUrl,
 					$result->name,
 					$path,
-					$link,
+					$this->urlGenerator->linkToRouteAbsolute('files.view.index', [
+						'dir' => $pathInfo['dirname'],
+						'scrollto' => $pathInfo['basename'],
+					]),
 					'',
 					true
 				);
-				$searchResultEntry->addAttribute('fileId', (string)$result->fileId);
-				$searchResultEntry->addAttribute('path', $path);
-				return $searchResultEntry;
 			}, $this->legacyProvider->search($query->getTerm()))
 		);
 	}
@@ -11,7 +11,6 @@ namespace OCA\Comments\Search;
 use OCP\Comments\IComment;
 use OCP\Comments\ICommentsManager;
 use OCP\Files\Folder;
-use OCP\Files\InvalidPathException;
 use OCP\Files\Node;
 use OCP\Files\NotFoundException;
 use OCP\IUser;
@@ -62,10 +61,9 @@ class LegacyProvider extends Provider {
 					$result[] = new Result($query,
 						$comment,
 						$displayName,
-						$file->getPath(),
-						$file->getId(),
+						$file->getPath()
 					);
-				} catch (NotFoundException|InvalidPathException $e) {
+				} catch (NotFoundException $e) {
 					continue;
 				}
 			}
@@ -34,10 +34,6 @@ class Result extends BaseResult {
 	 * @deprecated 20.0.0
 	 */
 	public $fileName;
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public int $fileId;

 	/**
 	 * @throws NotFoundException
@@ -51,7 +47,6 @@ class Result extends BaseResult {
 		 */
 		public string $authorName,
 		string $path,
-		int $fileId,
 	) {
 		parent::__construct(
 			$comment->getId(),
@@ -63,7 +58,6 @@ class Result extends BaseResult {
 		$this->authorId = $comment->getActorId();
 		$this->fileName = basename($path);
 		$this->path = $this->getVisiblePath($path);
-		$this->fileId = $fileId;
 	}

 	/**
@@ -95,7 +95,7 @@
 				:class="{'comment__message--expanded': expanded}"
 				:text="richContent.message"
 				:arguments="richContent.mentions"
-				@click.native="onExpand" />
+				@click="onExpand" />
 		</div>
 	</component>
 </template>
@@ -320,7 +320,6 @@ $comment-padding: 10px;
 		display: flex;
 		flex-grow: 1;
 		flex-direction: column;
-		container-type: inline-size;
 	}

 	&__header {
@@ -22,7 +22,7 @@ export const useDeletedCommentLimbo = defineStore('deletedCommentLimbo', {
 		},

 		checkForId(id) {
-			return this.idsInLimbo.includes(id)
+			this.idsInLimbo.includes(id)
 		},
 	},
 })
@@ -9,7 +9,7 @@
 	<name>Contacts Interaction</name>
 	<summary>Manages interaction between accounts and contacts</summary>
 	<description>Collect data about accounts and contacts interactions and provide an address book for the data</description>
-	<version>1.14.1</version>
+	<version>1.13.0</version>
 	<licence>agpl</licence>
 	<author>Christoph Wurst</author>
 	<author homepage="https://github.com/nextcloud/groupware">Nextcloud Groupware Team</author>
@@ -21,16 +21,11 @@
 	<category>social</category>
 	<bugs>https://github.com/nextcloud/server/issues</bugs>
 	<dependencies>
-		<nextcloud min-version="33" max-version="33"/>
+		<nextcloud min-version="32" max-version="32"/>
 	</dependencies>
 	<background-jobs>
 		<job>OCA\ContactsInteraction\BackgroundJob\CleanupJob</job>
 	</background-jobs>
-	<repair-steps>
-		<live-migration>
-			<step>OCA\ContactsInteraction\Migration\FixVcardCategory</step>
-		</live-migration>
-	</repair-steps>
 	<sabre>
 		<address-book-plugins>
 			<plugin>OCA\ContactsInteraction\AddressBookProvider</plugin>
@@ -16,7 +16,5 @@ return array(
    'OCA\\ContactsInteraction\\Db\\RecentContact' => $baseDir . '/../lib/Db/RecentContact.php',
    'OCA\\ContactsInteraction\\Db\\RecentContactMapper' => $baseDir . '/../lib/Db/RecentContactMapper.php',
    'OCA\\ContactsInteraction\\Listeners\\ContactInteractionListener' => $baseDir . '/../lib/Listeners/ContactInteractionListener.php',
-    'OCA\\ContactsInteraction\\Listeners\\UserDeletedListener' => $baseDir . '/../lib/Listeners/UserDeletedListener.php',
-    'OCA\\ContactsInteraction\\Migration\\FixVcardCategory' => $baseDir . '/../lib/Migration/FixVcardCategory.php',
    'OCA\\ContactsInteraction\\Migration\\Version010000Date20200304152605' => $baseDir . '/../lib/Migration/Version010000Date20200304152605.php',
 );
@@ -31,8 +31,6 @@ class ComposerStaticInitContactsInteraction
        'OCA\\ContactsInteraction\\Db\\RecentContact' => __DIR__ . '/..' . '/../lib/Db/RecentContact.php',
        'OCA\\ContactsInteraction\\Db\\RecentContactMapper' => __DIR__ . '/..' . '/../lib/Db/RecentContactMapper.php',
        'OCA\\ContactsInteraction\\Listeners\\ContactInteractionListener' => __DIR__ . '/..' . '/../lib/Listeners/ContactInteractionListener.php',
-        'OCA\\ContactsInteraction\\Listeners\\UserDeletedListener' => __DIR__ . '/..' . '/../lib/Listeners/UserDeletedListener.php',
-        'OCA\\ContactsInteraction\\Migration\\FixVcardCategory' => __DIR__ . '/..' . '/../lib/Migration/FixVcardCategory.php',
        'OCA\\ContactsInteraction\\Migration\\Version010000Date20200304152605' => __DIR__ . '/..' . '/../lib/Migration/Version010000Date20200304152605.php',
    );

@@ -57,12 +57,12 @@ class AddressBook extends ExternalAddressBook implements IACL {
 	public function getChild($name): Card {
 		try {
 			return new Card(
-				$this->mapper,
 				$this->mapper->find(
 					$this->getUid(),
 					(int)$name
 				),
-				$this->principalUri
+				$this->principalUri,
+				$this->getACL()
 			);
 		} catch (DoesNotExistException $ex) {
 			throw new NotFound('Contact does not exist: ' . $ex->getMessage(), 0, $ex);
@@ -76,9 +76,9 @@ class AddressBook extends ExternalAddressBook implements IACL {
 		return array_map(
 			function (RecentContact $contact) {
 				return new Card(
-					$this->mapper,
 					$contact,
-					$this->principalUri
+					$this->principalUri,
+					$this->getACL()
 				);
 			},
 			$this->mapper->findAll($this->getUid())
@@ -141,11 +141,6 @@ class AddressBook extends ExternalAddressBook implements IACL {
 				'principal' => $this->getOwner(),
 				'protected' => true,
 			],
-			[
-				'privilege' => '{DAV:}unbind',
-				'principal' => $this->getOwner(),
-				'protected' => true,
-			],
 		];
 	}

@@ -9,13 +9,11 @@ declare(strict_types=1);
 namespace OCA\ContactsInteraction\AppInfo;

 use OCA\ContactsInteraction\Listeners\ContactInteractionListener;
-use OCA\ContactsInteraction\Listeners\UserDeletedListener;
 use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\Contacts\Events\ContactInteractedWithEvent;
-use OCP\User\Events\UserDeletedEvent;

 class Application extends App implements IBootstrap {
 	public const APP_ID = 'contactsinteraction';
@@ -26,7 +24,6 @@ class Application extends App implements IBootstrap {

 	public function register(IRegistrationContext $context): void {
 		$context->registerEventListener(ContactInteractedWithEvent::class, ContactInteractionListener::class);
-		$context->registerEventListener(UserDeletedEvent::class, UserDeletedListener::class);
 	}

 	public function boot(IBootContext $context): void {
@@ -9,7 +9,6 @@ declare(strict_types=1);
 namespace OCA\ContactsInteraction;

 use OCA\ContactsInteraction\Db\RecentContact;
-use OCA\ContactsInteraction\Db\RecentContactMapper;
 use Sabre\CardDAV\ICard;
 use Sabre\DAV\Exception\NotImplemented;
 use Sabre\DAVACL\ACLTrait;
@@ -19,9 +18,9 @@ class Card implements ICard, IACL {
 	use ACLTrait;

 	public function __construct(
-		private RecentContactMapper $mapper,
 		private RecentContact $contact,
 		private string $principal,
+		private array $acls,
 	) {
 	}

@@ -36,13 +35,7 @@ class Card implements ICard, IACL {
 	 * @inheritDoc
 	 */
 	public function getACL(): array {
-		return [
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner(),
-				'protected' => true,
-			],
-		];
+		return $this->acls;
 	}

 	/**
@@ -91,7 +84,7 @@ class Card implements ICard, IACL {
 	 * @inheritDoc
 	 */
 	public function delete(): void {
-		$this->mapper->delete($this->contact);
+		throw new NotImplemented();
 	}

 	/**
@@ -112,14 +112,4 @@ class RecentContactMapper extends QBMapper {

 		$delete->executeStatement();
 	}
-
-	public function deleteByUserId(string $uid): void {
-		$qb = $this->db->getQueryBuilder();
-
-		$delete = $qb
-			->delete($this->getTableName())
-			->where($qb->expr()->eq('actor_uid', $qb->createNamedParameter($uid)));
-
-		$delete->executeStatement();
-	}
 }
@@ -117,8 +117,7 @@ class ContactInteractionListener implements IEventListener {
 		$props = [
 			'URI' => UUIDUtil::getUUID(),
 			'FN' => $this->getDisplayName($contact->getUid()) ?? $contact->getEmail() ?? $contact->getFederatedCloudId(),
-			// Recently contacted not translated on purpose: https://github.com/nextcloud/contacts/issues/4663
-			'CATEGORIES' => 'Recently contacted',
+			'CATEGORIES' => $this->l10n->t('Recently contacted'),
 		];

 		if ($contact->getEmail() !== null) {
@@ -1,35 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-
-namespace OCA\ContactsInteraction\Listeners;
-
-use OCA\ContactsInteraction\Db\RecentContactMapper;
-use OCP\EventDispatcher\Event;
-use OCP\EventDispatcher\IEventListener;
-use OCP\User\Events\UserDeletedEvent;
-
-/**
- * @template-implements IEventListener<Event|UserDeletedEvent>
- */
-class UserDeletedListener implements IEventListener {
-
-	public function __construct(
-		private readonly RecentContactMapper $recentContactMapper,
-	) {
-	}
-
-	#[\Override]
-	public function handle(Event $event): void {
-		if (!($event instanceof UserDeletedEvent)) {
-			return;
-		}
-
-		$this->recentContactMapper->deleteByUserId($event->getUser()->getUID());
-	}
-}
@@ -1,88 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-
-namespace OCA\ContactsInteraction\Migration;
-
-use OC\Migration\BackgroundRepair;
-use OCA\ContactsInteraction\AppInfo\Application;
-use OCP\BackgroundJob\IJobList;
-use OCP\IDBConnection;
-use OCP\Migration\IOutput;
-use OCP\Migration\IRepairStep;
-use Sabre\VObject\ParseException;
-use Sabre\VObject\Reader;
-
-class FixVcardCategory implements IRepairStep {
-
-	private const CARDS_PER_BATCH = 5000;
-
-	public function __construct(
-		private readonly IDBConnection $connection,
-		private readonly IJobList $jobList,
-	) {
-	}
-
-	public function getName(): string {
-		return 'Fix category of recent contacts vcards';
-	}
-
-	public function run(IOutput $output): void {
-		$query = $this->connection->getQueryBuilder();
-
-		$cardsWithTranslatedCategory = $query->select(['id', 'card'])
-			->from('recent_contact')
-			->where($query->expr()->notLike(
-				'card',
-				$query->createNamedParameter('%CATEGORIES:Recently contacted%')
-			))
-			->setMaxResults(self::CARDS_PER_BATCH)
-			->executeQuery();
-		$rowCount = $cardsWithTranslatedCategory->rowCount();
-
-		$output->startProgress($rowCount);
-
-		$this->connection->beginTransaction();
-
-		$updateQuery = $query->update('recent_contact')
-			->set('card', $query->createParameter('card'))
-			->where($query->expr()->eq('id', $query->createParameter('id')));
-
-		while ($card = $cardsWithTranslatedCategory->fetch()) {
-			$output->advance(1);
-
-			try {
-				$vcard = Reader::read($card['card']);
-			} catch (ParseException $e) {
-				$output->info('Could not parse vcard with id ' . $card['id']);
-				continue;
-			}
-
-			$vcard->remove('CATEGORIES');
-			$vcard->add('CATEGORIES', 'Recently contacted');
-
-			$updateQuery->setParameter('id', $card['id']);
-			$updateQuery->setParameter('card', $vcard->serialize());
-			$updateQuery->executeStatement();
-		}
-
-		$this->connection->commit();
-
-		$cardsWithTranslatedCategory->closeCursor();
-
-		$output->finishProgress();
-
-		if ($rowCount === self::CARDS_PER_BATCH) {
-			$this->jobList->add(BackgroundRepair::class, [
-				'app' => Application::APP_ID,
-				'step' => FixVcardCategory::class,
-				'reschedule' => time(), // Use a different argument to reschedule the job
-			]);
-		}
-	}
-}
@@ -12,7 +12,7 @@

 The Nextcloud Dashboard is your starting point of the day, giving you an overview of your upcoming appointments, urgent emails, chat messages, incoming tickets, latest tweets and much more! People can add the widgets they like and change the background to their liking.]]>
 	</description>
-	<version>7.13.0</version>
+	<version>7.12.0</version>
 	<licence>agpl</licence>
 	<author>Julius Härtl</author>
 	<namespace>Dashboard</namespace>
@@ -22,7 +22,7 @@ The Nextcloud Dashboard is your starting point of the day, giving you an overvie
 	<bugs>https://github.com/nextcloud/server/issues</bugs>

 	<dependencies>
-		<nextcloud min-version="33" max-version="33"/>
+		<nextcloud min-version="32" max-version="32"/>
 	</dependencies>

 	<navigations>
@@ -20,9 +20,9 @@ OC.L10N.register(
    "Edit widgets" : "تعديل أدوات الصفحة الرئيسية",
    "Get more widgets from the App Store" : "يمكنك الحصول على المزيد من الأدوات من متجر التطبيقات",
    "Weather service" : "خدمة الطقس",
+    "For your privacy, the weather data is requested by your Nextcloud server on your behalf so the weather service receives no personal information." : "للحفاظ على خصوصيتك، يتم استدعاء بيانات حالة الطقس عبر خادم NextCloud الخاص بك نيابه عنك، وبالتالي فإن خدمة حالة الطقس لا تشارك معلوماتك الشخصية.",
    "Weather data from Met.no" : "بيانات الطقس من Met.no",
    "geocoding with Nominatim" : "الترميز الجغرافي مع Nominatim",
-    "elevation data from OpenTopoData" : "بيانات التقييم من OpenTopoData",
-    "For your privacy, the weather data is requested by your Nextcloud server on your behalf so the weather service receives no personal information." : "للحفاظ على خصوصيتك، يتم استدعاء بيانات حالة الطقس عبر خادم NextCloud الخاص بك نيابه عنك، وبالتالي فإن خدمة حالة الطقس لا تشارك معلوماتك الشخصية."
+    "elevation data from OpenTopoData" : "بيانات التقييم من OpenTopoData"
 },
 "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
@@ -18,9 +18,9 @@
    "Edit widgets" : "تعديل أدوات الصفحة الرئيسية",
    "Get more widgets from the App Store" : "يمكنك الحصول على المزيد من الأدوات من متجر التطبيقات",
    "Weather service" : "خدمة الطقس",
+    "For your privacy, the weather data is requested by your Nextcloud server on your behalf so the weather service receives no personal information." : "للحفاظ على خصوصيتك، يتم استدعاء بيانات حالة الطقس عبر خادم NextCloud الخاص بك نيابه عنك، وبالتالي فإن خدمة حالة الطقس لا تشارك معلوماتك الشخصية.",
    "Weather data from Met.no" : "بيانات الطقس من Met.no",
    "geocoding with Nominatim" : "الترميز الجغرافي مع Nominatim",
-    "elevation data from OpenTopoData" : "بيانات التقييم من OpenTopoData",
-    "For your privacy, the weather data is requested by your Nextcloud server on your behalf so the weather service receives no personal information." : "للحفاظ على خصوصيتك، يتم استدعاء بيانات حالة الطقس عبر خادم NextCloud الخاص بك نيابه عنك، وبالتالي فإن خدمة حالة الطقس لا تشارك معلوماتك الشخصية."
+    "elevation data from OpenTopoData" : "بيانات التقييم من OpenTopoData"
 },"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
 }
@@ -18,9 +18,9 @@ OC.L10N.register(
    "Edit widgets" : "Editar los widgets",
    "Get more widgets from the App Store" : "Consigui más widgets de l'App Store",
    "Weather service" : "Serviciu del clima",
+    "For your privacy, the weather data is requested by your Nextcloud server on your behalf so the weather service receives no personal information." : "Pa la to privacidá, los datos del clima solicítense dende esta instancia de Nextcloud y, polo tanto, el serviciu del clima no recibe nenguna información personal.",
    "Weather data from Met.no" : "datos del clima de Met.no",
    "geocoding with Nominatim" : "xeocodificación con Nominatim",
-    "elevation data from OpenTopoData" : "datos d'elevaciones d'OpenTopoData",
-    "For your privacy, the weather data is requested by your Nextcloud server on your behalf so the weather service receives no personal information." : "Pa la to privacidá, los datos del clima solicítense dende esta instancia de Nextcloud y, polo tanto, el serviciu del clima no recibe nenguna información personal."
+    "elevation data from OpenTopoData" : "datos d'elevaciones d'OpenTopoData"
 },
 "nplurals=2; plural=(n != 1);");
@@ -16,9 +16,9 @@
    "Edit widgets" : "Editar los widgets",
    "Get more widgets from the App Store" : "Consigui más widgets de l'App Store",
    "Weather service" : "Serviciu del clima",
+    "For your privacy, the weather data is requested by your Nextcloud server on your behalf so the weather service receives no personal information." : "Pa la to privacidá, los datos del clima solicítense dende esta instancia de Nextcloud y, polo tanto, el serviciu del clima no recibe nenguna información personal.",
    "Weather data from Met.no" : "datos del clima de Met.no",
    "geocoding with Nominatim" : "xeocodificación con Nominatim",
-    "elevation data from OpenTopoData" : "datos d'elevaciones d'OpenTopoData",
-    "For your privacy, the weather data is requested by your Nextcloud server on your behalf so the weather service receives no personal information." : "Pa la to privacidá, los datos del clima solicítense dende esta instancia de Nextcloud y, polo tanto, el serviciu del clima no recibe nenguna información personal."
+    "elevation data from OpenTopoData" : "datos d'elevaciones d'OpenTopoData"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -1,21 +0,0 @@
-OC.L10N.register(
-    "dashboard",
-    {
-    "Dashboard" : "Панэль кіравання",
-    "Dashboard app" : "Праграма Панэль кіравання",
-    "Weather" : "Надвор'е",
-    "Status" : "Статус",
-    "Good morning" : "Добрай раніцы",
-    "Good morning, {name}" : "Добрай раніцы, {name}",
-    "Good afternoon" : "Добры дзень",
-    "Good afternoon, {name}" : "Добры дзень, {name}",
-    "Good evening" : "Добры вечар",
-    "Good evening, {name}" : "Добры вечар, {name}",
-    "Hello" : "Вітаем",
-    "Hello, {name}" : "Вітаем, {name}",
-    "Happy birthday 🥳🤩🎂🎉" : "З народзінамі 🥳🤩🎂🎉",
-    "Happy birthday, {name} 🥳🤩🎂🎉" : "З народзінамі, {name} 🥳🤩🎂🎉",
-    "Customize" : "Дапасаваць",
-    "Edit widgets" : "Рэдагаваць віджэты"
-},
-"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);");
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Robin Appelman	8a5c50a313	test: add test that aborted uploads don't overwrite existing content Signed-off-by: Robin Appelman <robin@icewind.nl>	2025-08-04 17:42:15 +02:00
Robin Appelman	fee6a56339	fix: fix check if we can use a part file Signed-off-by: Robin Appelman <robin@icewind.nl>	2025-08-04 17:37:49 +02:00
Robin Appelman	8ab626bedf	fix: better object store write error propagation Signed-off-by: Robin Appelman <robin@icewind.nl>	2025-08-04 17:34:46 +02:00
Robin Appelman	168a58eaeb	fix: always do stream counting for object store upload Signed-off-by: Robin Appelman <robin@icewind.nl>	2025-08-04 17:34:46 +02:00
Robin Appelman	1fdece8fce	fix: validate written size for s3 multipart uploads Signed-off-by: Robin Appelman <robin@icewind.nl>	2025-08-04 17:34:44 +02:00