fix(ContactsManager): Fix conflict with value type from database

Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
fix(l10n): Update translations from Transifex
2025-10-26 18:28:01 +01:00 · 2025-10-26 00:13:27 +00:00 · 2025-10-25 00:13:40 +00:00 · 2025-10-24 14:42:16 +02:00 · 2025-10-24 13:46:20 +02:00 · 2025-10-24 11:56:25 +02:00
2887 changed files with 55557 additions and 95998 deletions
@@ -4,35 +4,33 @@ ARG DEBIAN_FRONTEND=noninteractive

 # PHP
 RUN apt-get update -y && \
-    apt install -y apache2 vim software-properties-common sudo nano gnupg2 wget curl git \
-    lsb-release ca-certificates apt-transport-https && \
-    add-apt-repository ppa:ondrej/php -y && \
-    apt-get update -y
+    apt install -y apache2 vim software-properties-common sudo nano gnupg2

 RUN apt-get install --no-install-recommends -y \
-    php8.4 \
-    php8.4-common \
-    php8.4-gd \
-    php8.4-zip \
-    php8.4-curl \
-    php8.4-xml \
-    php8.4-xmlrpc \
-    php8.4-mbstring \
-    php8.4-sqlite \
-    php8.4-xdebug \
-    php8.4-pgsql \
-    php8.4-intl \
-    php8.4-imagick \
-    php8.4-gmp \
-    php8.4-apcu \
-    php8.4-bcmath \
-    php8.4-redis \
-    php8.4-soap \
-    php8.4-imap \
-    php8.4-opcache \
-    php8.4-cli \
-    php8.4-dev \
+    php8.3 \
+    php8.3-common \
+    php8.3-gd \
+    php8.3-zip \
+    php8.3-curl \
+    php8.3-xml \
+    php8.3-xmlrpc \
+    php8.3-mbstring \
+    php8.3-sqlite \
+    php8.3-xdebug \
+    php8.3-pgsql \
+    php8.3-intl \
+    php8.3-imagick \
+    php8.3-gmp \
+    php8.3-apcu \
+    php8.3-bcmath \
+    php8.3-redis \
+    php8.3-soap \
+    php8.3-imap \
+    php8.3-opcache \
+    php8.3-cli \
+    php8.3-dev \
    libmagickcore-6.q16-7-extra \
+    curl \
    lsof \
    make \
 	unzip
@@ -44,39 +42,39 @@ RUN curl -sS https://getcomposer.org/installer -o /tmp/composer-setup.php && \
    php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer && \
    rm /tmp/composer-setup.php /tmp/composer-setup.sig

-RUN echo "xdebug.remote_enable = 1" >> /etc/php/8.4/cli/conf.d/20-xdebug.ini && \
-    echo "xdebug.remote_autostart = 1" >> /etc/php/8.4/cli/conf.d/20-xdebug.ini && \
-	echo "apc.enable_cli=1" >> /etc/php/8.4/cli/conf.d/20-apcu.ini
+RUN echo "xdebug.remote_enable = 1" >> /etc/php/8.3/cli/conf.d/20-xdebug.ini && \
+    echo "xdebug.remote_autostart = 1" >> /etc/php/8.3/cli/conf.d/20-xdebug.ini && \
+	echo "apc.enable_cli=1" >> /etc/php/8.3/cli/conf.d/20-apcu.ini

 # Autostart XDebug for apache
 RUN { \
 	echo "xdebug.mode=debug"; \
 	echo "xdebug.start_with_request=yes"; \
-} >> /etc/php/8.4/apache2/conf.d/20-xdebug.ini
+} >> /etc/php/8.3/apache2/conf.d/20-xdebug.ini

 # Increase PHP memory limit to 512mb
-RUN sed -i 's/memory_limit = .*/memory_limit = 512M/' /etc/php/8.4/apache2/php.ini
+RUN sed -i 's/memory_limit = .*/memory_limit = 512M/' /etc/php/8.3/apache2/php.ini

-# Docker CLI only (for controlling host Docker via socket)
-RUN install -m 0755 -d /etc/apt/keyrings && \
-    curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc && \
-    chmod a+r /etc/apt/keyrings/docker.asc && \
-    echo \
-        "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
-        $(. /etc/os-release && echo "${UBUNTU_CODENAME:-$VERSION_CODENAME}") stable" | \
-        tee /etc/apt/sources.list.d/docker.list > /dev/null && \
+# Docker
+RUN apt-get -y install \
+    apt-transport-https \
+    ca-certificates \
+    curl \
+    gnupg-agent \
+    software-properties-common && \
+    curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \
+    add-apt-repository \
+   "deb [arch=amd64] https://download.docker.com/linux/ubuntu \
+   $(lsb_release -cs) \
+   stable" && \
    apt-get update -y && \
-    apt-get install -y docker-ce-cli && \
+    apt-get install -y docker-ce docker-ce-cli containerd.io && \
    ln -s /var/run/docker-host.sock /var/run/docker.sock

 # Dedicated DevContainer user runs Apache
 ENV APACHE_RUN_USER=devcontainer
 ENV APACHE_RUN_GROUP=devcontainer
-# Delete any existing user/group with UID/GID 1000 first
-RUN (getent passwd 1000 && userdel -r $(getent passwd 1000 | cut -d: -f1)) || true && \
-    (getent group 1000 && groupdel $(getent group 1000 | cut -d: -f1)) || true && \
-    groupadd -g 1000 ${APACHE_RUN_GROUP} && \
-    useradd -u 1000 -g 1000 -ms /bin/bash ${APACHE_RUN_USER} && \
+RUN useradd -ms /bin/bash ${APACHE_RUN_USER} && \
 	adduser ${APACHE_RUN_USER} sudo && \
 	echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers && \
 	sed -ri "s/^export APACHE_RUN_USER=.*$/export APACHE_RUN_USER=${APACHE_RUN_USER}/" "/etc/apache2/envvars" && \
@@ -86,6 +84,6 @@ USER devcontainer

 # NVM
 RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash
-RUN bash --login -i -c 'source /home/devcontainer/.bashrc && nvm install 22'
+RUN bash --login -i -c 'source /home/devcontainer/.bashrc && nvm install 16'

 WORKDIR /var/www/html
@@ -1,5 +1,6 @@
 # SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
 # SPDX-License-Identifier: AGPL-3.0-or-later
+version: '3'
 services:
  nextclouddev:
    build: .
@@ -5,9 +5,4 @@
 #
 # Set git safe.directory
 git config --global --add safe.directory /var/www/html
-git config --global --add safe.directory /var/www/html/3rdparty
-
-# Ensure devcontainer user has access to docker socket
-if [ -S /var/run/docker.sock ]; then
-    sudo chmod 666 /var/run/docker.sock
-fi
+git config --global --add safe.directory /var/www/html/3rdparty
@@ -0,0 +1,14 @@
+# SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: AGPL-3.0-or-later
+# Ignoring folders for eslint
+node_modules/
+3rdparty/
+**/vendor/
+**/l10n/
+**/js/*
+*.config.js
+tests/lib/
+apps-extra
+
+# TODO: remove when comments files is not using handlebar templates anymore
+apps/comments/src/templates.js
@@ -0,0 +1,60 @@
+/**
+ * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+module.exports = {
+	globals: {
+		__webpack_nonce__: true,
+		_: true,
+		$: true,
+		dayNames: true,
+		escapeHTML: true,
+		firstDay: true,
+		moment: true,
+		oc_userconfig: true,
+		sinon: true,
+	},
+	plugins: [
+		'cypress',
+	],
+	extends: [
+		'@nextcloud/eslint-config/typescript',
+		'plugin:cypress/recommended',
+	],
+	rules: {
+		'comma-dangle': 'error',
+		'no-tabs': 'warn',
+		// TODO: make sure we fix this as this is bad vue coding style.
+		// Use proper sync modifier
+		'vue/no-mutating-props': 'warn',
+		'vue/custom-event-name-casing': ['error', 'kebab-case', {
+			// allows custom xxxx:xxx events formats
+			ignores: ['/^[a-z]+(?:-[a-z]+)*:[a-z]+(?:-[a-z]+)*$/u'],
+		}],
+		'vue/html-self-closing': 'error',
+	},
+	settings: {
+		jsdoc: {
+			mode: 'typescript',
+		},
+		'import/resolver': {
+			typescript: {}, // this loads <rootdir>/tsconfig.json to eslint
+		},
+	},
+	overrides: [
+		// Allow any in tests
+		{
+			files: ['**/*.spec.ts'],
+			rules: {
+				'@typescript-eslint/no-explicit-any': 'warn',
+			},
+		},
+		{
+			files: ['*.vue'],
+			rules: {
+				'no-irregular-whitespace': 'off',
+				'vue/no-irregular-whitespace': 'error',
+			},
+		},
+	],
+}
@@ -19,7 +19,3 @@ af6de04e9e141466dc229e444ff3f146f4a34765
 b06f5ba4c47450f355a8903c1a93ac68e8c6cfc2
 # Update to coding-standard 1.4.0
 5981b7eb512aa411f51cad541d01c5c6e93476f0
-# Migrate `and` `or` operators to logical `&&` `||` operators
-660f3f6fd1ae5539b8f74bfa48859d1b9f1e6abf
-# Migrate to ESLint v9 enforced code style
-91f3b6b4ee60e0f8bb6e21f92d5bc52e4cebe657
@@ -31,9 +31,9 @@ package-lock.json                             @nextcloud/server-dependabot
 /apps/contactsinteraction/lib                 @kesselb @SebastianKrupinski
 /apps/contactsinteraction/tests               @kesselb @SebastianKrupinski
 /apps/dashboard/appinfo/info.xml              @julien-nc @juliusknorr
-/apps/dav/lib/CalDAV                          @ChristophWurst @SebastianKrupinski @tcitworld
+/apps/dav/lib/CalDAV                          @st3iny @SebastianKrupinski @tcitworld
 /apps/dav/lib/CardDAV                         @hamza221 @SebastianKrupinski
-/apps/dav/tests/unit/CalDAV                   @ChristophWurst @SebastianKrupinski @tcitworld
+/apps/dav/tests/unit/CalDAV                   @st3iny @SebastianKrupinski @tcitworld
 /apps/dav/tests/unit/CardDAV                  @hamza221 @SebastianKrupinski
 /apps/encryption/appinfo/info.xml             @come-nc @icewind1991
 /apps/federatedfilesharing/appinfo/info.xml   @icewind1991 @danxuliu
@@ -50,7 +50,7 @@ package-lock.json                             @nextcloud/server-dependabot
 /apps/sharebymail/appinfo/info.xml            @Altahrim @skjnldsv
 /apps/systemtags/appinfo/info.xml             @Antreesy @marcelklehr
 /apps/theming/appinfo/info.xml                @skjnldsv @juliusknorr
