[tx-robot] updated from transifex

[stable20] Make user:report command scale

.devcontainer/Dockerfile

@@ -1,47 +0,0 @@
-FROM ubuntu:focal
-
-ARG DEBIAN_FRONTEND=noninteractive
-
-# PHP
-RUN apt-get update -y
-RUN apt-get install --no-install-recommends -y \
-    php7.4 \
-    php7.4-gd \
-    php7.4-zip \
-    php7.4-curl \
-    php7.4-xml \
-    php7.4-mbstring \
-    php7.4-sqlite \
-    php7.4-xdebug \
-    php7.4-pgsql \
-    php7.4-intl \
-    php7.4-imagick \
-    php7.4-gmp \
-    php7.4-apcu \
-    php7.4-bcmath \
-    libmagickcore-6.q16-3-extra \
-    curl \
-    vim \
-    lsof \
-    make \
-    nodejs \
-    npm
-
-RUN echo "xdebug.remote_enable = 1" >> /etc/php/7.4/cli/conf.d/20-xdebug.ini
-RUN echo "xdebug.remote_autostart = 1" >> /etc/php/7.4/cli/conf.d/20-xdebug.ini
-
-# Docker
-RUN apt-get -y install \
-    apt-transport-https \
-    ca-certificates \
-    curl \
-    gnupg-agent \
-    software-properties-common
-RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
-RUN add-apt-repository \
-   "deb [arch=amd64] https://download.docker.com/linux/ubuntu \
-   $(lsb_release -cs) \
-   stable"
-RUN apt-get update -y
-RUN apt-get install -y docker-ce docker-ce-cli containerd.io
-RUN ln -s /var/run/docker-host.sock /var/run/docker.sock  

.devcontainer/codespace.config.php

@@ -1,18 +0,0 @@
-<?php
-
-$cloudEnvironmentId = getenv('CLOUDENV_ENVIRONMENT_ID');
-
-$CONFIG = [
-    'mail_from_address' => 'no-reply',
-    'mail_smtpmode' => 'smtp',
-    'mail_sendmailmode' => 'smtp',
-    'mail_domain' => 'example.com',
-    'mail_smtphost' => 'localhost',
-    'mail_smtpport' => '1025',
-    'memcache.local' => '\OC\Memcache\APCu',
-];
-
-if($cloudEnvironmentId !== true) {
-    $CONFIG['overwritehost'] = $cloudEnvironmentId . '-80.apps.codespaces.githubusercontent.com';
-    $CONFIG['overwriteprotocol'] = 'https';
-}

.devcontainer/devcontainer.json

@@ -1,22 +0,0 @@
-{
-	"name": "NextcloudServer",
-	"dockerComposeFile": "docker-compose.yml",
-	"service": "nextclouddev",
-	"postCreateCommand": ".devcontainer/setup.sh",
-	"forwardPorts": [
-		80,
-		8080,
-		8025
-	],
-	"runArgs": [
-		"--privileged"
-	],
-	"extensions": [
-		"felixfbecker.php-debug",
-		"felixfbecker.php-intellisense",
-		"ms-azuretools.vscode-docker"
-	],
-	"settings": {
-		"php.suggest.basic": false,
-	}
-}

.devcontainer/docker-compose.yml

@@ -1,29 +0,0 @@
-version: '3'
-services:
-  nextclouddev:
-    build: .
-    volumes:
-      - .:/workspace:cached
-      - /var/run/docker.sock:/var/run/docker-host.sock
-    command: /bin/sh -c "while sleep 1000; do :; done"
-    ports:
-      - 80:80
-      - 8080:8080
-      - 8025:8025
-
-  db:
-    image: postgres
-    restart: always
-    environment:
-      POSTGRES_PASSWORD: postgres
-    network_mode: service:nextclouddev
-
-  adminer:
-    image: adminer
-    restart: always
-    network_mode: service:nextclouddev
-
-  mailhog:
-    image: mailhog/mailhog
-    restart: always
-    network_mode: service:nextclouddev

.devcontainer/setup.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" >/dev/null 2>&1 && pwd )"
-
-cd $DIR/
-git submodule update --init
-
-# Codespace config
-cp .devcontainer/codespace.config.php config/codespace.config.php

.eslintignore

