nextcloud / server

apps/files_versions/lib/Sabre/RootCollection.php

Indentation +40 added lines, -40 removed lines

@@ -33,52 +33,52 @@
 
 class RootCollection extends AbstractPrincipalCollection {
 
-	/** @var IRootFolder */
-	private $rootFolder;
+    /** @var IRootFolder */
+    private $rootFolder;
 
-	/** @var IUserManager */
-	private $userManager;
+    /** @var IUserManager */
+    private $userManager;
 
-	/** @var IVersionManager */
-	private $versionManager;
+    /** @var IVersionManager */
+    private $versionManager;
 
-	public function __construct(
-		PrincipalBackend\BackendInterface $principalBackend,
-		IRootFolder $rootFolder,
-		IConfig $config,
-		IUserManager $userManager,
-		IVersionManager $versionManager
-	) {
-		parent::__construct($principalBackend, 'principals/users');
+    public function __construct(
+        PrincipalBackend\BackendInterface $principalBackend,
+        IRootFolder $rootFolder,
+        IConfig $config,
+        IUserManager $userManager,
+        IVersionManager $versionManager
+    ) {
+        parent::__construct($principalBackend, 'principals/users');
 
-		$this->rootFolder = $rootFolder;
-		$this->userManager = $userManager;
-		$this->versionManager = $versionManager;
+        $this->rootFolder = $rootFolder;
+        $this->userManager = $userManager;
+        $this->versionManager = $versionManager;
 
-		$this->disableListing = !$config->getSystemValue('debug', false);
-	}
+        $this->disableListing = !$config->getSystemValue('debug', false);
+    }
 
-	/**
-	 * This method returns a node for a principal.
-	 *
-	 * The passed array contains principal information, and is guaranteed to
-	 * at least contain a uri item. Other properties may or may not be
-	 * supplied by the authentication backend.
-	 *
-	 * @param array $principalInfo
-	 * @return INode
-	 */
-	public function getChildForPrincipal(array $principalInfo) {
-		list(, $name) = \Sabre\Uri\split($principalInfo['uri']);
-		$user = \OC::$server->getUserSession()->getUser();
-		if (is_null($user) || $name !== $user->getUID()) {
-			throw new \Sabre\DAV\Exception\Forbidden();
-		}
-		return new VersionHome($principalInfo, $this->rootFolder, $this->userManager, $this->versionManager);
-	}
+    /**
+     * This method returns a node for a principal.
+     *
+     * The passed array contains principal information, and is guaranteed to
+     * at least contain a uri item. Other properties may or may not be
+     * supplied by the authentication backend.
+     *
+     * @param array $principalInfo
+     * @return INode
+     */
+    public function getChildForPrincipal(array $principalInfo) {
+        list(, $name) = \Sabre\Uri\split($principalInfo['uri']);
+        $user = \OC::$server->getUserSession()->getUser();
+        if (is_null($user) || $name !== $user->getUID()) {
+            throw new \Sabre\DAV\Exception\Forbidden();
+        }
+        return new VersionHome($principalInfo, $this->rootFolder, $this->userManager, $this->versionManager);
+    }
 
-	public function getName() {
-		return 'versions';
-	}
+    public function getName() {
+        return 'versions';
+    }
 
 }

apps/files_versions/lib/Sabre/VersionRoot.php

Indentation +53 added lines, -53 removed lines