-/apps/twofactor_backupcodes/appinfo/info.xml  @miaulalala @ChristophWurst
+/apps/twofactor_backupcodes/appinfo/info.xml  @st3iny @miaulalala @ChristophWurst
 /apps/updatenotification/appinfo/info.xml     @JuliaKirschenheuter @sorbaugh
 /apps/user_ldap/appinfo/info.xml              @come-nc @blizzz
 /apps/user_status/appinfo/info.xml            @Antreesy @nickvergessen
@@ -72,9 +72,9 @@ package-lock.json                             @nextcloud/server-dependabot

 # Two-Factor Authentication
 # https://github.com/nextcloud/wg-two-factor-authentication#members
-**/TwoFactorAuth                    @ChristophWurst @miaulalala @nickvergessen
-/apps/twofactor_backupcodes         @ChristophWurst @miaulalala @nickvergessen
-/core/templates/twofactor*          @ChristophWurst @miaulalala @nickvergessen
+**/TwoFactorAuth                    @ChristophWurst @miaulalala @nickvergessen @st3iny
+/apps/twofactor_backupcodes         @ChristophWurst @miaulalala @nickvergessen @st3iny
+/core/templates/twofactor*          @ChristophWurst @miaulalala @nickvergessen @st3iny

 # Limit login to IP
 # Watch login routes for https://github.com/nextcloud/limit_login_to_ip