@@ -1,11 +0,0 @@
-# Ignoring folders for eslint
-node_modules/
-3rdparty/
-**/vendor/
-**/l10n/
-**/js/*
-*.config.js
-tests/lib/
-
-# TODO: remove when comments files is not using handlebar templates anymore
-apps/comments/src/templates.js

.eslintrc.js

@@ -8,7 +8,7 @@ module.exports = {
 		escapeHTML: true,
 		oc_userconfig: true,
 		dayNames: true,
-		firstDay: true,
+		firstDay: true
 	},
 	extends: ['@nextcloud'],
 	rules: {

.github/FUNDING.yml

@@ -1 +0,0 @@
-custom: https://nextcloud.com/include/

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,8 @@
 blank_issues_enabled: false
 contact_links:
-    - name: ❓ Community Support and Help
+    - name: ❓ Question
       url: https://help.nextcloud.com/
-      about: Configuration, webserver/proxy or performance issues and other questions
+      about: I have a question …
     - name: 💼 Nextcloud Enterprise
       url: https://portal.nextcloud.com/
-      about: If you are a Nextcloud Enterprise customer, or need Professional support, so it can be resolved directly by our dedicated engineers more quickly
+      about: If you are a customer and are using Nextcloud Enterprise, please submit your issue directly in the Nextcloud Portal so it can be resolved by our dedicated engineers more quickly.

.github/dependabot.yml

@@ -1,165 +0,0 @@
-version: 2
-updates:
-# Linting and coding style
-- package-ecosystem: composer
-  directory: "/"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-
-# Main master npm
-- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  open-pull-requests-limit: 10
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-
-# Testing master npm
-- package-ecosystem: npm
-  directory: "/build"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-
-# Testing master composer
-- package-ecosystem: composer
-  directory: "/build/integration"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-
-
-# Main stableXX npm
-- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  target-branch: stable19
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-  ignore:
-    # ignore all GitHub linguist patch updates
-    - dependency-name: "*"
-      update-types: ["version-update:semver-major", "version-update:semver-minor"]
-
-- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  target-branch: stable20
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-  ignore:
-    # ignore all GitHub linguist patch updates
-    - dependency-name: "*"
-      update-types: ["version-update:semver-major", "version-update:semver-minor"]
-
-- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  target-branch: stable21
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-  ignore:
-    # ignore all GitHub linguist patch updates
-    - dependency-name: "*"
-      update-types: ["version-update:semver-major", "version-update:semver-minor"]
-
-# Testing StableXX composer
-- package-ecosystem: composer
-  directory: "/build/integration"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  target-branch: stable19
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-  ignore:
-    # ignore all GitHub linguist patch updates
-    - dependency-name: "*"
-      update-types: ["version-update:semver-major", "version-update:semver-minor"]
-
-- package-ecosystem: composer
-  directory: "/build/integration"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  target-branch: stable20
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-  ignore:
-    # ignore all GitHub linguist patch updates
-    - dependency-name: "*"
-      update-types: ["version-update:semver-major", "version-update:semver-minor"]
-
-- package-ecosystem: composer
-  directory: "/build/integration"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  target-branch: stable21
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-  ignore:
-    # ignore all GitHub linguist patch updates
-    - dependency-name: "*"
-      update-types: ["version-update:semver-major", "version-update:semver-minor"]

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

@@ -1,5 +1,5 @@
 name: Dependabot
-on: pull_request_target
+on: pull_request
 
 jobs:
   auto-merge:
@@ -7,15 +7,13 @@ jobs:
     steps:
       # Default github action approve
       - uses: hmarr/auto-approve-action@v2.0.0
-        if: github.ref == 'refs/heads/master' &&
-            (github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]')
+        if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
       # Nextcloud bot approve and merge request
-      - uses: ahmadnassri/action-dependabot-auto-merge@v2
-        if: github.ref == 'refs/heads/master' &&
-            (github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]')
+      - uses: ahmadnassri/action-dependabot-auto-merge@v1
+        if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
         with:
-          target: minor
+          target: patch
           github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }}

.github/workflows/fixup.yml

@@ -1,12 +0,0 @@
-name: Pull request checks
-on: pull_request
-
-jobs:
-  commit-message-check:
-    name: Block fixup and squash commits
-    runs-on: ubuntu-latest
-    steps:
-      - name: Run check
-        uses: xt0rted/block-autosquash-commits-action@main
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/lint.yml

@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['7.3', '7.4', '8.0']
+        php-versions: ['7.2', '7.3', 7.4]
     name: php${{ matrix.php-versions }} lint
     steps:
     - name: Checkout
@@ -15,7 +15,6 @@ jobs:
       uses: shivammathur/setup-php@master
       with:
         php-version: ${{ matrix.php-versions }}
-        extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
         coverage: none
     - name: Lint
       run: composer run lint
@@ -30,7 +29,6 @@ jobs:
       uses: shivammathur/setup-php@master
       with:
         php-version: 7.4
-        extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
         coverage: none
         tools: cs2pr
     - name: Install dependencies
@@ -39,26 +37,4 @@ jobs:
       run: |
         composer run cs:check -- --format=checkstyle | cs2pr
         composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 )
-      shell: bash
-
-  node:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [12.x]
-
-    name: eslint node${{ matrix.node-version }}
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Set up node ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node-version }}
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Lint
-        run: npm run lint
+      shell: bash {0}

.github/workflows/node.yml

@@ -50,17 +50,6 @@ jobs:
     - name: Test
       run: npm run test
 
-  jsunit:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Use node ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-          node-version: ${{ matrix.node-version }}
-    - name: Test
-      run: ./autotest-js.sh
-
   handlebars:
     runs-on: ubuntu-latest
     strategy:

.github/workflows/oci.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   phpunit-oci8:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     strategy:
       # do not stop on another job's failure
@@ -41,7 +41,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-versions }}
-          extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,oci8,openssl,pdo_sqlite,posix,sqlite,xml,zip
+          extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, oci8
           tools: phpunit:8.5.2
           coverage: none
 

.github/workflows/psalm-github.yml

@@ -1,28 +0,0 @@
-name: Psalm show github
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - stable*
-
-jobs:
-  psalm:
-    name: Psalm
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-        with:
-          submodules: recursive
-      - name: Psalm
-        uses: docker://vimeo/psalm-github-actions
-        continue-on-error: true
-        with:
-          composer_ignore_platform_reqs: false
-          report_file: results.sarif
-      - name: Upload Analysis results to GitHub
-        uses: github/codeql-action/upload-sarif@v1
-        with:
-          sarif_file: results.sarif

.github/workflows/psalm-security.yml

@@ -1,28 +0,0 @@
-name: Psalm Security Analysis
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - stable*
-
-jobs:
-  psalm:
-    name: Psalm
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-        with:
-          submodules: recursive
-      - name: Psalm
-        uses: docker://vimeo/psalm-github-actions
-        with:
-          security_analysis: true
-          composer_ignore_platform_reqs: false
-          report_file: results.sarif
-      - name: Upload Security Analysis results to GitHub
-        uses: github/codeql-action/upload-sarif@v1
-        with:
-          sarif_file: results.sarif

.github/workflows/static-code-analysis.yml

@@ -17,7 +17,6 @@ jobs:
               uses: shivammathur/setup-php@master
               with:
                 php-version: 7.4
-                extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
                 coverage: none
             - name: Composer install
               run: composer i
@@ -28,29 +27,3 @@ jobs:
             - name: Show potential changes in Psalm baseline
               run: |
                 bash -c "[[ ! \"`git status --porcelain build/psalm-baseline.xml`\" ]] || ( echo 'Uncommited changes in Psalm baseline' && git status && git diff build/psalm-baseline.xml)"
-
-    static-code-analysis-ocp:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v2
-            - name: Checkout submodules
-              shell: bash
-              run: |
-                auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-                git submodule sync --recursive
-                git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
-            - name: Set up php7.4
-              uses: shivammathur/setup-php@master
-              with:
-                php-version: 7.4
-                extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
-                coverage: none
-            - name: Composer install
-              run: composer i
-            - name: Psalm
-              run: composer run psalm -- -c psalm-ocp.xml --monochrome --no-progress --output-format=text --update-baseline || ( git diff -- . ':!lib/composer' && exit 1 )
-            - name: Check diff
-              run: git diff -- . ':!lib/composer'
-            - name: Show potential changes in Psalm baseline
-              run: |
-                bash -c "[[ ! \"`git status --porcelain build/psalm-baseline-ocp.xml`\" ]] || ( echo 'Uncommited changes in Psalm baseline' && git status && git diff build/psalm-baseline.xml)"

.github/workflows/update-psalm-baseline.yml

@@ -15,20 +15,16 @@ jobs:
           auth_header="$(git config --local --get http.https://github.com/.extraheader)"
           git submodule sync --recursive
           git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
-      - name: Set up php7.4
-        uses: shivammathur/setup-php@master
-        with:
-          php-version: 7.4
-          extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
-          coverage: none
-      - name: Composer install
-        run: composer i
+      - name: Remove composer.json
+        shell: bash
+        run: rm composer.json composer.lock
       - name: Psalm
-        run: composer run psalm -- --monochrome --no-progress --output-format=text --update-baseline
+        uses: docker://jakzal/phpqa:php7.4-alpine
+        with:
+          args: psalm --monochrome --no-progress --output-format=text --update-baseline
       - name: Reset composer.json and composer.lock
         run: |
-          rm -rf lib/composer
-          git checkout -- composer.json composer.lock lib/composer
+          git checkout -- composer.json composer.lock
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v3
         with:

.htaccess

@@ -61,12 +61,16 @@
   RewriteCond %{HTTP_USER_AGENT} DavClnt
   RewriteRule ^$ /remote.php/webdav/ [L,R=302]
   RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+  RewriteRule ^\.well-known/host-meta /public.php?service=host-meta [QSA,L]
+  RewriteRule ^\.well-known/host-meta\.json /public.php?service=host-meta-json [QSA,L]
+  RewriteRule ^\.well-known/webfinger /public.php?service=webfinger [QSA,L]
+  RewriteRule ^\.well-known/nodeinfo /public.php?service=nodeinfo [QSA,L]
   RewriteRule ^\.well-known/carddav /remote.php/dav/ [R=301,L]
   RewriteRule ^\.well-known/caldav /remote.php/dav/ [R=301,L]
   RewriteRule ^remote/(.*) remote.php [QSA,L]
   RewriteRule ^(?:build|tests|config|lib|3rdparty|templates)/.* - [R=404,L]
-  RewriteRule ^\.well-known/(?!acme-challenge|pki-validation) /index.php [QSA,L]
-  RewriteRule ^(?:\.(?!well-known)|autotest|occ|issue|indie|db_|console).* - [R=404,L]
+  RewriteCond %{REQUEST_URI} !^/\.well-known/(acme-challenge|pki-validation)/.*
+  RewriteRule ^(?:\.|autotest|occ|issue|indie|db_|console).* - [R=404,L]
 </IfModule>
 <IfModule mod_mime.c>
   AddType image/svg+xml svg svgz

.mailmap

@@ -164,7 +164,6 @@ ideaship <ideaship@users.noreply.github.com>
 Ignacio Daniel Rostagno <ignaciorostagno@vijona.com.ar>
 infoneo <infoneo@yahoo.pl>
 Insanemal <insanemal@gmail.com>
-Tobias Perschon <tobias@perschon.at> Tobias Perschon <tofuSCHNITZEL@users.noreply.github.com>
 Tobias Ramforth <tobias@ramforth.com> Tobias Ramforth <tobias.ramforth@udo.edu>
 Tobias Ramforth <tobias@ramforth.com> irgsmirx <tobias.ramforth@udo.edu>
 Isaac Rosenberg <irosenb7@gmail.com>
@@ -358,8 +357,7 @@ Simon Birnbach <simon@simon-birnbach.de>
 Simon Könnecke <simonkoennecke@gmail.com>
 Simon Whittaker <simon@swbh.net>
 Sjors van der Pluijm <sjors@desjors.nl> Sjors van der Pluijm <sjors@youngguns.nl>
-John Molakvoæ <skjnldsv@protonmail.com> John Molakvoæ <skjnldsv@users.noreply.github.com>
-John Molakvoæ <skjnldsv@protonmail.com> John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
+John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> John Molakvoæ <skjnldsv@users.noreply.github.com>
 st3so <st3so@server.fake>
 Stefan <mu.stefan@googlemail.com>
 Stefan Göckeritz <admin@s-goecker.de>
@@ -383,7 +381,6 @@ TheSFReader <TheSFReader@gmail.com>
 Thibaut GRIDEL <tgridel@free.fr>
 thomas <thomas@thomas-VirtualBox.(none)>
 Thomas Citharel <nextcloud@tcit.fr> Thomas Citharel <tcit@tcit.fr>
-Thomas Citharel <nextcloud@tcit.fr> Thomas Citharel <github@tcit.fr>
 Thomas Müller <thomas.mueller@tmit.eu> Thomas Mueller <thomas.mueller@tmit.eu>
 Thomas Müller <thomas.mueller@tmit.eu> Thomas Müller <DeepDiver1975@users.noreply.github.com>
 Thomas Olsen <tol@tanghus>
@@ -409,9 +406,8 @@ Victor Dubiniuk <dubiniuk@owncloud.com> Victor Dubiniuk <victor.dubiniuk@gmail.c
 Victor Dubiniuk <dubiniuk@owncloud.com> VicDeo <dubiniuk@owncloud.com>
 Victor Dubiniuk <dubiniuk@owncloud.com> VicDeo <victor.dubiniuk@gmail.com>
 Vincent Cloutier <vincent1cloutier@gmail.com>
-Vincent Petry <vincent@nextcloud.com> Vincent Petry <PVince81@yahoo.fr>
-Vincent Petry <vincent@nextcloud.com> Vincent Petry <vincent@vvortex.site>
-Vincent Petry <vincent@nextcloud.com> Vincent Petry <pvince81@owncloud.com>
+Vincent Petry <pvince81@owncloud.com> Vincent Petry <PVince81@yahoo.fr>
+Vincent Petry <pvince81@owncloud.com> Vincent Petry <vincent@vvortex.site>
 Vinicius Cubas Brand <vinicius@eita.org.br> Vinicius Cubas Brand <viniciuscb@gmail.com>
 Vitaly Kuznetsov <vitty@altlinux.ru>
 Vladimir Sapronov <vladimir.sapronov@gmail.com>

.php_cs.dist

@@ -9,15 +9,12 @@ use Nextcloud\CodingStandard\Config;
 $config = new Config();
 $config
 	->getFinder()
+	->ignoreVCSIgnored(true)
 	->exclude('config')
 	->exclude('data')
 	->notPath('3rdparty')
-	->notPath('build/integration/vendor')
-	->notPath('build/lib')
-	->notPath('build/node_modules')
 	->notPath('build/stubs')
 	->notPath('composer')
-	->notPath('node_modules')
 	->notPath('vendor')
 	->in(__DIR__);
 return $config;

3rdparty

@@ -1 +1 @@
-Subproject commit 0d7c15582f5d2478f333c0487acf88ae881d9206
+Subproject commit 7d744fc500cae115e4ce6a8c9f96f283d9239123

AUTHORS

@@ -24,7 +24,6 @@ Nextcloud is written by:
  - Artem Kochnev <MrJeos@gmail.com>
  - Artem Sidorenko <artem@posteo.de>
  - Arthur Schiwon <blizzz@arthur-schiwon.de>
- - Ashod Nakashian <ashod.nakashian@collabora.co.uk>
  - Axel Helmert <axel.helmert@luka.de>
  - Bart Visscher <bartv@thisnet.nl>
  - Bartek Przybylski <bart.p.pl@gmail.com>
@@ -48,7 +47,6 @@ Nextcloud is written by:
  - Byron Marohn <combustible@live.com>
  - Carla Schroder <carla@owncloud.com>
  - Carlos Cerrillo <ccerrillo@gmail.com>
- - Carlos Ferreira <carlos@reendex.com>
  - Carsten Wiedmann <carsten_sttgt@gmx.de>
  - Christian <16852529+cviereck@users.noreply.github.com>
  - Christian Berendt <berendt@b1-systems.de>
@@ -83,6 +81,7 @@ Nextcloud is written by:
  - Donquixote <marjunebatac@gmail.com>
  - Elijah Martin-Merrill <elijah@nyp-itsours.com>
  - Eric Masseran <rico.masseran@gmail.com>
+ - Estelle Poulin <dev@inspiredby.es>
  - Evgeny Golyshev <eugulixes@gmail.com>
  - Fabrizio Steiner <fabrizio.steiner@gmail.com>
  - Felix Epp <work@felixepp.de>
@@ -106,13 +105,11 @@ Nextcloud is written by:
  - Greta Doci <gretadoci@gmail.com>
  - GretaD <gretadoci@gmail.com>
  - Guillaume COMPAGNON <gcompagnon@outlook.com>
- - Guillaume Virlet <github@virlet.org>
  - Hemanth Kumar Veeranki <hems.india1997@gmail.com>
  - Hendrik Leppelsack <hendrik@leppelsack.de>
  - Holger Hees <holger.hees@gmail.com>
  - Ilja Neumann <ineumann@owncloud.com>
  - Individual IT Services <info@individual-it.net>
- - Iscle <albertiscle9@gmail.com>
  - J0WI <J0WI@users.noreply.github.com>
  - Jaakko Salo <jaakkos@gmail.com>
  - Jacob Neplokh <me@jacobneplokh.com>
@@ -133,7 +130,6 @@ Nextcloud is written by:
  - Joel S <joel.devbox@protonmail.com>
  - Johan Björk <johanimon@gmail.com>
  - Johannes Ernst <jernst@indiecomputing.com>
- - Johannes Leuker <developers@hosting.de>
  - Johannes Riedel <joeried@users.noreply.github.com>
  - Johannes Schlichenmaier <johannes@schlichenmaier.info>
  - Johannes Willnecker <johannes@willnecker.com>
@@ -210,6 +206,7 @@ Nextcloud is written by:
  - Michael Kuhn <michael@ikkoku.de>
  - Michael Letzgus <www@chronos.michael-letzgus.de>
  - Michael Roitzsch <reactorcontrol@icloud.com>
+ - Michael Roth <michael.roth@rz.uni-augsburg.de>
  - Michael Weimann <mail@michael-weimann.eu>
  - Michael Zamot <michael@zamot.io>
  - Michał Węgrzynek <michal.wegrzynek@malloc.com.pl>
@@ -228,6 +225,7 @@ Nextcloud is written by:
  - Ole Ostergaard <ole.ostergaard@knime.com>
  - Oliver Gasser <oliver.gasser@gmail.com>
  - Oliver Kohl D.Sc. <oliver@kohl.bz>
+ - Oliver Salzburg <oliver.salzburg@gmail.com>
  - Oliver Wegner <void1976@gmail.com>
  - Olivier Paroz <github@oparoz.com>
  - Owen Winkler <a_github@midnightcircus.com>
@@ -258,13 +256,11 @@ Nextcloud is written by:
  - RealRancor <fisch.666@gmx.de>
  - Rello <Rello@users.noreply.github.com>
  - Remco Brenninkmeijer <requist1@starmail.nl>
- - Richard Steinmetz <richard@steinmetz.cloud>
  - Rinat Gumirov <rinat.gumirov@mail.ru>
  - Robert Dailey <rcdailey@gmail.com>
  - Robin Appelman <robin@icewind.nl>
  - Robin McCorkell <robin@mccorkell.me.uk>
  - Robin Müller <coder-hugo@users.noreply.github.com>
- - Robin Windey <ro.windey@gmail.com>
  - Roeland Jago Douma <roeland@famdouma.nl>
  - Roger Szabo <roger.szabo@web.de>
  - Roland Tapken <roland@bitarbeiter.net>
@@ -314,7 +310,6 @@ Nextcloud is written by:
  - Stephen Cuppett <steve@cuppett.com>
  - Steven Bühner <buehner@me.com>
  - Sujith H <sharidasan@owncloud.com>
- - Sujith Haridasan <sujith.h@gmail.com>
  - Sven Strickroth <email@cs-ware.de>
  - Sylvia van Os <sylvia@hackerchick.me>
  - Tekhnee <info@tekhnee.org>
@@ -344,7 +339,7 @@ Nextcloud is written by:
  - Victor Dubiniuk <dubiniuk@owncloud.com>
  - Viktor Szépe <viktor@szepe.net>
  - Vincent Chan <plus.vincchan@gmail.com>
- - Vincent Petry <vincent@nextcloud.com>
+ - Vincent Petry <pvince81@owncloud.com>
  - Vinicius Cubas Brand <vinicius@eita.org.br>
  - Vitor Mattos <vitor@php.rio>
  - Vlastimil Pecinka <pecinka@email.cz>
@@ -354,7 +349,6 @@ Nextcloud is written by:
  - Xheni Myrtaj <myrtajxheni@gmail.com>
  - Xuanwo <xuanwo@yunify.com>
  - adrien <adrien.waksberg@believedigital.com>
- - aler9 <46489434+aler9@users.noreply.github.com>
  - alexweirig <alex.weirig@technolink.lu>
  - b108@volgograd "b108@volgograd"
  - bladewing <lukas@ifflaender-family.de>
@@ -362,7 +356,6 @@ Nextcloud is written by:
  - blizzz <blizzz@arthur-schiwon.de>
  - brad2014 <brad2014@users.noreply.github.com>
  - brumsel <brumsel@losecatcher.de>
- - call-me-matt <nextcloud@matthiasheinisch.de>
  - cetra3 <peter@parashift.com.au>
  - cmeh <cmeh@users.noreply.github.com>
  - comradekingu <epost@anotheragency.no>
@@ -372,9 +365,7 @@ Nextcloud is written by:
  - derkostka <sebastian.kostka@gmail.com>
  - duritong <peter.meier+github@immerda.ch>
  - eduardo <eduardo@vnexu.net>
- - eleith <online+github@eleith.com>
  - enoch <lanxenet@hotmail.com>
- - essys <essys@users.noreply.github.com>
  - exner104 <59639860+exner104@users.noreply.github.com>
  - fabian <fabian@web2.0-apps.de>
  - felixboehm <felix@webhippie.de>
@@ -382,7 +373,6 @@ Nextcloud is written by:
  - fnuesse <fnuesse@techfak.uni-bielefeld.de>
  - helix84 <helix84@centrum.sk>
  - hkjolhede <hkjolhede@gmail.com>
- - hoellen <dev@hoellen.eu>
  - ideaship <ideaship@users.noreply.github.com>
  - j-ed <juergen@eisfair.org>
  - j3l11234 <297259024@qq.com>
@@ -390,28 +380,23 @@ Nextcloud is written by:
  - jknockaert <jasper@knockaert.nl>
  - josh4trunks <joshruehlig@gmail.com>
  - karakayasemi <karakayasemi@itu.edu.tr>
- - kevin147147 <kevintamool@gmail.com>
  - korelstar <korelstar@users.noreply.github.com>
- - leith abdulla <online-nextcloud@eleith.com>
  - lui87kw <lukas.ifflaender@uni-wuerzburg.de>
- - lynn-stephenson <lynn.stephenson@protonmail.com>
  - macjohnny <estebanmarin@gmx.ch>
  - marco44 <cousinmarc@gmail.com>
  - martin-rueegg <martin.rueegg@metaworx.ch>
  - martin.mattel@diemattels.at <martin.mattel@diemattels.at>
  - martink-p <47943787+martink-p@users.noreply.github.com>
- - matt <34400929+call-me-matt@users.noreply.github.com>
- - medcloud <42641918+medcloud@users.noreply.github.com>
  - michaelletzgus <michaelletzgus@users.noreply.github.com>
  - michag86 <micha_g@arcor.de>
  - mmccarn <mmccarn-github@mmsionline.us>
  - nhirokinet <nhirokinet@nhiroki.net>
- - nik gaffney <nik@fo.am>
  - nishiki <nishiki@yaegashi.fr>
  - onehappycat <one.happy.cat@gmx.com>
  - oparoz <owncloud@interfasys.ch>
  - phisch <git@philippschaffrath.de>
  - rakekniven <mark.ziegler@rakekniven.de>
+ - rawtaz <rawtaz@users.noreply.github.com>
  - root "root@oc.(none)"
  - root <root@localhost.localdomain>
  - rubo77 <github@r.z11.de>
@@ -423,7 +408,6 @@ Nextcloud is written by:
  - sualko <klaus@jsxc.org>
  - tbartenstein <tbartenstein@users.noreply.github.com>
  - tbelau666 <thomas.belau@gmx.de>
- - timm2k <timm2k@gmx.de>
  - tux-rampage <tux-rampage@users.noreply.github.com>
  - v1r0x <vinzenz.rosenkranz@gmail.com>
  - voxsim "Simon Vocella"

Makefile

@@ -1,7 +1,7 @@
 all: clean dev-setup build-js-production
 
 # Dev env management
-dev-setup: clean npm-init
+dev-setup: clean clean-dev npm-init
 
 npm-init:
 	npm ci
@@ -43,6 +43,9 @@ clean:
 	rm -rf apps/workflowengine/js/
 	rm -rf core/js/dist
 
+clean-dev:
+	rm -rf node_modules
+
 clean-git: clean
 	git checkout -- apps/accessibility/js/
 	git checkout -- apps/comments/js/

README.md

@@ -29,7 +29,7 @@ Enterprise? Public Sector or Education user? You may want to have a look into [*
 ## Get in touch 💬
 
 * [📋 Forum](https://help.nextcloud.com)
-* [👥 Facebook](https://www.facebook.com/nextclouders)
+* [👥 Facebook](https://facebook.com/nextclouders)
 * [🐣 Twitter](https://twitter.com/Nextclouders)
 * [🐘 Mastodon](https://mastodon.xyz/@nextcloud)
 
@@ -56,9 +56,8 @@ Several apps that are included by default in regular releases such as [First run
 
 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.
 
-### Working with front-end code 🏗
 
-#### Building
+### Building front-end code 🏗
 
 We are moving more and more towards using Vue.js in the frontend, starting with Settings. For building the code on changes, use these terminal commands in the root folder:
 
@@ -76,8 +75,6 @@ make watch-js
 make build-js-production
 ```
 
-#### Commiting changes
-
 **When making changes, also commit the compiled files!**
 
 We still use Handlebars templates some places in Files and Settings. We will replace these step-by-step with Vue.js, but in the meantime you need to compile them separately.
@@ -92,29 +89,6 @@ Then inside the root folder of your local Nextcloud development installation, ru
 ./build/compile-handlebars-templates.sh
 ```
 
-Before checking in JS changes, make sure to also build for production:
-```
-make build-js-production
-```
-Then add the compiled files for committing.
-
-To save some time, to only rebuild for a specific app, use the following and replace the module with the app name:
-```
-MODULE=user_status make build-js-production
-```
-
-Please note that if you used `make build-js` or `make watch-js` before, you'll notice that a lot of files were marked as changed, so might need to clear the workspace first.
-
-### Working with back-end code 🏗
-
-When changing back-end PHP code, in general no additional steps are needed before checking in.
-
-However, if new files were created, you will need to run the following command to update the autoloader files:
-```bash
-build/autoloaderchecker.sh
-```
-
-After that, please also include the autoloader file changes in your commits.
 
 ### Tools we use 🛠
 

apps/accessibility/appinfo/info.xml

@@ -5,7 +5,7 @@
 	<name>Accessibility</name>
 	<summary>Accessibility options for nextcloud</summary>
 	<description><![CDATA[Provides multiple accessibilities options to ease your use of Nextcloud]]></description>
-	<version>1.7.0</version>
+	<version>1.6.0</version>
 	<licence>agpl</licence>
 	<author>John Molakvoæ</author>
 	<namespace>Accessibility</namespace>
@@ -16,7 +16,7 @@
 	<bugs>https://github.com/nextcloud/server/issues</bugs>
 
 	<dependencies>
-		<nextcloud min-version="22" max-version="22"/>
+		<nextcloud min-version="20" max-version="20"/>
 	</dependencies>
 
 	<repair-steps>

apps/accessibility/appinfo/routes.php

@@ -31,17 +31,17 @@ return [
 	'ocs' => [
 		[
 			'name' => 'Config#getConfig',
-			'url' => '/api/v1/config',
+			'url'  => '/api/v1/config',
 			'verb' => 'GET',
 		],
 		[
 			'name' => 'Config#setConfig',
-			'url' => '/api/v1/config/{key}',
+			'url'  => '/api/v1/config/{key}',
 			'verb' => 'PUT',
 		],
 		[
 			'name' => 'Config#deleteConfig',
-			'url' => '/api/v1/config/{key}',
+			'url'  => '/api/v1/config/{key}',
 			'verb' => 'DELETE',
 		],
 	]

apps/accessibility/composer/composer/ClassLoader.php

@@ -37,13 +37,11 @@ namespace Composer\Autoload;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Jordi Boggiano <j.boggiano@seld.be>
- * @see    https://www.php-fig.org/psr/psr-0/
- * @see    https://www.php-fig.org/psr/psr-4/
+ * @see    http://www.php-fig.org/psr/psr-0/
+ * @see    http://www.php-fig.org/psr/psr-4/
  */
 class ClassLoader
 {
-    private $vendorDir;
-
     // PSR-4
     private $prefixLengthsPsr4 = array();
     private $prefixDirsPsr4 = array();
@@ -59,13 +57,6 @@ class ClassLoader
     private $missingClasses = array();
     private $apcuPrefix;
 
-    private static $registeredLoaders = array();
-
-    public function __construct($vendorDir = null)
-    {
-        $this->vendorDir = $vendorDir;
-    }
-
     public function getPrefixes()
     {
         if (!empty($this->prefixesPsr0)) {
@@ -309,17 +300,6 @@ class ClassLoader
     public function register($prepend = false)
     {
         spl_autoload_register(array($this, 'loadClass'), true, $prepend);
-
-        if (null === $this->vendorDir) {
-            return;
-        }
-
-        if ($prepend) {
-            self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
-        } else {
-            unset(self::$registeredLoaders[$this->vendorDir]);
-            self::$registeredLoaders[$this->vendorDir] = $this;
-        }
     }
 
     /**
@@ -328,10 +308,6 @@ class ClassLoader
     public function unregister()
     {
         spl_autoload_unregister(array($this, 'loadClass'));
-
-        if (null !== $this->vendorDir) {
-            unset(self::$registeredLoaders[$this->vendorDir]);
-        }
     }
 
     /**
@@ -391,16 +367,6 @@ class ClassLoader
         return $file;
     }
 
-    /**
-     * Returns the currently registered loaders indexed by their corresponding vendor directories.
-     *
-     * @return self[]
-     */
-    public static function getRegisteredLoaders()
-    {
-        return self::$registeredLoaders;
-    }
-
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup

apps/accessibility/composer/composer/autoload_classmap.php

@@ -6,7 +6,6 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = $vendorDir;
 
 return array(
-    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
     'OCA\\Accessibility\\AccessibilityProvider' => $baseDir . '/../lib/AccessibilityProvider.php',
     'OCA\\Accessibility\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
     'OCA\\Accessibility\\Controller\\AccessibilityController' => $baseDir . '/../lib/Controller/AccessibilityController.php',

apps/accessibility/composer/composer/autoload_real.php

@@ -23,12 +23,12 @@ class ComposerAutoloaderInitAccessibility
         }
 
         spl_autoload_register(array('ComposerAutoloaderInitAccessibility', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
         spl_autoload_unregister(array('ComposerAutoloaderInitAccessibility', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
-            require __DIR__ . '/autoload_static.php';
+            require_once __DIR__ . '/autoload_static.php';
 
             call_user_func(\Composer\Autoload\ComposerStaticInitAccessibility::getInitializer($loader));
         } else {

apps/accessibility/composer/composer/autoload_static.php

@@ -21,7 +21,6 @@ class ComposerStaticInitAccessibility
     );
 
     public static $classMap = array (
-        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
         'OCA\\Accessibility\\AccessibilityProvider' => __DIR__ . '/..' . '/../lib/AccessibilityProvider.php',
         'OCA\\Accessibility\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
         'OCA\\Accessibility\\Controller\\AccessibilityController' => __DIR__ . '/..' . '/../lib/Controller/AccessibilityController.php',

apps/accessibility/css/dark.scss

@@ -2,9 +2,8 @@
 $color-main-text: #d8d8d8;
 $color-main-background: #181818;
 
-$color-background-hover: lighten($color-main-background, 4%);
-$color-background-dark: lighten($color-main-background, 7%);
-$color-background-darker: lighten($color-main-background, 14%);
+$color-background-dark: lighten($color-main-background, 4%);
+$color-background-darker: lighten($color-main-background, 8%);
 
 $color-placeholder-light: lighten($color-main-background, 10%);
 $color-placeholder-dark: lighten($color-main-background, 20%);
@@ -54,12 +53,11 @@ $color-border-dark: lighten($color-main-background, 14%);
 
 .bubble,
 .app-navigation-entry-menu,
-.popovermenu,
-.popover__menu {
+.popovermenu {
 	li {
 		> button,
 		> a,
-		> .menuitem, > .popover__menuitem {
+		> .menuitem {
 			> img {
 				filter: invert(100%);
 			}
@@ -73,22 +71,6 @@ $color-border-dark: lighten($color-main-background, 14%);
 	border: 1px solid var(--color-border);
 }
 
-.popover[x-placement^='top'] .popover__arrow {
-	border-top-color: var(--color-border);
-}
-.popover[x-placement^='bottom'] .popover__arrow {
-	border-bottom-color: var(--color-border);
-}
-.popover[x-placement^='left'] .popover__arrow {
-	border-left-color: var(--color-border);
-}
-.popover[x-placement^='right'] .popover__arrow {
-	border-right-color: var(--color-border);
-}
-.popover .popover__inner {
-	border: 1px solid var(--color-border);
-}
-
 // Prevent slideshow icons from going dark
 #slideshow {
 	[class^='icon-'], [class*=' icon-']{

apps/accessibility/lib/AccessibilityProvider.php

@@ -53,41 +53,41 @@ class AccessibilityProvider {
 	public function __construct(string $appName,
 								IURLGenerator $urlGenerator,
 								IL10N $l) {
-		$this->appName = $appName;
+		$this->appName      = $appName;
 		$this->urlGenerator = $urlGenerator;
-		$this->l = $l;
+		$this->l            = $l;
 	}
 
 	public function getThemes() {
 		return [
 			[
-				'id' => 'dark',
-				'img' => $this->urlGenerator->imagePath($this->appName, 'theme-dark.jpg'),
+				'id'    => 'dark',
+				'img'   => $this->urlGenerator->imagePath($this->appName, 'theme-dark.jpg'),
 				'title' => $this->l->t('Dark theme'),
 				'enableLabel' => $this->l->t('Enable dark theme'),
-				'text' => $this->l->t('A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find.')
+				'text'  => $this->l->t('A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find.')
 			]
 		];
 	}
 
 	public function getHighContrast() {
 		return [
-			'id' => 'highcontrast',
-			'img' => $this->urlGenerator->imagePath($this->appName, 'mode-highcontrast.jpg'),
+			'id'    => 'highcontrast',
+			'img'   => $this->urlGenerator->imagePath($this->appName, 'mode-highcontrast.jpg'),
 			'title' => $this->l->t('High contrast mode'),
 			'enableLabel' => $this->l->t('Enable high contrast mode'),
-			'text' => $this->l->t('A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased.')
+			'text'  => $this->l->t('A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased.')
 		];
 	}
 
 	public function getFonts() {
 		return [
 			[
-				'id' => 'fontdyslexic',
-				'img' => $this->urlGenerator->imagePath($this->appName, 'font-opendyslexic.jpg'),
+				'id'    => 'fontdyslexic',
+				'img'   => $this->urlGenerator->imagePath($this->appName, 'font-opendyslexic.jpg'),
 				'title' => $this->l->t('Dyslexia font'),
 				'enableLabel' => $this->l->t('Enable dyslexia font'),
-				'text' => $this->l->t('OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia.')
+				'text'  => $this->l->t('OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia.')
 			]
 		];
 	}

apps/accessibility/lib/AppInfo/Application.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 /**
  * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
  *
+ * @author Alexey Pyltsyn <lex61rus@gmail.com>
  * @author Christoph Wurst <christoph@winzerhof-wurst.at>
  * @author Joas Schilling <coding@schilljs.com>
  * @author John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@@ -35,7 +36,9 @@ use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
+use OCP\AppFramework\IAppContainer;
 use OCP\IConfig;
+use OCP\IInitialStateService;
 use OCP\IURLGenerator;
 use OCP\IUserSession;
 use function count;
@@ -52,11 +55,11 @@ class Application extends App implements IBootstrap {
 	}
 
 	public function register(IRegistrationContext $context): void {
-		$context->registerInitialStateProvider(JSDataService::class);
 	}
 
 	public function boot(IBootContext $context): void {
 		$context->injectFn([$this, 'injectCss']);
+		$context->injectFn([$this, 'registerInitialState']);
 	}
 
 	public function injectCss(IUserSession $userSession,
@@ -81,4 +84,13 @@ class Application extends App implements IBootstrap {
 			\OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'media' => '(prefers-color-scheme: dark)', 'href' => $linkToCSS]);
 		}
 	}
+
+	public function registerInitialState(IInitialStateService $initialState,
+										  IAppContainer $container) {
+		$initialState->provideLazyInitialState(self::APP_ID, 'data', function () use ($container) {
+			/** @var JSDataService $data */
+			$data = $container->query(JSDataService::class);
+			return $data;
+		});
+	}
 }

apps/accessibility/lib/Controller/AccessibilityController.php

@@ -40,12 +40,14 @@ use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataDisplayResponse;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\IConfig;
+use OCP\ILogger;
 use OCP\IRequest;
+use OCP\IURLGenerator;
+use OCP\IUserManager;
 use OCP\IUserSession;
-use Psr\Log\LoggerInterface;
 use ScssPhp\ScssPhp\Compiler;
 use ScssPhp\ScssPhp\Exception\ParserException;
-use ScssPhp\ScssPhp\OutputStyle;
+use ScssPhp\ScssPhp\Formatter\Crunched;
 
 class AccessibilityController extends Controller {
 
@@ -58,15 +60,24 @@ class AccessibilityController extends Controller {
 	/** @var IConfig */
 	private $config;
 
-	/** @var LoggerInterface */
+	/** @var IUserManager */
+	private $userManager;
+
+	/** @var ILogger */
 	private $logger;
 
+	/** @var IURLGenerator */
+	private $urlGenerator;
+
 	/** @var ITimeFactory */
 	protected $timeFactory;
 
 	/** @var IUserSession */
 	private $userSession;
 
+	/** @var IAppManager */
+	private $appManager;
+
 	/** @var IconsCacher */
 	protected $iconsCacher;
 
@@ -76,29 +87,45 @@ class AccessibilityController extends Controller {
 	/** @var null|string */
 	private $injectedVariables;
 
-	/** @var string */
-	private $appRoot;
-
+	/**
+	 * Account constructor.
+	 *
+	 * @param string $appName
+	 * @param IRequest $request
+	 * @param IConfig $config
+	 * @param IUserManager $userManager
+	 * @param ILogger $logger
+	 * @param IURLGenerator $urlGenerator
+	 * @param ITimeFactory $timeFactory
+	 * @param IUserSession $userSession
+	 * @param IAppManager $appManager
+	 * @param \OC_Defaults $defaults
+	 */
 	public function __construct(string $appName,
 								IRequest $request,
 								IConfig $config,
-								LoggerInterface $logger,
+								IUserManager $userManager,
+								ILogger $logger,
+								IURLGenerator $urlGenerator,
 								ITimeFactory $timeFactory,
 								IUserSession $userSession,
 								IAppManager $appManager,
 								IconsCacher $iconsCacher,
 								\OC_Defaults $defaults) {
 		parent::__construct($appName, $request);
-		$this->appName = $appName;
-		$this->config = $config;
-		$this->logger = $logger;
-		$this->timeFactory = $timeFactory;
-		$this->userSession = $userSession;
-		$this->iconsCacher = $iconsCacher;
-		$this->defaults = $defaults;
+		$this->appName      = $appName;
+		$this->config       = $config;
+		$this->userManager  = $userManager;
+		$this->logger       = $logger;
+		$this->urlGenerator = $urlGenerator;
+		$this->timeFactory  = $timeFactory;
+		$this->userSession  = $userSession;
+		$this->appManager   = $appManager;
+		$this->iconsCacher  = $iconsCacher;
+		$this->defaults     = $defaults;
 
 		$this->serverRoot = \OC::$SERVERROOT;
-		$this->appRoot = $appManager->getAppPath($this->appName);
+		$this->appRoot    = $this->appManager->getAppPath($this->appName);
 	}
 
 	/**
@@ -109,8 +136,8 @@ class AccessibilityController extends Controller {
 	 * @return DataDisplayResponse
 	 */
 	public function getCss(): DataDisplayResponse {
-		$css = '';
-		$imports = '';
+		$css        = '';
+		$imports    = '';
 		if ($this->userSession->isLoggedIn()) {
 			$userValues = $this->getUserValues();
 		} else {
@@ -134,7 +161,8 @@ class AccessibilityController extends Controller {
 			]);
 
 			// Continue after throw
-			$scss->setOutputStyle(OutputStyle::COMPRESSED);
+			$scss->setIgnoreErrors(true);
+			$scss->setFormatter(Crunched::class);
 
 			// Import theme, variables and compile css4 variables
 			try {
@@ -145,12 +173,7 @@ class AccessibilityController extends Controller {
 					'@import "css-variables.scss";'
 				);
 			} catch (ParserException $e) {
-				$this->logger->error($e->getMessage(),
-					[
-						'app' => 'core',
-						'exception' => $e,
-					]
-				);
+				$this->logger->error($e->getMessage(), ['app' => 'core']);
 			}
 		}
 
@@ -159,7 +182,7 @@ class AccessibilityController extends Controller {
 
 		// Rebase all urls
 		$appWebRoot = substr($this->appRoot, strlen($this->serverRoot) - strlen(\OC::$WEBROOT));
-		$css = $this->rebaseUrls($css, $appWebRoot . '/css');
+		$css        = $this->rebaseUrls($css, $appWebRoot . '/css');
 
 		if (in_array('dark', $userValues) && $this->iconsCacher->getCachedList() && $this->iconsCacher->getCachedList()->getSize() > 0) {
 			$iconsCss = $this->invertSvgIconsColor($this->iconsCacher->getCachedList()->getContent());
@@ -192,7 +215,7 @@ class AccessibilityController extends Controller {
 	 */
 	private function getUserValues(): array {
 		$userTheme = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'theme', false);
-		$userFont = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'font', false);
+		$userFont  = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'font', false);
 		$userHighContrast = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'highcontrast', false);
 
 		return [$userTheme, $userHighContrast, $userFont];
@@ -217,7 +240,7 @@ class AccessibilityController extends Controller {
 	 * @return string
 	 */
 	private function rebaseUrls(string $css, string $webDir): string {
-		$re = '/url\([\'"]([^\/][\.\w?=\/-]*)[\'"]\)/x';
+		$re    = '/url\([\'"]([^\/][\.\w?=\/-]*)[\'"]\)/x';
 		$subst = 'url(\'' . $webDir . '/$1\')';
 
 		return preg_replace($re, $subst, $css);
@@ -259,12 +282,7 @@ class AccessibilityController extends Controller {
 			$scss->compile($variables);
 			$this->injectedVariables = $variables;
 		} catch (ParserException $e) {
-			$this->logger->error($e->getMessage(),
-				[
-					'app' => 'core',
-					'exception' => $e,
-				]
-			);
+			$this->logger->logException($e, ['app' => 'core']);
 		}
 		return $variables;
 	}

apps/accessibility/lib/Controller/ConfigController.php

@@ -75,11 +75,11 @@ class ConfigController extends OCSController {
 								IUserSession $userSession,
 								AccessibilityProvider $accessibilityProvider) {
 		parent::__construct($appName, $request);
-		$this->appName = $appName;
-		$this->config = $config;
-		$this->userSession = $userSession;
+		$this->appName               = $appName;
+		$this->config                = $config;
+		$this->userSession           = $userSession;
 		$this->accessibilityProvider = $accessibilityProvider;
-		$this->userId = $userSession->getUser()->getUID();
+		$this->userId				 = $userSession->getUser()->getUID();
 	}
 
 	/**
@@ -115,9 +115,9 @@ class ConfigController extends OCSController {
 
 			$themes = $this->accessibilityProvider->getThemes();
 			$highcontrast = [$this->accessibilityProvider->getHighContrast()];
-			$fonts = $this->accessibilityProvider->getFonts();
+			$fonts  = $this->accessibilityProvider->getFonts();
 
-			$availableOptions = array_map(function ($option): string {
+			$availableOptions = array_map(function ($option) {
 				return $option['id'];
 			}, array_merge($themes, $highcontrast, $fonts));
 

apps/accessibility/lib/Service/JSDataService.php

@@ -27,11 +27,10 @@ declare(strict_types=1);
 namespace OCA\Accessibility\Service;
 
 use OCA\Accessibility\AppInfo\Application;
-use OCP\AppFramework\Services\InitialStateProvider;
 use OCP\IConfig;
 use OCP\IUserSession;
 
-class JSDataService extends InitialStateProvider {
+class JSDataService implements \JsonSerializable {
 	/** @var IUserSession */
 	private $userSession;
 	/** @var IConfig */
@@ -45,11 +44,7 @@ class JSDataService extends InitialStateProvider {
 		$this->config = $config;
 	}
 
-	public function getKey(): string {
-		return 'data';
-	}
-
-	public function getData() {
+	public function jsonSerialize() {
 		$user = $this->userSession->getUser();
 
 		if ($user === null) {

apps/accessibility/lib/Settings/Personal.php

@@ -3,7 +3,6 @@
  * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
  * @copyright Copyright (c) 2019 Janis Köhr <janiskoehr@icloud.com>
  *
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
  * @author John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
  *
  * @license GNU AGPL version 3 or any later version
@@ -27,8 +26,8 @@ namespace OCA\Accessibility\Settings;
 
 use OCA\Accessibility\AccessibilityProvider;
 use OCP\AppFramework\Http\TemplateResponse;
-use OCP\AppFramework\Services\IInitialState;
 use OCP\IConfig;
+use OCP\IInitialStateService;
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\IUserSession;
@@ -55,47 +54,57 @@ class Personal implements ISettings {
 	/** @var AccessibilityProvider */
 	private $accessibilityProvider;
 
-	/** @var IInitialState */
+	/** @var IInitialStateService */
 	private $initialStateService;
 
+	/**
+	 * Settings constructor.
+	 *
+	 * @param string $appName
+	 * @param IConfig $config
+	 * @param IUserSession $userSession
+	 * @param IL10N $l
+	 * @param IURLGenerator $urlGenerator
+	 * @param AccessibilityProvider $accessibilityProvider
+	 */
 	public function __construct(string $appName,
 								IConfig $config,
 								IUserSession $userSession,
 								IL10N $l,
 								IURLGenerator $urlGenerator,
 								AccessibilityProvider $accessibilityProvider,
-								IInitialState $initialStateService) {
-		$this->appName = $appName;
-		$this->config = $config;
-		$this->userSession = $userSession;
-		$this->l = $l;
-		$this->urlGenerator = $urlGenerator;
+								IInitialStateService $initialStateService) {
+		$this->appName               = $appName;
+		$this->config                = $config;
+		$this->userSession           = $userSession;
+		$this->l                     = $l;
+		$this->urlGenerator          = $urlGenerator;
 		$this->accessibilityProvider = $accessibilityProvider;
-		$this->initialStateService = $initialStateService;
+		$this->initialStateService   = $initialStateService;
 	}
 
 	/**
 	 * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
 	 * @since 9.1
 	 */
-	public function getForm(): TemplateResponse {
+	public function getForm() {
 		Util::addScript('accessibility', 'accessibility');
 		Util::addStyle('accessibility', 'style');
 
 		$availableConfig = [
 			'themes' => $this->accessibilityProvider->getThemes(),
-			'fonts' => $this->accessibilityProvider->getFonts(),
+			'fonts'  => $this->accessibilityProvider->getFonts(),
 			'highcontrast' => $this->accessibilityProvider->getHighContrast()
 		];
 
 		$userConfig = [
 			'highcontrast' => $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'highcontrast', false),
-			'theme' => $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'theme', false),
-			'font' => $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'font', false)
+			'theme'  => $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'theme', false),
+			'font'   => $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'font', false)
 		];
 
-		$this->initialStateService->provideInitialState('available-config', $availableConfig);
-		$this->initialStateService->provideInitialState('user-config', $userConfig);
+		$this->initialStateService->provideInitialState($this->appName, 'available-config', $availableConfig);
+		$this->initialStateService->provideInitialState($this->appName, 'user-config', $userConfig);
 
 		return new TemplateResponse($this->appName, 'settings-personal');
 	}
@@ -104,7 +113,7 @@ class Personal implements ISettings {
 	 * @return string the section ID, e.g. 'sharing'
 	 * @since 9.1
 	 */
-	public function getSection(): string {
+	public function getSection() {
 		return $this->appName;
 	}
 
@@ -116,7 +125,7 @@ class Personal implements ISettings {
 	 * E.g.: 70
 	 * @since 9.1
 	 */
-	public function getPriority(): int {
+	public function getPriority() {
 		return 40;
 	}
 }

apps/accessibility/lib/Settings/PersonalSection.php

@@ -2,7 +2,6 @@
 /**
  * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
  *
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
  * @author John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
  *
  * @license GNU AGPL version 3 or any later version
@@ -49,9 +48,9 @@ class PersonalSection implements IIconSection {
 	public function __construct(string $appName,
 								IURLGenerator $urlGenerator,
 								IL10N $l) {
-		$this->appName = $appName;
+		$this->appName      = $appName;
 		$this->urlGenerator = $urlGenerator;
-		$this->l = $l;
+		$this->l            = $l;
 	}
 
 	/**

apps/accessibility/src/accessibilityoca.js

@@ -1,7 +1,7 @@
 /**
  * @copyright Copyright (c) 2020 Roeland Jago Douma <roeland@famdouma.nl>
  *
- * @author Jan C. Borchardt <hey@jancborchardt.net>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author John Molakvoæ <skjnldsv@protonmail.com>
  *
  * @license GNU AGPL version 3 or any later version
@@ -17,10 +17,8 @@
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 import { loadState } from '@nextcloud/initial-state'
 
 OCA.Accessibility = loadState('accessibility', 'data')

apps/accessibility/src/main.js

@@ -16,10 +16,8 @@
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 import Vue from 'vue'
 import { loadState } from '@nextcloud/initial-state'
 import App from './Accessibility.vue'

apps/accessibility/webpack.js

@@ -1,25 +1,3 @@
-/**
- * @copyright Copyright (c) 2016 John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @author John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
 const path = require('path')
 
 module.exports = {

apps/admin_audit/appinfo/info.xml

@@ -5,7 +5,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.11.0</version>
+	<version>1.10.0</version>
 	<licence>agpl</licence>
 	<author>Nextcloud</author>
 	<namespace>AdminAudit</namespace>
@@ -15,7 +15,7 @@
 	<category>monitoring</category>
 	<bugs>https://github.com/nextcloud/server/issues</bugs>
 	<dependencies>
-		<nextcloud min-version="22" max-version="22"/>
+		<nextcloud min-version="20" max-version="20"/>
 	</dependencies>
 	<background-jobs>
 		<job>OCA\AdminAudit\BackgroundJobs\Rotate</job>

apps/admin_audit/composer/composer/ClassLoader.php

@@ -37,13 +37,11 @@ namespace Composer\Autoload;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Jordi Boggiano <j.boggiano@seld.be>
- * @see    https://www.php-fig.org/psr/psr-0/
- * @see    https://www.php-fig.org/psr/psr-4/
+ * @see    http://www.php-fig.org/psr/psr-0/
+ * @see    http://www.php-fig.org/psr/psr-4/
  */
 class ClassLoader
 {
-    private $vendorDir;
-
     // PSR-4
     private $prefixLengthsPsr4 = array();
     private $prefixDirsPsr4 = array();
@@ -59,13 +57,6 @@ class ClassLoader
     private $missingClasses = array();
     private $apcuPrefix;
 
-    private static $registeredLoaders = array();
-
-    public function __construct($vendorDir = null)
-    {
-        $this->vendorDir = $vendorDir;
-    }
-
     public function getPrefixes()
     {
         if (!empty($this->prefixesPsr0)) {
@@ -309,17 +300,6 @@ class ClassLoader
     public function register($prepend = false)
     {
         spl_autoload_register(array($this, 'loadClass'), true, $prepend);
-
-        if (null === $this->vendorDir) {
-            return;
-        }
-
-        if ($prepend) {
-            self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
-        } else {
-            unset(self::$registeredLoaders[$this->vendorDir]);
-            self::$registeredLoaders[$this->vendorDir] = $this;
-        }
     }
 
     /**
@@ -328,10 +308,6 @@ class ClassLoader
     public function unregister()
     {
         spl_autoload_unregister(array($this, 'loadClass'));
-
-        if (null !== $this->vendorDir) {
-            unset(self::$registeredLoaders[$this->vendorDir]);
-        }
     }
 
     /**
@@ -391,16 +367,6 @@ class ClassLoader
         return $file;
     }
 
-    /**
-     * Returns the currently registered loaders indexed by their corresponding vendor directories.
-     *
-     * @return self[]
-     */
-    public static function getRegisteredLoaders()
-    {
-        return self::$registeredLoaders;
-    }
-
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup

apps/admin_audit/composer/composer/autoload_classmap.php

@@ -6,7 +6,6 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = $vendorDir;
 
 return array(
-    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
     'OCA\\AdminAudit\\Actions\\Action' => $baseDir . '/../lib/Actions/Action.php',
     'OCA\\AdminAudit\\Actions\\AppManagement' => $baseDir . '/../lib/Actions/AppManagement.php',
     'OCA\\AdminAudit\\Actions\\Auth' => $baseDir . '/../lib/Actions/Auth.php',
@@ -20,5 +19,4 @@ return array(
     'OCA\\AdminAudit\\Actions\\Versions' => $baseDir . '/../lib/Actions/Versions.php',
     'OCA\\AdminAudit\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
     'OCA\\AdminAudit\\BackgroundJobs\\Rotate' => $baseDir . '/../lib/BackgroundJobs/Rotate.php',
-    'OCA\\AdminAudit\\Listener\\CriticalActionPerformedEventListener' => $baseDir . '/../lib/Listener/CriticalActionPerformedEventListener.php',
 );

apps/admin_audit/composer/composer/autoload_real.php

@@ -23,12 +23,12 @@ class ComposerAutoloaderInitAdminAudit
         }
 
         spl_autoload_register(array('ComposerAutoloaderInitAdminAudit', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
         spl_autoload_unregister(array('ComposerAutoloaderInitAdminAudit', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
-            require __DIR__ . '/autoload_static.php';
+            require_once __DIR__ . '/autoload_static.php';
 
             call_user_func(\Composer\Autoload\ComposerStaticInitAdminAudit::getInitializer($loader));
         } else {

apps/admin_audit/composer/composer/autoload_static.php

@@ -21,7 +21,6 @@ class ComposerStaticInitAdminAudit
     );
 
     public static $classMap = array (
-        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
         'OCA\\AdminAudit\\Actions\\Action' => __DIR__ . '/..' . '/../lib/Actions/Action.php',
         'OCA\\AdminAudit\\Actions\\AppManagement' => __DIR__ . '/..' . '/../lib/Actions/AppManagement.php',
         'OCA\\AdminAudit\\Actions\\Auth' => __DIR__ . '/..' . '/../lib/Actions/Auth.php',
@@ -35,7 +34,6 @@ class ComposerStaticInitAdminAudit
         'OCA\\AdminAudit\\Actions\\Versions' => __DIR__ . '/..' . '/../lib/Actions/Versions.php',
         'OCA\\AdminAudit\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
         'OCA\\AdminAudit\\BackgroundJobs\\Rotate' => __DIR__ . '/..' . '/../lib/BackgroundJobs/Rotate.php',
-        'OCA\\AdminAudit\\Listener\\CriticalActionPerformedEventListener' => __DIR__ . '/..' . '/../lib/Listener/CriticalActionPerformedEventListener.php',
     );
 
     public static function getInitializer(ClassLoader $loader)

apps/admin_audit/lib/Actions/Action.php

@@ -29,13 +29,16 @@ declare(strict_types=1);
 
 namespace OCA\AdminAudit\Actions;
 
-use Psr\Log\LoggerInterface;
+use OCP\ILogger;
 
 class Action {
-	/** @var LoggerInterface */
+	/** @var ILogger */
 	private $logger;
 
-	public function __construct(LoggerInterface $logger) {
+	/**
+	 * @param ILogger $logger
+	 */
+	public function __construct(ILogger $logger) {
 		$this->logger = $logger;
 	}
 
@@ -50,7 +53,7 @@ class Action {
 	public function log(string $text,
 						array $params,
 						array $elements,
-						bool $obfuscateParameters = false): void {
+						bool $obfuscateParameters = false) {
 		foreach ($elements as $element) {
 			if (!isset($params[$element])) {
 				if ($obfuscateParameters) {

apps/admin_audit/lib/Actions/AppManagement.php

@@ -32,7 +32,7 @@ class AppManagement extends Action {
 	/**
 	 * @param string $appName
 	 */
-	public function enableApp(string $appName): void {
+	public function enableApp(string $appName) {
 		$this->log('App "%s" enabled',
 			['app' => $appName],
 			['app']
@@ -43,7 +43,7 @@ class AppManagement extends Action {
 	 * @param string $appName
 	 * @param string[] $groups
 	 */
-	public function enableAppForGroups(string $appName, array $groups): void {
+	public function enableAppForGroups(string $appName, array $groups) {
 		$this->log('App "%1$s" enabled for groups: %2$s',
 			['app' => $appName, 'groups' => implode(', ', $groups)],
 			['app', 'groups']
@@ -53,7 +53,7 @@ class AppManagement extends Action {
 	/**
 	 * @param string $appName
 	 */
-	public function disableApp(string $appName): void {
+	public function disableApp(string $appName) {
 		$this->log('App "%s" disabled',
 			['app' => $appName],
 			['app']

apps/admin_audit/lib/Actions/Auth.php

@@ -33,7 +33,7 @@ namespace OCA\AdminAudit\Actions;
  * @package OCA\AdminAudit\Actions
  */
 class Auth extends Action {
-	public function loginAttempt(array $params): void {
+	public function loginAttempt(array $params) {
 		$this->log(
 			'Login attempt: "%s"',
 			$params,
@@ -44,7 +44,7 @@ class Auth extends Action {
 		);
 	}
 
-	public function loginSuccessful(array $params): void {
+	public function loginSuccessful(array $params) {
 		$this->log(
 			'Login successful: "%s"',
 			$params,
@@ -55,7 +55,7 @@ class Auth extends Action {
 		);
 	}
 
-	public function logout(array $params): void {
+	public function logout(array $params) {
 		$this->log(
 			'Logout occurred',
 			[],

apps/admin_audit/lib/Actions/Console.php

@@ -32,7 +32,7 @@ class Console extends Action {
 	/**
 	 * @param $arguments
 	 */
-	public function runCommand(array $arguments): void {
+	public function runCommand(array $arguments) {
 		if (!isset($arguments[1]) || $arguments[1] === '_completion') {
 			// Don't log autocompletion
 			return;

apps/admin_audit/lib/Actions/Files.php

@@ -38,7 +38,7 @@ class Files extends Action {
 	 *
 	 * @param array $params
 	 */
-	public function read(array $params): void {
+	public function read(array $params) {
 		$this->log(
 			'File accessed: "%s"',
 			$params,
@@ -53,7 +53,7 @@ class Files extends Action {
 	 *
 	 * @param array $params
 	 */
-	public function rename(array $params): void {
+	public function rename(array $params) {
 		$this->log(
 			'File renamed: "%s" to "%s"',
 			$params,
@@ -69,7 +69,7 @@ class Files extends Action {
 	 *
 	 * @param array $params
 	 */
-	public function create(array $params): void {
+	public function create(array $params) {
 		if ($params['path'] === '/' || $params['path'] === '' || $params['path'] === null) {
 			return;
 		}
@@ -88,7 +88,7 @@ class Files extends Action {
 	 *
 	 * @param array $params
 	 */
-	public function copy(array $params): void {
+	public function copy(array $params) {
 		$this->log(
 			'File copied: "%s" to "%s"',
 			$params,
@@ -104,7 +104,7 @@ class Files extends Action {
 	 *
 	 * @param array $params
 	 */
-	public function write(array $params): void {
+	public function write(array $params) {
 		if ($params['path'] === '/' || $params['path'] === '' || $params['path'] === null) {
 			return;
 		}
@@ -123,7 +123,7 @@ class Files extends Action {
 	 *
 	 * @param array $params
 	 */
-	public function update(array $params): void {
+	public function update(array $params) {
 		$this->log(
 			'File updated: "%s"',
 			$params,
@@ -138,7 +138,7 @@ class Files extends Action {
 	 *
 	 * @param array $params
 	 */
-	public function delete(array $params): void {
+	public function delete(array $params) {
 		$this->log(
 			'File deleted: "%s"',
 			$params,
@@ -153,7 +153,7 @@ class Files extends Action {
 	 *
 	 * @param array $params
 	 */
-	public function preview(array $params): void {
+	public function preview(array $params) {
 		$this->log(
 			'Preview accessed: "%s" (width: "%s", height: "%s" crop: "%s", mode: "%s")',
 			$params,

apps/admin_audit/lib/Actions/GroupManagement.php

@@ -45,7 +45,7 @@ class GroupManagement extends Action {
 	 * @param IGroup $group
 	 * @param IUser $user
 	 */
-	public function addUser(IGroup $group, IUser $user): void {
+	public function addUser(IGroup $group, IUser $user) {
 		$this->log('User "%s" added to group "%s"',
 			[
 				'group' => $group->getGID(),
@@ -63,7 +63,7 @@ class GroupManagement extends Action {
 	 * @param IGroup $group
 	 * @param IUser $user
 	 */
-	public function removeUser(IGroup $group, IUser $user): void {
+	public function removeUser(IGroup $group, IUser $user) {
 		$this->log('User "%s" removed from group "%s"',
 			[
 				'group' => $group->getGID(),
@@ -74,13 +74,13 @@ class GroupManagement extends Action {
 			]
 		);
 	}
-
+	
 	/**
 	 * log create group to group event
 	 *
 	 * @param IGroup $group
 	 */
-	public function createGroup(IGroup $group): void {
+	public function createGroup(IGroup $group) {
 		$this->log('Group created: "%s"',
 			[
 				'group' => $group->getGID()
@@ -96,7 +96,7 @@ class GroupManagement extends Action {
 	 *
 	 * @param IGroup $group
 	 */
-	public function deleteGroup(IGroup $group): void {
+	public function deleteGroup(IGroup $group) {
 		$this->log('Group deleted: "%s"',
 			[
 				'group' => $group->getGID()

apps/admin_audit/lib/Actions/Security.php

@@ -41,7 +41,7 @@ class Security extends Action {
 	 * @param IUser $user
 	 * @param array $params
 	 */
-	public function twofactorFailed(IUser $user, array $params): void {
+	public function twofactorFailed(IUser $user, array $params) {
 		$params['uid'] = $user->getUID();
 		$params['displayName'] = $user->getDisplayName();
 
@@ -62,7 +62,7 @@ class Security extends Action {
 	 * @param IUser $user
 	 * @param array $params
 	 */
-	public function twofactorSuccess(IUser $user, array $params): void {
+	public function twofactorSuccess(IUser $user, array $params) {
 		$params['uid'] = $user->getUID();
 		$params['displayName'] = $user->getDisplayName();
 

apps/admin_audit/lib/Actions/Sharing.php

@@ -7,7 +7,6 @@ declare(strict_types=1);
  *
  * @author Daniel Calviño Sánchez <danxuliu@gmail.com>
  * @author Joas Schilling <coding@schilljs.com>
- * @author Julius Härtl <jus@bitgrid.net>
  * @author Lukas Reschke <lukas@statuscode.ch>
  * @author Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
  *
@@ -43,7 +42,7 @@ class Sharing extends Action {
 	 *
 	 * @param array $params
 	 */
-	public function shared(array $params): void {
+	public function shared(array $params) {
 		if ($params['shareType'] === IShare::TYPE_LINK) {
 			$this->log(
 				'The %s "%s" with ID "%s" has been shared via link with permissions "%s" (Share ID: %s)',
@@ -147,19 +146,6 @@ class Sharing extends Action {
 					'id',
 				]
 			);
-		} elseif ($params['shareType'] === IShare::TYPE_DECK) {
-			$this->log(
-				'The %s "%s" with ID "%s" has been shared to the deck card "%s" with permissions "%s" (Share ID: %s)',
-				$params,
-				[
-					'itemType',
-					'itemTarget',
-					'itemSource',
-					'shareWith',
-					'permissions',
-					'id',
-				]
-			);
 		}
 	}
 
@@ -168,7 +154,7 @@ class Sharing extends Action {
 	 *
 	 * @param array $params
 	 */
-	public function unshare(array $params): void {
+	public function unshare(array $params) {
 		if ($params['shareType'] === IShare::TYPE_LINK) {
 			$this->log(
 				'The %s "%s" with ID "%s" has been unshared (Share ID: %s)',
@@ -264,18 +250,6 @@ class Sharing extends Action {
 					'id',
 				]
 			);
-		} elseif ($params['shareType'] === IShare::TYPE_DECK) {
-			$this->log(
-				'The %s "%s" with ID "%s" has been unshared from the deck card "%s" (Share ID: %s)',
-				$params,
-				[
-					'itemType',
-					'fileTarget',
-					'itemSource',
-					'shareWith',
-					'id',
-				]
-			);
 		}
 	}
 
@@ -284,7 +258,7 @@ class Sharing extends Action {
 	 *
 	 * @param array $params
 	 */
-	public function updatePermissions(array $params): void {
+	public function updatePermissions(array $params) {
 		$this->log(
 			'The permissions of the shared %s "%s" with ID "%s" have been changed to "%s"',
 			$params,
@@ -302,7 +276,7 @@ class Sharing extends Action {
 	 *
 	 * @param array $params
 	 */
-	public function updatePassword(array $params): void {
+	public function updatePassword(array $params) {
 		$this->log(
 			'The password of the publicly shared %s "%s" with ID "%s" has been changed',
 			$params,
@@ -319,27 +293,16 @@ class Sharing extends Action {
 	 *
 	 * @param array $params
 	 */
-	public function updateExpirationDate(array $params): void {
-		if ($params['date'] === null) {
-			$this->log(
-				'The expiration date of the publicly shared %s with ID "%s" has been removed',
-				$params,
-				[
-					'itemType',
-					'itemSource',
-				]
-			);
-		} else {
-			$this->log(
-				'The expiration date of the publicly shared %s with ID "%s" has been changed to "%s"',
-				$params,
-				[
-					'itemType',
-					'itemSource',
-					'date',
-				]
-			);
-		}
+	public function updateExpirationDate(array $params) {
+		$this->log(
+			'The expiration date of the publicly shared %s with ID "%s" has been changed to "%s"',
+			$params,
+			[
+				'itemType',
+				'itemSource',
+				'date',
+			]
+		);
 	}
 
 	/**
@@ -347,7 +310,7 @@ class Sharing extends Action {
 	 *
 	 * @param array $params
 	 */
-	public function shareAccessed(array $params): void {
+	public function shareAccessed(array $params) {
 		$this->log(
 			'The shared %s with the token "%s" by "%s" has been accessed.',
 			$params,

apps/admin_audit/lib/Actions/Trashbin.php

@@ -29,13 +29,13 @@ declare(strict_types=1);
 namespace OCA\AdminAudit\Actions;
 
 class Trashbin extends Action {
-	public function delete(array $params): void {
+	public function delete(array $params) {
 		$this->log('File "%s" deleted from trash bin.',
 			['path' => $params['path']], ['path']
 		);
 	}
 
-	public function restore(array $params): void {
+	public function restore(array $params) {
 		$this->log('File "%s" restored from trash bin.',
 			['path' => $params['filePath']], ['path']
 		);

apps/admin_audit/lib/Actions/UserManagement.php

@@ -44,7 +44,7 @@ class UserManagement extends Action {
 	 *
 	 * @param array $params
 	 */
-	public function create(array $params): void {
+	public function create(array $params) {
 		$this->log(
 			'User created: "%s"',
 			$params,
@@ -59,7 +59,7 @@ class UserManagement extends Action {
 	 *
 	 * @param string $uid
 	 */
-	public function assign(string $uid): void {
+	public function assign(string $uid) {
 		$this->log(
 		'UserID assigned: "%s"',
 			[ 'uid' => $uid ],
@@ -72,7 +72,7 @@ class UserManagement extends Action {
 	 *
 	 * @param array $params
 	 */
-	public function delete(array $params): void {
+	public function delete(array $params) {
 		$this->log(
 			'User deleted: "%s"',
 			$params,
@@ -87,7 +87,7 @@ class UserManagement extends Action {
 	 *
 	 * @param string $uid
 	 */
-	public function unassign(string $uid): void {
+	public function unassign(string $uid) {
 		$this->log(
 			'UserID unassigned: "%s"',
 			[ 'uid' => $uid ],
@@ -100,7 +100,7 @@ class UserManagement extends Action {
 	 *
 	 * @param array $params
 	 */
-	public function change(array $params): void {
+	public function change(array $params) {
 		switch ($params['feature']) {
 			case 'enabled':
 				$this->log(
@@ -130,7 +130,7 @@ class UserManagement extends Action {
 	 *
 	 * @param IUser $user
 	 */
-	public function setPassword(IUser $user): void {
+	public function setPassword(IUser $user) {
 		if ($user->getBackendClassName() === 'Database') {
 			$this->log(
 				'Password of user "%s" has been changed',

apps/admin_audit/lib/Actions/Versions.php

@@ -29,7 +29,7 @@ declare(strict_types=1);
 namespace OCA\AdminAudit\Actions;
 
 class Versions extends Action {
-	public function rollback(array $params): void {
+	public function rollback(array $params) {
 		$this->log('Version "%s" of "%s" was restored.',
 			[
 				'version' => $params['revision'],
@@ -39,7 +39,7 @@ class Versions extends Action {
 		);
 	}
 
-	public function delete(array $params): void {
+	public function delete(array $params) {
 		$this->log('Version "%s" was deleted.',
 			['path' => $params['path']],
 			['path']

apps/admin_audit/lib/AppInfo/Application.php

@@ -8,7 +8,6 @@ declare(strict_types=1);
  * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
  * @author Bjoern Schiessle <bjoern@schiessle.org>
  * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Daniel Kesselberg <mail@danielkesselberg.de>
  * @author GrayFix <grayfix@gmail.com>
  * @author Joas Schilling <coding@schilljs.com>
  * @author Morris Jobke <hey@morrisjobke.de>
@@ -49,7 +48,6 @@ use OCA\AdminAudit\Actions\Sharing;
 use OCA\AdminAudit\Actions\Trashbin;
 use OCA\AdminAudit\Actions\UserManagement;
 use OCA\AdminAudit\Actions\Versions;
-use OCA\AdminAudit\Listener\CriticalActionPerformedEventListener;
 use OCP\App\ManagerEvent;
 use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IBootContext;
@@ -59,20 +57,19 @@ use OCP\Authentication\TwoFactorAuth\IProvider;
 use OCP\Console\ConsoleEvent;
 use OCP\IConfig;
 use OCP\IGroupManager;
+use OCP\ILogger;
 use OCP\IPreview;
 use OCP\IServerContainer;
 use OCP\IUserSession;
-use OCP\Log\Audit\CriticalActionPerformedEvent;
 use OCP\Log\ILogFactory;
 use OCP\Share;
 use OCP\Util;
-use Psr\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Application extends App implements IBootstrap {
 
-	/** @var LoggerInterface */
+	/** @var ILogger */
 	protected $logger;
 
 	public function __construct() {
@@ -80,11 +77,10 @@ class Application extends App implements IBootstrap {
 	}
 
 	public function register(IRegistrationContext $context): void {
-		$context->registerEventListener(CriticalActionPerformedEvent::class, CriticalActionPerformedEventListener::class);
 	}
 
 	public function boot(IBootContext $context): void {
-		/** @var LoggerInterface $logger */
+		/** @var ILogger $logger */
 		$logger = $context->injectFn(
 			Closure::fromCallable([$this, 'getLogger'])
 		);
@@ -97,22 +93,22 @@ class Application extends App implements IBootstrap {
 	}
 
 	private function getLogger(IConfig $config,
-							   LoggerInterface $logger,
-							   ILogFactory $logFactory): LoggerInterface {
+							   ILogger $logger,
+							   ILogFactory $logFactory): ILogger {
 		$default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
 		$logFile = $config->getAppValue('admin_audit', 'logfile', $default);
 
 		if ($logFile === null) {
 			return $logger;
 		}
-		return $logFactory->getCustomPsrLogger($logFile);
+		return $logFactory->getCustomLogger($logFile);
 	}
 
 	/**
 	 * Register hooks in order to log them
 	 */
-	private function registerHooks(LoggerInterface $logger,
-									 IServerContainer $serverContainer): void {
+	private function registerHooks(ILogger $logger,
+									 IServerContainer $serverContainer) {
 		$this->userManagementHooks($logger, $serverContainer->get(IUserSession::class));
 		$this->groupHooks($logger, $serverContainer->get(IGroupManager::class));
 		$this->authHooks($logger);
@@ -131,8 +127,8 @@ class Application extends App implements IBootstrap {
 		$this->securityHooks($logger, $eventDispatcher);
 	}
 
-	private function userManagementHooks(LoggerInterface $logger,
-										 IUserSession $userSession): void {
+	private function userManagementHooks(ILogger $logger,
+										 IUserSession $userSession) {
 		$userActions = new UserManagement($logger);
 
 		Util::connectHook('OC_User', 'post_createUser', $userActions, 'create');
@@ -145,8 +141,8 @@ class Application extends App implements IBootstrap {
 		$userSession->listen('\OC\User', 'postUnassignedUserId', [$userActions, 'unassign']);
 	}
 
-	private function groupHooks(LoggerInterface $logger,
-								IGroupManager $groupManager): void {
+	private function groupHooks(ILogger $logger,
+								IGroupManager $groupManager) {
 		$groupActions = new GroupManagement($logger);
 
 		assert($groupManager instanceof GroupManager);
@@ -156,7 +152,7 @@ class Application extends App implements IBootstrap {
 		$groupManager->listen('\OC\Group', 'postCreate', [$groupActions, 'createGroup']);
 	}
 
-	private function sharingHooks(LoggerInterface $logger): void {
+	private function sharingHooks(ILogger $logger) {
 		$shareActions = new Sharing($logger);
 
 		Util::connectHook(Share::class, 'post_shared', $shareActions, 'shared');
@@ -168,7 +164,7 @@ class Application extends App implements IBootstrap {
 		Util::connectHook(Share::class, 'share_link_access', $shareActions, 'shareAccessed');
 	}
 
-	private function authHooks(LoggerInterface $logger): void {
+	private function authHooks(ILogger $logger) {
 		$authActions = new Auth($logger);
 
 		Util::connectHook('OC_User', 'pre_login', $authActions, 'loginAttempt');
@@ -176,8 +172,8 @@ class Application extends App implements IBootstrap {
 		Util::connectHook('OC_User', 'logout', $authActions, 'logout');
 	}
 
-	private function appHooks(LoggerInterface $logger,
-							  EventDispatcherInterface $eventDispatcher): void {
+	private function appHooks(ILogger $logger,
+							  EventDispatcherInterface $eventDispatcher) {
 		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE, function (ManagerEvent $event) use ($logger) {
 			$appActions = new AppManagement($logger);
 			$appActions->enableApp($event->getAppID());
@@ -192,16 +188,16 @@ class Application extends App implements IBootstrap {
 		});
 	}
 
-	private function consoleHooks(LoggerInterface $logger,
-								  EventDispatcherInterface $eventDispatcher): void {
+	private function consoleHooks(ILogger $logger,
+								  EventDispatcherInterface $eventDispatcher) {
 		$eventDispatcher->addListener(ConsoleEvent::EVENT_RUN, function (ConsoleEvent $event) use ($logger) {
 			$appActions = new Console($logger);
 			$appActions->runCommand($event->getArguments());
 		});
 	}
 
-	private function fileHooks(LoggerInterface $logger,
-							   EventDispatcherInterface $eventDispatcher): void {
+	private function fileHooks(ILogger $logger,
+							   EventDispatcherInterface $eventDispatcher) {
 		$fileActions = new Files($logger);
 		$eventDispatcher->addListener(
 			IPreview::EVENT,
@@ -262,20 +258,20 @@ class Application extends App implements IBootstrap {
 		);
 	}
 
-	private function versionsHooks(LoggerInterface $logger): void {
+	private function versionsHooks(ILogger $logger) {
 		$versionsActions = new Versions($logger);
 		Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback');
 		Util::connectHook('\OCP\Versions', 'delete', $versionsActions, 'delete');
 	}
 
-	private function trashbinHooks(LoggerInterface $logger): void {
+	private function trashbinHooks(ILogger $logger) {
 		$trashActions = new Trashbin($logger);
 		Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete');
 		Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore');
 	}
 
-	private function securityHooks(LoggerInterface $logger,
-								   EventDispatcherInterface $eventDispatcher): void {
+	private function securityHooks(ILogger $logger,
+								   EventDispatcherInterface $eventDispatcher) {
 		$eventDispatcher->addListener(IProvider::EVENT_SUCCESS, function (GenericEvent $event) use ($logger) {
 			$security = new Security($logger);
 			$security->twofactorSuccess($event->getSubject(), $event->getArguments());

apps/admin_audit/lib/BackgroundJobs/Rotate.php

@@ -1,7 +1,4 @@
 <?php
-
-declare(strict_types=1);
-
 /**
  * @copyright Copyright (c) 2018 Arthur Schiwon <blizzz@arthur-schiwon.de>
  *
@@ -28,31 +25,26 @@ declare(strict_types=1);
 namespace OCA\AdminAudit\BackgroundJobs;
 
 use OC\BackgroundJob\TimedJob;
-use OCP\IConfig;
 use OCP\Log\RotationTrait;
 
 class Rotate extends TimedJob {
 	use RotationTrait;
 
-	/** @var IConfig */
-	private $config;
-
-	public function __construct(IConfig  $config) {
-		$this->config = $config;
-
-		$this->setInterval(60 * 60 * 3);
+	public function __construct() {
+		$this->setInterval(60*60*3);
 	}
 
 	protected function run($argument) {
-		$default = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
-		$this->filePath = $this->config->getAppValue('admin_audit', 'logfile', $default);
+		$config = \OC::$server->getConfig();
+		$default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
+		$this->filePath = $config->getAppValue('admin_audit', 'logfile', $default);
 
 		if ($this->filePath === '') {
 			// default log file, nothing to do
 			return;
 		}
 
-		$this->maxSize = $this->config->getSystemValue('log_rotate_size', 100 * 1024 * 1024);
+		$this->maxSize = $config->getSystemValue('log_rotate_size', 100 * 1024 * 1024);
 
 		if ($this->shouldRotateBySize()) {
 			$this->rotate();

apps/admin_audit/lib/Listener/CriticalActionPerformedEventListener.php

@@ -1,44 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * @copyright Copyright (c) 2021 Joas Schilling <coding@schilljs.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace OCA\AdminAudit\Listener;
-
-use OCA\AdminAudit\Actions\Action;
-use OCP\EventDispatcher\Event;
-use OCP\EventDispatcher\IEventListener;
-use OCP\Log\Audit\CriticalActionPerformedEvent;
-
-class CriticalActionPerformedEventListener extends Action implements IEventListener {
-	public function handle(Event $event): void {
-		if (!($event instanceof CriticalActionPerformedEvent)) {
-			return;
-		}
-
-		$this->log(
-			$event->getLogMessage(),
-			$event->getParameters(),
-			array_keys($event->getParameters()),
-			$event->getObfuscateParameters()
-		);
-	}
-}

apps/admin_audit/tests/Actions/SecurityTest.php

@@ -28,12 +28,12 @@ declare(strict_types=1);
 namespace OCA\AdminAudit\Tests\Actions;
 
 use OCA\AdminAudit\Actions\Security;
+use OCP\ILogger;
 use OCP\IUser;
-use Psr\Log\LoggerInterface;
 use Test\TestCase;
 
 class SecurityTest extends TestCase {
-	/** @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject */
+	/** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */
 	private $logger;
 
 	/** @var Security */
@@ -45,7 +45,7 @@ class SecurityTest extends TestCase {
 	protected function setUp(): void {
 		parent::setUp();
 
-		$this->logger = $this->createMock(LoggerInterface::class);
+		$this->logger = $this->createMock(ILogger::class);
 		$this->security = new Security($this->logger);
 
 		$this->user = $this->createMock(IUser::class);

apps/cloud_federation_api/appinfo/info.xml

@@ -5,7 +5,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.4.0</version>
+	<version>1.3.0</version>
 	<licence>agpl</licence>
 	<author>Bjoern Schiessle</author>
 	<namespace>CloudFederationAPI</namespace>
@@ -15,6 +15,6 @@
 	<category>files</category>
 	<bugs>https://github.com/nextcloud/cloud_federation/issues</bugs>
 	<dependencies>
-		<nextcloud min-version="22" max-version="22"/>
+		<nextcloud min-version="20" max-version="20"/>
 	</dependencies>
 </info>

apps/cloud_federation_api/composer/composer/ClassLoader.php

@@ -37,13 +37,11 @@ namespace Composer\Autoload;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Jordi Boggiano <j.boggiano@seld.be>
- * @see    https://www.php-fig.org/psr/psr-0/
- * @see    https://www.php-fig.org/psr/psr-4/
+ * @see    http://www.php-fig.org/psr/psr-0/
+ * @see    http://www.php-fig.org/psr/psr-4/
  */
 class ClassLoader
 {
-    private $vendorDir;
-
     // PSR-4
     private $prefixLengthsPsr4 = array();
     private $prefixDirsPsr4 = array();
@@ -59,13 +57,6 @@ class ClassLoader
     private $missingClasses = array();
     private $apcuPrefix;
 
-    private static $registeredLoaders = array();
-
-    public function __construct($vendorDir = null)
-    {
-        $this->vendorDir = $vendorDir;
-    }
-
     public function getPrefixes()
     {
         if (!empty($this->prefixesPsr0)) {
@@ -309,17 +300,6 @@ class ClassLoader
     public function register($prepend = false)
     {
         spl_autoload_register(array($this, 'loadClass'), true, $prepend);
-
-        if (null === $this->vendorDir) {
-            return;
-        }
-
-        if ($prepend) {
-            self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
-        } else {
-            unset(self::$registeredLoaders[$this->vendorDir]);
-            self::$registeredLoaders[$this->vendorDir] = $this;
-        }
     }
 
     /**
@@ -328,10 +308,6 @@ class ClassLoader
     public function unregister()
     {
         spl_autoload_unregister(array($this, 'loadClass'));
-
-        if (null !== $this->vendorDir) {
-            unset(self::$registeredLoaders[$this->vendorDir]);
-        }
     }
 
     /**
@@ -391,16 +367,6 @@ class ClassLoader
         return $file;
     }
 
-    /**
-     * Returns the currently registered loaders indexed by their corresponding vendor directories.
-     *
-     * @return self[]
-     */
-    public static function getRegisteredLoaders()
-    {
-        return self::$registeredLoaders;
-    }
-
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup

apps/cloud_federation_api/composer/composer/autoload_classmap.php

@@ -6,7 +6,6 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = $vendorDir;
 
 return array(
-    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
     'OCA\\CloudFederationAPI\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
     'OCA\\CloudFederationAPI\\Capabilities' => $baseDir . '/../lib/Capabilities.php',
     'OCA\\CloudFederationAPI\\Config' => $baseDir . '/../lib/Config.php',

apps/cloud_federation_api/composer/composer/autoload_real.php

@@ -23,12 +23,12 @@ class ComposerAutoloaderInitCloudFederationAPI
         }
 
         spl_autoload_register(array('ComposerAutoloaderInitCloudFederationAPI', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
         spl_autoload_unregister(array('ComposerAutoloaderInitCloudFederationAPI', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
-            require __DIR__ . '/autoload_static.php';
+            require_once __DIR__ . '/autoload_static.php';
 
             call_user_func(\Composer\Autoload\ComposerStaticInitCloudFederationAPI::getInitializer($loader));
         } else {

apps/cloud_federation_api/composer/composer/autoload_static.php

@@ -21,7 +21,6 @@ class ComposerStaticInitCloudFederationAPI
     );
 
     public static $classMap = array (
-        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
         'OCA\\CloudFederationAPI\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
         'OCA\\CloudFederationAPI\\Capabilities' => __DIR__ . '/..' . '/../lib/Capabilities.php',
         'OCA\\CloudFederationAPI\\Config' => __DIR__ . '/..' . '/../lib/Config.php',

apps/cloud_federation_api/lib/Controller/RequestHandlerController.php

@@ -38,11 +38,11 @@ use OCP\Federation\ICloudFederationFactory;
 use OCP\Federation\ICloudFederationProviderManager;
 use OCP\Federation\ICloudIdManager;
 use OCP\IGroupManager;
+use OCP\ILogger;
 use OCP\IRequest;
 use OCP\IURLGenerator;
 use OCP\IUserManager;
 use OCP\Share\Exceptions\ShareNotFound;
-use Psr\Log\LoggerInterface;
 
 /**
  * Class RequestHandlerController
@@ -53,7 +53,7 @@ use Psr\Log\LoggerInterface;
  */
 class RequestHandlerController extends Controller {
 
-	/** @var LoggerInterface */
+	/** @var ILogger */
 	private $logger;
 
 	/** @var IUserManager */
@@ -79,7 +79,7 @@ class RequestHandlerController extends Controller {
 
 	public function __construct($appName,
 								IRequest $request,
-								LoggerInterface $logger,
+								ILogger $logger,
 								IUserManager $userManager,
 								IGroupManager $groupManager,
 								IURLGenerator $urlGenerator,

apps/comments/appinfo/info.xml

@@ -5,7 +5,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.11.0</version>
+	<version>1.10.0</version>
 	<licence>agpl</licence>
 	<author>Arthur Schiwon</author>
 	<author>Vincent Petry</author>
@@ -17,7 +17,7 @@
 	<category>social</category>
 	<bugs>https://github.com/nextcloud/server/issues</bugs>
 	<dependencies>
-		<nextcloud min-version="22" max-version="22"/>
+		<nextcloud min-version="20" max-version="20"/>
 	</dependencies>
 
 	<activity>

apps/comments/composer/composer/ClassLoader.php

@@ -37,13 +37,11 @@ namespace Composer\Autoload;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Jordi Boggiano <j.boggiano@seld.be>
- * @see    https://www.php-fig.org/psr/psr-0/
- * @see    https://www.php-fig.org/psr/psr-4/
+ * @see    http://www.php-fig.org/psr/psr-0/
+ * @see    http://www.php-fig.org/psr/psr-4/
  */
 class ClassLoader
 {
-    private $vendorDir;
-
     // PSR-4
     private $prefixLengthsPsr4 = array();
     private $prefixDirsPsr4 = array();
@@ -59,13 +57,6 @@ class ClassLoader
     private $missingClasses = array();
     private $apcuPrefix;
 
-    private static $registeredLoaders = array();
-
-    public function __construct($vendorDir = null)
-    {
-        $this->vendorDir = $vendorDir;
-    }
-
     public function getPrefixes()
     {
         if (!empty($this->prefixesPsr0)) {
@@ -309,17 +300,6 @@ class ClassLoader
     public function register($prepend = false)
     {
         spl_autoload_register(array($this, 'loadClass'), true, $prepend);
-
-        if (null === $this->vendorDir) {
-            return;
-        }
-
-        if ($prepend) {
-            self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
-        } else {
-            unset(self::$registeredLoaders[$this->vendorDir]);
-            self::$registeredLoaders[$this->vendorDir] = $this;
-        }
     }
 
     /**
@@ -328,10 +308,6 @@ class ClassLoader
     public function unregister()
     {
         spl_autoload_unregister(array($this, 'loadClass'));
-
-        if (null !== $this->vendorDir) {
-            unset(self::$registeredLoaders[$this->vendorDir]);
-        }
     }
 
     /**
@@ -391,16 +367,6 @@ class ClassLoader
         return $file;
     }
 
-    /**
-     * Returns the currently registered loaders indexed by their corresponding vendor directories.
-     *
-     * @return self[]
-     */
-    public static function getRegisteredLoaders()
-    {
-        return self::$registeredLoaders;
-    }
-
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup

apps/comments/composer/composer/autoload_classmap.php

@@ -6,7 +6,6 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = $vendorDir;
 
 return array(
-    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
     'OCA\\Comments\\Activity\\Filter' => $baseDir . '/../lib/Activity/Filter.php',
     'OCA\\Comments\\Activity\\Listener' => $baseDir . '/../lib/Activity/Listener.php',
     'OCA\\Comments\\Activity\\Provider' => $baseDir . '/../lib/Activity/Provider.php',
@@ -16,10 +15,10 @@ return array(
     'OCA\\Comments\\Collaboration\\CommentersSorter' => $baseDir . '/../lib/Collaboration/CommentersSorter.php',
     'OCA\\Comments\\Controller\\Notifications' => $baseDir . '/../lib/Controller/Notifications.php',
     'OCA\\Comments\\EventHandler' => $baseDir . '/../lib/EventHandler.php',
+    'OCA\\Comments\\JSSettingsHelper' => $baseDir . '/../lib/JSSettingsHelper.php',
     'OCA\\Comments\\Listener\\CommentsEntityEventListener' => $baseDir . '/../lib/Listener/CommentsEntityEventListener.php',
     'OCA\\Comments\\Listener\\LoadAdditionalScripts' => $baseDir . '/../lib/Listener/LoadAdditionalScripts.php',
     'OCA\\Comments\\Listener\\LoadSidebarScripts' => $baseDir . '/../lib/Listener/LoadSidebarScripts.php',
-    'OCA\\Comments\\MaxAutoCompleteResultsInitialState' => $baseDir . '/../lib/MaxAutoCompleteResultsInitialState.php',
     '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',

apps/comments/composer/composer/autoload_real.php

@@ -23,12 +23,12 @@ class ComposerAutoloaderInitComments
         }
 
         spl_autoload_register(array('ComposerAutoloaderInitComments', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
         spl_autoload_unregister(array('ComposerAutoloaderInitComments', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
-            require __DIR__ . '/autoload_static.php';
+            require_once __DIR__ . '/autoload_static.php';
 
             call_user_func(\Composer\Autoload\ComposerStaticInitComments::getInitializer($loader));
         } else {

apps/comments/composer/composer/autoload_static.php

@@ -21,7 +21,6 @@ class ComposerStaticInitComments
     );
 
     public static $classMap = array (
-        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
         'OCA\\Comments\\Activity\\Filter' => __DIR__ . '/..' . '/../lib/Activity/Filter.php',
         'OCA\\Comments\\Activity\\Listener' => __DIR__ . '/..' . '/../lib/Activity/Listener.php',
         'OCA\\Comments\\Activity\\Provider' => __DIR__ . '/..' . '/../lib/Activity/Provider.php',
@@ -31,10 +30,10 @@ class ComposerStaticInitComments
         'OCA\\Comments\\Collaboration\\CommentersSorter' => __DIR__ . '/..' . '/../lib/Collaboration/CommentersSorter.php',
         'OCA\\Comments\\Controller\\Notifications' => __DIR__ . '/..' . '/../lib/Controller/Notifications.php',
         'OCA\\Comments\\EventHandler' => __DIR__ . '/..' . '/../lib/EventHandler.php',
+        'OCA\\Comments\\JSSettingsHelper' => __DIR__ . '/..' . '/../lib/JSSettingsHelper.php',
         'OCA\\Comments\\Listener\\CommentsEntityEventListener' => __DIR__ . '/..' . '/../lib/Listener/CommentsEntityEventListener.php',
         'OCA\\Comments\\Listener\\LoadAdditionalScripts' => __DIR__ . '/..' . '/../lib/Listener/LoadAdditionalScripts.php',
         'OCA\\Comments\\Listener\\LoadSidebarScripts' => __DIR__ . '/..' . '/../lib/Listener/LoadSidebarScripts.php',
-        'OCA\\Comments\\MaxAutoCompleteResultsInitialState' => __DIR__ . '/..' . '/../lib/MaxAutoCompleteResultsInitialState.php',
         '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',

apps/comments/js/comments-tab.js

@@ -1,24 +0,0 @@
-!function(e){var t={};function n(o){if(t[o])return t[o].exports;var r=t[o]={i:o,l:!1,exports:{}};return e[o].call(r.exports,r,r.exports,n),r.l=!0,r.exports}n.m=e,n.c=t,n.d=function(e,t,o){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:o})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var o=Object.create(null);if(n.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var r in e)n.d(o,r,function(t){return e[t]}.bind(null,r));return o},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="/js/",n(n.s=706)}({706:function(e,n){
-/**
- * @copyright Copyright (c) 2020 John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @author John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-let o=null;const r=new OCA.Files.Sidebar.Tab({id:"comments",name:t("comments","Comments"),icon:"icon-comment",async mount(e,t,n){o&&o.$destroy(),o=new OCA.Comments.View("files",{parent:n}),await o.update(t.id),o.$mount(e)},update(e){o.update(e.id)},destroy(){o.$destroy(),o=null},scrollBottomReached(){o.onScrollBottomReached()}});window.addEventListener("DOMContentLoaded",(function(){OCA.Files&&OCA.Files.Sidebar&&OCA.Files.Sidebar.registerTab(r)}))}});
-//# sourceMappingURL=comments-tab.js.map

apps/comments/lib/Activity/Provider.php

@@ -185,7 +185,7 @@ class Provider implements IProvider {
 		// they will get the dead entries in their stream.
 		return [
 			'actor' => $subjectParameters[0],
-			'fileId' => $event->getObjectId(),
+			'fileId' => (int) $event->getObjectId(),
 			'filePath' => trim($subjectParameters[1], '/'),
 		];
 	}
@@ -213,11 +213,17 @@ class Provider implements IProvider {
 					continue;
 				}
 
-				$message = str_replace('@"' . $mention['id'] . '"', '{mention' . $mentionCount . '}', $message);
-				if (strpos($mention['id'], ' ') === false && strpos($mention['id'], 'guest/') !== 0) {
-					$message = str_replace('@' . $mention['id'], '{mention' . $mentionCount . '}', $message);
+				$pattern = '/(^|\s)(' . '@' . $mention['id'] . ')(\b)/';
+				if (strpos($mention['id'], ' ') !== false) {
+					$pattern = '/(^|\s)(' . '@"' . $mention['id'] . '"' . ')(\b)?/';
 				}
 
+				$message = preg_replace(
+					$pattern,
+					//'${1}' . $this->regexSafeUser($mention['id'], $displayName) . '${3}',
+					'${1}' . '{mention' . $mentionCount . '}' . '${3}',
+					$message
+				);
 				$mentions['mention' . $mentionCount] = $this->generateUserParameter($mention['id']);
 				$mentionCount++;
 			}

apps/comments/lib/AppInfo/Application.php

@@ -31,10 +31,10 @@ use Closure;
 use OCA\Comments\Capabilities;
 use OCA\Comments\Controller\Notifications;
 use OCA\Comments\EventHandler;
+use OCA\Comments\JSSettingsHelper;
 use OCA\Comments\Listener\CommentsEntityEventListener;
 use OCA\Comments\Listener\LoadAdditionalScripts;
 use OCA\Comments\Listener\LoadSidebarScripts;
-use OCA\Comments\MaxAutoCompleteResultsInitialState;
 use OCA\Comments\Notification\Notifier;
 use OCA\Comments\Search\LegacyProvider;
 use OCA\Comments\Search\CommentsSearchProvider;
@@ -45,8 +45,10 @@ use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\Comments\CommentsEntityEvent;
+use OCP\IConfig;
 use OCP\ISearch;
 use OCP\IServerContainer;
+use OCP\Util;
 
 class Application extends App implements IBootstrap {
 	public const APP_ID = 'comments';
@@ -73,18 +75,22 @@ class Application extends App implements IBootstrap {
 			CommentsEntityEventListener::class
 		);
 		$context->registerSearchProvider(CommentsSearchProvider::class);
-
-		$context->registerInitialStateProvider(MaxAutoCompleteResultsInitialState::class);
-
-		$context->registerNotifierService(Notifier::class);
 	}
 
 	public function boot(IBootContext $context): void {
+		$context->injectFn(Closure::fromCallable([$this, 'registerNotifier']));
 		$context->injectFn(Closure::fromCallable([$this, 'registerCommentsEventHandler']));
 
+		$jsSettingsHelper = new JSSettingsHelper($context->getAppContainer()->get(IConfig::class));
+		Util::connectHook('\OCP\Config', 'js', $jsSettingsHelper, 'extend');
+
 		$context->getServerContainer()->get(ISearch::class)->registerProvider(LegacyProvider::class, ['apps' => ['files']]);
 	}
 
+	protected function registerNotifier(IServerContainer $container) {
+		$container->getNotificationManager()->registerNotifierService(Notifier::class);
+	}
+
 	protected function registerCommentsEventHandler(IServerContainer $container) {
 		$container->getCommentsManager()->registerEventHandler(function () {
 			return $this->getContainer()->query(EventHandler::class);

apps/comments/lib/EventHandler.php

@@ -42,7 +42,7 @@ class EventHandler implements ICommentsEventHandler {
 	private $notificationListener;
 
 	public function __construct(ActivityListener $activityListener, NotificationListener $notificationListener) {
-		$this->activityListener = $activityListener;
+		$this->activityListener     = $activityListener;
 		$this->notificationListener = $notificationListener;
 	}
 

apps/comments/lib/JSSettingsHelper.php

@@ -1,11 +1,9 @@
 <?php
-
-declare(strict_types=1);
-
 /**
- * @copyright Copyright (c) 2021 Roeland Jago Douma <roeland@famdouma.nl>
+ * @copyright Copyright (c) 2017 Arthur Schiwon <blizzz@arthur-schiwon.de>
  *
- * @author Roeland Jago Douma <roeland@famdouma.nl>
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ * @author Christoph Wurst <christoph@winzerhof-wurst.at>
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -26,23 +24,22 @@ declare(strict_types=1);
 
 namespace OCA\Comments;
 
-use OCP\AppFramework\Services\InitialStateProvider;
 use OCP\IConfig;
 
-class MaxAutoCompleteResultsInitialState extends InitialStateProvider {
-
+class JSSettingsHelper {
 	/** @var IConfig */
-	private $config;
+	private $c;
 
-	public function __construct(IConfig $config) {
-		$this->config = $config;
+	public function __construct(IConfig $c) {
+		$this->c = $c;
 	}
 
-	public function getKey(): string {
-		return 'maxAutoCompleteResults';
-	}
+	public function extend(array $settings) {
+		$appConfig = json_decode($settings['array']['oc_appconfig'], true);
 
-	public function getData(): int {
-		return (int)$this->config->getAppValue('comments', 'maxAutoCompleteResults', '10');
+		$value = (int)$this->c->getAppValue('comments', 'maxAutoCompleteResults', 10);
+		$appConfig['comments']['maxAutoCompleteResults'] = $value;
+
+		$settings['array']['oc_appconfig'] = json_encode($appConfig);
 	}
 }

apps/comments/lib/Listener/LoadSidebarScripts.php

@@ -29,30 +29,18 @@ namespace OCA\Comments\Listener;
 
 use OCA\Comments\AppInfo\Application;
 use OCA\Files\Event\LoadSidebar;
-use OCP\Comments\ICommentsManager;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\Util;
 
 class LoadSidebarScripts implements IEventListener {
-
-	/** @var ICommentsManager */
-	private $commentsManager;
-
-	public function __construct(ICommentsManager $commentsManager) {
-		$this->commentsManager = $commentsManager;
-	}
-
 	public function handle(Event $event): void {
 		if (!($event instanceof LoadSidebar)) {
 			return;
 		}
 
-		$this->commentsManager->load();
-
 		// TODO: make sure to only include the sidebar script when
 		// we properly split it between files list and sidebar
 		Util::addScript(Application::APP_ID, 'comments');
-		Util::addScript(Application::APP_ID, 'comments-tab');
 	}
 }

apps/comments/lib/Notification/Notifier.php

@@ -133,7 +133,7 @@ class Notifier implements INotifier {
 				if (strpos($path, '/' . $notification->getUser() . '/files/') === 0) {
 					// Remove /user/files/...
 					$fullPath = $path;
-					[,,, $path] = explode('/', $fullPath, 4);
+					list(,,, $path) = explode('/', $fullPath, 4);
 				}
 				$subjectParameters = [
 					'file' => [
@@ -155,7 +155,7 @@ class Notifier implements INotifier {
 						'name' => $displayName,
 					];
 				}
-				[$message, $messageParameters] = $this->commentToRichMessage($comment);
+				list($message, $messageParameters) = $this->commentToRichMessage($comment);
 				$notification->setRichSubject($subject, $subjectParameters)
 					->setParsedSubject($this->richToParsed($subject, $subjectParameters))
 					->setRichMessage($message, $messageParameters)
@@ -195,11 +195,7 @@ class Notifier implements INotifier {
 			// could contain characters like '@' for user IDs) but a one-based
 			// index of the mentions of that type.
 			$mentionParameterId = 'mention-' . $mention['type'] . $mentionTypeCount[$mention['type']];
-			$message = str_replace('@"' . $mention['id'] . '"', '{' . $mentionParameterId . '}', $message);
-			if (strpos($mention['id'], ' ') === false && strpos($mention['id'], 'guest/') !== 0) {
-				$message = str_replace('@' . $mention['id'], '{' . $mentionParameterId . '}', $message);
-			}
-
+			$message = str_replace('@' . $mention['id'], '{' . $mentionParameterId . '}', $message);
 			try {
 				$displayName = $this->commentsManager->resolveDisplayName($mention['type'], $mention['id']);
 			} catch (\OutOfBoundsException $e) {

apps/comments/src/activitytabviewplugin.js

@@ -1,24 +1,11 @@
 /**
+ * @author Joas Schilling <coding@schilljs.com>
  * Copyright (c) 2016
  *
- * @author Joas Schilling <coding@schilljs.com>
- * @author John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
  *
+ * See the COPYING-README file.
  */
 
 (function() {

apps/comments/src/app.js

@@ -1,23 +1,10 @@
-/**
+/*
  * Copyright (c) 2016 Vincent Petry <pvince81@owncloud.com>
  *
- * @author John Molakvoæ <skjnldsv@protonmail.com>
- * @author Vincent Petry <vincent@nextcloud.com>
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
  *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * See the COPYING-README file.
  *
  */
 

apps/comments/src/commentcollection.js

@@ -0,0 +1,167 @@
+/* eslint-disable */
+/*
+ * Copyright (c) 2016
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+(function(OC, OCA) {
+
+	/**
+	 * @class OCA.Comments.CommentCollection
+	 * @classdesc
+	 *
+	 * Collection of comments assigned to a file
+	 *
+	 */
+	var CommentCollection = OC.Backbone.Collection.extend(
+		/** @lends OCA.Comments.CommentCollection.prototype */ {
+
+			sync: OC.Backbone.davSync,
+
+			model: OCA.Comments.CommentModel,
+
+			/**
+		 * Object type
+		 *
+		 * @type string
+		 */
+			_objectType: 'files',
+
+			/**
+		 * Object id
+		 *
+		 * @type string
+		 */
+			_objectId: null,
+
+			/**
+		 * True if there are no more page results left to fetch
+		 *
+		 * @type bool
+		 */
+			_endReached: false,
+
+			/**
+		 * Number of comments to fetch per page
+		 *
+		 * @type int
+		 */
+			_limit: 20,
+
+			/**
+		 * Initializes the collection
+		 *
+		 * @param {string} [options.objectType] object type
+		 * @param {string} [options.objectId] object id
+		 */
+			initialize: function(models, options) {
+				options = options || {}
+				if (options.objectType) {
+					this._objectType = options.objectType
+				}
+				if (options.objectId) {
+					this._objectId = options.objectId
+				}
+			},
+
+			url: function() {
+				return OC.linkToRemote('dav') + '/comments/'
+				+ encodeURIComponent(this._objectType) + '/'
+				+ encodeURIComponent(this._objectId) + '/'
+			},
+
+			setObjectId: function(objectId) {
+				this._objectId = objectId
+			},
+
+			hasMoreResults: function() {
+				return !this._endReached
+			},
+
+			reset: function() {
+				this._endReached = false
+				this._summaryModel = null
+				return OC.Backbone.Collection.prototype.reset.apply(this, arguments)
+			},
+
+			/**
+		 * Fetch the next set of results
+		 */
+			fetchNext: function(options) {
+				var self = this
+				if (!this.hasMoreResults()) {
+					return null
+				}
+
+				var body = '<?xml version="1.0" encoding="utf-8" ?>\n'
+				+ '<oc:filter-comments xmlns:D="DAV:" xmlns:oc="http://owncloud.org/ns">\n'
+				// load one more so we know there is more
+				+ '    <oc:limit>' + (this._limit + 1) + '</oc:limit>\n'
+				+ '    <oc:offset>' + this.length + '</oc:offset>\n'
+				+ '</oc:filter-comments>\n'
+
+				options = options || {}
+				var success = options.success
+				options = _.extend({
+					remove: false,
+					parse: true,
+					data: body,
+					davProperties: CommentCollection.prototype.model.prototype.davProperties,
+					success: function(resp) {
+						if (resp.length <= self._limit) {
+						// no new entries, end reached
+							self._endReached = true
+						} else {
+						// remove last entry, for next page load
+							resp = _.initial(resp)
+						}
+						if (!self.set(resp, options)) {
+							return false
+						}
+						if (success) {
+							success.apply(null, arguments)
+						}
+						self.trigger('sync', 'REPORT', self, options)
+					}
+				}, options)
+
+				return this.sync('REPORT', this, options)
+			},
+
+			/**
+		 * Returns the matching summary model
+		 *
+		 * @returns {OCA.Comments.CommentSummaryModel} summary model
+		 */
+			getSummaryModel: function() {
+				if (!this._summaryModel) {
+					this._summaryModel = new OCA.Comments.CommentSummaryModel({
+						id: this._objectId,
+						objectType: this._objectType
+					})
+				}
+				return this._summaryModel
+			},
+
+			/**
+		 * Updates the read marker for this comment thread
+		 *
+		 * @param {Date} [date] optional date, defaults to now
+		 * @param {Object} [options] backbone options
+		 */
+			updateReadMarker: function(date, options) {
+				options = options || {}
+
+				return this.getSummaryModel().save({
+					readMarker: (date || new Date()).toUTCString()
+				}, options)
+			}
+		})
+
+	OCA.Comments.CommentCollection = CommentCollection
+})(OC, OCA)

apps/comments/src/commentmodel.js

@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2016
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+(function(OC, OCA) {
+
+	_.extend(OC.Files.Client, {
+		PROPERTY_FILEID: '{' + OC.Files.Client.NS_OWNCLOUD + '}id',
+		PROPERTY_MESSAGE: '{' + OC.Files.Client.NS_OWNCLOUD + '}message',
+		PROPERTY_ACTORTYPE: '{' + OC.Files.Client.NS_OWNCLOUD + '}actorType',
+		PROPERTY_ACTORID: '{' + OC.Files.Client.NS_OWNCLOUD + '}actorId',
+		PROPERTY_ISUNREAD: '{' + OC.Files.Client.NS_OWNCLOUD + '}isUnread',
+		PROPERTY_OBJECTID: '{' + OC.Files.Client.NS_OWNCLOUD + '}objectId',
+		PROPERTY_OBJECTTYPE: '{' + OC.Files.Client.NS_OWNCLOUD + '}objectType',
+		PROPERTY_ACTORDISPLAYNAME: '{' + OC.Files.Client.NS_OWNCLOUD + '}actorDisplayName',
+		PROPERTY_CREATIONDATETIME: '{' + OC.Files.Client.NS_OWNCLOUD + '}creationDateTime',
+		PROPERTY_MENTIONS: '{' + OC.Files.Client.NS_OWNCLOUD + '}mentions',
+	})
+
+	/**
+	 * @class OCA.Comments.CommentModel
+	 * @classdesc
+	 *
+	 * Comment
+	 *
+	 */
+	const CommentModel = OC.Backbone.Model.extend(
+		/** @lends OCA.Comments.CommentModel.prototype */ {
+			sync: OC.Backbone.davSync,
+
+			defaults: {
+				actorType: 'users',
+				objectType: 'files',
+			},
+
+			davProperties: {
+				id: OC.Files.Client.PROPERTY_FILEID,
+				message: OC.Files.Client.PROPERTY_MESSAGE,
+				actorType: OC.Files.Client.PROPERTY_ACTORTYPE,
+				actorId: OC.Files.Client.PROPERTY_ACTORID,
+				actorDisplayName: OC.Files.Client.PROPERTY_ACTORDISPLAYNAME,
+				creationDateTime: OC.Files.Client.PROPERTY_CREATIONDATETIME,
+				objectType: OC.Files.Client.PROPERTY_OBJECTTYPE,
+				objectId: OC.Files.Client.PROPERTY_OBJECTID,
+				isUnread: OC.Files.Client.PROPERTY_ISUNREAD,
+				mentions: OC.Files.Client.PROPERTY_MENTIONS,
+			},
+
+			parse(data) {
+				return {
+					id: data.id,
+					message: data.message,
+					actorType: data.actorType,
+					actorId: data.actorId,
+					actorDisplayName: data.actorDisplayName,
+					creationDateTime: data.creationDateTime,
+					objectType: data.objectType,
+					objectId: data.objectId,
+					isUnread: (data.isUnread === 'true'),
+					mentions: this._parseMentions(data.mentions),
+				}
+			},
+
+			_parseMentions(mentions) {
+				if (_.isUndefined(mentions)) {
+					return {}
+				}
+				const result = {}
+				for (const i in mentions) {
+					const mention = mentions[i]
+					if (_.isUndefined(mention.localName) || mention.localName !== 'mention') {
+						continue
+					}
+					result[i] = {}
+					for (let child = mention.firstChild; child; child = child.nextSibling) {
+						if (_.isUndefined(child.localName) || !child.localName.startsWith('mention')) {
+							continue
+						}
+						result[i][child.localName] = child.textContent
+					}
+				}
+				return result
+			},
+		})
+
+	OCA.Comments.CommentModel = CommentModel
+})(OC, OCA)

apps/comments/src/comments-app.js

@@ -1,32 +0,0 @@
-/**
- * @copyright Copyright (c) 2020 John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @author John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-import CommentsInstance from './services/CommentsInstance'
-
-// Init Comments
-if (window.OCA && !window.OCA.Comments) {
-	Object.assign(window.OCA, { Comments: {} })
-}
-
-// Init Comments App view
-Object.assign(window.OCA.Comments, { View: CommentsInstance })
-console.debug('OCA.Comments.View initialized')

apps/comments/src/comments-tab.js

@@ -1,58 +0,0 @@
-/**
- * @copyright Copyright (c) 2020 John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @author John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-// Init Comments tab component
-let TabInstance = null
-const commentTab = new OCA.Files.Sidebar.Tab({
-	id: 'comments',
-	name: t('comments', 'Comments'),
-	icon: 'icon-comment',
-
-	async mount(el, fileInfo, context) {
-		if (TabInstance) {
-			TabInstance.$destroy()
-		}
-		TabInstance = new OCA.Comments.View('files', {
-			// Better integration with vue parent component
-			parent: context,
-		})
-		// Only mount after we have all the info we need
-		await TabInstance.update(fileInfo.id)
-		TabInstance.$mount(el)
-	},
-	update(fileInfo) {
-		TabInstance.update(fileInfo.id)
-	},
-	destroy() {
-		TabInstance.$destroy()
-		TabInstance = null
-	},
-	scrollBottomReached() {
-		TabInstance.onScrollBottomReached()
-	},
-})
-
-window.addEventListener('DOMContentLoaded', function() {
-	if (OCA.Files && OCA.Files.Sidebar) {
-		OCA.Files.Sidebar.registerTab(commentTab)
-	}
-})

apps/comments/src/comments.js

@@ -1,29 +1,17 @@
-/**
- * @copyright Copyright (c) 2016 Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @author John Molakvoæ <skjnldsv@protonmail.com>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
 import './app'
 import './templates'
+import './commentmodel'
+import './commentcollection'
+import './commentsummarymodel'
+import './commentstabview'
+import './commentsmodifymenu'
 import './filesplugin'
 import './activitytabviewplugin'
 
+import './vendor/Caret.js/dist/jquery.caret.min'
+import './vendor/At.js/dist/js/jquery.atwho.min'
+
+import './style/autocomplete.scss'
+import './style/comments.scss'
+
 window.OCA.Comments = OCA.Comments

apps/comments/src/commentsmodifymenu.js

@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2018
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+(function() {
+
+	/**
+	 * Construct a new CommentsModifyMenuinstance
+	 * @constructs CommentsModifyMenu
+	 * @memberof OC.Comments
+	 * @private
+	 */
+	const CommentsModifyMenu = OC.Backbone.View.extend({
+		tagName: 'div',
+		className: 'commentsModifyMenu popovermenu bubble menu',
+		_scopes: [
+			{
+				name: 'edit',
+				displayName: t('comments', 'Edit comment'),
+				iconClass: 'icon-rename',
+			},
+			{
+				name: 'delete',
+				displayName: t('comments', 'Delete comment'),
+				iconClass: 'icon-delete',
+			},
+		],
+		initialize() {
+
+		},
+		events: {
+			'click a.action': '_onClickAction',
+		},
+
+		/**
+		 * Event handler whenever an action has been clicked within the menu
+		 *
+		 * @param {Object} event event object
+		 */
+		_onClickAction(event) {
+			let $target = $(event.currentTarget)
+			if (!$target.hasClass('menuitem')) {
+				$target = $target.closest('.menuitem')
+			}
+
+			OC.hideMenus()
+
+			this.trigger('select:menu-item-clicked', event, $target.data('action'))
+		},
+
+		/**
+		 * Renders the menu with the currently set items
+		 */
+		render() {
+			this.$el.html(OCA.Comments.Templates.commentsmodifymenu({
+				items: this._scopes,
+			}))
+		},
+
+		/**
+		 * Displays the menu
+		 * @param {Event} context the click event
+		 */
+		show(context) {
+			this._context = context
+
+			for (const i in this._scopes) {
+				this._scopes[i].active = false
+			}
+
+			const $el = $(context.target)
+			const offsetIcon = $el.offset()
+			const offsetContainer = $el.closest('.authorRow').offset()
+
+			// adding some extra top offset to push the menu below the button.
+			const position = {
+				top: offsetIcon.top - offsetContainer.top + 48,
+				left: '',
+				right: '',
+			}
+
+			position.left = offsetIcon.left - offsetContainer.left
+
+			if (position.left > 200) {
+				// we need to position the menu to the right.
+				position.left = ''
+				position.right = this.$el.closest('.comment').find('.date').width()
+				this.$el.removeClass('menu-left').addClass('menu-right')
+			} else {
+				this.$el.removeClass('menu-right').addClass('menu-left')
+			}
+			this.$el.css(position)
+			this.render()
+			this.$el.removeClass('hidden')
+
+			OC.showMenu(null, this.$el)
+		},
+	})
+
+	OCA.Comments = OCA.Comments || {}
+	OCA.Comments.CommentsModifyMenu = CommentsModifyMenu
+})(OC, OCA)

apps/comments/src/commentstabview.js

@@ -0,0 +1,756 @@
+/* eslint-disable */
+/**
+ * Copyright (c) 2016
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+/* global Handlebars */
+
+import escapeHTML from 'escape-html'
+
+(function(OC, OCA) {
+
+	/**
+	 * @memberof OCA.Comments
+	 */
+	var CommentsTabView = OCA.Files.DetailTabView.extend(
+		/** @lends OCA.Comments.CommentsTabView.prototype */ {
+			id: 'commentsTabView',
+			className: 'tab commentsTabView',
+			_autoCompleteData: undefined,
+			_commentsModifyMenu: undefined,
+
+			events: {
+				'submit .newCommentForm': '_onSubmitComment',
+				'click .showMore': '_onClickShowMore',
+				'click .cancel': '_onClickCloseComment',
+				'click .comment': '_onClickComment',
+				'keyup div.message': '_onTextChange',
+				'change div.message': '_onTextChange',
+				'input div.message': '_onTextChange',
+				'paste div.message': '_onPaste'
+			},
+
+			_commentMaxLength: 1000,
+
+			initialize: function() {
+				OCA.Files.DetailTabView.prototype.initialize.apply(this, arguments)
+				this.collection = new OCA.Comments.CommentCollection()
+				this.collection.on('request', this._onRequest, this)
+				this.collection.on('sync', this._onEndRequest, this)
+				this.collection.on('add', this._onAddModel, this)
+				this.collection.on('change:message', this._onChangeModel, this)
+
+				this._commentMaxThreshold = this._commentMaxLength * 0.9
+
+				// TODO: error handling
+				_.bindAll(this, '_onTypeComment', '_initAutoComplete', '_onAutoComplete')
+			},
+
+			template: function(params) {
+				var currentUser = OC.getCurrentUser()
+				return OCA.Comments.Templates['view'](_.extend({
+					actorId: currentUser.uid,
+					actorDisplayName: currentUser.displayName
+				}, params))
+			},
+
+			editCommentTemplate: function(params) {
+				var currentUser = OC.getCurrentUser()
+				return OCA.Comments.Templates['edit_comment'](_.extend({
+					actorId: currentUser.uid,
+					actorDisplayName: currentUser.displayName,
+					newMessagePlaceholder: t('comments', 'New comment …'),
+					submitText: t('comments', 'Post'),
+					cancelText: t('comments', 'Cancel'),
+					tag: 'li'
+				}, params))
+			},
+
+			commentTemplate: function(params) {
+				params = _.extend({
+					editTooltip: t('comments', 'Edit comment'),
+					isUserAuthor: OC.getCurrentUser().uid === params.actorId,
+					isLong: this._isLong(params.message)
+				}, params)
+
+				if (params.actorType === 'deleted_users') {
+				// makes the avatar a X
+					params.actorId = null
+					params.actorDisplayName = t('comments', '[Deleted user]')
+				}
+
+				return OCA.Comments.Templates['comment'](params)
+			},
+
+			getLabel: function() {
+				return t('comments', 'Comments')
+			},
+
+			getIcon: function() {
+				return 'icon-comment'
+			},
+
+			setFileInfo: function(fileInfo) {
+				if (fileInfo) {
+					this.model = fileInfo
+
+					this.render()
+					this._initAutoComplete($('#commentsTabView').find('.newCommentForm .message'))
+					this.collection.setObjectId(this.model.id)
+					// reset to first page
+					this.collection.reset([], { silent: true })
+					this.nextPage()
+				} else {
+					this.model = null
+					this.render()
+					this.collection.reset()
+				}
+			},
+
+			render: function() {
+				this.$el.html(this.template({
+					emptyResultLabel: t('comments', 'No comments yet, start the conversation!'),
+					moreLabel: t('comments', 'More comments …')
+				}))
+				this.$el.find('.comments').before(this.editCommentTemplate({ tag: 'div' }))
+				this.$el.find('.has-tooltip').tooltip()
+				this.$container = this.$el.find('ul.comments')
+				this.$el.find('.avatar').avatar(OC.getCurrentUser().uid, 32)
+				this.delegateEvents()
+				this.$el.find('.message').on('keydown input change', this._onTypeComment)
+
+				autosize(this.$el.find('.newCommentRow .message'))
+				this.$el.find('.newCommentForm .message').focus()
+			},
+
+			_initAutoComplete: function($target) {
+				var s = this
+				var limit = 10
+				if (!_.isUndefined(OC.appConfig.comments)) {
+					limit = OC.appConfig.comments.maxAutoCompleteResults
+				}
+				$target.atwho({
+					at: '@',
+					limit: limit,
+					callbacks: {
+						remoteFilter: s._onAutoComplete,
+						highlighter: function(li) {
+						// misuse the highlighter callback to instead of
+						// highlighting loads the avatars.
+							var $li = $(li)
+							$li.find('.avatar').avatar(undefined, 32)
+							return $li
+						},
+						sorter: function(q, items) { return items }
+					},
+					displayTpl: function(item) {
+						return '<li>'
+						+ '<span class="avatar-name-wrapper">'
+							+ '<span class="avatar" '
+									+ 'data-username="' + escapeHTML(item.id) + '" ' // for avatars
+									+ 'data-user="' + escapeHTML(item.id) + '" ' // for contactsmenu
+									+ 'data-user-display-name="' + escapeHTML(item.label) + '">'
+							+ '</span>'
+							+ '<strong>' + escapeHTML(item.label) + '</strong>'
+						+ '</span></li>'
+					},
+					insertTpl: function(item) {
+						return ''
+						+ '<span class="avatar-name-wrapper">'
+							+ '<span class="avatar" '
+									+ 'data-username="' + escapeHTML(item.id) + '" ' // for avatars
+									+ 'data-user="' + escapeHTML(item.id) + '" ' // for contactsmenu
+									+ 'data-user-display-name="' + escapeHTML(item.label) + '">'
+							+ '</span>'
+							+ '<strong>' + escapeHTML(item.label) + '</strong>'
+						+ '</span>'
+					},
+					searchKey: 'label'
+				})
+				$target.on('inserted.atwho', function(je, $el) {
+					var editionMode = true
+					s._postRenderItem(
+					// we need to pass the parent of the inserted element
+					// passing the whole comments form would re-apply and request
+					// avatars from the server
+						$(je.target).find(
+							'span[data-username="' + $el.find('[data-username]').data('username') + '"]'
+						).parent(),
+						editionMode
+					)
+				})
+			},
+
+			_onAutoComplete: function(query, callback) {
+				var s = this
+				if (!_.isUndefined(this._autoCompleteRequestTimer)) {
+					clearTimeout(this._autoCompleteRequestTimer)
+				}
+				this._autoCompleteRequestTimer = _.delay(function() {
+					if (!_.isUndefined(this._autoCompleteRequestCall)) {
+						this._autoCompleteRequestCall.abort()
+					}
+					this._autoCompleteRequestCall = $.ajax({
+						url: OC.linkToOCS('core', 2) + 'autocomplete/get',
+						data: {
+							search: query,
+							itemType: 'files',
+							itemId: s.model.get('id'),
+							sorter: 'commenters|share-recipients',
+							limit: OC.appConfig.comments.maxAutoCompleteResults
+						},
+						beforeSend: function(request) {
+							request.setRequestHeader('Accept', 'application/json')
+						},
+						success: function(result) {
+							callback(result.ocs.data)
+						}
+					})
+				}, 400)
+			},
+
+			_formatItem: function(commentModel) {
+				var timestamp = new Date(commentModel.get('creationDateTime')).getTime()
+				var data = _.extend({
+					timestamp: timestamp,
+					date: OC.Util.relativeModifiedDate(timestamp),
+					altDate: OC.Util.formatDate(timestamp),
+					formattedMessage: this._formatMessage(commentModel.get('message'), commentModel.get('mentions'))
+				}, commentModel.attributes)
+				return data
+			},
+
+			_toggleLoading: function(state) {
+				this._loading = state
+				this.$el.find('.loading').toggleClass('hidden', !state)
+			},
+
+			_onRequest: function(type) {
+				if (type === 'REPORT') {
+					this._toggleLoading(true)
+					this.$el.find('.showMore').addClass('hidden')
+				}
+			},
+
+			_onEndRequest: function(type) {
+				var fileInfoModel = this.model
+				this._toggleLoading(false)
+				this.$el.find('.emptycontent').toggleClass('hidden', !!this.collection.length)
+				this.$el.find('.showMore').toggleClass('hidden', !this.collection.hasMoreResults())
+
+				if (type !== 'REPORT') {
+					return
+				}
+
+				// find first unread comment
+				var firstUnreadComment = this.collection.findWhere({ isUnread: true })
+				if (firstUnreadComment) {
+				// update read marker
+					this.collection.updateReadMarker(
+						null,
+						{
+							success: function() {
+								fileInfoModel.set('commentsUnread', 0)
+							}
+						}
+					)
+				}
+				this.$el.find('.newCommentForm .message').focus()
+
+			},
+
+			/**
+			 * takes care of post-rendering after a new comment was added to the
+			 * collection
+			 *
+			 * @param model
+			 * @param collection
+			 * @param options
+			 * @private
+			 */
+			_onAddModel: function(model, collection, options) {
+			// we need to render it immediately, to ensure that the right
+			// order of comments is kept on opening comments tab
+				var $comment = $(this.commentTemplate(this._formatItem(model)))
+				if (!_.isUndefined(options.at) && collection.length > 1) {
+					this.$container.find('li').eq(options.at).before($comment)
+				} else {
+					this.$container.append($comment)
+				}
+				this._postRenderItem($comment)
+				$('#commentsTabView').find('.newCommentForm div.message').text('').prop('contenteditable', true)
+
+				// we need to update the model, because it consists of client data
+				// only, but the server might add meta data, e.g. about mentions
+				var oldMentions = model.get('mentions')
+				var self = this
+				model.fetch({
+					success: function(model) {
+						if (_.isEqual(oldMentions, model.get('mentions'))) {
+						// don't attempt to render if unnecessary, avoids flickering
+							return
+						}
+						var $updated = $(self.commentTemplate(self._formatItem(model)))
+						$comment.html($updated.html())
+						self._postRenderItem($comment)
+					}
+				})
+
+			},
+
+			/**
+			 * takes care of post-rendering after a new comment was edited
+			 *
+			 * @param model
+			 * @private
+			 */
+			_onChangeModel: function(model) {
+				if (model.get('message').trim() === model.previous('message').trim()) {
+					return
+				}
+
+				var $form = this.$container.find('.comment[data-id="' + model.id + '"] form')
+				var $row = $form.closest('.comment')
+				var $target = $row.data('commentEl')
+				if (_.isUndefined($target)) {
+				// ignore noise – this is only set after editing a comment and hitting post
+					return
+				}
+				var self = this
+
+				// we need to update the model, because it consists of client data
+				// only, but the server might add meta data, e.g. about mentions
+				model.fetch({
+					success: function(model) {
+						$target.removeClass('hidden')
+						$row.remove()
+
+						var $message = $target.find('.message')
+						$message
+							.html(self._formatMessage(model.get('message'), model.get('mentions')))
+							.find('.avatar')
+							.each(function() { $(this).avatar() })
+						self._postRenderItem($message)
+					}
+				})
+			},
+
+			_postRenderItem: function($el, editionMode) {
+				$el.find('.has-tooltip').tooltip()
+				var inlineAvatars = $el.find('.message .avatar')
+				if ($($el.context).hasClass('message')) {
+					inlineAvatars = $el.find('.avatar')
+				}
+				inlineAvatars.each(function() {
+					var $this = $(this)
+					$this.avatar($this.attr('data-username'), 16)
+				})
+				$el.find('.authorRow .avatar').each(function() {
+					var $this = $(this)
+					$this.avatar($this.attr('data-username'), 32)
+				})
+
+				var username = $el.find('.avatar').data('username')
+				if (username !== OC.getCurrentUser().uid) {
+					$el.find('.authorRow .avatar, .authorRow .author').contactsMenu(
+						username, 0, $el.find('.authorRow'))
+				}
+
+				var $message = $el.find('.message')
+				if ($message.length === 0) {
+				// it is the case when writing a comment and mentioning a person
+					$message = $el
+				}
+
+				if (!editionMode) {
+					var self = this
+					// add the dropdown menu to display the edit and delete option
+					var modifyCommentMenu = new OCA.Comments.CommentsModifyMenu()
+					$el.find('.authorRow').append(modifyCommentMenu.$el)
+					$el.find('.more').on('click', _.bind(modifyCommentMenu.show, modifyCommentMenu))
+
+					self.listenTo(modifyCommentMenu, 'select:menu-item-clicked', function(ev, action) {
+						if (action === 'edit') {
+							self._onClickEditComment(ev)
+						} else if (action === 'delete') {
+							self._onClickDeleteComment(ev)
+						}
+					})
+				}
+
+				this._postRenderMessage($message, editionMode)
+			},
+
+			_postRenderMessage: function($el, editionMode) {
+				if (editionMode) {
+					return
+				}
+
+				$el.find('.avatar-name-wrapper').each(function() {
+					var $this = $(this)
+					var $avatar = $this.find('.avatar')
+
+					var user = $avatar.data('user')
+					if (user !== OC.getCurrentUser().uid) {
+						$this.contactsMenu(user, 0, $this)
+					}
+				})
+			},
+
+			/**
+			 * Convert a message to be displayed in HTML,
+			 * converts newlines to <br> tags.
+			 */
+			_formatMessage: function(message, mentions, editMode) {
+				message = escapeHTML(message).replace(/\n/g, '<br/>')
+
+				for (var i in mentions) {
+					if (!mentions.hasOwnProperty(i)) {
+						return
+					}
+					var mention = '@' + mentions[i].mentionId
+					if (mentions[i].mentionId.indexOf(' ') !== -1) {
+						mention = _.escape('@"' + mentions[i].mentionId + '"')
+					}
+
+					// escape possible regex characters in the name
+					mention = mention.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+					var regex = new RegExp('(^|\\s)(' + mention + ')\\b', 'g')
+					if (mentions[i].mentionId.indexOf(' ') !== -1) {
+						regex = new RegExp('(^|\\s)(' + mention + ')', 'g')
+					}
+
+					var displayName = this._composeHTMLMention(mentions[i].mentionId, mentions[i].mentionDisplayName)
+
+					// replace every mention either at the start of the input or after a whitespace
+					// followed by a non-word character.
+					message = message.replace(regex,
+						function(match, p1) {
+						// to  get number of whitespaces (0 vs 1) right
+							return p1 + displayName
+						}
+					)
+				}
+				if (editMode !== true) {
+					message = OCP.Comments.plainToRich(message)
+				}
+				return message
+			},
+
+			_composeHTMLMention: function(uid, displayName) {
+				var avatar = ''
+				+ '<span class="avatar" '
+						+ 'data-username="' + _.escape(uid) + '" '
+						+ 'data-user="' + _.escape(uid) + '" '
+						+ 'data-user-display-name="' + _.escape(displayName) + '">'
+				+ '</span>'
+
+				var isCurrentUser = (uid === OC.getCurrentUser().uid)
+
+				return ''
+				+ '<span class="atwho-inserted" contenteditable="false">'
+					+ '<span class="avatar-name-wrapper' + (isCurrentUser ? ' currentUser' : '') + '">'
+						+ avatar
+						+ '<strong>' + _.escape(displayName) + '</strong>'
+					+ '</span>'
+				+ '</span>'
+			},
+
+			nextPage: function() {
+				if (this._loading || !this.collection.hasMoreResults()) {
+					return
+				}
+
+				this.collection.fetchNext()
+			},
+
+			_onClickEditComment: function(ev) {
+				ev.preventDefault()
+				var $comment = $(ev.target).closest('.comment')
+				var commentId = $comment.data('id')
+				var commentToEdit = this.collection.get(commentId)
+				var $formRow = $(this.editCommentTemplate(_.extend({
+					isEditMode: true,
+					submitText: t('comments', 'Save')
+				}, commentToEdit.attributes)))
+
+				$comment.addClass('hidden').removeClass('collapsed')
+				// spawn form
+				$comment.after($formRow)
+				$formRow.data('commentEl', $comment)
+				$formRow.find('.message').on('keydown input change', this._onTypeComment)
+
+				// copy avatar element from original to avoid flickering
+				$formRow.find('.avatar:first').replaceWith($comment.find('.avatar:first').clone())
+				$formRow.find('.has-tooltip').tooltip()
+
+				var $message = $formRow.find('.message')
+				$message
+					.html(this._formatMessage(commentToEdit.get('message'), commentToEdit.get('mentions'), true))
+					.find('.avatar')
+					.each(function() { $(this).avatar() })
+				var editionMode = true
+				this._postRenderItem($message, editionMode)
+
+				// Enable autosize
+				autosize($formRow.find('.message'))
+
+				// enable autocomplete
+				this._initAutoComplete($formRow.find('.message'))
+
+				return false
+			},
+
+			_onTypeComment: function(ev) {
+				var $field = $(ev.target)
+				var len = $field.text().length
+				var $submitButton = $field.data('submitButtonEl')
+				if (!$submitButton) {
+					$submitButton = $field.closest('form').find('.submit')
+					$field.data('submitButtonEl', $submitButton)
+				}
+				$field.tooltip('hide')
+				if (len > this._commentMaxThreshold) {
+					$field.attr('data-original-title', t('comments', 'Allowed characters {count} of {max}', { count: len, max: this._commentMaxLength }))
+					$field.tooltip({ trigger: 'manual' })
+					$field.tooltip('show')
+					$field.addClass('error')
+				}
+
+				var limitExceeded = (len > this._commentMaxLength)
+				$field.toggleClass('error', limitExceeded)
+				$submitButton.prop('disabled', limitExceeded)
+
+				// Submits form with Enter, but Shift+Enter is a new line. If the
+				// autocomplete popover is being shown Enter does not submit the
+				// form either; it will be handled by At.js which will add the
+				// currently selected item to the message.
+				if (ev.keyCode === 13 && !ev.shiftKey && !$field.atwho('isSelecting')) {
+					$submitButton.click()
+					ev.preventDefault()
+				}
+			},
+
+			_onClickComment: function(ev) {
+				var $row = $(ev.target)
+				if (!$row.is('.comment')) {
+					$row = $row.closest('.comment')
+				}
+				$row.removeClass('collapsed')
+			},
+
+			_onClickCloseComment: function(ev) {
+				ev.preventDefault()
+				var $row = $(ev.target).closest('.comment')
+				$row.data('commentEl').removeClass('hidden')
+				$row.remove()
+				return false
+			},
+
+			_onClickDeleteComment: function(ev) {
+				ev.preventDefault()
+				var $comment = $(ev.target).closest('.comment')
+				var commentId = $comment.data('id')
+				var $loading = $comment.find('.deleteLoading')
+				var $moreIcon = $comment.find('.more')
+
+				$comment.addClass('disabled')
+				$loading.removeClass('hidden')
+				$moreIcon.addClass('hidden')
+
+				$comment.data('commentEl', $comment)
+
+				this.collection.get(commentId).destroy({
+					success: function() {
+						$comment.data('commentEl').remove()
+						$comment.remove()
+					},
+					error: function() {
+						$loading.addClass('hidden')
+						$moreIcon.removeClass('hidden')
+						$comment.removeClass('disabled')
+
+						OC.Notification.showTemporary(t('comments', 'Error occurred while retrieving comment with ID {id}', { id: commentId }))
+					}
+				})
+
+				return false
+			},
+
+			_onClickShowMore: function(ev) {
+				ev.preventDefault()
+				this.nextPage()
+			},
+
+			/**
+		 * takes care of updating comment element states after submit (either new
+		 * comment or edit).
+		 *
+		 * @param {OC.Backbone.Model} model
+		 * @param {jQuery} $form
+		 * @private
+		 */
+			_onSubmitSuccess: function(model, $form) {
+				var $submit = $form.find('.submit')
+				var $loading = $form.find('.submitLoading')
+				var $message = $form.find('.message')
+
+				$submit.removeClass('hidden')
+				$loading.addClass('hidden')
+				$message.prop('contenteditable', true)
+				$message.text('')
+			},
+
+			_commentBodyHTML2Plain: function($el) {
+				var $comment = $el.clone()
+
+				$comment.find('.avatar-name-wrapper').each(function() {
+					var $this = $(this)
+					var $inserted = $this.parent()
+					var userId = $this.find('.avatar').data('username').toString()
+					if (userId.indexOf(' ') !== -1) {
+						$inserted.html('@"' + userId + '"')
+					} else {
+						$inserted.html('@' + userId)
+					}
+				})
+
+				$comment.html(OCP.Comments.richToPlain($comment.html()))
+
+				var oldHtml
+				var html = $comment.html()
+				do {
+				// replace works one by one
+					oldHtml = html
+					html = oldHtml.replace('<br>', '\n')	// preserve line breaks
+				} while (oldHtml !== html)
+				$comment.html(html)
+
+				return $comment.text()
+			},
+
+			_onSubmitComment: function(e) {
+				var self = this
+				var $form = $(e.target)
+				var commentId = $form.closest('.comment').data('id')
+				var currentUser = OC.getCurrentUser()
+				var $submit = $form.find('.submit')
+				var $loading = $form.find('.submitLoading')
+				var $commentField = $form.find('.message')
+				var message = $commentField.text().trim()
+				e.preventDefault()
+
+				if (!message.length || message.length > this._commentMaxLength) {
+					return
+				}
+
+				$commentField.prop('contenteditable', false)
+				$submit.addClass('hidden')
+				$loading.removeClass('hidden')
+
+				message = this._commentBodyHTML2Plain($commentField)
+				if (commentId) {
+					// edit mode
+					var comment = this.collection.get(commentId)
+					comment.save({
+						message: message
+					}, {
+						success: function(model) {
+							self._onSubmitSuccess(model, $form)
+							if (model.get('message').trim() === model.previous('message').trim()) {
+								// model change event doesn't trigger, manually remove the row.
+								var $row = $form.closest('.comment')
+								$row.data('commentEl').removeClass('hidden')
+								$row.remove()
+							}
+						},
+						error: function() {
+							self._onSubmitError($form, commentId)
+						}
+					})
+				} else {
+					this.collection.create({
+						actorId: currentUser.uid,
+						actorDisplayName: currentUser.displayName,
+						actorType: 'users',
+						verb: 'comment',
+						message: message,
+						creationDateTime: (new Date()).toUTCString()
+					}, {
+						at: 0,
+						// wait for real creation before adding
+						wait: true,
+						success: function(model) {
+							self._onSubmitSuccess(model, $form)
+						},
+						error: function() {
+							self._onSubmitError($form, undefined)
+						}
+					})
+				}
+
+				return false
+			},
+
+			/**
+		 * takes care of updating the UI after an error on submit (either new
+		 * comment or edit).
+		 *
+		 * @param {jQuery} $form
+		 * @param {string|undefined} commentId
+		 * @private
+		 */
+			_onSubmitError: function($form, commentId) {
+				$form.find('.submit').removeClass('hidden')
+				$form.find('.submitLoading').addClass('hidden')
+				$form.find('.message').prop('contenteditable', true)
+
+				if (!_.isUndefined(commentId)) {
+					OC.Notification.show(t('comments', 'Error occurred while updating comment with id {id}', { id: commentId }), { type: 'error' })
+				} else {
+					OC.Notification.show(t('comments', 'Error occurred while posting comment'), { type: 'error' })
+				}
+			},
+
+			/**
+		 * ensures the contenteditable div is really empty, when user removed
+		 * all input, so that the placeholder will be shown again
+		 *
+		 * @private
+		 */
+			_onTextChange: function() {
+				var $message = $('#commentsTabView').find('.newCommentForm div.message')
+				if (!$message.text().trim().length) {
+					$message.empty()
+				}
+			},
+
+			/**
+		 * Limit pasting to plain text
+		 *
+		 * @param e
+		 * @private
+		 */
+			_onPaste: function(e) {
+				e.preventDefault()
+				var text = e.originalEvent.clipboardData.getData('text/plain')
+				document.execCommand('insertText', false, text)
+			},
+
+			/**
+		 * Returns whether the given message is long and needs
+		 * collapsing
+		 */
+			_isLong: function(message) {
+				return message.length > 250 || (message.match(/\n/g) || []).length > 1
+			}
+		})
+
+	OCA.Comments.CommentsTabView = CommentsTabView
+})(OC, OCA)