fix(search): Refactor emptyContentMessage logic

Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
2026-01-21 18:06:08 +01:00
4317 changed files with 52789 additions and 64412 deletions
@@ -71,8 +71,9 @@ body:
        Select Nextcloud Server version.
        _Versions not listed here are not maintained and not supported anymore_
      options:
+        - "30"
+        - "31"
        - "32"
-        - "33"
        - "master"
    validations:
      required: true
@@ -95,7 +96,6 @@ body:
        Select PHP engine version serving Nextcloud Server.
        _Describe in the "Additional info" section if you chose "Other"._
      options:
-        - "PHP 8.5"
        - "PHP 8.4"
        - "PHP 8.3"
        - "PHP 8.2"
@@ -21,7 +21,7 @@ updates:
 - package-ecosystem: composer
  directories:
    - "/"
-    - "/vendor-bin/behat"
+    - "/build/integration"
    - "/vendor-bin/cs-fixer"
    - "/vendor-bin/openapi-extractor"
    - "/vendor-bin/phpunit"
@@ -64,10 +64,9 @@ updates:
        - "@vitest/*"

 # Latest stable release
-
 # Composer dependencies for linting and testing
 - package-ecosystem: composer
-  target-branch: stable33
+  target-branch: stable32
  directories:
    - "/"
    - "/vendor-bin/behat"
@@ -75,7 +74,6 @@ updates:
    - "/vendor-bin/openapi-extractor"
    - "/vendor-bin/phpunit"
    - "/vendor-bin/psalm"
-    - "/vendor-bin/rector"
  schedule:
    interval: weekly
    day: saturday
@@ -89,13 +87,11 @@ updates:
    - dependency-name: "*"
      update-types: ["version-update:semver-major", "version-update:semver-minor"]

+# Latest stable branch
 # frontend dependencies
 - package-ecosystem: npm
-  target-branch: stable33
-  directories:
-    - "/"
-    - "/build/frontend"
-    - "/build/frontend-legacy"
+  target-branch: stable32
+  directory: "/"
  schedule:
    interval: weekly
    day: saturday
@@ -107,15 +103,6 @@ updates:
    - "feature: dependencies"
  # Disable automatic rebasing because without a build CI will likely fail anyway
  rebase-strategy: "disabled"
-  groups:
-    vite:
-      patterns:
-        - "vite"
-        - "@nextcloud/vite-config"
-    vitest:
-      patterns:
-        - "vitest"
-        - "@vitest/*"
  ignore:
    # no major updates on stable branches
    - dependency-name: "*"
@@ -125,10 +112,10 @@ updates:

 # Composer dependencies for linting and testing
 - package-ecosystem: composer
-  target-branch: stable32
+  target-branch: stable31
  directories:
    - "/"
-    - "/vendor-bin/behat"
+    - "/build/integration"
    - "/vendor-bin/cs-fixer"
    - "/vendor-bin/openapi-extractor"
    - "/vendor-bin/phpunit"
@@ -136,7 +123,7 @@ updates:
  schedule:
    interval: weekly
    day: saturday
-    time: "04:30"
+    time: "04:00"
    timezone: Europe/Paris
  labels:
    - "3. to review"
@@ -148,12 +135,12 @@ updates:

 # frontend dependencies
 - package-ecosystem: npm
-  target-branch: stable32
+  target-branch: stable31
  directory: "/"
  schedule:
    interval: weekly
    day: saturday
-    time: "04:30"
+    time: "04:00"
    timezone: Europe/Paris
  open-pull-requests-limit: 20
  labels:
@@ -52,7 +52,7 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          submodules: true
@@ -82,7 +82,7 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          submodules: true
@@ -31,7 +31,7 @@ jobs:
              - 'version.php'

      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false

@@ -27,10 +27,10 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false

-      - uses: webiny/action-conventional-commits@faccb24fc2550dd15c0390d944379d2d8ed9690e # v1.3.1
+      - uses: webiny/action-conventional-commits@8bc41ff4e7d423d56fa4905f6ff79209a78776c7 # v1.3.0
        with:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -32,18 +32,18 @@ jobs:
          build-mode: none
    steps:
    - name: Checkout repository
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
      with:
        persist-credentials: false

    - name: Initialize CodeQL
-      uses: github/codeql-action/init@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2
+      uses: github/codeql-action/init@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
      with:
        languages: ${{ matrix.language }}
        build-mode: ${{ matrix.build-mode }}
        config-file: ./.github/codeql-config.yml

    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2
+      uses: github/codeql-action/analyze@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
      with:
        category: "/language:${{matrix.language}}"
@@ -103,7 +103,7 @@ jobs:
          key: git-repo

      - name: Checkout ${{ needs.init.outputs.head_ref }}
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          # Needed to allow force push later
          persist-credentials: true
@@ -38,7 +38,7 @@ jobs:
        id: comment-branch

      - name: Checkout ${{ steps.comment-branch.outputs.head_ref }}
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          fetch-depth: 0
@@ -48,7 +48,7 @@ jobs:
          exit 1

      - name: Checkout server
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          # We need to checkout submodules for 3rdparty
@@ -107,7 +107,7 @@ jobs:
    services:
      mysql:
        # Only start mysql if we are running the setup tests
-        image: ${{matrix.containers == 'setup' && 'ghcr.io/nextcloud/continuous-integration-mysql-8.4:latest' || ''}} # zizmor: ignore[unpinned-images]
+        image: ${{matrix.containers == 'setup' && 'ghcr.io/nextcloud/continuous-integration-mysql-8.4:latest' || ''}}
        ports:
          - '3306/tcp'
        env:
@@ -119,7 +119,7 @@ jobs:

      mariadb:
        # Only start mariadb if we are running the setup tests
-        image: ${{matrix.containers == 'setup' && 'mariadb:11.4' || ''}} # zizmor: ignore[unpinned-images]
+        image: ${{matrix.containers == 'setup' && 'mariadb:11.4' || ''}}
        ports:
          - '3306/tcp'
        env:
@@ -131,7 +131,7 @@ jobs:

      postgres:
        # Only start postgres if we are running the setup tests
-        image: ${{matrix.containers == 'setup' && 'ghcr.io/nextcloud/continuous-integration-postgres-17:latest' || ''}} # zizmor: ignore[unpinned-images]
+        image: ${{matrix.containers == 'setup' && 'ghcr.io/nextcloud/continuous-integration-postgres-17:latest' || ''}}
        ports:
          - '5432/tcp'
        env:
@@ -142,7 +142,7 @@ jobs:

      oracle:
        # Only start oracle if we are running the setup tests
-        image: ${{matrix.containers == 'setup' && 'ghcr.io/gvenzl/oracle-free:23' || ''}} # zizmor: ignore[unpinned-images]
+        image: ${{matrix.containers == 'setup' && 'ghcr.io/gvenzl/oracle-free:23' || ''}}
        ports:
          - '1521'
        env:
@@ -171,7 +171,7 @@ jobs:
        run: ./node_modules/cypress/bin/cypress install

      - name: Run ${{ matrix.containers == 'component' && 'component' || 'E2E' }} cypress tests
-        uses: cypress-io/github-action@84d178e4bbce871e23f2ffa3085898cde0e4f0ec # v7.1.2
+        uses: cypress-io/github-action@2ad32e649e4db26c07674ebae31a297601dbcbaf # v6.10.8
        with:
          # We already installed the dependencies in the init job
          install: false
@@ -65,7 +65,7 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          submodules: true
@@ -74,7 +74,7 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          submodules: true
@@ -163,7 +163,7 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          submodules: true
@@ -65,7 +65,7 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          submodules: true
@@ -56,13 +56,13 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          submodules: true

      - name: Checkout user_saml
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          repository: nextcloud/user_saml
@@ -75,7 +75,7 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          submodules: true
@@ -70,7 +70,7 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          submodules: true
@@ -64,7 +64,7 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          submodules: true
@@ -24,14 +24,14 @@ jobs:
          require: write

      - name: Checkout github_helper
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          repository: nextcloud/github_helper
          path: github_helper

      - name: Checkout server
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          path: server
@@ -73,7 +73,7 @@ jobs:
         fi

      - name: Set up php 8.2
-        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
+        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2.35.5
        timeout-minutes: 5
        with:
          php-version: 8.2
@@ -53,7 +53,7 @@ jobs:

    steps:
        - name: Checkout server
-          uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+          uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
          with:
            persist-credentials: false
            submodules: true
@@ -71,7 +71,7 @@ jobs:
            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

        - name: Set up Python
-          uses: LizardByte/actions/actions/setup_python@9bf3ef783775e17fe6b8dde3585d94ec570b93c2 # v2026.212.22356
+          uses: LizardByte/actions/actions/setup_python@e6bc045033a5614035b66daafc38ff86faecb23a # v2026.116.208
          with:
            python-version: '2.7'

@@ -52,7 +52,7 @@ jobs:

    steps:
        - name: Checkout server
-          uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+          uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
          with:
            persist-credentials: false
            submodules: true
@@ -76,7 +76,7 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          submodules: true
@@ -97,14 +97,14 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          submodules: true

      - name: Checkout Talk app
        if: ${{ matrix.test-suite == 'videoverification_features' }}
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          repository: nextcloud/spreed
@@ -113,7 +113,7 @@ jobs:

      - name: Checkout Activity app
        if: ${{ matrix.test-suite == 'sharing_features' }}
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          repository: nextcloud/activity
@@ -56,7 +56,7 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false

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

    steps:
      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false

      - name: Set up php
-        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
+        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2.35.5
        timeout-minutes: 5
        with:
          php-version: 8.2
@@ -53,12 +53,12 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
+        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2.35.5
        timeout-minutes: 5
        with:
          php-version: ${{ matrix.php-versions }}
@@ -25,7 +25,7 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false

@@ -59,7 +59,7 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false

@@ -58,7 +58,7 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false

@@ -56,7 +56,7 @@ jobs:
    name: NPM build
    steps:
      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false

@@ -26,7 +26,6 @@ jobs:
      matrix:
        branches:
          - ${{ github.event.repository.default_branch }}
-          - 'stable33'
          - 'stable32'
          - 'stable31'

@@ -35,7 +34,7 @@ jobs:
    steps:
      - name: Checkout
        id: checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          ref: ${{ matrix.branches }}
@@ -70,7 +69,7 @@ jobs:

      - name: Create Pull Request
        if: steps.checkout.outcome == 'success'
-        uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
+        uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725 # v8.0.0
        with:
          token: ${{ secrets.COMMAND_BOT_PAT }}
          commit-message: 'fix(deps): Fix npm audit'
@@ -79,7 +79,7 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          submodules: true
@@ -80,7 +80,7 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          submodules: true
@@ -77,7 +77,7 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          submodules: true
@@ -26,12 +26,12 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false

      - name: Set up php
-        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
+        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2.35.5
        timeout-minutes: 5
        with:
          php-version: '8.2'
@@ -35,14 +35,14 @@ jobs:
          exit 1

      - name: Checkout server before PR
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          submodules: true
          ref: ${{ github.event.pull_request.base.ref }}

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
+        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2.35.5
        timeout-minutes: 5
        with:
          php-version: ${{ matrix.php-versions }}
@@ -33,7 +33,7 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          submodules: true
@@ -92,13 +92,13 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
+        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2.35.5
        timeout-minutes: 5
        with:
          php-version: ${{ matrix.php-versions }}
@@ -72,7 +72,7 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          submodules: true
@@ -121,7 +121,7 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          submodules: true
@@ -92,13 +92,13 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
+        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2.35.5
        timeout-minutes: 5
        with:
          php-version: ${{ matrix.php-versions }}
@@ -75,7 +75,7 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          submodules: true
@@ -72,7 +72,7 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          submodules: true
@@ -99,13 +99,13 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
+        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2.35.5
        timeout-minutes: 5
        with:
          php-version: ${{ matrix.php-versions }}
@@ -92,13 +92,13 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
+        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2.35.5
        timeout-minutes: 5
        with:
          php-version: ${{ matrix.php-versions }}
@@ -75,28 +75,25 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
+        uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2.35.5
        timeout-minutes: 5
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
-          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
+          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
          coverage: ${{ matrix.coverage && 'xdebug' || 'none' }}
          ini-file: development
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

      - name: Set up dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y ghostscript
-          composer i
+        run: composer i

      - name: Set up Nextcloud
        run: |
@@ -110,7 +107,7 @@ jobs:
        run: ./occ app:list && echo "======= System config =======" && ./occ config:list system

      - name: PHPUnit database tests
-        run: composer run test:db -- --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.db.xml' || '' }} tests/lib/Preview/PostscriptTest.php
+        run: composer run test:db -- --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.db.xml' || '' }}

      - name: Upload db code coverage
        if: ${{ !cancelled() && matrix.coverage }}
@@ -128,8 +125,6 @@ jobs:
      - name: Print logs
        if: always()
        run: |
-          gs --version
-          cat /etc/ImageMagick-6/policy.xml
          cat data/nextcloud.log

  summary:
@@ -1,69 +0,0 @@
-# This workflow is provided via the organization template repository
-#
-# https://github.com/nextcloud/.github
-# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
-#
-# SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
-# SPDX-License-Identifier: MIT
-
-name: Apply rector changes
-
-on:
-  workflow_dispatch:
-  schedule:
-    # At 14:30 on Sundays
-    - cron: '30 14 * * 0'
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        php-versions: [ '8.2' ]
-
-    name: rector-apply
-
-    steps:
-      - name: Checkout
-        id: checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          persist-credentials: false
-          ref: ${{ github.event.repository.default_branch }}
-
-      - name: Set up php${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
-        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
-          coverage: none
-          ini-file: development
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Install dependencies
-        run: |
-          composer remove nextcloud/ocp --dev --no-scripts
-          composer i
-
-      - name: Rector
-        run: composer run rector
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
-        with:
-          token: ${{ secrets.COMMAND_BOT_PAT }}
-          commit-message: 'refactor: Apply rector changes'
-          committer: GitHub <noreply@github.com>
-          author: nextcloud-command <nextcloud-command@users.noreply.github.com>
-          signoff: true
-          branch: automated/noid/rector-changes
-          title: 'Apply rector changes'
-          labels: |
-            technical debt
-            3. to review
@@ -1,45 +0,0 @@
-# SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
-# SPDX-License-Identifier: AGPL-3.0-or-later
-name: Rector
-
-on:
-  pull_request:
-
-permissions:
-  contents: read
-
-concurrency:
-  group: rector-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  strict:
-    runs-on: ubuntu-latest
-
-    if: ${{ github.event_name != 'push' && github.repository_owner != 'nextcloud-gmbh' }}
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          persist-credentials: false
-          submodules: true
-
-      - name: Set up php
-        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 #v2.36.0
-        with:
-          php-version: '8.2'
-          extensions: apcu,ctype,curl,dom,fileinfo,ftp,gd,imagick,intl,json,ldap,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
-          coverage: none
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Composer install
-        run: composer i
-
-      - name: Rector
-        run: composer run rector:strict
-
-      - name: Show changes
-        if: always()
-        run: git diff --exit-code -- . ':!lib/composer'
@@ -19,7 +19,7 @@ jobs:
    runs-on: ubuntu-latest-low
    steps:
      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false

@@ -15,6 +15,7 @@ on:

 permissions:
  contents: read
+  security-events: write

 concurrency:
  group: static-code-analysis-${{ github.head_ref || github.run_id }}
@@ -28,7 +29,7 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
        with:
          persist-credentials: false
          submodules: true
@@ -58,12 +59,9 @@ jobs:

    if: ${{ github.repository_owner != 'nextcloud-gmbh' }}

-    permissions:
-      security-events: write
-
    steps:
      - name: Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
        with:
          persist-credentials: false
          submodules: true
@@ -88,7 +86,7 @@ jobs:

      - name: Upload Security Analysis results to GitHub
        if: always()
-        uses: github/codeql-action/upload-sarif@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v3
+        uses: github/codeql-action/upload-sarif@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v3
        with:
          sarif_file: results.sarif

@@ -99,7 +97,7 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
        with:
          persist-credentials: false
          submodules: true
@@ -131,7 +129,7 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
        with:
          persist-credentials: false
          submodules: true
@@ -151,30 +149,3 @@ jobs:

      - name: Psalm
        run: composer run psalm:ncu -- --threads=1 --monochrome --no-progress --output-format=github
-
-  static-code-analysis-strict:
-    runs-on: ubuntu-latest
-
-    if: ${{ github.event_name != 'push' && github.repository_owner != 'nextcloud-gmbh' }}
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
-        with:
-          persist-credentials: false
-          submodules: true
-
-      - name: Set up php
-        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 #v2.36.0
-        with:
-          php-version: '8.2'
-          extensions: ctype,curl,dom,fileinfo,gd,imagick,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
-          coverage: none
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Composer install
-        run: composer i
-
-      - name: Psalm
-        run: composer run psalm:strict -- --threads=1 --monochrome --no-progress --output-format=github
@@ -17,12 +17,12 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        branches: ['master', 'stable33', 'stable32', 'stable31', 'stable30', 'stable29',  'stable28',  'stable27', 'stable26', 'stable25', 'stable24', 'stable23', 'stable22']
+        branches: ['master', 'stable32', 'stable31', 'stable30', 'stable29',  'stable28',  'stable27', 'stable26', 'stable25', 'stable24', 'stable23', 'stable22']

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

    steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          ref: ${{ matrix.branches }}
@@ -32,7 +32,7 @@ jobs:
        run: curl --etag-compare build/ca-bundle-etag.txt --etag-save build/ca-bundle-etag.txt --output resources/config/ca-bundle.crt https://curl.se/ca/cacert.pem

      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0
+        uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725
        with:
          token: ${{ secrets.COMMAND_BOT_PAT }}
          commit-message: 'fix(security): Update CA certificate bundle'
@@ -17,12 +17,12 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        branches: ['master', 'stable33', 'stable32', 'stable31', 'stable30', 'stable29',  'stable28',  'stable27', 'stable26', 'stable25', 'stable24', 'stable23', 'stable22']
+        branches: ['master', 'stable32', 'stable31', 'stable30', 'stable29',  'stable28',  'stable27', 'stable26', 'stable25', 'stable24', 'stable23', 'stable22']

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

    steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          ref: ${{ matrix.branches }}
@@ -35,7 +35,7 @@ jobs:
        run: openssl crl -verify -in resources/codesigning/root.crl -CAfile resources/codesigning/root.crt -noout

      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0
+        uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725
        with:
          token: ${{ secrets.COMMAND_BOT_PAT }}
          commit-message: 'fix(security): Update code signing revocation list'
@@ -16,7 +16,7 @@ jobs:
    runs-on: ubuntu-latest-low

    steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          submodules: true
@@ -107,7 +107,7 @@ jobs:
          fi

      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0
+        uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725
        if: steps.update-files.outputs.CHANGES_MADE == 'true'
        with:
          token: ${{ secrets.COMMAND_BOT_PAT }}
@@ -35,8 +35,8 @@ Enterprise? Public Sector or Education user? You may want to have a look into [*
 ## Get in touch 💬

 * [📋 Forum](https://help.nextcloud.com)
-* [🦋 Bluesky](https://bsky.app/profile/nextcloud.bsky.social)
 * [👥 Facebook](https://www.facebook.com/nextclouders)
+* [🐣 Twitter](https://twitter.com/Nextclouders)
 * [🐘 Mastodon](https://mastodon.xyz/@nextcloud)

 You can also [get support for Nextcloud](https://nextcloud.com/support)!
@@ -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.24.0</version>
+	<version>1.23.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="34" max-version="34"/>
+		<nextcloud min-version="33" max-version="33"/>
 	</dependencies>
 	<background-jobs>
 		<job>OCA\AdminAudit\BackgroundJobs\Rotate</job>
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "admin_audit",
-    {
-    "Auditing / Logging" : "Аудит / Лог",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Nextcloud-д файл нэвтрэлт болон мэдрэмтгий үйлдлүүдийг бүртгэх зэрэг лог хөтлөх чадварыг олгодог."
-},
-"nplurals=2; plural=(n != 1);");
@@ -1,5 +0,0 @@
-{ "translations": {
-    "Auditing / Logging" : "Аудит / Лог",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Nextcloud-д файл нэвтрэлт болон мэдрэмтгий үйлдлүүдийг бүртгэх зэрэг лог хөтлөх чадварыг олгодог."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
@@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /**
 * SPDX-FileCopyrightText: 2022 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.18.0</version>
+	<version>1.17.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="34" max-version="34"/>
+		<nextcloud min-version="33" max-version="33"/>
 	</dependencies>
 </info>
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "cloud_federation_api",
-    {
-    "Cloud Federation API" : "Cloud Federation API",
-    "Enable clouds to communicate with each other and exchange data" : "Үүлнүүдийг хоорондоо холбогдож өгөгдөл солилцох боломжтой болгох",
-    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "Cloud Federation API нь янз бүрийн Nextcloud инстанцуудад хоорондоо харилцах болон өгөгдөл солилцох боломжийг олгодог."
-},
-"nplurals=2; plural=(n != 1);");
@@ -1,6 +0,0 @@
-{ "translations": {
-    "Cloud Federation API" : "Cloud Federation API",
-    "Enable clouds to communicate with each other and exchange data" : "Үүлнүүдийг хоорондоо холбогдож өгөгдөл солилцох боломжтой болгох",
-    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "Cloud Federation API нь янз бүрийн Nextcloud инстанцуудад хоорондоо харилцах болон өгөгдөл солилцох боломжийг олгодог."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
@@ -3,6 +3,6 @@ OC.L10N.register(
    {
    "Cloud Federation API" : "Cloud Federation API",
    "Enable clouds to communicate with each other and exchange data" : "Увімкніть хмари аби спілкуватися один з одним і обмінюватися даними",
-    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "Cloud Federation API дозволяє різним примірникам сервера хмари Nextcloud спілкуватися між собою та обмінюватися даними."
+    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "Cloud Federation API дозволяє різним примірникам серверу хмари Nextcloud спілкуватися між собою та обмінюватися даними."
 },
 "nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);");
@@ -1,6 +1,6 @@
 { "translations": {
    "Cloud Federation API" : "Cloud Federation API",
    "Enable clouds to communicate with each other and exchange data" : "Увімкніть хмари аби спілкуватися один з одним і обмінюватися даними",
-    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "Cloud Federation API дозволяє різним примірникам сервера хмари Nextcloud спілкуватися між собою та обмінюватися даними."
+    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "Cloud Federation API дозволяє різним примірникам серверу хмари Nextcloud спілкуватися між собою та обмінюватися даними."
 },"pluralForm" :"nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);"
 }
@@ -1,8 +1,8 @@
 OC.L10N.register(
    "cloud_federation_api",
    {
-    "Cloud Federation API" : "Jamg'armaning bulutli APIsi",
+    "Cloud Federation API" : "Asl faylni o'chirishda kutilmagan xatolik yuz berdi.",
    "Enable clouds to communicate with each other and exchange data" : "Bulutlar bir-biri bilan aloqa qilish va ma'lumot almashish imkonini beradi",
-    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "Cloud Jamoada API turli xil Nextcloud misollariga bir-biri bilan muloqot qilish va ma'lumotlarni almashish imkonini beradi."
+    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "Cloud Federation API turli xil Nextcloud misollariga bir-biri bilan muloqot qilish va ma'lumotlarni almashish imkonini beradi."
 },
 "nplurals=1; plural=0;");
@@ -1,6 +1,6 @@
 { "translations": {
-    "Cloud Federation API" : "Jamg'armaning bulutli APIsi",
+    "Cloud Federation API" : "Asl faylni o'chirishda kutilmagan xatolik yuz berdi.",
    "Enable clouds to communicate with each other and exchange data" : "Bulutlar bir-biri bilan aloqa qilish va ma'lumot almashish imkonini beradi",
-    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "Cloud Jamoada API turli xil Nextcloud misollariga bir-biri bilan muloqot qilish va ma'lumotlarni almashish imkonini beradi."
+    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "Cloud Federation API turli xil Nextcloud misollariga bir-biri bilan muloqot qilish va ma'lumotlarni almashish imkonini beradi."
 },"pluralForm" :"nplurals=1; plural=0;"
 }
@@ -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.24.0</version>
+	<version>1.23.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="34" max-version="34"/>
+		<nextcloud min-version="33" max-version="33"/>
 	</dependencies>

 	<activity>
@@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /**
 * SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
 * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -10,18 +10,11 @@ OC.L10N.register(
    "{author} commented on {file}" : "{author} je komentirao {file}",
    "<strong>Comments</strong> for files" : "<strong>Komentari</strong> za datoteke",
    "Files" : "Datoteke",
-    "You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "Spomenuti ste u komentaru na „{file}” od računa koji je u međuvremenu izbrisan.",
-    "{user} mentioned you in a comment on \"{file}\"" : "{user} vas je spomenuo u komentaru na „{file}”",
    "Files app plugin to add comments to files" : "Dodatak za aplikaciju Datoteke za dodavanje komentara na datoteke",
    "Edit comment" : "Uredi komentar",
    "Delete comment" : "Izbriši komentar",
    "Cancel edit" : "Otkaži uređivanje",
-    "New comment" : "Novi komentar",
-    "Write a comment …" : "Napiši komentar …",
    "Post comment" : "Objavi komentar",
-    "@ for mentions, : for emoji, / for smart picker" : "@ za spominjanje, : za emoji, / za pametni odabir",
-    "Could not reload comments" : "Nije moguće ponovno učitati komentare",
-    "Failed to mark comments as read" : "Nije uspjelo označavanje komentara kao pročitani",
    "Unable to load the comments list" : "Nije moguće učitati popis komentara",
    "No comments yet, start the conversation!" : "Još nema komentara, započnite razgovor!",
    "No more messages" : "Nema više poruka",
@@ -31,7 +24,6 @@ OC.L10N.register(
    "An error occurred while trying to edit the comment" : "Došlo je do pogreške prilikom uređivanja komentara",
    "Comment deleted" : "Komentar izbrisan",
    "An error occurred while trying to delete the comment" : "Došlo je do pogreške prilikom brisanja komentara",
-    "An error occurred while trying to create the comment" : "Došlo je do pogreške prilikom stvaranja komentara",
-    "Write a comment …" : "Napiši komentar …"
+    "An error occurred while trying to create the comment" : "Došlo je do pogreške prilikom stvaranja komentara"
 },
 "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;");
@@ -8,18 +8,11 @@
    "{author} commented on {file}" : "{author} je komentirao {file}",
    "<strong>Comments</strong> for files" : "<strong>Komentari</strong> za datoteke",
    "Files" : "Datoteke",
-    "You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "Spomenuti ste u komentaru na „{file}” od računa koji je u međuvremenu izbrisan.",
-    "{user} mentioned you in a comment on \"{file}\"" : "{user} vas je spomenuo u komentaru na „{file}”",
    "Files app plugin to add comments to files" : "Dodatak za aplikaciju Datoteke za dodavanje komentara na datoteke",
    "Edit comment" : "Uredi komentar",
    "Delete comment" : "Izbriši komentar",
    "Cancel edit" : "Otkaži uređivanje",
-    "New comment" : "Novi komentar",
-    "Write a comment …" : "Napiši komentar …",
    "Post comment" : "Objavi komentar",
-    "@ for mentions, : for emoji, / for smart picker" : "@ za spominjanje, : za emoji, / za pametni odabir",
-    "Could not reload comments" : "Nije moguće ponovno učitati komentare",
-    "Failed to mark comments as read" : "Nije uspjelo označavanje komentara kao pročitani",
    "Unable to load the comments list" : "Nije moguće učitati popis komentara",
    "No comments yet, start the conversation!" : "Još nema komentara, započnite razgovor!",
    "No more messages" : "Nema više poruka",
@@ -29,7 +22,6 @@
    "An error occurred while trying to edit the comment" : "Došlo je do pogreške prilikom uređivanja komentara",
    "Comment deleted" : "Komentar izbrisan",
    "An error occurred while trying to delete the comment" : "Došlo je do pogreške prilikom brisanja komentara",
-    "An error occurred while trying to create the comment" : "Došlo je do pogreške prilikom stvaranja komentara",
-    "Write a comment …" : "Napiši komentar …"
+    "An error occurred while trying to create the comment" : "Došlo je do pogreške prilikom stvaranja komentara"
 },"pluralForm" :"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"
 }
@@ -1,37 +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} шинэ сэтгэгдэл"],
-    "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" : "Сэтгэгдэл үүсгэх үед алдаа гарлаа",
-    "Write a comment …" : "Сэтгэгдэл бичих …"
-},
-"nplurals=2; plural=(n != 1);");
@@ -1,35 +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} шинэ сэтгэгдэл"],
-    "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" : "Сэтгэгдэл үүсгэх үед алдаа гарлаа",
-    "Write a comment …" : "Сэтгэгдэл бичих …"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
@@ -17,7 +17,6 @@ OC.L10N.register(
    "Delete comment" : "Zmazať komentár",
    "Cancel edit" : "Zrušiť upravovanie",
    "New comment" : "Nový komentár",
-    "Write a comment …" : "Napísať komentár ...",
    "Post comment" : "Odoslať komentár",
    "@ for mentions, : for emoji, / for smart picker" : "@ pre spomienky, : pre emotikony, / pre inteligentný výber",
    "Could not reload comments" : "Nepodarilo sa obnoviť komentáre",
@@ -15,7 +15,6 @@
    "Delete comment" : "Zmazať komentár",
    "Cancel edit" : "Zrušiť upravovanie",
    "New comment" : "Nový komentár",
-    "Write a comment …" : "Napísať komentár ...",
    "Post comment" : "Odoslať komentár",
    "@ for mentions, : for emoji, / for smart picker" : "@ pre spomienky, : pre emotikony, / pre inteligentný výber",
    "Could not reload comments" : "Nepodarilo sa obnoviť komentáre",
@@ -1,37 +0,0 @@
-OC.L10N.register(
-    "comments",
-    {
-    "Comments" : "Izohlar",
-    "You commented" : "Siz fikr bildirgansiz",
-    "{author} commented" : "{author} izoh qoldirdi",
-    "You commented on %1$s" : "Siz %1$s haqida fikr bildirdingiz",
-    "You commented on {file}" : "Siz {file} ga izoh qoldirdingiz",
-    "%1$s commented on %2$s" : "%1$s %2$s haqida fikr bildirdi",
-    "{author} commented on {file}" : "{author} {file} ga izoh qoldirdi",
-    "<strong>Comments</strong> for files" : "Fayllar uchun <strong>Izohlar</strong>",
-    "Files" : "Fayllar",
-    "You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "Siz \"{file}\"da, keyinchalik o'chirilgan hisob tomonidan izohda tilga olingansiz",
-    "{user} mentioned you in a comment on \"{file}\"" : "{user} sizni \"{file}\" dagi izohda tilga oldi",
-    "Files app plugin to add comments to files" : "Fayllarga izohlar qo'shish ilova plagini",
-    "Edit comment" : "Izohni tahrirlash",
-    "Delete comment" : "Izohni o'chirish",
-    "Cancel edit" : "Tahrirni bekor qilish",
-    "New comment" : "Yangi izoh",
-    "Write a comment …" : "Fikr yozing…",
-    "Post comment" : "Fikr qoldirish",
-    "@ for mentions, : for emoji, / for smart picker" : "@ eslatmalar uchun, : emojilar uchun, / aqlli tanlovclar uchun",
-    "Could not reload comments" : "Izohlarni qayta yuklab bo'lmadi",
-    "Failed to mark comments as read" : "Izohlarni o'qilgan deb belgilashda xatolik yuz berdi",
-    "Unable to load the comments list" : "Izohlar ro'yxatini yuklab bo'lmadi",
-    "No comments yet, start the conversation!" : "Hali izohlar yo'q, suhbatni boshlang!",
-    "No more messages" : "Boshqa xabarlar yo'q",
-    "Retry" : "Qayta urinish",
-    "_1 new comment_::_{unread} new comments_" : ["{unread} ta yangi izoh"],
-    "Comment" : "Izoh",
-    "An error occurred while trying to edit the comment" : "Izohni tahrirlashda xatolik yuz berdi",
-    "Comment deleted" : "Izoh o'chirildi",
-    "An error occurred while trying to delete the comment" : "Izohni o'chirishda xatolik yuz berdi",
-    "An error occurred while trying to create the comment" : "Izoh yaratishda xatolik yuz berdi",
-    "Write a comment …" : "Izoh yozing..."
-},
-"nplurals=1; plural=0;");
@@ -1,35 +0,0 @@
-{ "translations": {
-    "Comments" : "Izohlar",
-    "You commented" : "Siz fikr bildirgansiz",
-    "{author} commented" : "{author} izoh qoldirdi",
-    "You commented on %1$s" : "Siz %1$s haqida fikr bildirdingiz",
-    "You commented on {file}" : "Siz {file} ga izoh qoldirdingiz",
-    "%1$s commented on %2$s" : "%1$s %2$s haqida fikr bildirdi",
-    "{author} commented on {file}" : "{author} {file} ga izoh qoldirdi",
-    "<strong>Comments</strong> for files" : "Fayllar uchun <strong>Izohlar</strong>",
-    "Files" : "Fayllar",
-    "You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "Siz \"{file}\"da, keyinchalik o'chirilgan hisob tomonidan izohda tilga olingansiz",
-    "{user} mentioned you in a comment on \"{file}\"" : "{user} sizni \"{file}\" dagi izohda tilga oldi",
-    "Files app plugin to add comments to files" : "Fayllarga izohlar qo'shish ilova plagini",
-    "Edit comment" : "Izohni tahrirlash",
-    "Delete comment" : "Izohni o'chirish",
-    "Cancel edit" : "Tahrirni bekor qilish",
-    "New comment" : "Yangi izoh",
-    "Write a comment …" : "Fikr yozing…",
-    "Post comment" : "Fikr qoldirish",
-    "@ for mentions, : for emoji, / for smart picker" : "@ eslatmalar uchun, : emojilar uchun, / aqlli tanlovclar uchun",
-    "Could not reload comments" : "Izohlarni qayta yuklab bo'lmadi",
-    "Failed to mark comments as read" : "Izohlarni o'qilgan deb belgilashda xatolik yuz berdi",
-    "Unable to load the comments list" : "Izohlar ro'yxatini yuklab bo'lmadi",
-    "No comments yet, start the conversation!" : "Hali izohlar yo'q, suhbatni boshlang!",
-    "No more messages" : "Boshqa xabarlar yo'q",
-    "Retry" : "Qayta urinish",
-    "_1 new comment_::_{unread} new comments_" : ["{unread} ta yangi izoh"],
-    "Comment" : "Izoh",
-    "An error occurred while trying to edit the comment" : "Izohni tahrirlashda xatolik yuz berdi",
-    "Comment deleted" : "Izoh o'chirildi",
-    "An error occurred while trying to delete the comment" : "Izohni o'chirishda xatolik yuz berdi",
-    "An error occurred while trying to create the comment" : "Izoh yaratishda xatolik yuz berdi",
-    "Write a comment …" : "Izoh yozing..."
-},"pluralForm" :"nplurals=1; plural=0;"
-}
@@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /**
 * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
 * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -12,6 +12,7 @@ use OCP\App\IAppManager;
 use OCP\Comments\CommentsEvent;
 use OCP\Files\Config\IMountProviderCollection;
 use OCP\Files\IRootFolder;
+use OCP\Files\Node;
 use OCP\IUser;
 use OCP\IUserSession;
 use OCP\Share\IShareHelper;
@@ -46,8 +47,10 @@ class Listener {
 		foreach ($mounts as $mount) {
 			$owner = $mount->getUser()->getUID();
 			$ownerFolder = $this->rootFolder->getUserFolder($owner);
-			$node = $ownerFolder->getFirstNodeById((int)$event->getComment()->getObjectId());
-			if ($node !== null) {
+			$nodes = $ownerFolder->getById((int)$event->getComment()->getObjectId());
+			if (!empty($nodes)) {
+				/** @var Node $node */
+				$node = array_shift($nodes);
 				$al = $this->shareHelper->getPathsForAccessList($node);
 				$users += $al['users'];
 			}
@@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /**
 * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
 * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /**
 * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
 * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -70,11 +70,11 @@ class NotificationsController extends Controller {
 				return new NotFoundResponse();
 			}
 			$userFolder = $this->rootFolder->getUserFolder($currentUser->getUID());
-			$file = $userFolder->getFirstNodeById((int)$comment->getObjectId());
+			$files = $userFolder->getById((int)$comment->getObjectId());

 			$this->markProcessed($comment, $currentUser);

-			if ($file === null) {
+			if (empty($files)) {
 				return new NotFoundResponse();
 			}

@@ -32,8 +32,8 @@ class CommentsEntityEventListener implements IEventListener {
 		}

 		$event->addEntityCollection('files', function ($name): bool {
-			$node = $this->rootFolder->getUserFolder($this->userId)->getFirstNodeById((int)$name);
-			return $node !== null;
+			$nodes = $this->rootFolder->getUserFolder($this->userId)->getById((int)$name);
+			return !empty($nodes);
 		});
 	}
 }
@@ -84,10 +84,11 @@ class Notifier implements INotifier {
 					throw new UnknownNotificationException('Unsupported comment object');
 				}
 				$userFolder = $this->rootFolder->getUserFolder($notification->getUser());
-				$node = $userFolder->getFirstNodeById((int)$parameters[1]);
-				if ($node === null) {
+				$nodes = $userFolder->getById((int)$parameters[1]);
+				if (empty($nodes)) {
 					throw new AlreadyProcessedException();
 				}
+				$node = $nodes[0];

 				$path = rtrim($node->getPath(), '/');
 				if (str_starts_with($path, '/' . $notification->getUser() . '/files/')) {
@@ -116,11 +116,11 @@ class CommentsSearchProvider implements IProvider {
 	 * @throws NotFoundException
 	 */
 	protected function getFileForComment(Folder $userFolder, IComment $comment): Node {
-		$node = $userFolder->getFirstNodeById((int)$comment->getObjectId());
-		if ($node === null) {
+		$nodes = $userFolder->getById((int)$comment->getObjectId());
+		if (empty($nodes)) {
 			throw new NotFoundException('File not found');
 		}

-		return $node;
+		return array_shift($nodes);
 	}
 }
@@ -1,11 +1,11 @@
-/*!
+/**
 * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
 * SPDX-License-Identifier: AGPL-3.0-or-later
 */

-import type { IFolder, IView } from '@nextcloud/files'
+import type { Folder, View } from '@nextcloud/files'

-import { File, Permission } from '@nextcloud/files'
+import { File, FileAction, Permission } from '@nextcloud/files'
 import { describe, expect, test, vi } from 'vitest'
 import logger from '../logger.js'
 import { action } from './inlineUnreadCommentsAction.ts'
@@ -13,7 +13,7 @@ import { action } from './inlineUnreadCommentsAction.ts'
 const view = {
 	id: 'files',
 	name: 'Files',
-} as IView
+} as View

 describe('Inline unread comments action display name tests', () => {
 	test('Default values', () => {
@@ -29,35 +29,36 @@ describe('Inline unread comments action display name tests', () => {
 			root: '/files/admin',
 		})

+		expect(action).toBeInstanceOf(FileAction)
 		expect(action.id).toBe('comments-unread')
 		expect(action.displayName({
 			nodes: [file],
 			view,
-			folder: {} as IFolder,
+			folder: {} as Folder,
 			contents: [],
 		})).toBe('')
 		expect(action.title!({
 			nodes: [file],
 			view,
-			folder: {} as IFolder,
+			folder: {} as Folder,
 			contents: [],
 		})).toBe('1 new comment')
 		expect(action.iconSvgInline({
 			nodes: [file],
 			view,
-			folder: {} as IFolder,
+			folder: {} as Folder,
 			contents: [],
 		})).toMatch(/<svg.+<\/svg>/)
 		expect(action.enabled!({
 			nodes: [file],
 			view,
-			folder: {} as IFolder,
+			folder: {} as Folder,
 			contents: [],
 		})).toBe(true)
 		expect(action.inline!({
 			nodes: [file],
 			view,
-			folder: {} as IFolder,
+			folder: {} as Folder,
 			contents: [],
 		})).toBe(true)
 		expect(action.default).toBeUndefined()
@@ -80,13 +81,13 @@ describe('Inline unread comments action display name tests', () => {
 		expect(action.displayName({
 			nodes: [file],
 			view,
-			folder: {} as IFolder,
+			folder: {} as Folder,
 			contents: [],
 		})).toBe('')
 		expect(action.title!({
 			nodes: [file],
 			view,
-			folder: {} as IFolder,
+			folder: {} as Folder,
 			contents: [],
 		})).toBe('2 new comments')
 	})
@@ -107,7 +108,7 @@ describe('Inline unread comments action enabled tests', () => {
 		expect(action.enabled!({
 			nodes: [file],
 			view,
-			folder: {} as IFolder,
+			folder: {} as Folder,
 			contents: [],
 		})).toBe(false)
 	})
@@ -128,7 +129,7 @@ describe('Inline unread comments action enabled tests', () => {
 		expect(action.enabled!({
 			nodes: [file],
 			view,
-			folder: {} as IFolder,
+			folder: {} as Folder,
 			contents: [],
 		})).toBe(false)
 	})
@@ -149,7 +150,7 @@ describe('Inline unread comments action enabled tests', () => {
 		expect(action.enabled!({
 			nodes: [file],
 			view,
-			folder: {} as IFolder,
+			folder: {} as Folder,
 			contents: [],
 		})).toBe(true)
 	})
@@ -170,7 +171,7 @@ describe('Inline unread comments action enabled tests', () => {
 		expect(action.enabled!({
 			nodes: [file],
 			view,
-			folder: {} as IFolder,
+			folder: {} as Folder,
 			contents: [],
 		})).toBe(true)
 	})
@@ -203,7 +204,7 @@ describe('Inline unread comments action execute tests', () => {
 		const result = await action.exec!({
 			nodes: [file],
 			view,
-			folder: {} as IFolder,
+			folder: {} as Folder,
 			contents: [],
 		})

@@ -240,7 +241,7 @@ describe('Inline unread comments action execute tests', () => {
 		const result = await action.exec!({
 			nodes: [file],
 			view,
-			folder: {} as IFolder,
+			folder: {} as Folder,
 			contents: [],
 		})

@@ -3,15 +3,12 @@
 * SPDX-License-Identifier: AGPL-3.0-or-later
 */

-import type { IFileAction } from '@nextcloud/files'
-
 import CommentProcessingSvg from '@mdi/svg/svg/comment-processing.svg?raw'
-import { getSidebar } from '@nextcloud/files'
+import { FileAction, getSidebar } from '@nextcloud/files'
 import { n, t } from '@nextcloud/l10n'
 import logger from '../logger.js'
-import { isUsingActivityIntegration } from '../utils/activity.js'

-export const action: IFileAction = {
+export const action = new FileAction({
 	id: 'comments-unread',

 	title({ nodes }) {
@@ -39,13 +36,7 @@ export const action: IFileAction = {

 		try {
 			const sidebar = getSidebar()
-			const sidebarTabId = isUsingActivityIntegration() ? 'activity' : 'comments'
-			if (sidebar.isOpen && sidebar.node?.source === nodes[0].source) {
-				logger.debug('Sidebar already open for this node, just activating comments tab')
-				sidebar.setActiveTab(sidebarTabId)
-				return null
-			}
-			sidebar.open(nodes[0], sidebarTabId)
+			sidebar.open(nodes[0], 'comments')
 			return null
 		} catch (error) {
 			logger.error('Error while opening sidebar', { error })
@@ -56,4 +47,4 @@ export const action: IFileAction = {
 	inline: () => true,

 	order: -140,
-}
+})
@@ -1,4 +1,4 @@
-/*!
+/**
 * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
 * SPDX-License-Identifier: AGPL-3.0-or-later
 */
@@ -6,18 +6,18 @@
 import MessageReplyText from '@mdi/svg/svg/message-reply-text.svg?raw'
 import { getCSPNonce } from '@nextcloud/auth'
 import { registerSidebarTab } from '@nextcloud/files'
+import { loadState } from '@nextcloud/initial-state'
 import { t } from '@nextcloud/l10n'
 import wrap from '@vue/web-component-wrapper'
 import { createPinia, PiniaVuePlugin } from 'pinia'
 import Vue from 'vue'
 import { registerCommentsPlugins } from './comments-activity-tab.ts'
-import { isUsingActivityIntegration } from './utils/activity.ts'

 __webpack_nonce__ = getCSPNonce()

 const tagName = 'comments_files-sidebar-tab'

-if (isUsingActivityIntegration()) {
+if (loadState('comments', 'activityEnabled', false) && OCA?.Activity?.registerSidebarAction !== undefined) {
 	// Do not mount own tab but mount into activity
 	window.addEventListener('DOMContentLoaded', function() {
 		registerCommentsPlugins()
@@ -1,13 +0,0 @@
-/*!
- * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-
-import { loadState } from '@nextcloud/initial-state'
-
-/**
- * Check if the comments app is using the Activity app integration for the sidebar.
- */
-export function isUsingActivityIntegration() {
-	return loadState('comments', 'activityEnabled', false) && window.OCA?.Activity?.registerSidebarAction !== undefined
-}
@@ -92,11 +92,12 @@ class ListenerTest extends TestCase {
 			->willReturn($userMountCache);

 		$node = $this->createMock(Node::class);
+		$nodes = [ $node ];

 		$ownerFolder = $this->createMock(Folder::class);
 		$ownerFolder->expects($this->any())
-			->method('getFirstNodeById')
-			->willReturn($node);
+			->method('getById')
+			->willReturn($nodes);

 		$this->rootFolder->expects($this->any())
 			->method('getUserFolder')
@@ -107,8 +107,8 @@ class NotificationsTest extends TestCase {
 			->willReturn($folder);

 		$folder->expects($this->once())
-			->method('getFirstNodeById')
-			->willReturn($file);
+			->method('getById')
+			->willReturn([$file]);

 		$this->session->expects($this->once())
 			->method('getUser')
@@ -183,8 +183,8 @@ class NotificationsTest extends TestCase {
 			->willReturn($folder);

 		$folder->expects($this->once())
-			->method('getFirstNodeById')
-			->willReturn(null);
+			->method('getById')
+			->willReturn([]);

 		$user = $this->createMock(IUser::class);

@@ -86,9 +86,9 @@ class NotifierTest extends TestCase {
 			->with('you')
 			->willReturn($userFolder);
 		$userFolder->expects($this->once())
-			->method('getFirstNodeById')
+			->method('getById')
 			->with('678')
-			->willReturn($node);
+			->willReturn([$node]);

 		$this->notification->expects($this->exactly(2))
 			->method('getUser')
@@ -202,9 +202,9 @@ class NotifierTest extends TestCase {
 			->with('you')
 			->willReturn($userFolder);
 		$userFolder->expects($this->once())
-			->method('getFirstNodeById')
+			->method('getById')
 			->with('678')
-			->willReturn($node);
+			->willReturn([$node]);

 		$this->notification->expects($this->exactly(2))
 			->method('getUser')
@@ -301,7 +301,7 @@ class NotifierTest extends TestCase {

 		$this->folder
 			->expects($this->never())
-			->method('getFirstNodeById');
+			->method('getById');

 		$this->notification
 			->expects($this->once())
@@ -338,7 +338,7 @@ class NotifierTest extends TestCase {

 		$this->folder
 			->expects($this->never())
-			->method('getFirstNodeById');
+			->method('getById');

 		$this->notification
 			->expects($this->once())
@@ -378,7 +378,7 @@ class NotifierTest extends TestCase {

 		$this->folder
 			->expects($this->never())
-			->method('getFirstNodeById');
+			->method('getById');

 		$this->notification
 			->expects($this->once())
@@ -435,7 +435,7 @@ class NotifierTest extends TestCase {

 		$this->folder
 			->expects($this->never())
-			->method('getFirstNodeById');
+			->method('getById');

 		$this->notification
 			->expects($this->once())
@@ -497,9 +497,9 @@ class NotifierTest extends TestCase {
 			->with('you')
 			->willReturn($userFolder);
 		$userFolder->expects($this->once())
-			->method('getFirstNodeById')
+			->method('getById')
 			->with('678')
-			->willReturn(null);
+			->willReturn([]);

 		$this->notification->expects($this->once())
 			->method('getUser')
@@ -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.15.0</version>
+	<version>1.14.1</version>
 	<licence>agpl</licence>
 	<author>Christoph Wurst</author>
 	<author homepage="https://github.com/nextcloud/groupware">Nextcloud Groupware Team</author>
@@ -21,7 +21,7 @@
 	<category>social</category>
 	<bugs>https://github.com/nextcloud/server/issues</bugs>
 	<dependencies>
-		<nextcloud min-version="34" max-version="34"/>
+		<nextcloud min-version="33" max-version="33"/>
 	</dependencies>
 	<background-jobs>
 		<job>OCA\ContactsInteraction\BackgroundJob\CleanupJob</job>
@@ -2,8 +2,6 @@ OC.L10N.register(
    "contactsinteraction",
    {
    "Recently contacted" : "Nedavno kontaktiran",
-    "Contacts Interaction" : "Interakcija kontakata",
-    "Manages interaction between accounts and contacts" : "Upravlja interakcijom između računa i kontakata",
-    "Collect data about accounts and contacts interactions and provide an address book for the data" : "Prikuplja podatke o interakcijama između računa i kontakata te pruža adresar za te podatke"
+    "Contacts Interaction" : "Interakcija kontakata"
 },
 "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;");
@@ -1,7 +1,5 @@
 { "translations": {
    "Recently contacted" : "Nedavno kontaktiran",
-    "Contacts Interaction" : "Interakcija kontakata",
-    "Manages interaction between accounts and contacts" : "Upravlja interakcijom između računa i kontakata",
-    "Collect data about accounts and contacts interactions and provide an address book for the data" : "Prikuplja podatke o interakcijama između računa i kontakata te pruža adresar za te podatke"
+    "Contacts Interaction" : "Interakcija kontakata"
 },"pluralForm" :"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"
 }
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "contactsinteraction",
-    {
-    "Recently contacted" : "Саяхан холбоо барьсан",
-    "Contacts Interaction" : "Харилцагчийн харилцан үйлдэл",
-    "Manages interaction between accounts and contacts" : "Бүртгэл ба харилцагчдын хоорондын харилцааг удирддаг",
-    "Collect data about accounts and contacts interactions and provide an address book for the data" : "Бүртгэл болон харилцагчдын харилцан үйлчлэлийн өгөгдлийг цуглуулж, тэдгээр өгөгдлийн хаягийн дэвтрийг хангана"
-},
-"nplurals=2; plural=(n != 1);");
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Recently contacted" : "Саяхан холбоо барьсан",
-    "Contacts Interaction" : "Харилцагчийн харилцан үйлдэл",
-    "Manages interaction between accounts and contacts" : "Бүртгэл ба харилцагчдын хоорондын харилцааг удирддаг",
-    "Collect data about accounts and contacts interactions and provide an address book for the data" : "Бүртгэл болон харилцагчдын харилцан үйлчлэлийн өгөгдлийг цуглуулж, тэдгээр өгөгдлийн хаягийн дэвтрийг хангана"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
@@ -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.14.0</version>
+	<version>7.13.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="34" max-version="34"/>
+		<nextcloud min-version="33" max-version="33"/>
 	</dependencies>

 	<navigations>
@@ -22,6 +22,7 @@ OC.L10N.register(
    "Weather service" : "خدمة الطقس",
    "Weather data from Met.no" : "بيانات الطقس من Met.no",
    "geocoding with Nominatim" : "الترميز الجغرافي مع Nominatim",
-    "elevation data from OpenTopoData" : "بيانات التقييم من OpenTopoData"
+    "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 الخاص بك نيابه عنك، وبالتالي فإن خدمة حالة الطقس لا تشارك معلوماتك الشخصية."
 },
 "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;");
@@ -20,6 +20,7 @@
    "Weather service" : "خدمة الطقس",
    "Weather data from Met.no" : "بيانات الطقس من Met.no",
    "geocoding with Nominatim" : "الترميز الجغرافي مع Nominatim",
-    "elevation data from OpenTopoData" : "بيانات التقييم من OpenTopoData"
+    "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 الخاص بك نيابه عنك، وبالتالي فإن خدمة حالة الطقس لا تشارك معلوماتك الشخصية."
 },"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;"
 }
@@ -20,6 +20,7 @@ OC.L10N.register(
    "Weather service" : "Serviciu del clima",
    "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"
+    "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."
 },
 "nplurals=2; plural=(n != 1);");
@@ -18,6 +18,7 @@
    "Weather service" : "Serviciu del clima",
    "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"
+    "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."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -19,6 +19,7 @@ OC.L10N.register(
    "Weather service" : "Метеорологична услуга",
    "Weather data from Met.no" : "Данни за времето от Met.no",
    "geocoding with Nominatim" : "геокодиране с Nominatim",
-    "elevation data from OpenTopoData" : " кота данни от OpenTopoData"
+    "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  сървъра ви от ваше име, така че метеорологичната служба не получава лична информация."
 },
 "nplurals=2; plural=(n != 1);");
--- a/Show More
+++ b/Show More