@@ -33,74 +33,74 @@
 
 class VersionRoot implements ICollection {
 
-	/** @var IUser */
-	private $user;
+    /** @var IUser */
+    private $user;
 
-	/** @var IRootFolder */
-	private $rootFolder;
+    /** @var IRootFolder */
+    private $rootFolder;
 
-	/** @var IVersionManager */
-	private $versionManager;
+    /** @var IVersionManager */
+    private $versionManager;
 
-	public function __construct(IUser $user, IRootFolder $rootFolder, IVersionManager $versionManager) {
-		$this->user = $user;
-		$this->rootFolder = $rootFolder;
-		$this->versionManager = $versionManager;
-	}
+    public function __construct(IUser $user, IRootFolder $rootFolder, IVersionManager $versionManager) {
+        $this->user = $user;
+        $this->rootFolder = $rootFolder;
+        $this->versionManager = $versionManager;
+    }
 
-	public function delete() {
-		throw new Forbidden();
-	}
+    public function delete() {
+        throw new Forbidden();
+    }
 
-	public function getName(): string {
-		return 'versions';
-	}
+    public function getName(): string {
+        return 'versions';
+    }
 
-	public function setName($name) {
-		throw new Forbidden();
-	}
+    public function setName($name) {
+        throw new Forbidden();
+    }
 
-	public function createFile($name, $data = null) {
-		throw new Forbidden();
-	}
+    public function createFile($name, $data = null) {
+        throw new Forbidden();
+    }
 
-	public function createDirectory($name) {
-		throw new Forbidden();
-	}
+    public function createDirectory($name) {
+        throw new Forbidden();
+    }
 
-	public function getChild($name) {
-		$userFolder = $this->rootFolder->getUserFolder($this->user->getUID());
+    public function getChild($name) {
+        $userFolder = $this->rootFolder->getUserFolder($this->user->getUID());
 
-		$fileId = (int)$name;
-		$nodes = $userFolder->getById($fileId);
+        $fileId = (int)$name;
+        $nodes = $userFolder->getById($fileId);
 
-		if ($nodes === []) {
-			throw new NotFound();
-		}
+        if ($nodes === []) {
+            throw new NotFound();
+        }
 
-		$node = array_pop($nodes);
+        $node = array_pop($nodes);
 
-		if (!$node instanceof File) {
-			throw new NotFound();
-		}
+        if (!$node instanceof File) {
+            throw new NotFound();
+        }
 
-		return new VersionCollection($userFolder, $node, $this->user, $this->versionManager);
-	}
+        return new VersionCollection($userFolder, $node, $this->user, $this->versionManager);
+    }
 
-	public function getChildren(): array {
-		return [];
-	}
+    public function getChildren(): array {
+        return [];
+    }
 
-	public function childExists($name): bool {
-		try {
-			$this->getChild($name);
-			return true;
-		} catch (NotFound $e) {
-			return false;
-		}
-	}
+    public function childExists($name): bool {
+        try {
+            $this->getChild($name);
+            return true;
+        } catch (NotFound $e) {
+            return false;
+        }
+    }
 
-	public function getLastModified(): int {
-		return 0;
-	}
+    public function getLastModified(): int {
+        return 0;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
 	public function getChild($name) {
 		$userFolder = $this->rootFolder->getUserFolder($this->user->getUID());
 
-		$fileId = (int)$name;
+		$fileId = (int) $name;
 		$nodes = $userFolder->getById($fileId);
 
 		if ($nodes === []) {

apps/files_versions/lib/Sabre/VersionFile.php

Spacing +2 added lines, -2 removed lines

@@ -60,7 +60,7 @@ 
 	}
 
 	public function getETag(): string {
-		return (string)$this->version->getRevisionId();
+		return (string) $this->version->getRevisionId();
 	}
 
 	public function getSize(): int {
@@ -72,7 +72,7 @@ 
 	}
 
 	public function getName(): string {
-		return (string)$this->version->getRevisionId();
+		return (string) $this->version->getRevisionId();
 	}
 
 	public function setName($name) {

Indentation +58 added lines, -58 removed lines

@@ -32,62 +32,62 @@
 use Sabre\DAV\IFile;
 
 class VersionFile implements IFile {
-	/** @var IVersion */
-	private $version;
-
-	/** @var IVersionManager */
-	private $versionManager;
-
-	public function __construct(IVersion $version, IVersionManager $versionManager) {
-		$this->version = $version;
-		$this->versionManager = $versionManager;
-	}
-
-	public function put($data) {
-		throw new Forbidden();
-	}
-
-	public function get() {
-		try {
-			return $this->versionManager->read($this->version);
-		} catch (NotFoundException $e) {
-			throw new NotFound();
-		}
-	}
-
-	public function getContentType(): string {
-		return $this->version->getMimeType();
-	}
-
-	public function getETag(): string {
-		return (string)$this->version->getRevisionId();
-	}
-
-	public function getSize(): int {
-		return $this->version->getSize();
-	}
-
-	public function delete() {
-		throw new Forbidden();
-	}
-
-	public function getName(): string {
-		return (string)$this->version->getRevisionId();
-	}
-
-	public function setName($name) {
-		throw new Forbidden();
-	}
-
-	public function getLastModified(): int {
-		return $this->version->getTimestamp();
-	}
-
-	public function rollBack() {
-		$this->versionManager->rollback($this->version);
-	}
-
-	public function getVersion(): IVersion {
-		return $this->version;
-	}
+    /** @var IVersion */
+    private $version;
+
+    /** @var IVersionManager */
+    private $versionManager;
+
+    public function __construct(IVersion $version, IVersionManager $versionManager) {
+        $this->version = $version;
+        $this->versionManager = $versionManager;
+    }
+
+    public function put($data) {
+        throw new Forbidden();
+    }
+
+    public function get() {
+        try {
+            return $this->versionManager->read($this->version);
+        } catch (NotFoundException $e) {
+            throw new NotFound();
+        }
+    }
+
+    public function getContentType(): string {
+        return $this->version->getMimeType();
+    }
+
+    public function getETag(): string {
+        return (string)$this->version->getRevisionId();
+    }
+
+    public function getSize(): int {
+        return $this->version->getSize();
+    }
+
+    public function delete() {
+        throw new Forbidden();
+    }
+
+    public function getName(): string {
+        return (string)$this->version->getRevisionId();
+    }
+
+    public function setName($name) {
+        throw new Forbidden();
+    }
+
+    public function getLastModified(): int {
+        return $this->version->getTimestamp();
+    }
+
+    public function rollBack() {
+        $this->versionManager->rollback($this->version);
+    }
+
+    public function getVersion(): IVersion {
+        return $this->version;
+    }
 }

apps/files_versions/lib/Sabre/VersionCollection.php

Indentation +72 added lines, -72 removed lines

@@ -35,76 +35,76 @@
 use Sabre\DAV\ICollection;
 
 class VersionCollection implements ICollection {
-	/** @var Folder */
-	private $userFolder;
-
-	/** @var File */
-	private $file;
-
-	/** @var IUser */
-	private $user;
-
-	/** @var IVersionManager */
-	private $versionManager;
-
-	public function __construct(Folder $userFolder, File $file, IUser $user, IVersionManager $versionManager) {
-		$this->userFolder = $userFolder;
-		$this->file = $file;
-		$this->user = $user;
-		$this->versionManager = $versionManager;
-	}
-
-	public function createFile($name, $data = null) {
-		throw new Forbidden();
-	}
-
-	public function createDirectory($name) {
-		throw new Forbidden();
-	}
-
-	public function getChild($name) {
-		/** @var VersionFile[] $versions */
-		$versions = $this->getChildren();
-
-		foreach ($versions as $version) {
-			if ($version->getName() === $name) {
-				return $version;
-			}
-		}
-
-		throw new NotFound();
-	}
-
-	public function getChildren(): array {
-		$versions = $this->versionManager->getVersionsForFile($this->user, $this->file);
-
-		return array_map(function (IVersion $version) {
-			return new VersionFile($version, $this->versionManager);
-		}, $versions);
-	}
-
-	public function childExists($name): bool {
-		try {
-			$this->getChild($name);
-			return true;
-		} catch (NotFound $e) {
-			return false;
-		}
-	}
-
-	public function delete() {
-		throw new Forbidden();
-	}
-
-	public function getName(): string {
-		return (string)$this->file->getId();
-	}
-
-	public function setName($name) {
-		throw new Forbidden();
-	}
-
-	public function getLastModified(): int {
-		return 0;
-	}
+    /** @var Folder */
+    private $userFolder;
+
+    /** @var File */
+    private $file;
+
+    /** @var IUser */
+    private $user;
+
+    /** @var IVersionManager */
+    private $versionManager;
+
+    public function __construct(Folder $userFolder, File $file, IUser $user, IVersionManager $versionManager) {
+        $this->userFolder = $userFolder;
+        $this->file = $file;
+        $this->user = $user;
+        $this->versionManager = $versionManager;
+    }
+
+    public function createFile($name, $data = null) {
+        throw new Forbidden();
+    }
+
+    public function createDirectory($name) {
+        throw new Forbidden();
+    }
+
+    public function getChild($name) {
+        /** @var VersionFile[] $versions */
+        $versions = $this->getChildren();
+
+        foreach ($versions as $version) {
+            if ($version->getName() === $name) {
+                return $version;
+            }
+        }
+
+        throw new NotFound();
+    }
+
+    public function getChildren(): array {
+        $versions = $this->versionManager->getVersionsForFile($this->user, $this->file);
+
+        return array_map(function (IVersion $version) {
+            return new VersionFile($version, $this->versionManager);
+        }, $versions);
+    }
+
+    public function childExists($name): bool {
+        try {
+            $this->getChild($name);
+            return true;
+        } catch (NotFound $e) {
+            return false;
+        }
+    }
+
+    public function delete() {
+        throw new Forbidden();
+    }
+
+    public function getName(): string {
+        return (string)$this->file->getId();
+    }
+
+    public function setName($name) {
+        throw new Forbidden();
+    }
+
+    public function getLastModified(): int {
+        return 0;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -78,7 +78,7 @@ 
 	public function getChildren(): array {
 		$versions = $this->versionManager->getVersionsForFile($this->user, $this->file);
 
-		return array_map(function (IVersion $version) {
+		return array_map(function(IVersion $version) {
 			return new VersionFile($version, $this->versionManager);
 		}, $versions);
 	}
@@ -97,7 +97,7 @@ 
 	}
 
 	public function getName(): string {
-		return (string)$this->file->getId();
+		return (string) $this->file->getId();
 	}
 
 	public function setName($name) {

apps/dav/lib/Migration/Version1008Date20181030113700.php

Indentation +16 added lines, -16 removed lines

@@ -33,22 +33,22 @@
 
 class Version1008Date20181030113700 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->getTable('cards');
-		$table->addColumn('uid', Type::STRING, [
-			'notnull' => false,
-			'length' => 255
-		]);
+        $table = $schema->getTable('cards');
+        $table->addColumn('uid', Type::STRING, [
+            'notnull' => false,
+            'length' => 255
+        ]);
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

lib/private/AppFramework/Middleware/Security/PasswordConfirmationMiddleware.php

Indentation +52 added lines, -52 removed lines

@@ -32,60 +32,60 @@
 use OCP\User\Backend\IPasswordConfirmationBackend;
 
 class PasswordConfirmationMiddleware extends Middleware {
-	/** @var ControllerMethodReflector */
-	private $reflector;
-	/** @var ISession */
-	private $session;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var ITimeFactory */
-	private $timeFactory;
-	/** @var array */
-	private $excludedUserBackEnds = ['user_saml' => true, 'user_globalsiteselector' => true];
+    /** @var ControllerMethodReflector */
+    private $reflector;
+    /** @var ISession */
+    private $session;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var ITimeFactory */
+    private $timeFactory;
+    /** @var array */
+    private $excludedUserBackEnds = ['user_saml' => true, 'user_globalsiteselector' => true];
 
-	/**
-	 * PasswordConfirmationMiddleware constructor.
-	 *
-	 * @param ControllerMethodReflector $reflector
-	 * @param ISession $session
-	 * @param IUserSession $userSession
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(ControllerMethodReflector $reflector,
-								ISession $session,
-								IUserSession $userSession,
-								ITimeFactory $timeFactory) {
-		$this->reflector = $reflector;
-		$this->session = $session;
-		$this->userSession = $userSession;
-		$this->timeFactory = $timeFactory;
-	}
+    /**
+     * PasswordConfirmationMiddleware constructor.
+     *
+     * @param ControllerMethodReflector $reflector
+     * @param ISession $session
+     * @param IUserSession $userSession
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(ControllerMethodReflector $reflector,
+                                ISession $session,
+                                IUserSession $userSession,
+                                ITimeFactory $timeFactory) {
+        $this->reflector = $reflector;
+        $this->session = $session;
+        $this->userSession = $userSession;
+        $this->timeFactory = $timeFactory;
+    }
 
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @throws NotConfirmedException
-	 */
-	public function beforeController($controller, $methodName) {
-		if ($this->reflector->hasAnnotation('PasswordConfirmationRequired')) {
-			$user = $this->userSession->getUser();
-			$backendClassName = '';
-			if ($user !== null) {
-				$backend = $user->getBackend();
-				if ($backend instanceof IPasswordConfirmationBackend) {
-					if (!$backend->canConfirmPassword($user->getUID())) {
-						return;
-					}
-				}
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     * @throws NotConfirmedException
+     */
+    public function beforeController($controller, $methodName) {
+        if ($this->reflector->hasAnnotation('PasswordConfirmationRequired')) {
+            $user = $this->userSession->getUser();
+            $backendClassName = '';
+            if ($user !== null) {
+                $backend = $user->getBackend();
+                if ($backend instanceof IPasswordConfirmationBackend) {
+                    if (!$backend->canConfirmPassword($user->getUID())) {
+                        return;
+                    }
+                }
 
-				$backendClassName = $user->getBackendClassName();
-			}
+                $backendClassName = $user->getBackendClassName();
+            }
 
-			$lastConfirm = (int) $this->session->get('last-password-confirm');
-			// we can't check the password against a SAML backend, so skip password confirmation in this case
-			if (!isset($this->excludedUserBackEnds[$backendClassName]) && $lastConfirm < ($this->timeFactory->getTime() - (30 * 60 + 15))) { // allow 15 seconds delay
-				throw new NotConfirmedException();
-			}
-		}
-	}
+            $lastConfirm = (int) $this->session->get('last-password-confirm');
+            // we can't check the password against a SAML backend, so skip password confirmation in this case
+            if (!isset($this->excludedUserBackEnds[$backendClassName]) && $lastConfirm < ($this->timeFactory->getTime() - (30 * 60 + 15))) { // allow 15 seconds delay
+                throw new NotConfirmedException();
+            }
+        }
+    }
 }

lib/public/User/Backend/IPasswordConfirmationBackend.php

Indentation +4 added lines, -4 removed lines

@@ -29,8 +29,8 @@
  */
 interface IPasswordConfirmationBackend {
 
-	/**
-	 * @since 15.0.0
-	 */
-	public function canConfirmPassword(string $uid): bool;
+    /**
+     * @since 15.0.0
+     */
+    public function canConfirmPassword(string $uid): bool;
 }

apps/comments/lib/Activity/Provider.php

Spacing +4 added lines, -4 removed lines

@@ -213,18 +213,18 @@
 					continue;
 				}
 
-				$pattern = '/(^|\s)(' . '@' . $mention['id'] . ')(\b)/';
+				$pattern = '/(^|\s)('.'@'.$mention['id'].')(\b)/';
 				if (strpos($mention['id'], ' ') !== false) {
-					$pattern = '/(^|\s)(' . '@"' . $mention['id'] . '"' . ')(\b)?/';
+					$pattern = '/(^|\s)('.'@"'.$mention['id'].'"'.')(\b)?/';
 				}
 
 				$message = preg_replace(
 					$pattern,
 					//'${1}' . $this->regexSafeUser($mention['id'], $displayName) . '${3}',
-					'${1}' . '{mention' . $mentionCount . '}' . '${3}',
+					'${1}'.'{mention'.$mentionCount.'}'.'${3}',
 					$message
 				);
-				$mentions['mention' . $mentionCount] = $this->generateUserParameter($mention['id']);
+				$mentions['mention'.$mentionCount] = $this->generateUserParameter($mention['id']);
 				$mentionCount++;
 			}
 

Indentation +240 added lines, -240 removed lines

@@ -36,244 +36,244 @@
 
 class Provider implements IProvider {
 
-	/** @var IFactory */
-	protected $languageFactory;
-
-	/** @var IL10N */
-	protected $l;
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var ICommentsManager */
-	protected $commentsManager;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var IManager */
-	protected $activityManager;
-
-	/** @var string[] */
-	protected $displayNames = [];
-
-	/**
-	 * @param IFactory $languageFactory
-	 * @param IURLGenerator $url
-	 * @param ICommentsManager $commentsManager
-	 * @param IUserManager $userManager
-	 * @param IManager $activityManager
-	 */
-	public function __construct(IFactory $languageFactory, IURLGenerator $url, ICommentsManager $commentsManager, IUserManager $userManager, IManager $activityManager) {
-		$this->languageFactory = $languageFactory;
-		$this->url = $url;
-		$this->commentsManager = $commentsManager;
-		$this->userManager = $userManager;
-		$this->activityManager = $activityManager;
-	}
-
-	/**
-	 * @param string $language
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
-		if ($event->getApp() !== 'comments') {
-			throw new \InvalidArgumentException();
-		}
-
-		$this->l = $this->languageFactory->get('comments', $language);
-
-		if ($event->getSubject() === 'add_comment_subject') {
-			$this->parseMessage($event);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/comment.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/comment.svg')));
-			}
-
-			if ($this->activityManager->isFormattingFilteredObject()) {
-				try {
-					return $this->parseShortVersion($event);
-				} catch (\InvalidArgumentException $e) {
-					// Ignore and simply use the long version...
-				}
-			}
-
-			return $this->parseLongVersion($event);
-		} else {
-			throw new \InvalidArgumentException();
-		}
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 */
-	protected function parseShortVersion(IEvent $event) {
-		$subjectParameters = $this->getSubjectParameters($event);
-
-		if ($event->getSubject() === 'add_comment_subject') {
-			if ($subjectParameters['actor'] === $this->activityManager->getCurrentUserId()) {
-				$event->setParsedSubject($this->l->t('You commented'))
-					->setRichSubject($this->l->t('You commented'), []);
-			} else {
-				$author = $this->generateUserParameter($subjectParameters['actor']);
-				$event->setParsedSubject($this->l->t('%1$s commented', [$author['name']]))
-					->setRichSubject($this->l->t('{author} commented'), [
-						'author' => $author,
-					]);
-			}
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 */
-	protected function parseLongVersion(IEvent $event) {
-		$subjectParameters = $this->getSubjectParameters($event);
-
-		if ($event->getSubject() === 'add_comment_subject') {
-			if ($subjectParameters['actor'] === $this->activityManager->getCurrentUserId()) {
-				$event->setParsedSubject($this->l->t('You commented on %1$s', [
-					$subjectParameters['filePath'],
-				]))
-					->setRichSubject($this->l->t('You commented on {file}'), [
-						'file' => $this->generateFileParameter($subjectParameters['fileId'], $subjectParameters['filePath']),
-					]);
-			} else {
-				$author = $this->generateUserParameter($subjectParameters['actor']);
-				$event->setParsedSubject($this->l->t('%1$s commented on %2$s', [
-					$author['name'],
-					$subjectParameters['filePath'],
-				]))
-					->setRichSubject($this->l->t('{author} commented on {file}'), [
-						'author' => $author,
-						'file' => $this->generateFileParameter($subjectParameters['fileId'], $subjectParameters['filePath']),
-					]);
-			}
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		return $event;
-	}
-
-	protected function getSubjectParameters(IEvent $event) {
-		$subjectParameters = $event->getSubjectParameters();
-		if (isset($subjectParameters['fileId'])) {
-			return $subjectParameters;
-		}
-
-		// Fix subjects from 12.0.3 and older
-		//
-		// Do NOT Remove unless necessary
-		// Removing this will break parsing of activities that were created on
-		// Nextcloud 12, so we should keep this as long as it's acceptable.
-		// Otherwise if people upgrade over multiple releases in a short period,
-		// they will get the dead entries in their stream.
-		return [
-			'actor' => $subjectParameters[0],
-			'fileId' => (int) $event->getObjectId(),
-			'filePath' => trim($subjectParameters[1], '/'),
-		];
-	}
-
-	/**
-	 * @param IEvent $event
-	 */
-	protected function parseMessage(IEvent $event) {
-		$messageParameters = $event->getMessageParameters();
-		if (empty($messageParameters)) {
-			// Email
-			return;
-		}
-
-		$commentId = isset($messageParameters['commentId']) ? $messageParameters['commentId'] : $messageParameters[0];
-
-		try {
-			$comment = $this->commentsManager->get((string) $commentId);
-			$message = $comment->getMessage();
-
-			$mentionCount = 1;
-			$mentions = [];
-			foreach ($comment->getMentions() as $mention) {
-				if ($mention['type'] !== 'user') {
-					continue;
-				}
-
-				$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++;
-			}
-
-			$event->setParsedMessage($comment->getMessage())
-				->setRichMessage($message, $mentions);
-		} catch (NotFoundException $e) {
-		}
-	}
-
-	/**
-	 * @param int $id
-	 * @param string $path
-	 * @return array
-	 */
-	protected function generateFileParameter($id, $path) {
-		return [
-			'type' => 'file',
-			'id' => $id,
-			'name' => basename($path),
-			'path' => $path,
-			'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
-		];
-	}
-
-	/**
-	 * @param string $uid
-	 * @return array
-	 */
-	protected function generateUserParameter($uid) {
-		if (!isset($this->displayNames[$uid])) {
-			$this->displayNames[$uid] = $this->getDisplayName($uid);
-		}
-
-		return [
-			'type' => 'user',
-			'id' => $uid,
-			'name' => $this->displayNames[$uid],
-		];
-	}
-
-	/**
-	 * @param string $uid
-	 * @return string
-	 */
-	protected function getDisplayName($uid) {
-		$user = $this->userManager->get($uid);
-		if ($user instanceof IUser) {
-			return $user->getDisplayName();
-		} else {
-			return $uid;
-		}
-	}
+    /** @var IFactory */
+    protected $languageFactory;
+
+    /** @var IL10N */
+    protected $l;
+
+    /** @var IURLGenerator */
+    protected $url;
+
+    /** @var ICommentsManager */
+    protected $commentsManager;
+
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var IManager */
+    protected $activityManager;
+
+    /** @var string[] */
+    protected $displayNames = [];
+
+    /**
+     * @param IFactory $languageFactory
+     * @param IURLGenerator $url
+     * @param ICommentsManager $commentsManager
+     * @param IUserManager $userManager
+     * @param IManager $activityManager
+     */
+    public function __construct(IFactory $languageFactory, IURLGenerator $url, ICommentsManager $commentsManager, IUserManager $userManager, IManager $activityManager) {
+        $this->languageFactory = $languageFactory;
+        $this->url = $url;
+        $this->commentsManager = $commentsManager;
+        $this->userManager = $userManager;
+        $this->activityManager = $activityManager;
+    }
+
+    /**
+     * @param string $language
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parse($language, IEvent $event, IEvent $previousEvent = null) {
+        if ($event->getApp() !== 'comments') {
+            throw new \InvalidArgumentException();
+        }
+
+        $this->l = $this->languageFactory->get('comments', $language);
+
+        if ($event->getSubject() === 'add_comment_subject') {
+            $this->parseMessage($event);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/comment.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/comment.svg')));
+            }
+
+            if ($this->activityManager->isFormattingFilteredObject()) {
+                try {
+                    return $this->parseShortVersion($event);
+                } catch (\InvalidArgumentException $e) {
+                    // Ignore and simply use the long version...
+                }
+            }
+
+            return $this->parseLongVersion($event);
+        } else {
+            throw new \InvalidArgumentException();
+        }
+    }
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     */
+    protected function parseShortVersion(IEvent $event) {
+        $subjectParameters = $this->getSubjectParameters($event);
+
+        if ($event->getSubject() === 'add_comment_subject') {
+            if ($subjectParameters['actor'] === $this->activityManager->getCurrentUserId()) {
+                $event->setParsedSubject($this->l->t('You commented'))
+                    ->setRichSubject($this->l->t('You commented'), []);
+            } else {
+                $author = $this->generateUserParameter($subjectParameters['actor']);
+                $event->setParsedSubject($this->l->t('%1$s commented', [$author['name']]))
+                    ->setRichSubject($this->l->t('{author} commented'), [
+                        'author' => $author,
+                    ]);
+            }
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     */
+    protected function parseLongVersion(IEvent $event) {
+        $subjectParameters = $this->getSubjectParameters($event);
+
+        if ($event->getSubject() === 'add_comment_subject') {
+            if ($subjectParameters['actor'] === $this->activityManager->getCurrentUserId()) {
+                $event->setParsedSubject($this->l->t('You commented on %1$s', [
+                    $subjectParameters['filePath'],
+                ]))
+                    ->setRichSubject($this->l->t('You commented on {file}'), [
+                        'file' => $this->generateFileParameter($subjectParameters['fileId'], $subjectParameters['filePath']),
+                    ]);
+            } else {
+                $author = $this->generateUserParameter($subjectParameters['actor']);
+                $event->setParsedSubject($this->l->t('%1$s commented on %2$s', [
+                    $author['name'],
+                    $subjectParameters['filePath'],
+                ]))
+                    ->setRichSubject($this->l->t('{author} commented on {file}'), [
+                        'author' => $author,
+                        'file' => $this->generateFileParameter($subjectParameters['fileId'], $subjectParameters['filePath']),
+                    ]);
+            }
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        return $event;
+    }
+
+    protected function getSubjectParameters(IEvent $event) {
+        $subjectParameters = $event->getSubjectParameters();
+        if (isset($subjectParameters['fileId'])) {
+            return $subjectParameters;
+        }
+
+        // Fix subjects from 12.0.3 and older
+        //
+        // Do NOT Remove unless necessary
+        // Removing this will break parsing of activities that were created on
+        // Nextcloud 12, so we should keep this as long as it's acceptable.
+        // Otherwise if people upgrade over multiple releases in a short period,
+        // they will get the dead entries in their stream.
+        return [
+            'actor' => $subjectParameters[0],
+            'fileId' => (int) $event->getObjectId(),
+            'filePath' => trim($subjectParameters[1], '/'),
+        ];
+    }
+
+    /**
+     * @param IEvent $event
+     */
+    protected function parseMessage(IEvent $event) {
+        $messageParameters = $event->getMessageParameters();
+        if (empty($messageParameters)) {
+            // Email
+            return;
+        }
+
+        $commentId = isset($messageParameters['commentId']) ? $messageParameters['commentId'] : $messageParameters[0];
+
+        try {
+            $comment = $this->commentsManager->get((string) $commentId);
+            $message = $comment->getMessage();
+
+            $mentionCount = 1;
+            $mentions = [];
+            foreach ($comment->getMentions() as $mention) {
+                if ($mention['type'] !== 'user') {
+                    continue;
+                }
+
+                $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++;
+            }
+
+            $event->setParsedMessage($comment->getMessage())
+                ->setRichMessage($message, $mentions);
+        } catch (NotFoundException $e) {
+        }
+    }
+
+    /**
+     * @param int $id
+     * @param string $path
+     * @return array
+     */
+    protected function generateFileParameter($id, $path) {
+        return [
+            'type' => 'file',
+            'id' => $id,
+            'name' => basename($path),
+            'path' => $path,
+            'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
+        ];
+    }
+
+    /**
+     * @param string $uid
+     * @return array
+     */
+    protected function generateUserParameter($uid) {
+        if (!isset($this->displayNames[$uid])) {
+            $this->displayNames[$uid] = $this->getDisplayName($uid);
+        }
+
+        return [
+            'type' => 'user',
+            'id' => $uid,
+            'name' => $this->displayNames[$uid],
+        ];
+    }
+
+    /**
+     * @param string $uid
+     * @return string
+     */
+    protected function getDisplayName($uid) {
+        $user = $this->userManager->get($uid);
+        if ($user instanceof IUser) {
+            return $user->getDisplayName();
+        } else {
+            return $uid;
+        }
+    }
 }

lib/private/Repair/ClearFrontendCaches.php

Indentation +29 added lines, -29 removed lines

@@ -31,40 +31,40 @@
 
 class ClearFrontendCaches implements IRepairStep {
 
-	/** @var ICacheFactory */
-	protected $cacheFactory;
+    /** @var ICacheFactory */
+    protected $cacheFactory;
 
-	/** @var SCSSCacher */
-	protected $scssCacher;
+    /** @var SCSSCacher */
+    protected $scssCacher;
 
-	/** @var JSCombiner */
-	protected $jsCombiner;
+    /** @var JSCombiner */
+    protected $jsCombiner;
 
-	public function __construct(ICacheFactory $cacheFactory,
-								SCSSCacher $SCSSCacher,
-								JSCombiner $JSCombiner) {
-		$this->cacheFactory = $cacheFactory;
-		$this->scssCacher   = $SCSSCacher;
-		$this->jsCombiner   = $JSCombiner;
-	}
+    public function __construct(ICacheFactory $cacheFactory,
+                                SCSSCacher $SCSSCacher,
+                                JSCombiner $JSCombiner) {
+        $this->cacheFactory = $cacheFactory;
+        $this->scssCacher   = $SCSSCacher;
+        $this->jsCombiner   = $JSCombiner;
+    }
 
-	public function getName() {
-		return 'Clear frontend caches';
-	}
+    public function getName() {
+        return 'Clear frontend caches';
+    }
 
-	public function run(IOutput $output) {
-		try {
-			$c = $this->cacheFactory->createDistributed('imagePath');
-			$c->clear();
-			$output->info('Image cache cleared');
+    public function run(IOutput $output) {
+        try {
+            $c = $this->cacheFactory->createDistributed('imagePath');
+            $c->clear();
+            $output->info('Image cache cleared');
 
-			$this->scssCacher->resetCache();
-			$output->info('SCSS cache cleared');
+            $this->scssCacher->resetCache();
+            $output->info('SCSS cache cleared');
 
-			$this->jsCombiner->resetCache();
-			$output->info('JS cache cleared');
-		} catch (\Exception $e) {
-			$output->warning('Unable to clear the frontend cache');
-		}
-	}
+            $this->jsCombiner->resetCache();
+            $output->info('JS cache cleared');
+        } catch (\Exception $e) {
+            $output->warning('Unable to clear the frontend cache');
+        }
+    }
 }