@@ -96,16 +96,16 @@ ResponseDefinitions.php             @provokateurin @nextcloud/server-backend
 */Notifications/*                   @nickvergessen @nextcloud/talk-backend

 # Groupware team
-/build/integration/dav_features/caldav.feature            @ChristophWurst @SebastianKrupinski @tcitworld
+/build/integration/dav_features/caldav.feature            @st3iny @SebastianKrupinski @tcitworld
 /build/integration/dav_features/carddav.feature           @hamza221 @SebastianKrupinski
-/lib/private/Calendar                                     @ChristophWurst @SebastianKrupinski @tcitworld
+/lib/private/Calendar                                     @st3iny @SebastianKrupinski @tcitworld
 /lib/private/Contacts                                     @hamza221 @SebastianKrupinski
-/lib/public/Calendar                                      @ChristophWurst @SebastianKrupinski @tcitworld
+/lib/public/Calendar                                      @st3iny @SebastianKrupinski @tcitworld
 /lib/public/Contacts                                      @hamza221 @SebastianKrupinski

 # Desktop client teamn
 /apps/dav/lib/Connector/Sabre/BlockLegacyClientPlugin.php @nextcloud/desktop

 # Personal interest
-*/Activity/*                                              @nickvergessen @nextcloud/server-backend
-/apps/workflowengine/lib                                  @nickvergessen @blizzz
+*/Activity/*                                     @nickvergessen @nextcloud/server-backend
+/apps/workflowengine/lib                         @nickvergessen @blizzz
@@ -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
@@ -38,10 +38,7 @@ updates:

 # Main master npm frontend dependencies
 - package-ecosystem: npm
-  directories:
-    - "/"
-    - "/build/frontend"
-    - "/build/frontend-legacy"
+  directory: "/"
  schedule:
    interval: weekly
    day: saturday
@@ -57,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"
@@ -81,7 +78,7 @@ updates:
 # Latest stable branch
 # frontend dependencies
 - package-ecosystem: npm
-  target-branch: stable32
+  target-branch: stable31
  directory: "/"
  schedule:
    interval: weekly
@@ -103,7 +100,7 @@ updates:

 # Composer dependencies for linting and testing
 - package-ecosystem: composer
-  target-branch: stable31
+  target-branch: stable30
  directories:
    - "/"
    - "/build/integration"
@@ -126,7 +123,7 @@ updates:

 # frontend dependencies
 - package-ecosystem: npm
-  target-branch: stable31
+  target-branch: stable30
  directory: "/"
  schedule:
    interval: weekly
@@ -46,7 +46,7 @@ jobs:

    strategy:
      matrix:
-        php-versions: ['8.2']
+        php-versions: ['8.1']

    name: PHP checkers

@@ -75,7 +75,7 @@ jobs:

    strategy:
      matrix:
-        php-versions: ['8.2']
+        php-versions: ['8.1']

    name: Translation and Files checkers

@@ -32,18 +32,16 @@ jobs:
          build-mode: none
    steps:
    - name: Checkout repository
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      with:
-        persist-credentials: false
+      uses: actions/checkout@v5

    - name: Initialize CodeQL
-      uses: github/codeql-action/init@5d5cd550d3e189c569da8f16ea8de2d821c9bf7a # v3.31.2
+      uses: github/codeql-action/init@v3
      with:
        languages: ${{ matrix.language }}
        build-mode: ${{ matrix.build-mode }}
        config-file: ./.github/codeql-config.yml

    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@5d5cd550d3e189c569da8f16ea8de2d821c9bf7a # v3.31.2
+      uses: github/codeql-action/analyze@v3
      with:
        category: "/language:${{matrix.language}}"
@@ -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
@@ -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,8 +102,8 @@ 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: ['setup', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9']
-        # Hack as strategy.job-total includes the "setup" and GitHub does not allow math expressions
+        containers: ['component', 'setup', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9']
+        # 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]

@@ -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 }}

@@ -194,7 +194,6 @@ jobs:
          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
          SPLIT: ${{ matrix.total-containers }}
          SPLIT_INDEX: ${{ matrix.containers == 'component' && 0 || matrix.containers }}
-          SPLIT_RANDOM_SEED: ${{ github.run_id }}
          SETUP_TESTING: ${{ matrix.containers == 'setup' && 'true' || '' }}

      - name: Upload snapshots and videos
@@ -206,19 +205,20 @@ jobs:
            cypress/snapshots
            cypress/videos

-      - name: Show logs
+      - name: Extract NC logs
        if: failure() && matrix.containers != 'component'
-        run: |
-          for id in $(docker ps -aq); do
-            docker container inspect "$id" --format '=== Logs for container {{.Name}} ==='
-            docker logs "$id" >> nextcloud.log
-          done
-          echo '=== Nextcloud server logs ==='
-          docker exec nextcloud-e2e-test-server_${{ env.APP_NAME }} cat data/nextcloud.log
+        run: docker logs nextcloud-cypress-tests_${{ env.APP_NAME }} > nextcloud.log
+
+      - name: Upload NC logs
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        if: failure() && matrix.containers != 'component'
+        with:
+          name: nc_logs_${{ matrix.containers }}
+          path: nextcloud.log

      - name: Create data dir archive
        if: failure() && matrix.containers != 'component'
-        run: docker exec nextcloud-e2e-test-server_${{ env.APP_NAME }} tar -cvjf - data > data.tar
+        run: docker exec nextcloud-cypress-tests_${{ env.APP_NAME }} tar -cvjf - data > data.tar

      - name: Upload data dir archive
        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
@@ -45,10 +45,10 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        php-versions: ['8.2', '8.4']
+        php-versions: ['8.1', '8.4']
        ftpd: ['proftpd', 'vsftpd', 'pure-ftpd']
        include:
-          - php-versions: '8.2'
+          - php-versions: '8.1'
            coverage: ${{ github.event_name != 'pull_request' }}

    name: php${{ matrix.php-versions }}-${{ matrix.ftpd }}
@@ -45,7 +45,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        php-versions: ['8.2', '8.4']
+        php-versions: ['8.1', '8.2', '8.4']
        include:
          - php-versions: '8.3'
            coverage: ${{ github.event_name != 'pull_request' }}
@@ -134,7 +134,7 @@ jobs:

    strategy:
      matrix:
-        php-versions: ['8.2', '8.4']
+        php-versions: ['8.1', '8.2', '8.4']
        include:
          - php-versions: '8.3'
            coverage: ${{ github.event_name != 'pull_request' }}
@@ -45,10 +45,10 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        php-versions: ['8.2', '8.4']
+        php-versions: ['8.1', '8.4']
        sftpd: ['openssh']
        include:
-          - php-versions: '8.2'
+          - php-versions: '8.1'
            coverage: ${{ github.event_name != 'pull_request' }}

    name: php${{ matrix.php-versions }}-${{ matrix.sftpd }}
@@ -67,10 +67,10 @@ jobs:
      - name: Pull images
        run: |
          docker pull ghcr.io/icewind1991/samba-krb-test-dc
-          docker pull ghcr.io/icewind1991/samba-krb-test-apache-gssapi:8.4
+          docker pull ghcr.io/icewind1991/samba-krb-test-apache
          docker pull ghcr.io/icewind1991/samba-krb-test-client
          docker tag ghcr.io/icewind1991/samba-krb-test-dc icewind1991/samba-krb-test-dc
-          docker tag ghcr.io/icewind1991/samba-krb-test-apache-gssapi:8.4 icewind1991/samba-krb-test-apache-gssapi
+          docker tag ghcr.io/icewind1991/samba-krb-test-apache icewind1991/samba-krb-test-apache
          docker tag ghcr.io/icewind1991/samba-krb-test-client icewind1991/samba-krb-test-client

      - name: Setup AD-DC
@@ -45,8 +45,9 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
+        php-versions: ['8.1']
        include:
-          - php-versions: '8.2'
+          - php-versions: '8.1'
            coverage: ${{ github.event_name != 'pull_request' }}

    name: php${{ matrix.php-versions }}-smb
@@ -45,7 +45,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        php-versions: ['8.3', '8.4']
+        php-versions: ['8.1', '8.2', '8.3', '8.4']
        include:
          - php-versions: '8.2'
            coverage: ${{ github.event_name != 'pull_request' }}
@@ -44,7 +44,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        php-versions: ['8.3', '8.4']
+        php-versions: ['8.1', '8.2', '8.3', '8.4']
        include:
          - php-versions: '8.2'
            coverage: ${{ github.event_name != 'pull_request' }}
@@ -45,7 +45,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        php-versions: ['8.2']
+        php-versions: ['8.1']
        endpoint: ['old', 'new']
        service: ['CalDAV', 'CardDAV']

@@ -45,7 +45,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        php-versions: ['8.2']
+        php-versions: ['8.1']
        endpoint: ['webdav', 'dav']

    name: Litmus WebDAV ${{ matrix.endpoint }}
@@ -45,7 +45,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        php-versions: ['8.2']
+        php-versions: ['8.1']
        key: ['objectstore', 'objectstore_multibucket']

    name: php${{ matrix.php-versions }}-${{ matrix.key }}-minio
@@ -73,9 +73,9 @@ jobs:
          - 'theming_features'
          - 'videoverification_features'

-        php-versions: ['8.4']
-        spreed-versions: ['main']
-        activity-versions: ['master']
+        php-versions: ['8.1']
+        spreed-versions: ['stable32']
+        activity-versions: ['stable32']

    services:
      redis:
@@ -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 }}

@@ -47,7 +47,7 @@ jobs:

    strategy:
      matrix:
-        php-versions: [ '8.2', '8.3', '8.4' ]
+        php-versions: [ '8.1', '8.2', '8.3', '8.4' ]

    name: php-lint

@@ -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 }}

@@ -90,7 +90,7 @@ jobs:
          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 }}

@@ -114,6 +114,35 @@ jobs:
        if: ${{ !cancelled() }}
        uses: codecov/test-results-action@47f89e9acb64b76debcd5ea40642d25a4adced9f # v1.1.1

+  jsunit:
+    runs-on: ubuntu-latest
+    needs: [versions, changes]
+
+    if: ${{ needs.versions.result != 'failure' && needs.changes.outputs.src != 'false' }}
+
+    env:
+      CYPRESS_INSTALL_BINARY: 0
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          persist-credentials: false
+
+      - name: Set up node ${{ needs.versions.outputs.nodeVersion }}
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+        with:
+          node-version: ${{ needs.versions.outputs.nodeVersion }}
+
+      - name: Set up npm ${{ needs.versions.outputs.npmVersion }}
+        run: npm i -g 'npm@${{ needs.versions.outputs.npmVersion }}'
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Test
+        run: npm run test:jsunit
+
  handlebars:
    runs-on: ubuntu-latest
    needs: [versions, changes]
@@ -131,7 +160,7 @@ jobs:
          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 }}

@@ -148,7 +177,7 @@ jobs:
    permissions:
      contents: none
    runs-on: ubuntu-latest-low
-    needs: [changes, test, handlebars]
+    needs: [changes, test, jsunit, handlebars]

    if: always()

@@ -156,4 +185,4 @@ jobs:

    steps:
      - name: Summary status
-        run: if ${{ needs.changes.outputs.src != 'false' && (needs.test.result != 'success' || needs.handlebars.result != 'success') }}; then exit 1; fi
+        run: if ${{ needs.changes.outputs.src != 'false' && (needs.test.result != 'success' || needs.jsunit.result != 'success' || needs.handlebars.result != 'success') }}; then exit 1; fi
@@ -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,7 +24,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        branches: ['main', 'master', 'stable32', 'stable31', 'stable30']
+        branches: ['main', 'master', 'stable31', 'stable30']

    name: npm-audit-fix-${{ 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 }}

@@ -49,9 +49,9 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        php-versions: ['8.2', '8.3']
+        php-versions: ['8.1', '8.2']
        include:
-          - php-versions: '8.4'
+          - php-versions: '8.3'
            coverage: true

    name: php${{ matrix.php-versions }}-azure
@@ -49,7 +49,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        php-versions: ['8.2']
+        php-versions: ['8.1', '8.2']
        include:
          - php-versions: '8.3'
            coverage: true
@@ -49,7 +49,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        php-versions: ['8.2']
+        php-versions: ['8.1', '8.2']
        include:
          - php-versions: '8.3'
            coverage: true
@@ -33,7 +33,7 @@ jobs:
      - name: Set up php
        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 # v2.35.4
        with:
-          php-version: '8.2'
+          php-version: '8.1'
          extensions: ctype, curl, dom, fileinfo, gd, json, libxml, mbstring, openssl, pcntl, pdo, posix, session, simplexml, xml, xmlreader, xmlwriter, zip, zlib
          coverage: none
          ini-file: development
@@ -23,7 +23,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        php-versions: ['8.2']
+        php-versions: ['8.1']

    name: performance-${{ matrix.php-versions }}

@@ -71,7 +71,7 @@ jobs:
            curl -s -u test:test -T README.md http://localhost:8080/remote.php/dav/files/test/new_file.txt
            curl -s -u test:test -X DELETE http://localhost:8080/remote.php/dav/files/test/new_file.txt
          output: before.json
-          profiler-branch: master
+          profiler-branch: stable32

      - name: Apply PR # zizmor: ignore[template-injection]
        run: |
@@ -93,7 +93,7 @@ jobs:
            curl -s -u test:test -T README.md http://localhost:8080/remote.php/dav/files/test/new_file.txt
            curl -s -u test:test -X DELETE http://localhost:8080/remote.php/dav/files/test/new_file.txt
          output: after.json
-          profiler-branch: master
+          profiler-branch: stable32
          compare-with: before.json

      - name: Upload profiles
@@ -5,10 +5,9 @@ name: PHPUnit 32bits
 on:
  pull_request:
    paths:
-      - "version.php"
-      - ".github/workflows/phpunit-32bits.yml"
-      - "tests/phpunit-autotest.xml"
-      - "lib/private/Snowflake/*"
+      - 'version.php'
+      - '.github/workflows/phpunit-32bits.yml'
+      - 'tests/phpunit-autotest.xml'
  workflow_dispatch:
  schedule:
    - cron: "15 1 * * 1-6"
@@ -31,7 +30,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        php-versions: ["8.2", "8.3", "8.4"]
+        php-versions: ['8.1','8.3']

    steps:
      - name: Checkout server
@@ -52,7 +51,8 @@ jobs:
          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
          coverage: none
          ini-file: development
-          ini-values: apc.enabled=on, apc.enable_cli=on, disable_functions= # https://github.com/shivammathur/setup-php/discussions/573
+          ini-values:
+            apc.enabled=on, apc.enable_cli=on, disable_functions= # https://github.com/shivammathur/setup-php/discussions/573
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

@@ -59,7 +59,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        php-versions: ['8.2']
+        php-versions: ['8.1']
        mariadb-versions: ['10.3', '10.6', '10.11', '11.4', '11.8']
        include:
          - php-versions: '8.3'
@@ -56,7 +56,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        php-versions: ['8.3', '8.4']
+        php-versions: ['8.1', '8.3', '8.4']
        include:
          - php-versions: '8.2'
            coverage: ${{ github.event_name != 'pull_request' }}
@@ -56,7 +56,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        php-versions: ['8.2']
+        php-versions: ['8.1']
        mysql-versions: ['8.4']

    name: Sharding - MySQL ${{ matrix.mysql-versions }} (PHP ${{ matrix.php-versions }}) - database tests
@@ -59,7 +59,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        php-versions: ['8.2']
+        php-versions: ['8.1']
        mysql-versions: ['8.0', '8.4']
        include:
          - mysql-versions: '8.0'
@@ -59,7 +59,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        php-versions: ['8.3', '8.4']
+        php-versions: ['8.1', '8.3', '8.4']
        include:
          - php-versions: '8.2'
            coverage: ${{ github.event_name != 'pull_request' }}
@@ -49,7 +49,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        php-versions: ['8.2']
+        php-versions: ['8.1']
        key: ['s3', 's3-multibucket']

    name: php${{ matrix.php-versions }}-${{ matrix.key }}-minio
@@ -61,9 +61,9 @@ jobs:
      matrix:
        include:
          - oracle-versions: '11'
-            php-versions: '8.2'
+            php-versions: '8.1'
          - oracle-versions: '18'
-            php-versions: '8.2'
+            php-versions: '8.1'
            coverage: ${{ github.event_name != 'pull_request' }}
          - oracle-versions: '21'
            php-versions: '8.2'
@@ -59,15 +59,15 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        php-versions: ['8.2']
+        php-versions: ['8.1']
        # To keep the matrix smaller we ignore PostgreSQL versions in between as we already test the minimum and the maximum
-        postgres-versions: ['14', '18']
+        postgres-versions: ['13', '17']
        include:
          - php-versions: '8.3'
-            postgres-versions: '18'
+            postgres-versions: '17'
            coverage: ${{ github.event_name != 'pull_request' }}
          - php-versions: '8.4'
-            postgres-versions: '18'
+            postgres-versions: '17'

    name: PostgreSQL ${{ matrix.postgres-versions }} (PHP ${{ matrix.php-versions }}) - database tests

@@ -86,7 +86,7 @@ jobs:
          POSTGRES_USER: root
          POSTGRES_PASSWORD: rootpassword
          POSTGRES_DB: nextcloud
-        options: --mount type=tmpfs,destination=/var/lib/postgresql --health-cmd pg_isready --health-interval 5s --health-timeout 2s --health-retries 5
+        options: --mount type=tmpfs,destination=/var/lib/postgresql/data --health-cmd pg_isready --health-interval 5s --health-timeout 2s --health-retries 5

    steps:
      - name: Checkout server
@@ -59,9 +59,9 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        php-versions: ['8.3', '8.4']
+        php-versions: ['8.2', '8.3', '8.4']
        include:
-          - php-versions: '8.2'
+          - php-versions: '8.1'
            coverage: ${{ github.event_name != 'pull_request' }}

    name: SQLite (PHP ${{ matrix.php-versions }})
@@ -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: >
@@ -36,7 +36,7 @@ jobs:
      - name: Set up php
        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
        with:
-          php-version: '8.2'
+          php-version: '8.1'
          extensions: apcu,ctype,curl,dom,fileinfo,ftp,gd,imagick,intl,json,ldap,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
          coverage: none
        env:
@@ -67,7 +67,7 @@ jobs:
      - name: Set up php
        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
        with:
-          php-version: '8.2'
+          php-version: '8.1'
          extensions: ctype,curl,dom,fileinfo,ftp,gd,imagick,intl,json,ldap,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
          coverage: none

@@ -102,7 +102,7 @@ jobs:
      - name: Set up php
        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
        with:
-          php-version: '8.2'
+          php-version: '8.1'
          extensions: ctype,curl,dom,fileinfo,gd,imagick,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
          coverage: none
        env:
@@ -133,7 +133,7 @@ jobs:
      - name: Set up php
        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
        with:
-          php-version: '8.2'
+          php-version: '8.1'
          extensions: ctype,curl,dom,fileinfo,gd,imagick,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
          coverage: none
        env:
@@ -17,7 +17,7 @@ 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 }}

@@ -17,7 +17,7 @@ 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 }}

@@ -11,7 +11,7 @@
 /apps/inc.php
 /assets
 /.htaccess
-node_modules/
+/node_modules
 /translationfiles
 /translationtool.phar

@@ -55,6 +55,10 @@ node_modules/
 /apps/files_external/3rdparty/irodsphp/prods/test*
 /apps/files_external/tests/config.*.php

+# apps modules
+/apps/*/node_modules
+
+
 # ignore themes except the example and the README
 /themes/*
 !/themes/example
@@ -127,6 +131,9 @@ nbproject
 # Tests
 /tests/phpunit.xml

+# Node Modules
+/build/node_modules/
+
 # nodejs
 /build/bin
 /build/lib/
@@ -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);
@@ -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>
@@ -5,13 +5,13 @@
 -->
 # Nextcloud Server ☁
 [![REUSE status](https://api.reuse.software/badge/github.com/nextcloud/server)](https://api.reuse.software/info/github.com/nextcloud/server)
-[![codecov](https://codecov.io/gh/nextcloud/server/branch/master/graph/badge.svg)](https://codecov.io/gh/nextcloud/server)
+[![codecov](https://codecov.io/gh/nextcloud/server/branch/stable32/graph/badge.svg)](https://codecov.io/gh/nextcloud/server)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/209/badge)](https://bestpractices.coreinfrastructure.org/projects/209)
 [![Design](https://contribute.design/api/shield/nextcloud/server)](https://contribute.design/nextcloud/server)

 **A safe home for all your data.**

-![](https://raw.githubusercontent.com/nextcloud/screenshots/master/nextcloud-hub-files-25-preview.png)
+![](https://raw.githubusercontent.com/nextcloud/screenshots/stable32/nextcloud-hub-files-25-preview.png)

 ## Why is this so awesome? 🤩

@@ -58,7 +58,7 @@ There are many ways to contribute, of which development is only one! Find out [h

 Third-party components are handled as git submodules which have to be initialized first. So aside from the regular git checkout invoking `git submodule update --init` or a similar command is needed, for details see Git documentation.

-Several apps that are included by default in regular releases such as [First run wizard](https://github.com/nextcloud/firstrunwizard) or [Activity](https://github.com/nextcloud/activity) are missing in `master` and have to be installed manually by cloning them into the `apps` subfolder.
+Several apps that are included by default in regular releases such as [First run wizard](https://github.com/nextcloud/firstrunwizard) or [Activity](https://github.com/nextcloud/activity) are missing in `stable32` and have to be installed manually by cloning them into the `apps` subfolder.

 Otherwise, git checkouts can be handled the same as release archives, by using the `stable*` branches. Note they should never be used on production systems.

@@ -178,7 +178,7 @@ SPDX-FileCopyrightText = "2020 Nextcloud GmbH and Nextcloud contributors"
 SPDX-License-Identifier = "AGPL-3.0-or-later"

 [[annotations]]
-path = ["cypress/tsconfig.json", "cypress/fixtures/appstore/apps.json", "dist/*.css"]
+path = ["cypress/tsconfig.json", "cypress/fixtures/appstore/apps.json", "dist/icons.css"]
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2022 Nextcloud GmbH and Nextcloud contributors"
 SPDX-License-Identifier = "AGPL-3.0-or-later"
@@ -250,7 +250,7 @@ SPDX-FileCopyrightText = "2023 Nextcloud GmbH and Nextcloud contributors"
 SPDX-License-Identifier = "AGPL-3.0-or-later"

 [[annotations]]
-path = ["apps/dav/lib/ExampleContentFiles/exampleContact.vcf", "tests/data/testvideo-remote-file.mp4", "tests/lib/AppFramework/Middleware/Mock/UseSessionController.php", "tests/lib/AppFramework/Middleware/Security/Mock/BruteForceMiddlewareController.php", "tests/lib/AppFramework/Middleware/Security/Mock/RateLimitingMiddlewareController.php"]
+path = "apps/dav/lib/ExampleContentFiles/exampleContact.vcf"
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2025 Nextcloud GmbH and Nextcloud contributors"
 SPDX-License-Identifier = "AGPL-3.0-or-later"
@@ -328,19 +328,19 @@ SPDX-FileCopyrightText = "2016-2024 Collabora Ltd."
 SPDX-License-Identifier = "LicenseRef-CollaboraTrademarks"

 [[annotations]]
-path = ["core/img/x.svg", "core/img/x-dark.svg", "core/img/x-light.svg", "core/img/twitter.svg", "core/img/actions/twitter.svg", "apps/federatedfilesharing/img/social-twitter.svg"]
+path = ["core/img/x.svg", "core/img/twitter.svg", "core/img/actions/twitter.svg", "apps/federatedfilesharing/img/social-twitter.svg"]
 precedence = "aggregate"
 SPDX-FileCopyrightText = "X Corp."
 SPDX-License-Identifier = "LicenseRef-XTrademarks"

 [[annotations]]
-path = ["core/img/bluesky.svg", "core/img/bluesky-light.svg", "core/img/actions/bluesky.svg"]
+path = ["core/img/bluesky.svg", "core/img/actions/bluesky.svg"]
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2012-2024 Fonticons, Inc."
 SPDX-License-Identifier = "CC-BY-4.0"

 [[annotations]]
-path = ["core/img/facebook.svg", "core/img/facebook-light.svg", "apps/federatedfilesharing/img/social-facebook.svg"]
+path = ["core/img/facebook.svg", "apps/federatedfilesharing/img/social-facebook.svg"]
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2024 Meta"
 SPDX-License-Identifier = "LicenseRef-FacebookTrademarks"
@@ -352,7 +352,7 @@ SPDX-FileCopyrightText = "2024 Diaspora"
 SPDX-License-Identifier = "LicenseRef-DiasporaTrademarks"

 [[annotations]]
-path = ["core/img/mastodon.svg", "core/img/mastodon-light.svg", "core/img/actions/mastodon.svg"]
+path = ["core/img/mastodon.svg", "core/img/actions/mastodon.svg"]
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2024 Mastodon gGmbH"
 SPDX-License-Identifier = "LicenseRef-MastodonTrademarks"
@@ -400,7 +400,7 @@ SPDX-FileCopyrightText = "2019 Fabian Wiktor <https://www.pexels.com/photo/green
 SPDX-License-Identifier = "CC0-1.0"

 [[annotations]]
-path = ["openapi.json", ".envrc", "flake.nix", "flake.lock", "build/eslint-baseline.json"]
+path = ["openapi.json", ".envrc", "flake.nix", "flake.lock"]
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2025 Nextcloud GmbH and Nextcloud contributors"
 SPDX-License-Identifier = "AGPL-3.0-or-later"
@@ -2,8 +2,7 @@
 * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
 * SPDX-License-Identifier: AGPL-3.0-or-later
 */
-
-export function getCurrentUser() {
+export const getCurrentUser = function() {
 	return {
 		uid: 'test',
 		displayName: 'Test',
@@ -11,8 +10,8 @@ export function getCurrentUser() {
 	}
 }

-export function getRequestToken() {
+export const getRequestToken = function() {
 	return 'test-token-1234'
 }

-export function onRequestTokenUpdate() {}
+export const onRequestTokenUpdate = function() {}
@@ -2,10 +2,9 @@
 * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
 * SPDX-License-Identifier: AGPL-3.0-or-later
 */
+import type { Capabilities } from '../../apps/files/src/types'

-import type { Capabilities } from '../../apps/files/src/types.ts'
-
-export function getCapabilities(): Capabilities {
+export const getCapabilities = (): Capabilities => {
 	return {
 		files: {
 			bigfilechunking: true,
@@ -3,6 +3,6 @@
 * SPDX-License-Identifier: AGPL-3.0-or-later
 */

-export function loadState(app: string, key: string, fallback?: any) {
+export const loadState = function(app: string, key: string, fallback?: any) {
 	return fallback
 }
@@ -2,10 +2,9 @@
 * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
 * SPDX-License-Identifier: AGPL-3.0-or-later
 */
-
-export function createClient() {}
-export function getPatcher() {
+export const createClient = () => {}
+export const getPatcher = () => {
 	return {
-		patch: () => {},
+		patch: () => {}
 	}
 }
@@ -2,11 +2,11 @@
 * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
 * SPDX-License-Identifier: AGPL-3.0-or-later
 */
-
-import mime from 'mime'
 import { basename } from 'node:path'
+import mime from 'mime'

 class FileSystemEntry {
+
 	private _isFile: boolean
 	private _fullPath: string

@@ -26,9 +26,11 @@ class FileSystemEntry {
 	get name() {
 		return basename(this._fullPath)
 	}
+
 }

 export class FileSystemFileEntry extends FileSystemEntry {
+
 	private _contents: string
 	private _lastModified: number

@@ -44,9 +46,11 @@ export class FileSystemFileEntry extends FileSystemEntry {
 		const type = mime.getType(this.name) || ''
 		success(new File([this._contents], this.name, { lastModified, type }))
 	}
+
 }

 export class FileSystemDirectoryEntry extends FileSystemEntry {
+
 	private _entries: FileSystemEntry[]

 	constructor(fullPath: string, entries: FileSystemEntry[]) {
@@ -66,6 +70,7 @@ export class FileSystemDirectoryEntry extends FileSystemEntry {
 			},
 		}
 	}
+
 }

 /**
@@ -74,6 +79,7 @@ export class FileSystemDirectoryEntry extends FileSystemEntry {
 * File API in the same test suite.
 */
 export class DataTransferItem {
+
 	private _type: string
 	private _entry: FileSystemEntry

@@ -98,7 +104,7 @@ export class DataTransferItem {
 		return this._type
 	}

-	getAsFile(): File | null {
+	getAsFile(): File|null {
 		if (this._entry.isFile && this._entry instanceof FileSystemFileEntry) {
 			let file: File | null = null
 			this._entry.file((f) => {
@@ -110,9 +116,10 @@ export class DataTransferItem {
 		// The browser will return an empty File object if the entry is a directory
 		return new File([], this._entry.name, { type: '' })
 	}
+
 }

-export function fileSystemEntryToDataTransferItem(entry: FileSystemEntry, isFileSystemAPIAvailable = true): DataTransferItem {
+export const fileSystemEntryToDataTransferItem = (entry: FileSystemEntry, isFileSystemAPIAvailable = true): DataTransferItem => {
 	return new DataTransferItem(
 		entry.isFile ? 'text/plain' : 'httpd/unix-directory',
 		entry,
@@ -2,7 +2,6 @@
 * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
 * SPDX-License-Identifier: CC0-1.0
 */
-
 export function setup() {
 	process.env.TZ = 'UTC'
 }
@@ -2,6 +2,5 @@
 * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
 * SPDX-License-Identifier: CC0-1.0
 */
-
 import '@testing-library/jest-dom/vitest'
 import 'core-js/stable/index.js'
@@ -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>
@@ -14,7 +14,10 @@ if (PHP_VERSION_ID < 50600) {
            echo $err;
        }
    }
-    throw new RuntimeException($err);
+    trigger_error(
+        $err,
+        E_USER_ERROR
+    );
 }

 require_once __DIR__ . '/composer/autoload_real.php';
@@ -26,23 +26,12 @@ use Composer\Semver\VersionParser;
 */
 class InstalledVersions
 {
-    /**
-     * @var string|null if set (by reflection by Composer), this should be set to the path where this class is being copied to
-     * @internal
-     */
-    private static $selfDir = null;
-
    /**
     * @var mixed[]|null
     * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
     */
    private static $installed;

-    /**
-     * @var bool
-     */
-    private static $installedIsLocalDir;
-
    /**
     * @var bool|null
     */
@@ -320,24 +309,6 @@ class InstalledVersions
    {
        self::$installed = $data;
        self::$installedByVendor = array();
-
-        // when using reload, we disable the duplicate protection to ensure that self::$installed data is
-        // always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not,
-        // so we have to assume it does not, and that may result in duplicate data being returned when listing
-        // all installed packages for example
-        self::$installedIsLocalDir = false;
-    }
-
-    /**
-     * @return string
-     */
-    private static function getSelfDir()
-    {
-        if (self::$selfDir === null) {
-            self::$selfDir = strtr(__DIR__, '\\', '/');
-        }
-
-        return self::$selfDir;
    }

    /**
@@ -351,27 +322,19 @@ class InstalledVersions
        }

        $installed = array();
-        $copiedLocalDir = false;

        if (self::$canGetVendors) {
-            $selfDir = self::getSelfDir();
            foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
-                $vendorDir = strtr($vendorDir, '\\', '/');
                if (isset(self::$installedByVendor[$vendorDir])) {
                    $installed[] = self::$installedByVendor[$vendorDir];
                } elseif (is_file($vendorDir.'/composer/installed.php')) {
                    /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
                    $required = require $vendorDir.'/composer/installed.php';
-                    self::$installedByVendor[$vendorDir] = $required;
-                    $installed[] = $required;
-                    if (self::$installed === null && $vendorDir.'/composer' === $selfDir) {
-                        self::$installed = $required;
-                        self::$installedIsLocalDir = true;
+                    $installed[] = self::$installedByVendor[$vendorDir] = $required;
+                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
+                        self::$installed = $installed[count($installed) - 1];
                    }
                }
-                if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) {
-                    $copiedLocalDir = true;
-                }
            }
        }

@@ -387,7 +350,7 @@ class InstalledVersions
            }
        }

-        if (self::$installed !== array() && !$copiedLocalDir) {
+        if (self::$installed !== array()) {
            $installed[] = self::$installed;
        }

@@ -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>
@@ -14,7 +14,10 @@ if (PHP_VERSION_ID < 50600) {
            echo $err;
        }
    }
-    throw new RuntimeException($err);
+    trigger_error(
+        $err,
+        E_USER_ERROR
+    );
 }

 require_once __DIR__ . '/composer/autoload_real.php';
@@ -26,23 +26,12 @@ use Composer\Semver\VersionParser;
 */
 class InstalledVersions
 {
-    /**
-     * @var string|null if set (by reflection by Composer), this should be set to the path where this class is being copied to
-     * @internal
-     */
-    private static $selfDir = null;
-
    /**
     * @var mixed[]|null
     * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
     */
    private static $installed;

-    /**
-     * @var bool
-     */
-    private static $installedIsLocalDir;
-
    /**
     * @var bool|null
     */
@@ -320,24 +309,6 @@ class InstalledVersions
    {
        self::$installed = $data;
        self::$installedByVendor = array();
-
-        // when using reload, we disable the duplicate protection to ensure that self::$installed data is
-        // always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not,
-        // so we have to assume it does not, and that may result in duplicate data being returned when listing
-        // all installed packages for example
-        self::$installedIsLocalDir = false;
-    }
-
-    /**
-     * @return string
-     */
-    private static function getSelfDir()
-    {
-        if (self::$selfDir === null) {
-            self::$selfDir = strtr(__DIR__, '\\', '/');
-        }
-
-        return self::$selfDir;
    }

    /**
@@ -351,27 +322,19 @@ class InstalledVersions
        }

        $installed = array();
-        $copiedLocalDir = false;

        if (self::$canGetVendors) {
-            $selfDir = self::getSelfDir();
            foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
-                $vendorDir = strtr($vendorDir, '\\', '/');
                if (isset(self::$installedByVendor[$vendorDir])) {
                    $installed[] = self::$installedByVendor[$vendorDir];
                } elseif (is_file($vendorDir.'/composer/installed.php')) {
                    /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
                    $required = require $vendorDir.'/composer/installed.php';
-                    self::$installedByVendor[$vendorDir] = $required;
-                    $installed[] = $required;
-                    if (self::$installed === null && $vendorDir.'/composer' === $selfDir) {
-                        self::$installed = $required;
-                        self::$installedIsLocalDir = true;
+                    $installed[] = self::$installedByVendor[$vendorDir] = $required;
+                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
+                        self::$installed = $installed[count($installed) - 1];
                    }
                }
-                if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) {
-                    $copiedLocalDir = true;
-                }
            }
        }

@@ -387,7 +350,7 @@ class InstalledVersions
            }
        }

-        if (self::$installed !== array() && !$copiedLocalDir) {
+        if (self::$installed !== array()) {
            $installed[] = self::$installed;
        }

@@ -236,7 +236,7 @@ class RequestHandlerController extends Controller {
 	 *
 	 * @param string $recipientProvider The address of the recipent's provider
 	 * @param string $token The token used for the invitation
-	 * @param string $userID The userID of the recipient at the recipient's provider
+	 * @param string $userId The userId of the recipient at the recipient's provider
 	 * @param string $email The email address of the recipient
 	 * @param string $name The display name of the recipient
 	 *
@@ -251,8 +251,8 @@ class RequestHandlerController extends Controller {
 	#[PublicPage]
 	#[NoCSRFRequired]
 	#[BruteForceProtection(action: 'inviteAccepted')]
-	public function inviteAccepted(string $recipientProvider, string $token, string $userID, string $email, string $name): JSONResponse {
-		$this->logger->debug('Processing share invitation for ' . $userID . ' with token ' . $token . ' and email ' . $email . ' and name ' . $name);
+	public function inviteAccepted(string $recipientProvider, string $token, string $userId, string $email, string $name): JSONResponse {
+		$this->logger->debug('Processing share invitation for ' . $userId . ' with token ' . $token . ' and email ' . $email . ' and name ' . $name);

 		$updated = $this->timeFactory->getTime();

@@ -309,7 +309,7 @@ class RequestHandlerController extends Controller {
 		$invitation->setRecipientEmail($email);
 		$invitation->setRecipientName($name);
 		$invitation->setRecipientProvider($recipientProvider);
-		$invitation->setRecipientUserId($userID);
+		$invitation->setRecipientUserId($userId);
 		$invitation->setAcceptedAt($updated);
 		$invitation = $this->federatedInviteMapper->update($invitation);

@@ -354,7 +354,7 @@
                                "required": [
                                    "recipientProvider",
                                    "token",
-                                    "userID",
+                                    "userId",
                                    "email",
                                    "name"
                                ],
@@ -367,9 +367,9 @@
                                        "type": "string",
                                        "description": "The token used for the invitation"
                                    },
-                                    "userID": {
+                                    "userId": {
                                        "type": "string",
-                                        "description": "The userID of the recipient at the recipient's provider"
+                                        "description": "The userId of the recipient at the recipient's provider"
                                    },
                                    "email": {
                                        "type": "string",
@@ -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>
@@ -14,7 +14,10 @@ if (PHP_VERSION_ID < 50600) {
            echo $err;
        }
    }
-    throw new RuntimeException($err);
+    trigger_error(
+        $err,
+        E_USER_ERROR
+    );
 }

 require_once __DIR__ . '/composer/autoload_real.php';
@@ -26,23 +26,12 @@ use Composer\Semver\VersionParser;
 */
 class InstalledVersions
 {
-    /**
-     * @var string|null if set (by reflection by Composer), this should be set to the path where this class is being copied to
-     * @internal
-     */
-    private static $selfDir = null;
-
    /**
     * @var mixed[]|null
     * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
     */
    private static $installed;

-    /**
-     * @var bool
-     */
-    private static $installedIsLocalDir;
-
    /**
     * @var bool|null
     */
@@ -320,24 +309,6 @@ class InstalledVersions
    {
        self::$installed = $data;
        self::$installedByVendor = array();
-
-        // when using reload, we disable the duplicate protection to ensure that self::$installed data is
-        // always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not,
-        // so we have to assume it does not, and that may result in duplicate data being returned when listing
-        // all installed packages for example
-        self::$installedIsLocalDir = false;
-    }
-
-    /**
-     * @return string
-     */
-    private static function getSelfDir()
-    {
-        if (self::$selfDir === null) {
-            self::$selfDir = strtr(__DIR__, '\\', '/');
-        }
-
-        return self::$selfDir;
    }

    /**
@@ -351,27 +322,19 @@ class InstalledVersions
        }

        $installed = array();
-        $copiedLocalDir = false;

        if (self::$canGetVendors) {
-            $selfDir = self::getSelfDir();
            foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
-                $vendorDir = strtr($vendorDir, '\\', '/');
                if (isset(self::$installedByVendor[$vendorDir])) {
                    $installed[] = self::$installedByVendor[$vendorDir];
                } elseif (is_file($vendorDir.'/composer/installed.php')) {
                    /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
                    $required = require $vendorDir.'/composer/installed.php';
-                    self::$installedByVendor[$vendorDir] = $required;
-                    $installed[] = $required;
-                    if (self::$installed === null && $vendorDir.'/composer' === $selfDir) {
-                        self::$installed = $required;
-                        self::$installedIsLocalDir = true;
+                    $installed[] = self::$installedByVendor[$vendorDir] = $required;
+                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
+                        self::$installed = $installed[count($installed) - 1];
                    }
                }
-                if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) {
-                    $copiedLocalDir = true;
-                }
            }
        }

@@ -387,7 +350,7 @@ class InstalledVersions
            }
        }

-        if (self::$installed !== array() && !$copiedLocalDir) {
+        if (self::$installed !== array()) {
            $installed[] = self::$installed;
        }

@@ -23,4 +23,6 @@ return array(
    'OCA\\Comments\\Notification\\Listener' => $baseDir . '/../lib/Notification/Listener.php',
    'OCA\\Comments\\Notification\\Notifier' => $baseDir . '/../lib/Notification/Notifier.php',
    'OCA\\Comments\\Search\\CommentsSearchProvider' => $baseDir . '/../lib/Search/CommentsSearchProvider.php',
+    'OCA\\Comments\\Search\\LegacyProvider' => $baseDir . '/../lib/Search/LegacyProvider.php',
+    'OCA\\Comments\\Search\\Result' => $baseDir . '/../lib/Search/Result.php',
 );
@@ -38,6 +38,8 @@ class ComposerStaticInitComments
        'OCA\\Comments\\Notification\\Listener' => __DIR__ . '/..' . '/../lib/Notification/Listener.php',
        'OCA\\Comments\\Notification\\Notifier' => __DIR__ . '/..' . '/../lib/Notification/Notifier.php',
        'OCA\\Comments\\Search\\CommentsSearchProvider' => __DIR__ . '/..' . '/../lib/Search/CommentsSearchProvider.php',
+        'OCA\\Comments\\Search\\LegacyProvider' => __DIR__ . '/..' . '/../lib/Search/LegacyProvider.php',
+        'OCA\\Comments\\Search\\Result' => __DIR__ . '/..' . '/../lib/Search/Result.php',
    );

    public static function getInitializer(ClassLoader $loader)
@@ -17,7 +17,6 @@ OC.L10N.register(
    "Delete comment" : "Elimina commento",
    "Cancel edit" : "Annulla modifica",
    "New comment" : "Nuovo commento",
-    "Write a comment …" : "Scrivi un commento ...",
    "Post comment" : "Pubblica commento",
    "@ for mentions, : for emoji, / for smart picker" : "@ per menzioni, : per emoji, / per selettore intelligente",
    "Could not reload comments" : "Impossibile ricaricare i commenti",
@@ -15,7 +15,6 @@
    "Delete comment" : "Elimina commento",
    "Cancel edit" : "Annulla modifica",
    "New comment" : "Nuovo commento",
-    "Write a comment …" : "Scrivi un commento ...",
    "Post comment" : "Pubblica commento",
    "@ for mentions, : for emoji, / for smart picker" : "@ per menzioni, : per emoji, / per selettore intelligente",
    "Could not reload comments" : "Impossibile ricaricare i commenti",
@@ -8,13 +8,6 @@ declare(strict_types=1);
 */
 namespace OCA\Comments\Search;

-use OCP\Comments\IComment;
-use OCP\Comments\ICommentsManager;
-use OCP\Files\Folder;
-use OCP\Files\InvalidPathException;
-use OCP\Files\IRootFolder;
-use OCP\Files\Node;
-use OCP\Files\NotFoundException;
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\IUser;
@@ -23,14 +16,14 @@ use OCP\Search\IProvider;
 use OCP\Search\ISearchQuery;
 use OCP\Search\SearchResult;
 use OCP\Search\SearchResultEntry;
+use function array_map;

 class CommentsSearchProvider implements IProvider {
 	public function __construct(
 		private IUserManager $userManager,
 		private IL10N $l10n,
 		private IURLGenerator $urlGenerator,
-		private ICommentsManager $commentsManager,
-		private IRootFolder $rootFolder,
+		private LegacyProvider $legacyProvider,
 	) {
 	}

@@ -51,76 +44,30 @@ class CommentsSearchProvider implements IProvider {
 	}

 	public function search(IUser $user, ISearchQuery $query): SearchResult {
-		$userFolder = $this->rootFolder->getUserFolder($user->getUID());
-
-		if ($userFolder === null) {
-			return SearchResult::complete($this->l10n->t('Comments'), []);
-		}
-
-		$result = [];
-		$numComments = 50;
-		$offset = 0;
-
-		while (count($result) < $numComments) {
-			$comments = $this->commentsManager->search($query->getTerm(), 'files', '', 'comment', $offset, $numComments);
-
-			foreach ($comments as $comment) {
-				if ($comment->getActorType() !== 'users') {
-					continue;
-				}
-
-				$displayName = $this->commentsManager->resolveDisplayName('user', $comment->getActorId());
-
-				try {
-					$file = $this->getFileForComment($userFolder, $comment);
-
-					$isUser = $this->userManager->userExists($comment->getActorId());
-					$avatarUrl = $isUser
-						? $this->urlGenerator->linkToRouteAbsolute('core.avatar.getAvatar', ['userId' => $comment->getActorId(), 'size' => 42])
-						: $this->urlGenerator->linkToRouteAbsolute('core.GuestAvatar.getAvatar', ['guestName' => $comment->getActorId(), 'size' => 42]);
-					$link = $this->urlGenerator->linkToRoute(
-						'files.View.showFile',
-						['fileid' => $file->getId()]
-					);
-
-					$result[] = new SearchResultEntry(
-						$avatarUrl,
-						$displayName,
-						$file->getPath(),
-						$link,
-						'',
-						true
-					);
-				} catch (NotFoundException|InvalidPathException $e) {
-					continue;
-				}
-			}
-
-			if (count($comments) < $numComments) {
-				// Didn't find more comments when we tried to get, so there are no more comments.
-				break;
-			}
-
-			$offset += $numComments;
-			$numComments = 50 - count($result);
-		}
-
-
 		return SearchResult::complete(
 			$this->l10n->t('Comments'),
-			$result,
+			array_map(function (Result $result) {
+				$path = $result->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(
+					$avatarUrl,
+					$result->name,
+					$path,
+					$link,
+					'',
+					true
+				);
+				$searchResultEntry->addAttribute('fileId', (string)$result->fileId);
+				$searchResultEntry->addAttribute('path', $path);
+				return $searchResultEntry;
+			}, $this->legacyProvider->search($query->getTerm()))
 		);
 	}
-
-	/**
-	 * @throws NotFoundException
-	 */
-	protected function getFileForComment(Folder $userFolder, IComment $comment): Node {
-		$nodes = $userFolder->getById((int)$comment->getObjectId());
-		if (empty($nodes)) {
-			throw new NotFoundException('File not found');
-		}
-
-		return array_shift($nodes);
-	}
 }
@@ -0,0 +1,99 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+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;
+use OCP\IUserSession;
+use OCP\Search\Provider;
+use OCP\Server;
+use function count;
+
+class LegacyProvider extends Provider {
+	/**
+	 * Search for $query
+	 *
+	 * @param string $query
+	 * @return array An array of OCP\Search\Result's
+	 * @since 7.0.0
+	 */
+	public function search($query): array {
+		$cm = Server::get(ICommentsManager::class);
+		$us = Server::get(IUserSession::class);
+
+		$user = $us->getUser();
+		if (!$user instanceof IUser) {
+			return [];
+		}
+		$uf = \OC::$server->getUserFolder($user->getUID());
+
+		if ($uf === null) {
+			return [];
+		}
+
+		$result = [];
+		$numComments = 50;
+		$offset = 0;
+
+		while (count($result) < $numComments) {
+			/** @var IComment[] $comments */
+			$comments = $cm->search($query, 'files', '', 'comment', $offset, $numComments);
+
+			foreach ($comments as $comment) {
+				if ($comment->getActorType() !== 'users') {
+					continue;
+				}
+
+				$displayName = $cm->resolveDisplayName('user', $comment->getActorId());
+
+				try {
+					$file = $this->getFileForComment($uf, $comment);
+					$result[] = new Result($query,
+						$comment,
+						$displayName,
+						$file->getPath(),
+						$file->getId(),
+					);
+				} catch (NotFoundException|InvalidPathException $e) {
+					continue;
+				}
+			}
+
+			if (count($comments) < $numComments) {
+				// Didn't find more comments when we tried to get, so there are no more comments.
+				return $result;
+			}
+
+			$offset += $numComments;
+			$numComments = 50 - count($result);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * @param Folder $userFolder
+	 * @param IComment $comment
+	 * @return Node
+	 * @throws NotFoundException
+	 */
+	protected function getFileForComment(Folder $userFolder, IComment $comment): Node {
+		$nodes = $userFolder->getById((int)$comment->getObjectId());
+		if (empty($nodes)) {
+			throw new NotFoundException('File not found');
+		}
+
+		return array_shift($nodes);
+	}
+}
@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+namespace OCA\Comments\Search;
+
+use OCP\Comments\IComment;
+use OCP\Files\NotFoundException;
+use OCP\Search\Result as BaseResult;
+
+/**
+ * @deprecated 20.0.0
+ */
+class Result extends BaseResult {
+	/**
+	 * @deprecated 20.0.0
+	 */
+	public $type = 'comment';
+	/**
+	 * @deprecated 20.0.0
+	 */
+	public $comment;
+	/**
+	 * @deprecated 20.0.0
+	 */
+	public $authorId;
+	/**
+	 * @deprecated 20.0.0
+	 */
+	public $path;
+	/**
+	 * @deprecated 20.0.0
+	 */
+	public $fileName;
+	/**
+	 * @deprecated 20.0.0
+	 */
+	public int $fileId;
+
+	/**
+	 * @throws NotFoundException
+	 * @deprecated 20.0.0
+	 */
+	public function __construct(
+		string $search,
+		IComment $comment,
+		/**
+		 * @deprecated 20.0.0
+		 */
+		public string $authorName,
+		string $path,
+		int $fileId,
+	) {
+		parent::__construct(
+			$comment->getId(),
+			$comment->getMessage()
+			/* @todo , [link to file] */
+		);
+
+		$this->comment = $this->getRelevantMessagePart($comment->getMessage(), $search);
+		$this->authorId = $comment->getActorId();
+		$this->fileName = basename($path);
+		$this->path = $this->getVisiblePath($path);
+		$this->fileId = $fileId;
+	}
+
+	/**
+	 * @throws NotFoundException
+	 */
+	protected function getVisiblePath(string $path): string {
+		$segments = explode('/', trim($path, '/'), 3);
+
+		if (!isset($segments[2])) {
+			throw new NotFoundException('Path not inside visible section');
+		}
+
+		return $segments[2];
+	}
+
+	/**
+	 * @throws NotFoundException
+	 */
+	protected function getRelevantMessagePart(string $message, string $search): string {
+		$start = mb_stripos($message, $search);
+		if ($start === false) {
+			throw new NotFoundException('Comment section not found');
+		}
+
+		$end = $start + mb_strlen($search);
+
+		if ($start <= 25) {
+			$start = 0;
+			$prefix = '';
+		} else {
+			$start -= 25;
+			$prefix = '…';
+		}
+
+		if ((mb_strlen($message) - $end) <= 25) {
+			$end = mb_strlen($message);
+			$suffix = '';
+		} else {
+			$end += 25;
+			$suffix = '…';
+		}
+
+		return $prefix . mb_substr($message, $start, $end - $start) . $suffix;
+	}
+}
@@ -2,13 +2,11 @@
 * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
 * SPDX-License-Identifier: AGPL-3.0-or-later
 */
-
-import type { View } from '@nextcloud/files'
-
-import { File, FileAction, Permission } from '@nextcloud/files'
+import { File, Permission, View, FileAction } from '@nextcloud/files'
 import { describe, expect, test, vi } from 'vitest'
-import logger from '../logger.js'
-import { action } from './inlineUnreadCommentsAction.ts'
+
+import { action } from './inlineUnreadCommentsAction'
+import logger from '../logger'

 const view = {
 	id: 'files',
@@ -122,7 +120,6 @@ describe('Inline unread comments action execute tests', () => {
 		const setActiveTabMock = vi.fn()
 		window.OCA = {
 			Files: {
-				// @ts-expect-error Mocking for testing
 				Sidebar: {
 					open: openMock,
 					setActiveTab: setActiveTabMock,
@@ -149,13 +146,10 @@ describe('Inline unread comments action execute tests', () => {
 	})

 	test('Action handles sidebar open failure', async () => {
-		const openMock = vi.fn(() => {
-			throw new Error('Mock error')
-		})
+		const openMock = vi.fn(() => { throw new Error('Mock error') })
 		const setActiveTabMock = vi.fn()
 		window.OCA = {
 			Files: {
-				// @ts-expect-error Mocking for testing
 				Sidebar: {
 					open: openMock,
 					setActiveTab: setActiveTabMock,
@@ -2,13 +2,11 @@
 * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
 * SPDX-License-Identifier: AGPL-3.0-or-later
 */
-
-import type { Node } from '@nextcloud/files'
-
+import { FileAction, Node } from '@nextcloud/files'
+import { translate as t, translatePlural as n } from '@nextcloud/l10n'
 import CommentProcessingSvg from '@mdi/svg/svg/comment-processing.svg?raw'
-import { FileAction } from '@nextcloud/files'
-import { n, t } from '@nextcloud/l10n'
-import logger from '../logger.js'
+
+import logger from '../logger'

 export const action = new FileAction({
 	id: 'comments-unread',
@@ -27,7 +25,7 @@ export const action = new FileAction({
 	iconSvgInline: () => CommentProcessingSvg,

 	enabled(nodes: Node[]) {
-		const unread = nodes[0].attributes['comments-unread'] as number | undefined
+		const unread = nodes[0].attributes['comments-unread'] as number|undefined
 		return typeof unread === 'number' && unread > 0
 	},

@@ -2,13 +2,13 @@
 * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
 * SPDX-License-Identifier: AGPL-3.0-or-later
 */
-
 import moment from '@nextcloud/moment'
-import { createPinia, PiniaVuePlugin } from 'pinia'
 import Vue, { type ComponentPublicInstance } from 'vue'
 import logger from './logger.js'
 import { getComments } from './services/GetComments.js'

+import { PiniaVuePlugin, createPinia } from 'pinia'
+
 Vue.use(PiniaVuePlugin)

 let ActivityTabPluginView
@@ -3,7 +3,6 @@
 * SPDX-License-Identifier: AGPL-3.0-or-later
 */

-import logger from './logger.js'
 import CommentsInstance from './services/CommentsInstance.js'

 // Init Comments
@@ -13,4 +12,4 @@ if (window.OCA && !window.OCA.Comments) {

 // Init Comments App view
 Object.assign(window.OCA.Comments, { View: CommentsInstance })
-logger.debug('OCA.Comments.View initialized')
+console.debug('OCA.Comments.View initialized')
@@ -3,6 +3,7 @@
 * SPDX-License-Identifier: AGPL-3.0-or-later
 */

+// eslint-disable-next-line n/no-missing-import, import/no-unresolved
 import MessageReplyText from '@mdi/svg/svg/message-reply-text.svg?raw'
 import { getCSPNonce } from '@nextcloud/auth'
 import { loadState } from '@nextcloud/initial-state'
@@ -3,16 +3,14 @@
  - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <template>
-	<component
-		:is="tag"
+	<component :is="tag"
 		v-show="!deleted && !isLimbo"
-		:class="{ 'comment--loading': loading }"
+		:class="{'comment--loading': loading}"
 		class="comment">
 		<!-- Comment header toolbar -->
 		<div class="comment__side">
 			<!-- Author -->
-			<NcAvatar
-				class="comment__avatar"
+			<NcAvatar class="comment__avatar"
 				:display-name="actorDisplayName"
 				:user="actorId"
 				:size="32" />
@@ -25,8 +23,7 @@
 					show if we have a message id and current user is author -->
 				<NcActions v-if="isOwnComment && id && !loading" class="comment__actions">
 					<template v-if="!editing">
-						<NcActionButton
-							close-after-click
+						<NcActionButton close-after-click
 							@click="onEdit">
 							<template #icon>
 								<IconPencilOutline :size="20" />
@@ -34,8 +31,7 @@
 							{{ t('comments', 'Edit comment') }}
 						</NcActionButton>
 						<NcActionSeparator />
-						<NcActionButton
-							close-after-click
+						<NcActionButton close-after-click
 							@click="onDeleteWithUndo">
 							<template #icon>
 								<IconTrashCanOutline :size="20" />
@@ -56,8 +52,7 @@
 				<div v-if="id && loading" class="comment_loading icon-loading-small" />

 				<!-- Relative time to the comment creation -->
-				<NcDateTime
-					v-else-if="creationDateTime"
+				<NcDateTime v-else-if="creationDateTime"
 					class="comment__timestamp"
 					:timestamp="timestamp"
 					:ignore-seconds="true" />
@@ -66,21 +61,19 @@
 			<!-- Message editor -->
 			<form v-if="editor || editing" class="comment__editor" @submit.prevent>
 				<div class="comment__editor-group">
-					<NcRichContenteditable
-						ref="editor"
+					<NcRichContenteditable ref="editor"
 						:auto-complete="autoComplete"
 						:contenteditable="!loading"
 						:label="editor ? t('comments', 'New comment') : t('comments', 'Edit comment')"
-						:placeholder="t('comments', 'Write a comment …')"
+						:placeholder="t('comments', 'Write a comment …')"
 						:value="localMessage"
 						:user-data="userData"
 						aria-describedby="tab-comments__editor-description"
 						@update:value="updateLocalMessage"
 						@submit="onSubmit" />
 					<div class="comment__submit">
-						<NcButton
-							variant="tertiary-no-background"
-							type="submit"
+						<NcButton type="tertiary-no-background"
+							native-type="submit"
 							:aria-label="t('comments', 'Post comment')"
 							:disabled="isEmptyMessage"
 							@click="onSubmit">
@@ -97,10 +90,9 @@
 			</form>

 			<!-- Message content -->
-			<NcRichText
-				v-else
+			<NcRichText v-else
 				class="comment__message"
-				:class="{ 'comment__message--expanded': expanded }"
+				:class="{'comment__message--expanded': expanded}"
 				:text="richContent.message"
 				:arguments="richContent.mentions"
 				@click.native="onExpand" />
@@ -111,7 +103,7 @@
 <script>
 import { getCurrentUser } from '@nextcloud/auth'
 import { translate as t } from '@nextcloud/l10n'
-import { mapStores } from 'pinia'
+
 import NcActionButton from '@nextcloud/vue/components/NcActionButton'
 import NcActions from '@nextcloud/vue/components/NcActions'
 import NcActionSeparator from '@nextcloud/vue/components/NcActionSeparator'
@@ -120,11 +112,14 @@ import NcButton from '@nextcloud/vue/components/NcButton'
 import NcDateTime from '@nextcloud/vue/components/NcDateTime'
 import NcLoadingIcon from '@nextcloud/vue/components/NcLoadingIcon'
 import NcUserBubble from '@nextcloud/vue/components/NcUserBubble'
+
 import IconArrowRight from 'vue-material-design-icons/ArrowRight.vue'
 import IconClose from 'vue-material-design-icons/Close.vue'
-import IconPencilOutline from 'vue-material-design-icons/PencilOutline.vue'
 import IconTrashCanOutline from 'vue-material-design-icons/TrashCanOutline.vue'
+import IconPencilOutline from 'vue-material-design-icons/PencilOutline.vue'
+
 import CommentMixin from '../mixins/CommentMixin.js'
+import { mapStores } from 'pinia'
 import { useDeletedCommentLimbo } from '../store/deletedCommentLimbo.js'

 // Dynamic loading
@@ -132,7 +127,6 @@ const NcRichContenteditable = () => import('@nextcloud/vue/components/NcRichCont
 const NcRichText = () => import('@nextcloud/vue/components/NcRichText')

 export default {
-	/* eslint vue/multi-word-component-names: "warn" */
 	name: 'Comment',

 	components: {
@@ -150,7 +144,6 @@ export default {
 		NcRichContenteditable,
 		NcRichText,
 	},
-
 	mixins: [CommentMixin],

 	inheritAttrs: false,
@@ -160,12 +153,10 @@ export default {
 			type: String,
 			required: true,
 		},
-
 		actorId: {
 			type: String,
 			required: true,
 		},
-
 		creationDateTime: {
 			type: String,
 			default: null,
@@ -186,7 +177,6 @@ export default {
 			type: Function,
 			required: true,
 		},
-
 		userData: {
 			type: Object,
 			default: () => ({}),
@@ -2,8 +2,7 @@
 * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
 * SPDX-License-Identifier: AGPL-3.0-or-later
 */
-
 import { registerFileAction } from '@nextcloud/files'
-import { action } from './actions/inlineUnreadCommentsAction.ts'
+import { action } from './actions/inlineUnreadCommentsAction'

 registerFileAction(action)
@@ -4,12 +4,12 @@
 */

 import { showError, showUndo, TOAST_UNDO_TIMEOUT } from '@nextcloud/dialogs'
-import { mapStores } from 'pinia'
-import logger from '../logger.js'
+import NewComment from '../services/NewComment.js'
 import DeleteComment from '../services/DeleteComment.js'
 import EditComment from '../services/EditComment.js'
-import NewComment from '../services/NewComment.js'
+import { mapStores } from 'pinia'
 import { useDeletedCommentLimbo } from '../store/deletedCommentLimbo.js'
+import logger from '../logger.js'

 export default {
 	props: {
@@ -62,7 +62,7 @@ export default {
 				this.editing = false
 			} catch (error) {
 				showError(t('comments', 'An error occurred while trying to edit the comment'))
-				logger.error('An error occurred while trying to edit the comment', { error })
+				console.error(error)
 			} finally {
 				this.loading = false
 			}
@@ -87,7 +87,7 @@ export default {
 				this.$emit('delete', this.id)
 			} catch (error) {
 				showError(t('comments', 'An error occurred while trying to delete the comment'))
-				logger.error('An error occurred while trying to delete the comment', { error })
+				console.error(error)
 				this.deleted = false
 				this.deletedCommentLimboStore.removeId(this.id)
 			}
@@ -106,7 +106,7 @@ export default {
 				this.localMessage = ''
 			} catch (error) {
 				showError(t('comments', 'An error occurred while trying to create the comment'))
-				logger.error('An error occurred while trying to create the comment', { error })
+				console.error(error)
 			} finally {
 				this.loading = false
 			}
@@ -1,9 +1,9 @@
-import { getCurrentUser } from '@nextcloud/auth'
 /**
 * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
 * SPDX-License-Identifier: AGPL-3.0-or-later
 */
 import axios from '@nextcloud/axios'
+import { getCurrentUser } from '@nextcloud/auth'
 import { loadState } from '@nextcloud/initial-state'
 import { generateOcsUrl } from '@nextcloud/router'
 import { defineComponent } from 'vue'
@@ -34,8 +34,8 @@ export default defineComponent({
 		/**
 		 * Autocomplete @mentions
 		 *
-		 * @param search the query
-		 * @param callback the callback to process the results with
+		 * @param {string} search the query
+		 * @param {Function} callback the callback to process the results with
 		 */
 		async autoComplete(search, callback) {
 			const { data } = await axios.get(generateOcsUrl('core/autocomplete/get'), {
@@ -48,9 +48,7 @@ export default defineComponent({
 				},
 			})
 			// Save user data so it can be used by the editor to replace mentions
-			data.ocs.data.forEach((user) => {
-				this.userData[user.id] = user
-			})
+			data.ocs.data.forEach(user => { this.userData[user.id] = user })
 			return callback(Object.values(this.userData))
 		},

@@ -63,7 +61,7 @@ export default defineComponent({
 		genMentionsData(mentions: any[]): Record<string, object> {
 			Object.values(mentions)
 				.flat()
-				.forEach((mention) => {
+				.forEach(mention => {
 					this.userData[mention.mentionId] = {
 						// TODO: support groups
 						icon: 'icon-user',
@@ -4,14 +4,14 @@
 */

 import { getCSPNonce } from '@nextcloud/auth'
-import { n, t } from '@nextcloud/l10n'
-import { createPinia, PiniaVuePlugin } from 'pinia'
+import { t, n } from '@nextcloud/l10n'
+import { PiniaVuePlugin, createPinia } from 'pinia'
 import Vue from 'vue'
 import CommentsApp from '../views/Comments.vue'
 import logger from '../logger.js'

 Vue.use(PiniaVuePlugin)
-
+// eslint-disable-next-line camelcase
 __webpack_nonce__ = getCSPNonce()

 // Add translates functions
@@ -28,6 +28,7 @@ Vue.mixin({
 })

 export default class CommentInstance {
+
 	/**
 	 * Initialize a new Comments instance for the desired type
 	 *
@@ -50,4 +51,5 @@ export default class CommentInstance {
 		const View = Vue.extend(CommentsApp)
 		return new View(options)
 	}
+
 }
@@ -3,18 +3,15 @@
 * SPDX-License-Identifier: AGPL-3.0-or-later
 */

-import { getRequestToken, onRequestTokenUpdate } from '@nextcloud/auth'
 import { createClient } from 'webdav'
 import { getRootPath } from '../utils/davUtils.js'
+import { getRequestToken, onRequestTokenUpdate } from '@nextcloud/auth'

 // init webdav client
 const client = createClient(getRootPath())

 // set CSRF token header
-/**
- * @param token
- */
-function setHeaders(token) {
+const setHeaders = (token) => {
 	client.setHeaders({
 		// Add this so the server knows it is an request from the browser
 		'X-Requested-With': 'XMLHttpRequest',
@@ -16,7 +16,7 @@ import client from './DavClient.js'
 export default async function(resourceType, resourceId, commentId, message) {
 	const commentPath = ['', resourceType, resourceId, commentId].join('/')

-	return await client.customRequest(commentPath, {
+	return await client.customRequest(commentPath, Object.assign({
 		method: 'PROPPATCH',
 		data: `<?xml version="1.0"?>
 			<d:propertyupdate
@@ -28,5 +28,5 @@ export default async function(resourceType, resourceId, commentId, message) {
 				</d:prop>
 			</d:set>
 			</d:propertyupdate>`,
-	})
+	}))
 }
@@ -3,9 +3,9 @@
 * SPDX-License-Identifier: AGPL-3.0-or-later
 */

-import type { DAVResult, FileStat, ResponseDataDetailed } from 'webdav'
+import { parseXML, type DAVResult, type FileStat, type ResponseDataDetailed } from 'webdav'

-import { parseXML } from 'webdav'
+// https://github.com/perry-mitchell/webdav-client/issues/339
 import { processResponsePayload } from 'webdav/dist/node/response.js'
 import { prepareFileFromProps } from 'webdav/dist/node/tools/dav.js'
 import client from './DavClient.js'
@@ -15,19 +15,19 @@ export const DEFAULT_LIMIT = 20
 /**
 * Retrieve the comments list
 *
- * @param data destructuring object
- * @param data.resourceType the resource type
- * @param data.resourceId the resource ID
- * @param [options] optional options for axios
- * @param [options.offset] the pagination offset
- * @param [options.limit] the pagination limit, defaults to 20
- * @param [options.datetime] optional date to query
- * @return the comments list
+ * @param {object} data destructuring object
+ * @param {string} data.resourceType the resource type
+ * @param {number} data.resourceId the resource ID
+ * @param {object} [options] optional options for axios
+ * @param {number} [options.offset] the pagination offset
+ * @param {number} [options.limit] the pagination limit, defaults to 20
+ * @param {Date} [options.datetime] optional date to query
+ * @return {{data: object[]}} the comments list
 */
-export async function getComments({ resourceType, resourceId }, options: { offset: number, limit?: number, datetime?: Date }) {
+export const getComments = async function({ resourceType, resourceId }, options: { offset: number, limit?: number, datetime?: Date }) {
 	const resourcePath = ['', resourceType, resourceId].join('/')
 	const datetime = options.datetime ? `<oc:datetime>${options.datetime.toISOString()}</oc:datetime>` : ''
-	const response = await client.customRequest(resourcePath, {
+	const response = await client.customRequest(resourcePath, Object.assign({
 		method: 'REPORT',
 		data: `<?xml version="1.0"?>
 			<oc:filter-comments
@@ -39,23 +39,16 @@ export async function getComments({ resourceType, resourceId }, options: { offse
 				<oc:offset>${options.offset || 0}</oc:offset>
 				${datetime}
 			</oc:filter-comments>`,
-		...options,
-	})
+	}, options))

 	const responseData = await response.text()
 	const result = await parseXML(responseData)
 	const stat = getDirectoryFiles(result, true)
-	// https://github.com/perry-mitchell/webdav-client/issues/339
 	return processResponsePayload(response, stat, true) as ResponseDataDetailed<FileStat[]>
 }

-/**
- * https://github.com/perry-mitchell/webdav-client/blob/8d9694613c978ce7404e26a401c39a41f125f87f/source/operations/directoryContents.ts
- *
- * @param result
- * @param isDetailed
- */
-function getDirectoryFiles(
+// https://github.com/perry-mitchell/webdav-client/blob/8d9694613c978ce7404e26a401c39a41f125f87f/source/operations/directoryContents.ts
+const getDirectoryFiles = function(
 	result: DAVResult,
 	isDetailed = false,
 ): Array<FileStat> {
@@ -65,7 +58,7 @@ function getDirectoryFiles(
 	} = result

 	// Map all items to a consistent output structure (results)
-	return responseItems.map((item) => {
+	return responseItems.map(item => {
 		// Each item should contain a stat object
 		const props = item.propstat!.prop!

@@ -4,9 +4,9 @@
 */

 import { getCurrentUser } from '@nextcloud/auth'
-import axios from '@nextcloud/axios'
 import { getRootPath } from '../utils/davUtils.js'
 import { decodeHtmlEntities } from '../utils/decodeHtmlEntities.js'
+import axios from '@nextcloud/axios'
 import client from './DavClient.js'

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

-import type { Response } from 'webdav'
-
 import client from './DavClient.js'

+import type { Response } from 'webdav'
+
 /**
 * Mark comments older than the date timestamp as read
 *
@@ -14,11 +14,11 @@ import client from './DavClient.js'
 * @param resourceId the resource ID
 * @param date the date object
 */
-export function markCommentsAsRead(
+export const markCommentsAsRead = (
 	resourceType: string,
 	resourceId: number,
 	date: Date,
-): Promise<Response> {
+): Promise<Response> => {
 	const resourcePath = ['', resourceType, resourceId].join('/')
 	const readMarker = date.toUTCString()

@@ -9,7 +9,7 @@
 * @param {Function} request the axios promise request
 * @return {object}
 */
-function cancelableRequest(request) {
+const cancelableRequest = function(request) {
 	const controller = new AbortController()
 	const signal = controller.signal

@@ -22,7 +22,7 @@ function cancelableRequest(request) {
 	const fetch = async function(url, options) {
 		const response = await request(
 			url,
-			{ signal, ...options },
+			Object.assign({ signal }, options),
 		)
 		return response
 	}
@@ -5,10 +5,7 @@

 import { generateRemoteUrl } from '@nextcloud/router'

-/**
- *
- */
-function getRootPath() {
+const getRootPath = function() {
 	return generateRemoteUrl('dav/comments')
 }

@@ -4,8 +4,7 @@
 -->

 <template>
-	<Comment
-		v-bind="editorData"
+	<Comment v-bind="editorData"
 		:auto-complete="autoComplete"
 		:resource-type="resourceType"
 		:editor="true"
@@ -16,18 +15,17 @@
 </template>

 <script lang="ts">
-import { showError } from '@nextcloud/dialogs'
-import { t } from '@nextcloud/l10n'
 import { defineComponent } from 'vue'
 import Comment from '../components/Comment.vue'
-import logger from '../logger.js'
 import CommentView from '../mixins/CommentView.js'
+import logger from '../logger'
+import { showError } from '@nextcloud/dialogs'
+import { translate as t } from '@nextcloud/l10n'

 export default defineComponent({
 	components: {
 		Comment,
 	},
-
 	mixins: [CommentView],
 	props: {
 		reloadCallback: {
@@ -35,15 +33,14 @@ export default defineComponent({
 			required: true,
 		},
 	},
-
 	methods: {
 		onNewComment() {
 			try {
 				// just force reload
 				this.reloadCallback()
-			} catch (error) {
+			} catch (e) {
 				showError(t('comments', 'Could not reload comments'))
-				logger.error('Could not reload comments', { error })
+				logger.debug(e)
 			}
 		},
 	},
@@ -4,8 +4,7 @@
 -->

 <template>
-	<Comment
-		ref="comment"
+	<Comment ref="comment"
 		tag="li"
 		v-bind="comment.props"
 		:auto-complete="autoComplete"
@@ -19,10 +18,10 @@

 <script lang="ts">
 import type { PropType } from 'vue'
+import { translate as t } from '@nextcloud/l10n'

-import { t } from '@nextcloud/l10n'
 import Comment from '../components/Comment.vue'
-import CommentView from '../mixins/CommentView.ts'
+import CommentView from '../mixins/CommentView'

 export default {
 	name: 'ActivityCommentEntry',
@@ -37,7 +36,6 @@ export default {
 			type: Object,
 			required: true,
 		},
-
 		reloadCallback: {
 			type: Function as PropType<() => void>,
 			required: true,
--- a/Show More
+++ b/Show More