nextcloud / server

apps/files/lib/Activity/Provider.php

Indentation +545 added lines, -545 removed lines

@@ -44,549 +44,549 @@
 
 class Provider implements IProvider {
 
-	/** @var IFactory */
-	protected $languageFactory;
-
-	/** @var IL10N */
-	protected $l;
-	/** @var IL10N */
-	protected $activityLang;
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var IManager */
-	protected $activityManager;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var IRootFolder */
-	protected $rootFolder;
-
-	/** @var IEventMerger */
-	protected $eventMerger;
-
-	/** @var ICloudIdManager */
-	protected $cloudIdManager;
-
-	/** @var IContactsManager */
-	protected $contactsManager;
-
-	/** @var string[] cached displayNames - key is the cloud id and value the displayname */
-	protected $displayNames = [];
-
-	protected $fileIsEncrypted = false;
-
-	public function __construct(IFactory $languageFactory,
-								IURLGenerator $url,
-								IManager $activityManager,
-								IUserManager $userManager,
-								IRootFolder $rootFolder,
-								ICloudIdManager $cloudIdManager,
-								IContactsManager $contactsManager,
-								IEventMerger $eventMerger) {
-		$this->languageFactory = $languageFactory;
-		$this->url = $url;
-		$this->activityManager = $activityManager;
-		$this->userManager = $userManager;
-		$this->rootFolder = $rootFolder;
-		$this->cloudIdManager = $cloudIdManager;
-		$this->contactsManager = $contactsManager;
-		$this->eventMerger = $eventMerger;
-	}
-
-	/**
-	 * @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() !== 'files') {
-			throw new \InvalidArgumentException();
-		}
-
-		$this->l = $this->languageFactory->get('files', $language);
-		$this->activityLang = $this->languageFactory->get('activity', $language);
-
-		if ($this->activityManager->isFormattingFilteredObject()) {
-			try {
-				return $this->parseShortVersion($event, $previousEvent);
-			} catch (\InvalidArgumentException $e) {
-				// Ignore and simply use the long version...
-			}
-		}
-
-		return $this->parseLongVersion($event, $previousEvent);
-	}
-
-	protected function setIcon(IEvent $event, string $icon, string $app = 'files') {
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath($app, $icon . '.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath($app, $icon . '.svg')));
-		}
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseShortVersion(IEvent $event, IEvent $previousEvent = null) {
-		$parsedParameters = $this->getParameters($event);
-
-		if ($event->getSubject() === 'created_by') {
-			$subject = $this->l->t('Created by {user}');
-			$this->setIcon($event, 'add-color');
-		} elseif ($event->getSubject() === 'changed_by') {
-			$subject = $this->l->t('Changed by {user}');
-			$this->setIcon($event, 'change');
-		} elseif ($event->getSubject() === 'deleted_by') {
-			$subject = $this->l->t('Deleted by {user}');
-			$this->setIcon($event, 'delete-color');
-		} elseif ($event->getSubject() === 'restored_by') {
-			$subject = $this->l->t('Restored by {user}');
-			$this->setIcon($event, 'actions/history', 'core');
-		} elseif ($event->getSubject() === 'renamed_by') {
-			$subject = $this->l->t('Renamed by {user}');
-			$this->setIcon($event, 'change');
-		} elseif ($event->getSubject() === 'moved_by') {
-			$subject = $this->l->t('Moved by {user}');
-			$this->setIcon($event, 'change');
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		if (!isset($parsedParameters['user'])) {
-			// External user via public link share
-			$subject = str_replace('{user}', $this->activityLang->t('"remote user"'), $subject);
-		}
-
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		return $this->eventMerger->mergeEvents('user', $event, $previousEvent);
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseLongVersion(IEvent $event, IEvent $previousEvent = null) {
-		$this->fileIsEncrypted = false;
-		$parsedParameters = $this->getParameters($event);
-
-		if ($event->getSubject() === 'created_self') {
-			$subject = $this->l->t('You created {file}');
-			if ($this->fileIsEncrypted) {
-				$subject = $this->l->t('You created an encrypted file in {file}');
-			}
-			$this->setIcon($event, 'add-color');
-		} elseif ($event->getSubject() === 'created_by') {
-			$subject = $this->l->t('{user} created {file}');
-			if ($this->fileIsEncrypted) {
-				$subject = $this->l->t('{user} created an encrypted file in {file}');
-			}
-			$this->setIcon($event, 'add-color');
-		} elseif ($event->getSubject() === 'created_public') {
-			$subject = $this->l->t('{file} was created in a public folder');
-			$this->setIcon($event, 'add-color');
-		} elseif ($event->getSubject() === 'changed_self') {
-			$subject = $this->l->t('You changed {file}');
-			if ($this->fileIsEncrypted) {
-				$subject = $this->l->t('You changed an encrypted file in {file}');
-			}
-			$this->setIcon($event, 'change');
-		} elseif ($event->getSubject() === 'changed_by') {
-			$subject = $this->l->t('{user} changed {file}');
-			if ($this->fileIsEncrypted) {
-				$subject = $this->l->t('{user} changed an encrypted file in {file}');
-			}
-			$this->setIcon($event, 'change');
-		} elseif ($event->getSubject() === 'deleted_self') {
-			$subject = $this->l->t('You deleted {file}');
-			if ($this->fileIsEncrypted) {
-				$subject = $this->l->t('You deleted an encrypted file in {file}');
-			}
-			$this->setIcon($event, 'delete-color');
-		} elseif ($event->getSubject() === 'deleted_by') {
-			$subject = $this->l->t('{user} deleted {file}');
-			if ($this->fileIsEncrypted) {
-				$subject = $this->l->t('{user} deleted an encrypted file in {file}');
-			}
-			$this->setIcon($event, 'delete-color');
-		} elseif ($event->getSubject() === 'restored_self') {
-			$subject = $this->l->t('You restored {file}');
-			$this->setIcon($event, 'actions/history', 'core');
-		} elseif ($event->getSubject() === 'restored_by') {
-			$subject = $this->l->t('{user} restored {file}');
-			$this->setIcon($event, 'actions/history', 'core');
-		} elseif ($event->getSubject() === 'renamed_self') {
-			$oldFileName = $parsedParameters['oldfile']['name'];
-			$newFileName = $parsedParameters['newfile']['name'];
-
-			if ($this->isHiddenFile($oldFileName)) {
-				if ($this->isHiddenFile($newFileName)) {
-					$subject = $this->l->t('You renamed {oldfile} (hidden) to {newfile} (hidden)');
-				} else {
-					$subject = $this->l->t('You renamed {oldfile} (hidden) to {newfile}');
-				}
-			} else {
-				if ($this->isHiddenFile($newFileName)) {
-					$subject = $this->l->t('You renamed {oldfile} to {newfile} (hidden)');
-				} else {
-					$subject = $this->l->t('You renamed {oldfile} to {newfile}');
-				}
-			}
-
-			$this->setIcon($event, 'change');
-		} elseif ($event->getSubject() === 'renamed_by') {
-			$oldFileName = $parsedParameters['oldfile']['name'];
-			$newFileName = $parsedParameters['newfile']['name'];
-
-			if ($this->isHiddenFile($oldFileName)) {
-				if ($this->isHiddenFile($newFileName)) {
-					$subject = $this->l->t('{user} renamed {oldfile} (hidden) to {newfile} (hidden)');
-				} else {
-					$subject = $this->l->t('{user} renamed {oldfile} (hidden) to {newfile}');
-				}
-			} else {
-				if ($this->isHiddenFile($newFileName)) {
-					$subject = $this->l->t('{user} renamed {oldfile} to {newfile} (hidden)');
-				} else {
-					$subject = $this->l->t('{user} renamed {oldfile} to {newfile}');
-				}
-			}
-
-			$this->setIcon($event, 'change');
-		} elseif ($event->getSubject() === 'moved_self') {
-			$subject = $this->l->t('You moved {oldfile} to {newfile}');
-			$this->setIcon($event, 'change');
-		} elseif ($event->getSubject() === 'moved_by') {
-			$subject = $this->l->t('{user} moved {oldfile} to {newfile}');
-			$this->setIcon($event, 'change');
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		if ($this->fileIsEncrypted) {
-			$event->setSubject($event->getSubject() . '_enc', $event->getSubjectParameters());
-		}
-
-		if (!isset($parsedParameters['user'])) {
-			// External user via public link share
-			$subject = str_replace('{user}', $this->activityLang->t('"remote user"'), $subject);
-		}
-
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		if ($event->getSubject() === 'moved_self' || $event->getSubject() === 'moved_by') {
-			$event = $this->eventMerger->mergeEvents('oldfile', $event, $previousEvent);
-		} else {
-			$event = $this->eventMerger->mergeEvents('file', $event, $previousEvent);
-		}
-
-		if ($event->getChildEvent() === null) {
-			// Couldn't group by file, maybe we can group by user
-			$event = $this->eventMerger->mergeEvents('user', $event, $previousEvent);
-		}
-
-		return $event;
-	}
-
-	private function isHiddenFile(string $filename): bool {
-		return strlen($filename) > 0 && $filename[0] === '.';
-	}
-
-	protected function setSubjects(IEvent $event, $subject, array $parameters) {
-		$placeholders = $replacements = [];
-		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
-			if ($parameter['type'] === 'file') {
-				$replacements[] = $parameter['path'];
-			} else {
-				$replacements[] = $parameter['name'];
-			}
-		}
-
-		$event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
-			->setRichSubject($subject, $parameters);
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return array
-	 * @throws \InvalidArgumentException
-	 */
-	protected function getParameters(IEvent $event) {
-		$parameters = $event->getSubjectParameters();
-		switch ($event->getSubject()) {
-			case 'created_self':
-			case 'created_public':
-			case 'changed_self':
-			case 'deleted_self':
-			case 'restored_self':
-				return [
-					'file' => $this->getFile($parameters[0], $event),
-				];
-			case 'created_by':
-			case 'changed_by':
-			case 'deleted_by':
-			case 'restored_by':
-				if ($parameters[1] === '') {
-					// External user via public link share
-					return [
-						'file' => $this->getFile($parameters[0], $event),
-					];
-				}
-				return [
-					'file' => $this->getFile($parameters[0], $event),
-					'user' => $this->getUser($parameters[1]),
-				];
-			case 'renamed_self':
-			case 'moved_self':
-				return [
-					'newfile' => $this->getFile($parameters[0]),
-					'oldfile' => $this->getFile($parameters[1]),
-				];
-			case 'renamed_by':
-			case 'moved_by':
-				if ($parameters[1] === '') {
-					// External user via public link share
-					return [
-						'newfile' => $this->getFile($parameters[0]),
-						'oldfile' => $this->getFile($parameters[2]),
-					];
-				}
-				return [
-					'newfile' => $this->getFile($parameters[0]),
-					'user' => $this->getUser($parameters[1]),
-					'oldfile' => $this->getFile($parameters[2]),
-				];
-		}
-		return [];
-	}
-
-	/**
-	 * @param array|string $parameter
-	 * @param IEvent|null $event
-	 * @return array
-	 * @throws \InvalidArgumentException
-	 */
-	protected function getFile($parameter, IEvent $event = null) {
-		if (is_array($parameter)) {
-			$path = reset($parameter);
-			$id = (string) key($parameter);
-		} elseif ($event !== null) {
-			// Legacy from before ownCloud 8.2
-			$path = $parameter;
-			$id = $event->getObjectId();
-		} else {
-			throw new \InvalidArgumentException('Could not generate file parameter');
-		}
-
-		$encryptionContainer = $this->getEndToEndEncryptionContainer($id, $path);
-		if ($encryptionContainer instanceof Folder) {
-			$this->fileIsEncrypted = true;
-			try {
-				$fullPath = rtrim($encryptionContainer->getPath(), '/');
-				// Remove /user/files/...
-				[,,, $path] = explode('/', $fullPath, 4);
-				if (!$path) {
-					throw new InvalidPathException('Path could not be split correctly');
-				}
-
-				return [
-					'type' => 'file',
-					'id' => $encryptionContainer->getId(),
-					'name' => $encryptionContainer->getName(),
-					'path' => $path,
-					'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $encryptionContainer->getId()]),
-				];
-			} catch (\Exception $e) {
-				// fall back to the normal one
-				$this->fileIsEncrypted = false;
-			}
-		}
-
-		return [
-			'type' => 'file',
-			'id' => $id,
-			'name' => basename($path),
-			'path' => trim($path, '/'),
-			'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
-		];
-	}
-
-	protected $fileEncrypted = [];
-
-	/**
-	 * Check if a file is end2end encrypted
-	 * @param int $fileId
-	 * @param string $path
-	 * @return Folder|null
-	 */
-	protected function getEndToEndEncryptionContainer($fileId, $path) {
-		if (isset($this->fileEncrypted[$fileId])) {
-			return $this->fileEncrypted[$fileId];
-		}
-
-		$fileName = basename($path);
-		if (!preg_match('/^[0-9a-fA-F]{32}$/', $fileName)) {
-			$this->fileEncrypted[$fileId] = false;
-			return $this->fileEncrypted[$fileId];
-		}
-
-		$userFolder = $this->rootFolder->getUserFolder($this->activityManager->getCurrentUserId());
-		$files = $userFolder->getById($fileId);
-		if (empty($files)) {
-			try {
-				// Deleted, try with parent
-				$file = $this->findExistingParent($userFolder, dirname($path));
-			} catch (NotFoundException $e) {
-				return null;
-			}
-
-			if (!$file instanceof Folder || !$file->isEncrypted()) {
-				return null;
-			}
-
-			$this->fileEncrypted[$fileId] = $file;
-			return $file;
-		}
-
-		$file = array_shift($files);
-
-		if ($file instanceof Folder && $file->isEncrypted()) {
-			// If the folder is encrypted, it is the Container,
-			// but can be the name is just fine.
-			$this->fileEncrypted[$fileId] = true;
-			return null;
-		}
-
-		$this->fileEncrypted[$fileId] = $this->getParentEndToEndEncryptionContainer($userFolder, $file);
-		return $this->fileEncrypted[$fileId];
-	}
-
-	/**
-	 * @param Folder $userFolder
-	 * @param string $path
-	 * @return Folder
-	 * @throws NotFoundException
-	 */
-	protected function findExistingParent(Folder $userFolder, $path) {
-		if ($path === '/') {
-			throw new NotFoundException('Reached the root');
-		}
-
-		try {
-			$folder = $userFolder->get(dirname($path));
-		} catch (NotFoundException $e) {
-			return $this->findExistingParent($userFolder, dirname($path));
-		}
-
-		return $folder;
-	}
-
-	/**
-	 * Check all parents until the user's root folder if one is encrypted
-	 *
-	 * @param Folder $userFolder
-	 * @param Node $file
-	 * @return Node|null
-	 */
-	protected function getParentEndToEndEncryptionContainer(Folder $userFolder, Node $file) {
-		try {
-			$parent = $file->getParent();
-
-			if ($userFolder->getId() === $parent->getId()) {
-				return null;
-			}
-		} catch (\Exception $e) {
-			return null;
-		}
-
-		if ($parent->isEncrypted()) {
-			return $parent;
-		}
-
-		return $this->getParentEndToEndEncryptionContainer($userFolder, $parent);
-	}
-
-	/**
-	 * @param string $uid
-	 * @return array
-	 */
-	protected function getUser($uid) {
-		// First try local user
-		$displayName = $this->userManager->getDisplayName($uid);
-		if ($displayName !== null) {
-			return [
-				'type' => 'user',
-				'id' => $uid,
-				'name' => $displayName,
-			];
-		}
-
-		// Then a contact from the addressbook
-		if ($this->cloudIdManager->isValidCloudId($uid)) {
-			$cloudId = $this->cloudIdManager->resolveCloudId($uid);
-			return [
-				'type' => 'user',
-				'id' => $cloudId->getUser(),
-				'name' => $this->getDisplayNameFromAddressBook($cloudId->getDisplayId()),
-				'server' => $cloudId->getRemote(),
-			];
-		}
-
-		// Fallback to empty dummy data
-		return [
-			'type' => 'user',
-			'id' => $uid,
-			'name' => $uid,
-		];
-	}
-
-	protected function getDisplayNameFromAddressBook(string $search): string {
-		if (isset($this->displayNames[$search])) {
-			return $this->displayNames[$search];
-		}
-
-		$addressBookContacts = $this->contactsManager->search($search, ['CLOUD'], [
-			'limit' => 1,
-			'enumeration' => false,
-			'fullmatch' => false,
-			'strict_search' => true,
-		]);
-		foreach ($addressBookContacts as $contact) {
-			if (isset($contact['isLocalSystemBook'])) {
-				continue;
-			}
-
-			if (isset($contact['CLOUD'])) {
-				$cloudIds = $contact['CLOUD'];
-				if (is_string($cloudIds)) {
-					$cloudIds = [$cloudIds];
-				}
-
-				$lowerSearch = strtolower($search);
-				foreach ($cloudIds as $cloudId) {
-					if (strtolower($cloudId) === $lowerSearch) {
-						$this->displayNames[$search] = $contact['FN'] . " ($cloudId)";
-						return $this->displayNames[$search];
-					}
-				}
-			}
-		}
-
-		return $search;
-	}
+    /** @var IFactory */
+    protected $languageFactory;
+
+    /** @var IL10N */
+    protected $l;
+    /** @var IL10N */
+    protected $activityLang;
+
+    /** @var IURLGenerator */
+    protected $url;
+
+    /** @var IManager */
+    protected $activityManager;
+
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var IRootFolder */
+    protected $rootFolder;
+
+    /** @var IEventMerger */
+    protected $eventMerger;
+
+    /** @var ICloudIdManager */
+    protected $cloudIdManager;
+
+    /** @var IContactsManager */
+    protected $contactsManager;
+
+    /** @var string[] cached displayNames - key is the cloud id and value the displayname */
+    protected $displayNames = [];
+
+    protected $fileIsEncrypted = false;
+
+    public function __construct(IFactory $languageFactory,
+                                IURLGenerator $url,
+                                IManager $activityManager,
+                                IUserManager $userManager,
+                                IRootFolder $rootFolder,
+                                ICloudIdManager $cloudIdManager,
+                                IContactsManager $contactsManager,
+                                IEventMerger $eventMerger) {
+        $this->languageFactory = $languageFactory;
+        $this->url = $url;
+        $this->activityManager = $activityManager;
+        $this->userManager = $userManager;
+        $this->rootFolder = $rootFolder;
+        $this->cloudIdManager = $cloudIdManager;
+        $this->contactsManager = $contactsManager;
+        $this->eventMerger = $eventMerger;
+    }
+
+    /**
+     * @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() !== 'files') {
+            throw new \InvalidArgumentException();
+        }
+
+        $this->l = $this->languageFactory->get('files', $language);
+        $this->activityLang = $this->languageFactory->get('activity', $language);
+
+        if ($this->activityManager->isFormattingFilteredObject()) {
+            try {
+                return $this->parseShortVersion($event, $previousEvent);
+            } catch (\InvalidArgumentException $e) {
+                // Ignore and simply use the long version...
+            }
+        }
+
+        return $this->parseLongVersion($event, $previousEvent);
+    }
+
+    protected function setIcon(IEvent $event, string $icon, string $app = 'files') {
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath($app, $icon . '.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath($app, $icon . '.svg')));
+        }
+    }
+
+    /**
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseShortVersion(IEvent $event, IEvent $previousEvent = null) {
+        $parsedParameters = $this->getParameters($event);
+
+        if ($event->getSubject() === 'created_by') {
+            $subject = $this->l->t('Created by {user}');
+            $this->setIcon($event, 'add-color');
+        } elseif ($event->getSubject() === 'changed_by') {
+            $subject = $this->l->t('Changed by {user}');
+            $this->setIcon($event, 'change');
+        } elseif ($event->getSubject() === 'deleted_by') {
+            $subject = $this->l->t('Deleted by {user}');
+            $this->setIcon($event, 'delete-color');
+        } elseif ($event->getSubject() === 'restored_by') {
+            $subject = $this->l->t('Restored by {user}');
+            $this->setIcon($event, 'actions/history', 'core');
+        } elseif ($event->getSubject() === 'renamed_by') {
+            $subject = $this->l->t('Renamed by {user}');
+            $this->setIcon($event, 'change');
+        } elseif ($event->getSubject() === 'moved_by') {
+            $subject = $this->l->t('Moved by {user}');
+            $this->setIcon($event, 'change');
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        if (!isset($parsedParameters['user'])) {
+            // External user via public link share
+            $subject = str_replace('{user}', $this->activityLang->t('"remote user"'), $subject);
+        }
+
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        return $this->eventMerger->mergeEvents('user', $event, $previousEvent);
+    }
+
+    /**
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseLongVersion(IEvent $event, IEvent $previousEvent = null) {
+        $this->fileIsEncrypted = false;
+        $parsedParameters = $this->getParameters($event);
+
+        if ($event->getSubject() === 'created_self') {
+            $subject = $this->l->t('You created {file}');
+            if ($this->fileIsEncrypted) {
+                $subject = $this->l->t('You created an encrypted file in {file}');
+            }
+            $this->setIcon($event, 'add-color');
+        } elseif ($event->getSubject() === 'created_by') {
+            $subject = $this->l->t('{user} created {file}');
+            if ($this->fileIsEncrypted) {
+                $subject = $this->l->t('{user} created an encrypted file in {file}');
+            }
+            $this->setIcon($event, 'add-color');
+        } elseif ($event->getSubject() === 'created_public') {
+            $subject = $this->l->t('{file} was created in a public folder');
+            $this->setIcon($event, 'add-color');
+        } elseif ($event->getSubject() === 'changed_self') {
+            $subject = $this->l->t('You changed {file}');
+            if ($this->fileIsEncrypted) {
+                $subject = $this->l->t('You changed an encrypted file in {file}');
+            }
+            $this->setIcon($event, 'change');
+        } elseif ($event->getSubject() === 'changed_by') {
+            $subject = $this->l->t('{user} changed {file}');
+            if ($this->fileIsEncrypted) {
+                $subject = $this->l->t('{user} changed an encrypted file in {file}');
+            }
+            $this->setIcon($event, 'change');
+        } elseif ($event->getSubject() === 'deleted_self') {
+            $subject = $this->l->t('You deleted {file}');
+            if ($this->fileIsEncrypted) {
+                $subject = $this->l->t('You deleted an encrypted file in {file}');
+            }
+            $this->setIcon($event, 'delete-color');
+        } elseif ($event->getSubject() === 'deleted_by') {
+            $subject = $this->l->t('{user} deleted {file}');
+            if ($this->fileIsEncrypted) {
+                $subject = $this->l->t('{user} deleted an encrypted file in {file}');
+            }
+            $this->setIcon($event, 'delete-color');
+        } elseif ($event->getSubject() === 'restored_self') {
+            $subject = $this->l->t('You restored {file}');
+            $this->setIcon($event, 'actions/history', 'core');
+        } elseif ($event->getSubject() === 'restored_by') {
+            $subject = $this->l->t('{user} restored {file}');
+            $this->setIcon($event, 'actions/history', 'core');
+        } elseif ($event->getSubject() === 'renamed_self') {
+            $oldFileName = $parsedParameters['oldfile']['name'];
+            $newFileName = $parsedParameters['newfile']['name'];
+
+            if ($this->isHiddenFile($oldFileName)) {
+                if ($this->isHiddenFile($newFileName)) {
+                    $subject = $this->l->t('You renamed {oldfile} (hidden) to {newfile} (hidden)');
+                } else {
+                    $subject = $this->l->t('You renamed {oldfile} (hidden) to {newfile}');
+                }
+            } else {
+                if ($this->isHiddenFile($newFileName)) {
+                    $subject = $this->l->t('You renamed {oldfile} to {newfile} (hidden)');
+                } else {
+                    $subject = $this->l->t('You renamed {oldfile} to {newfile}');
+                }
+            }
+
+            $this->setIcon($event, 'change');
+        } elseif ($event->getSubject() === 'renamed_by') {
+            $oldFileName = $parsedParameters['oldfile']['name'];
+            $newFileName = $parsedParameters['newfile']['name'];
+
+            if ($this->isHiddenFile($oldFileName)) {
+                if ($this->isHiddenFile($newFileName)) {
+                    $subject = $this->l->t('{user} renamed {oldfile} (hidden) to {newfile} (hidden)');
+                } else {
+                    $subject = $this->l->t('{user} renamed {oldfile} (hidden) to {newfile}');
+                }
+            } else {
+                if ($this->isHiddenFile($newFileName)) {
+                    $subject = $this->l->t('{user} renamed {oldfile} to {newfile} (hidden)');
+                } else {
+                    $subject = $this->l->t('{user} renamed {oldfile} to {newfile}');
+                }
+            }
+
+            $this->setIcon($event, 'change');
+        } elseif ($event->getSubject() === 'moved_self') {
+            $subject = $this->l->t('You moved {oldfile} to {newfile}');
+            $this->setIcon($event, 'change');
+        } elseif ($event->getSubject() === 'moved_by') {
+            $subject = $this->l->t('{user} moved {oldfile} to {newfile}');
+            $this->setIcon($event, 'change');
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        if ($this->fileIsEncrypted) {
+            $event->setSubject($event->getSubject() . '_enc', $event->getSubjectParameters());
+        }
+
+        if (!isset($parsedParameters['user'])) {
+            // External user via public link share
+            $subject = str_replace('{user}', $this->activityLang->t('"remote user"'), $subject);
+        }
+
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        if ($event->getSubject() === 'moved_self' || $event->getSubject() === 'moved_by') {
+            $event = $this->eventMerger->mergeEvents('oldfile', $event, $previousEvent);
+        } else {
+            $event = $this->eventMerger->mergeEvents('file', $event, $previousEvent);
+        }
+
+        if ($event->getChildEvent() === null) {
+            // Couldn't group by file, maybe we can group by user
+            $event = $this->eventMerger->mergeEvents('user', $event, $previousEvent);
+        }
+
+        return $event;
+    }
+
+    private function isHiddenFile(string $filename): bool {
+        return strlen($filename) > 0 && $filename[0] === '.';
+    }
+
+    protected function setSubjects(IEvent $event, $subject, array $parameters) {
+        $placeholders = $replacements = [];
+        foreach ($parameters as $placeholder => $parameter) {
+            $placeholders[] = '{' . $placeholder . '}';
+            if ($parameter['type'] === 'file') {
+                $replacements[] = $parameter['path'];
+            } else {
+                $replacements[] = $parameter['name'];
+            }
+        }
+
+        $event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
+            ->setRichSubject($subject, $parameters);
+    }
+
+    /**
+     * @param IEvent $event
+     * @return array
+     * @throws \InvalidArgumentException
+     */
+    protected function getParameters(IEvent $event) {
+        $parameters = $event->getSubjectParameters();
+        switch ($event->getSubject()) {
+            case 'created_self':
+            case 'created_public':
+            case 'changed_self':
+            case 'deleted_self':
+            case 'restored_self':
+                return [
+                    'file' => $this->getFile($parameters[0], $event),
+                ];
+            case 'created_by':
+            case 'changed_by':
+            case 'deleted_by':
+            case 'restored_by':
+                if ($parameters[1] === '') {
+                    // External user via public link share
+                    return [
+                        'file' => $this->getFile($parameters[0], $event),
+                    ];
+                }
+                return [
+                    'file' => $this->getFile($parameters[0], $event),
+                    'user' => $this->getUser($parameters[1]),
+                ];
+            case 'renamed_self':
+            case 'moved_self':
+                return [
+                    'newfile' => $this->getFile($parameters[0]),
+                    'oldfile' => $this->getFile($parameters[1]),
+                ];
+            case 'renamed_by':
+            case 'moved_by':
+                if ($parameters[1] === '') {
+                    // External user via public link share
+                    return [
+                        'newfile' => $this->getFile($parameters[0]),
+                        'oldfile' => $this->getFile($parameters[2]),
+                    ];
+                }
+                return [
+                    'newfile' => $this->getFile($parameters[0]),
+                    'user' => $this->getUser($parameters[1]),
+                    'oldfile' => $this->getFile($parameters[2]),
+                ];
+        }
+        return [];
+    }
+
+    /**
+     * @param array|string $parameter
+     * @param IEvent|null $event
+     * @return array
+     * @throws \InvalidArgumentException
+     */
+    protected function getFile($parameter, IEvent $event = null) {
+        if (is_array($parameter)) {
+            $path = reset($parameter);
+            $id = (string) key($parameter);
+        } elseif ($event !== null) {
+            // Legacy from before ownCloud 8.2
+            $path = $parameter;
+            $id = $event->getObjectId();
+        } else {
+            throw new \InvalidArgumentException('Could not generate file parameter');
+        }
+
+        $encryptionContainer = $this->getEndToEndEncryptionContainer($id, $path);
+        if ($encryptionContainer instanceof Folder) {
+            $this->fileIsEncrypted = true;
+            try {
+                $fullPath = rtrim($encryptionContainer->getPath(), '/');
+                // Remove /user/files/...
+                [,,, $path] = explode('/', $fullPath, 4);
+                if (!$path) {
+                    throw new InvalidPathException('Path could not be split correctly');
+                }
+
+                return [
+                    'type' => 'file',
+                    'id' => $encryptionContainer->getId(),
+                    'name' => $encryptionContainer->getName(),
+                    'path' => $path,
+                    'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $encryptionContainer->getId()]),
+                ];
+            } catch (\Exception $e) {
+                // fall back to the normal one
+                $this->fileIsEncrypted = false;
+            }
+        }
+
+        return [
+            'type' => 'file',
+            'id' => $id,
+            'name' => basename($path),
+            'path' => trim($path, '/'),
+            'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
+        ];
+    }
+
+    protected $fileEncrypted = [];
+
+    /**
+     * Check if a file is end2end encrypted
+     * @param int $fileId
+     * @param string $path
+     * @return Folder|null
+     */
+    protected function getEndToEndEncryptionContainer($fileId, $path) {
+        if (isset($this->fileEncrypted[$fileId])) {
+            return $this->fileEncrypted[$fileId];
+        }
+
+        $fileName = basename($path);
+        if (!preg_match('/^[0-9a-fA-F]{32}$/', $fileName)) {
+            $this->fileEncrypted[$fileId] = false;
+            return $this->fileEncrypted[$fileId];
+        }
+
+        $userFolder = $this->rootFolder->getUserFolder($this->activityManager->getCurrentUserId());
+        $files = $userFolder->getById($fileId);
+        if (empty($files)) {
+            try {
+                // Deleted, try with parent
+                $file = $this->findExistingParent($userFolder, dirname($path));
+            } catch (NotFoundException $e) {
+                return null;
+            }
+
+            if (!$file instanceof Folder || !$file->isEncrypted()) {
+                return null;
+            }
+
+            $this->fileEncrypted[$fileId] = $file;
+            return $file;
+        }
+
+        $file = array_shift($files);
+
+        if ($file instanceof Folder && $file->isEncrypted()) {
+            // If the folder is encrypted, it is the Container,
+            // but can be the name is just fine.
+            $this->fileEncrypted[$fileId] = true;
+            return null;
+        }
+
+        $this->fileEncrypted[$fileId] = $this->getParentEndToEndEncryptionContainer($userFolder, $file);
+        return $this->fileEncrypted[$fileId];
+    }
+
+    /**
+     * @param Folder $userFolder
+     * @param string $path
+     * @return Folder
+     * @throws NotFoundException
+     */
+    protected function findExistingParent(Folder $userFolder, $path) {
+        if ($path === '/') {
+            throw new NotFoundException('Reached the root');
+        }
+
+        try {
+            $folder = $userFolder->get(dirname($path));
+        } catch (NotFoundException $e) {
+            return $this->findExistingParent($userFolder, dirname($path));
+        }
+
+        return $folder;
+    }
+
+    /**
+     * Check all parents until the user's root folder if one is encrypted
+     *
+     * @param Folder $userFolder
+     * @param Node $file
+     * @return Node|null
+     */
+    protected function getParentEndToEndEncryptionContainer(Folder $userFolder, Node $file) {
+        try {
+            $parent = $file->getParent();
+
+            if ($userFolder->getId() === $parent->getId()) {
+                return null;
+            }
+        } catch (\Exception $e) {
+            return null;
+        }
+
+        if ($parent->isEncrypted()) {
+            return $parent;
+        }
+
+        return $this->getParentEndToEndEncryptionContainer($userFolder, $parent);
+    }
+
+    /**
+     * @param string $uid
+     * @return array
+     */
+    protected function getUser($uid) {
+        // First try local user
+        $displayName = $this->userManager->getDisplayName($uid);
+        if ($displayName !== null) {
+            return [
+                'type' => 'user',
+                'id' => $uid,
+                'name' => $displayName,
+            ];
+        }
+
+        // Then a contact from the addressbook
+        if ($this->cloudIdManager->isValidCloudId($uid)) {
+            $cloudId = $this->cloudIdManager->resolveCloudId($uid);
+            return [
+                'type' => 'user',
+                'id' => $cloudId->getUser(),
+                'name' => $this->getDisplayNameFromAddressBook($cloudId->getDisplayId()),
+                'server' => $cloudId->getRemote(),
+            ];
+        }
+
+        // Fallback to empty dummy data
+        return [
+            'type' => 'user',
+            'id' => $uid,
+            'name' => $uid,
+        ];
+    }
+
+    protected function getDisplayNameFromAddressBook(string $search): string {
+        if (isset($this->displayNames[$search])) {
+            return $this->displayNames[$search];
+        }
+
+        $addressBookContacts = $this->contactsManager->search($search, ['CLOUD'], [
+            'limit' => 1,
+            'enumeration' => false,
+            'fullmatch' => false,
+            'strict_search' => true,
+        ]);
+        foreach ($addressBookContacts as $contact) {
+            if (isset($contact['isLocalSystemBook'])) {
+                continue;
+            }
+
+            if (isset($contact['CLOUD'])) {
+                $cloudIds = $contact['CLOUD'];
+                if (is_string($cloudIds)) {
+                    $cloudIds = [$cloudIds];
+                }
+
+                $lowerSearch = strtolower($search);
+                foreach ($cloudIds as $cloudId) {
+                    if (strtolower($cloudId) === $lowerSearch) {
+                        $this->displayNames[$search] = $contact['FN'] . " ($cloudId)";
+                        return $this->displayNames[$search];
+                    }
+                }
+            }
+        }
+
+        return $search;
+    }
 }

apps/sharebymail/lib/Activity.php

Indentation +310 added lines, -310 removed lines

@@ -37,341 +37,341 @@
 
 class Activity implements IProvider {
 
-	/** @var IFactory */
-	protected $languageFactory;
+    /** @var IFactory */
+    protected $languageFactory;
 
-	/** @var IL10N */
-	protected $l;
+    /** @var IL10N */
+    protected $l;
 
-	/** @var IURLGenerator */
-	protected $url;
+    /** @var IURLGenerator */
+    protected $url;
 
-	/** @var IManager */
-	protected $activityManager;
+    /** @var IManager */
+    protected $activityManager;
 
-	/** @var IUserManager */
-	protected $userManager;
-	/** @var IContactsManager */
-	protected $contactsManager;
+    /** @var IUserManager */
+    protected $userManager;
+    /** @var IContactsManager */
+    protected $contactsManager;
 
-	/** @var array */
-	protected $contactNames = [];
+    /** @var array */
+    protected $contactNames = [];
 
-	public const SUBJECT_SHARED_EMAIL_SELF = 'shared_with_email_self';
-	public const SUBJECT_SHARED_EMAIL_BY = 'shared_with_email_by';
-	public const SUBJECT_SHARED_EMAIL_PASSWORD_SEND = 'shared_with_email_password_send';
-	public const SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF = 'shared_with_email_password_send_self';
-	public const SUBJECT_UNSHARED_EMAIL_SELF = 'unshared_with_email_self';
-	public const SUBJECT_UNSHARED_EMAIL_BY = 'unshared_with_email_by';
+    public const SUBJECT_SHARED_EMAIL_SELF = 'shared_with_email_self';
+    public const SUBJECT_SHARED_EMAIL_BY = 'shared_with_email_by';
+    public const SUBJECT_SHARED_EMAIL_PASSWORD_SEND = 'shared_with_email_password_send';
+    public const SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF = 'shared_with_email_password_send_self';
+    public const SUBJECT_UNSHARED_EMAIL_SELF = 'unshared_with_email_self';
+    public const SUBJECT_UNSHARED_EMAIL_BY = 'unshared_with_email_by';
 
-	/**
-	 * @param IFactory $languageFactory
-	 * @param IURLGenerator $url
-	 * @param IManager $activityManager
-	 * @param IUserManager $userManager
-	 * @param IContactsManager $contactsManager
-	 */
-	public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IContactsManager $contactsManager) {
-		$this->languageFactory = $languageFactory;
-		$this->url = $url;
-		$this->activityManager = $activityManager;
-		$this->userManager = $userManager;
-		$this->contactsManager = $contactsManager;
-	}
+    /**
+     * @param IFactory $languageFactory
+     * @param IURLGenerator $url
+     * @param IManager $activityManager
+     * @param IUserManager $userManager
+     * @param IContactsManager $contactsManager
+     */
+    public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IContactsManager $contactsManager) {
+        $this->languageFactory = $languageFactory;
+        $this->url = $url;
+        $this->activityManager = $activityManager;
+        $this->userManager = $userManager;
+        $this->contactsManager = $contactsManager;
+    }
 
-	/**
-	 * @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() !== 'sharebymail') {
-			throw new \InvalidArgumentException();
-		}
+    /**
+     * @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() !== 'sharebymail') {
+            throw new \InvalidArgumentException();
+        }
 
-		$this->l = $this->languageFactory->get('sharebymail', $language);
+        $this->l = $this->languageFactory->get('sharebymail', $language);
 
-		if ($this->activityManager->isFormattingFilteredObject()) {
-			try {
-				return $this->parseShortVersion($event);
-			} catch (\InvalidArgumentException $e) {
-				// Ignore and simply use the long version...
-			}
-		}
+        if ($this->activityManager->isFormattingFilteredObject()) {
+            try {
+                return $this->parseShortVersion($event);
+            } catch (\InvalidArgumentException $e) {
+                // Ignore and simply use the long version...
+            }
+        }
 
-		return $this->parseLongVersion($event);
-	}
+        return $this->parseLongVersion($event);
+    }
 
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseShortVersion(IEvent $event) {
-		$parsedParameters = $this->getParsedParameters($event);
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseShortVersion(IEvent $event) {
+        $parsedParameters = $this->getParsedParameters($event);
 
-		if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_SELF) {
-			$event->setParsedSubject($this->l->t('Shared with %1$s', [
-				$parsedParameters['email']['name'],
-			]))
-				->setRichSubject($this->l->t('Shared with {email}'), [
-					'email' => $parsedParameters['email'],
-				]);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} elseif ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_BY) {
-			$event->setParsedSubject($this->l->t('Shared with %1$s by %2$s', [
-				$parsedParameters['email']['name'],
-				$parsedParameters['actor']['name'],
-			]))
-				->setRichSubject($this->l->t('Shared with {email} by {actor}'), [
-					'email' => $parsedParameters['email'],
-					'actor' => $parsedParameters['actor'],
-				]);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARED_EMAIL_SELF) {
-			$event->setParsedSubject($this->l->t('Unshared from %1$s', [
-				$parsedParameters['email']['name'],
-			]))
-				->setRichSubject($this->l->t('Unshared from {email}'), [
-					'email' => $parsedParameters['email'],
-				]);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARED_EMAIL_BY) {
-			$event->setParsedSubject($this->l->t('Unshared from %1$s by %2$s', [
-				$parsedParameters['email']['name'],
-				$parsedParameters['actor']['name'],
-			]))
-				->setRichSubject($this->l->t('Unshared from {email} by {actor}'), [
-					'email' => $parsedParameters['email'],
-					'actor' => $parsedParameters['actor'],
-				]);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} elseif ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND) {
-			$event->setParsedSubject($this->l->t('Password for mail share sent to %1$s', [
-				$parsedParameters['email']['name']
-			]))
-				->setRichSubject($this->l->t('Password for mail share sent to {email}'), [
-					'email' => $parsedParameters['email']
-				]);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} elseif ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF) {
-			$event->setParsedSubject($this->l->t('Password for mail share sent to you'))
-				->setRichSubject($this->l->t('Password for mail share sent to you'));
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} else {
-			throw new \InvalidArgumentException();
-		}
+        if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_SELF) {
+            $event->setParsedSubject($this->l->t('Shared with %1$s', [
+                $parsedParameters['email']['name'],
+            ]))
+                ->setRichSubject($this->l->t('Shared with {email}'), [
+                    'email' => $parsedParameters['email'],
+                ]);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } elseif ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_BY) {
+            $event->setParsedSubject($this->l->t('Shared with %1$s by %2$s', [
+                $parsedParameters['email']['name'],
+                $parsedParameters['actor']['name'],
+            ]))
+                ->setRichSubject($this->l->t('Shared with {email} by {actor}'), [
+                    'email' => $parsedParameters['email'],
+                    'actor' => $parsedParameters['actor'],
+                ]);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } elseif ($event->getSubject() === self::SUBJECT_UNSHARED_EMAIL_SELF) {
+            $event->setParsedSubject($this->l->t('Unshared from %1$s', [
+                $parsedParameters['email']['name'],
+            ]))
+                ->setRichSubject($this->l->t('Unshared from {email}'), [
+                    'email' => $parsedParameters['email'],
+                ]);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } elseif ($event->getSubject() === self::SUBJECT_UNSHARED_EMAIL_BY) {
+            $event->setParsedSubject($this->l->t('Unshared from %1$s by %2$s', [
+                $parsedParameters['email']['name'],
+                $parsedParameters['actor']['name'],
+            ]))
+                ->setRichSubject($this->l->t('Unshared from {email} by {actor}'), [
+                    'email' => $parsedParameters['email'],
+                    'actor' => $parsedParameters['actor'],
+                ]);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } elseif ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND) {
+            $event->setParsedSubject($this->l->t('Password for mail share sent to %1$s', [
+                $parsedParameters['email']['name']
+            ]))
+                ->setRichSubject($this->l->t('Password for mail share sent to {email}'), [
+                    'email' => $parsedParameters['email']
+                ]);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } elseif ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF) {
+            $event->setParsedSubject($this->l->t('Password for mail share sent to you'))
+                ->setRichSubject($this->l->t('Password for mail share sent to you'));
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } else {
+            throw new \InvalidArgumentException();
+        }
 
-		return $event;
-	}
+        return $event;
+    }
 
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseLongVersion(IEvent $event) {
-		$parsedParameters = $this->getParsedParameters($event);
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseLongVersion(IEvent $event) {
+        $parsedParameters = $this->getParsedParameters($event);
 
-		if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_SELF) {
-			$event->setParsedSubject($this->l->t('You shared %1$s with %2$s by mail', [
-				$parsedParameters['file']['path'],
-				$parsedParameters['email']['name'],
-			]))
-				->setRichSubject($this->l->t('You shared {file} with {email} by mail'), $parsedParameters);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} elseif ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_BY) {
-			$event->setParsedSubject($this->l->t('%3$s shared %1$s with %2$s by mail', [
-				$parsedParameters['file']['path'],
-				$parsedParameters['email']['name'],
-				$parsedParameters['actor']['name'],
-			]))
-				->setRichSubject($this->l->t('{actor} shared {file} with {email} by mail'), $parsedParameters);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARED_EMAIL_SELF) {
-			$event->setParsedSubject($this->l->t('You unshared %1$s from %2$s by mail', [
-				$parsedParameters['file']['path'],
-				$parsedParameters['email']['name'],
-			]))
-				->setRichSubject($this->l->t('You unshared {file} from {email} by mail'), $parsedParameters);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARED_EMAIL_BY) {
-			$event->setParsedSubject($this->l->t('%3$s unshared %1$s from %2$s by mail', [
-				$parsedParameters['file']['path'],
-				$parsedParameters['email']['name'],
-				$parsedParameters['actor']['name'],
-			]))
-				->setRichSubject($this->l->t('{actor} unshared {file} from {email} by mail'), $parsedParameters);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} elseif ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND) {
-			$event->setParsedSubject($this->l->t('Password to access %1$s was sent to %2s', [
-				$parsedParameters['file']['path'],
-				$parsedParameters['email']['name']
-			]))
-				->setRichSubject($this->l->t('Password to access {file} was sent to {email}'), $parsedParameters);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} elseif ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF) {
-			$event->setParsedSubject(
-				$this->l->t('Password to access %1$s was sent to you',
-					[$parsedParameters['file']['path']]))
-				->setRichSubject($this->l->t('Password to access {file} was sent to you'), $parsedParameters);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} else {
-			throw new \InvalidArgumentException();
-		}
+        if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_SELF) {
+            $event->setParsedSubject($this->l->t('You shared %1$s with %2$s by mail', [
+                $parsedParameters['file']['path'],
+                $parsedParameters['email']['name'],
+            ]))
+                ->setRichSubject($this->l->t('You shared {file} with {email} by mail'), $parsedParameters);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } elseif ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_BY) {
+            $event->setParsedSubject($this->l->t('%3$s shared %1$s with %2$s by mail', [
+                $parsedParameters['file']['path'],
+                $parsedParameters['email']['name'],
+                $parsedParameters['actor']['name'],
+            ]))
+                ->setRichSubject($this->l->t('{actor} shared {file} with {email} by mail'), $parsedParameters);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } elseif ($event->getSubject() === self::SUBJECT_UNSHARED_EMAIL_SELF) {
+            $event->setParsedSubject($this->l->t('You unshared %1$s from %2$s by mail', [
+                $parsedParameters['file']['path'],
+                $parsedParameters['email']['name'],
+            ]))
+                ->setRichSubject($this->l->t('You unshared {file} from {email} by mail'), $parsedParameters);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } elseif ($event->getSubject() === self::SUBJECT_UNSHARED_EMAIL_BY) {
+            $event->setParsedSubject($this->l->t('%3$s unshared %1$s from %2$s by mail', [
+                $parsedParameters['file']['path'],
+                $parsedParameters['email']['name'],
+                $parsedParameters['actor']['name'],
+            ]))
+                ->setRichSubject($this->l->t('{actor} unshared {file} from {email} by mail'), $parsedParameters);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } elseif ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND) {
+            $event->setParsedSubject($this->l->t('Password to access %1$s was sent to %2s', [
+                $parsedParameters['file']['path'],
+                $parsedParameters['email']['name']
+            ]))
+                ->setRichSubject($this->l->t('Password to access {file} was sent to {email}'), $parsedParameters);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } elseif ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF) {
+            $event->setParsedSubject(
+                $this->l->t('Password to access %1$s was sent to you',
+                    [$parsedParameters['file']['path']]))
+                ->setRichSubject($this->l->t('Password to access {file} was sent to you'), $parsedParameters);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } else {
+            throw new \InvalidArgumentException();
+        }
 
-		return $event;
-	}
+        return $event;
+    }
 
-	protected function getParsedParameters(IEvent $event) {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
+    protected function getParsedParameters(IEvent $event) {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
 
-		switch ($subject) {
-			case self::SUBJECT_SHARED_EMAIL_SELF:
-			case self::SUBJECT_UNSHARED_EMAIL_SELF:
-				return [
-					'file' => $this->generateFileParameter($event->getObjectId(), $parameters[0]),
-					'email' => $this->generateEmailParameter($parameters[1]),
-				];
-			case self::SUBJECT_SHARED_EMAIL_BY:
-			case self::SUBJECT_UNSHARED_EMAIL_BY:
-				return [
-					'file' => $this->generateFileParameter($event->getObjectId(), $parameters[0]),
-					'email' => $this->generateEmailParameter($parameters[1]),
-					'actor' => $this->generateUserParameter($parameters[2]),
-				];
-			case self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND:
-				return [
-					'file' => $this->generateFileParameter($event->getObjectId(), $parameters[0]),
-					'email' => $this->generateEmailParameter($parameters[1]),
-				];
-			case self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF:
-				return [
-					'file' => $this->generateFileParameter($event->getObjectId(), $parameters[0]),
-				];
-		}
-		throw new \InvalidArgumentException();
-	}
+        switch ($subject) {
+            case self::SUBJECT_SHARED_EMAIL_SELF:
+            case self::SUBJECT_UNSHARED_EMAIL_SELF:
+                return [
+                    'file' => $this->generateFileParameter($event->getObjectId(), $parameters[0]),
+                    'email' => $this->generateEmailParameter($parameters[1]),
+                ];
+            case self::SUBJECT_SHARED_EMAIL_BY:
+            case self::SUBJECT_UNSHARED_EMAIL_BY:
+                return [
+                    'file' => $this->generateFileParameter($event->getObjectId(), $parameters[0]),
+                    'email' => $this->generateEmailParameter($parameters[1]),
+                    'actor' => $this->generateUserParameter($parameters[2]),
+                ];
+            case self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND:
+                return [
+                    'file' => $this->generateFileParameter($event->getObjectId(), $parameters[0]),
+                    'email' => $this->generateEmailParameter($parameters[1]),
+                ];
+            case self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF:
+                return [
+                    'file' => $this->generateFileParameter($event->getObjectId(), $parameters[0]),
+                ];
+        }
+        throw new \InvalidArgumentException();
+    }
 
-	/**
-	 * @param int $id
-	 * @param string $path
-	 * @return array
-	 */
-	protected function generateFileParameter($id, $path) {
-		return [
-			'type' => 'file',
-			'id' => $id,
-			'name' => basename($path),
-			'path' => trim($path, '/'),
-			'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
-		];
-	}
+    /**
+     * @param int $id
+     * @param string $path
+     * @return array
+     */
+    protected function generateFileParameter($id, $path) {
+        return [
+            'type' => 'file',
+            'id' => $id,
+            'name' => basename($path),
+            'path' => trim($path, '/'),
+            'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
+        ];
+    }
 
-	/**
-	 * @param string $email
-	 * @return array
-	 */
-	protected function generateEmailParameter($email) {
-		if (!isset($this->contactNames[$email])) {
-			$this->contactNames[$email] = $this->getContactName($email);
-		}
+    /**
+     * @param string $email
+     * @return array
+     */
+    protected function generateEmailParameter($email) {
+        if (!isset($this->contactNames[$email])) {
+            $this->contactNames[$email] = $this->getContactName($email);
+        }
 
-		return [
-			'type' => 'email',
-			'id' => $email,
-			'name' => $this->contactNames[$email],
-		];
-	}
+        return [
+            'type' => 'email',
+            'id' => $email,
+            'name' => $this->contactNames[$email],
+        ];
+    }
 
-	/**
-	 * @param string $uid
-	 * @return array
-	 */
-	protected function generateUserParameter($uid) {
-		return [
-			'type' => 'user',
-			'id' => $uid,
-			'name' => $this->userManager->getDisplayName($uid) ?? $uid,
-		];
-	}
+    /**
+     * @param string $uid
+     * @return array
+     */
+    protected function generateUserParameter($uid) {
+        return [
+            'type' => 'user',
+            'id' => $uid,
+            'name' => $this->userManager->getDisplayName($uid) ?? $uid,
+        ];
+    }
 
-	/**
-	 * @param string $email
-	 * @return string
-	 */
-	protected function getContactName($email) {
-		$addressBookContacts = $this->contactsManager->search($email, ['EMAIL'], [
-			'limit' => 1,
-			'enumeration' => false,
-			'fullmatch' => false,
-			'strict_search' => true,
-		]);
+    /**
+     * @param string $email
+     * @return string
+     */
+    protected function getContactName($email) {
+        $addressBookContacts = $this->contactsManager->search($email, ['EMAIL'], [
+            'limit' => 1,
+            'enumeration' => false,
+            'fullmatch' => false,
+            'strict_search' => true,
+        ]);
 
-		foreach ($addressBookContacts as $contact) {
-			if (isset($contact['isLocalSystemBook'])) {
-				continue;
-			}
+        foreach ($addressBookContacts as $contact) {
+            if (isset($contact['isLocalSystemBook'])) {
+                continue;
+            }
 
-			if (in_array($email, $contact['EMAIL'])) {
-				return $contact['FN'];
-			}
-		}
+            if (in_array($email, $contact['EMAIL'])) {
+                return $contact['FN'];
+            }
+        }
 
-		return $email;
-	}
+        return $email;
+    }
 }

apps/files_sharing/lib/Activity/Providers/Base.php

Indentation +202 added lines, -202 removed lines

@@ -37,206 +37,206 @@
 
 abstract class Base implements IProvider {
 
-	/** @var IFactory */
-	protected $languageFactory;
-
-	/** @var IL10N */
-	protected $l;
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var IManager */
-	protected $activityManager;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var IEventMerger */
-	protected $eventMerger;
-
-	/** @var IContactsManager */
-	protected $contactsManager;
-
-	/** @var ICloudIdManager */
-	protected $cloudIdManager;
-
-	/** @var array */
-	protected $displayNames = [];
-
-	public function __construct(IFactory $languageFactory,
-								IURLGenerator $url,
-								IManager $activityManager,
-								IUserManager $userManager,
-								ICloudIdManager $cloudIdManager,
-								IContactsManager $contactsManager,
-								IEventMerger $eventMerger) {
-		$this->languageFactory = $languageFactory;
-		$this->url = $url;
-		$this->activityManager = $activityManager;
-		$this->userManager = $userManager;
-		$this->cloudIdManager = $cloudIdManager;
-		$this->contactsManager = $contactsManager;
-		$this->eventMerger = $eventMerger;
-	}
-
-	/**
-	 * @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() !== 'files_sharing') {
-			throw new \InvalidArgumentException();
-		}
-
-		$this->l = $this->languageFactory->get('files_sharing', $language);
-
-		if ($this->activityManager->isFormattingFilteredObject()) {
-			try {
-				return $this->parseShortVersion($event);
-			} catch (\InvalidArgumentException $e) {
-				// Ignore and simply use the long version...
-			}
-		}
-
-		return $this->parseLongVersion($event, $previousEvent);
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	abstract protected function parseShortVersion(IEvent $event);
-
-	/**
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	abstract protected function parseLongVersion(IEvent $event, IEvent $previousEvent = null);
-
-	/**
-	 * @param IEvent $event
-	 * @param string $subject
-	 * @param array $parameters
-	 * @throws \InvalidArgumentException
-	 */
-	protected function setSubjects(IEvent $event, $subject, array $parameters) {
-		$placeholders = $replacements = [];
-		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
-			if ($parameter['type'] === 'file') {
-				$replacements[] = $parameter['path'];
-			} else {
-				$replacements[] = $parameter['name'];
-			}
-		}
-
-		$event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
-			->setRichSubject($subject, $parameters);
-	}
-
-	/**
-	 * @param array|string $parameter
-	 * @param IEvent|null $event
-	 * @return array
-	 * @throws \InvalidArgumentException
-	 */
-	protected function getFile($parameter, IEvent $event = null) {
-		if (is_array($parameter)) {
-			$path = reset($parameter);
-			$id = (string) key($parameter);
-		} elseif ($event !== null) {
-			// Legacy from before ownCloud 8.2
-			$path = $parameter;
-			$id = $event->getObjectId();
-		} else {
-			throw new \InvalidArgumentException('Could not generate file parameter');
-		}
-
-		return [
-			'type' => 'file',
-			'id' => $id,
-			'name' => basename($path),
-			'path' => trim($path, '/'),
-			'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
-		];
-	}
-
-	/**
-	 * @param string $uid
-	 * @return array
-	 */
-	protected function getUser($uid) {
-		// First try local user
-		$displayName = $this->userManager->getDisplayName($uid);
-		if ($displayName !== null) {
-			return [
-				'type' => 'user',
-				'id' => $uid,
-				'name' => $displayName,
-			];
-		}
-
-		// Then a contact from the addressbook
-		if ($this->cloudIdManager->isValidCloudId($uid)) {
-			$cloudId = $this->cloudIdManager->resolveCloudId($uid);
-			return [
-				'type' => 'user',
-				'id' => $cloudId->getUser(),
-				'name' => $this->getDisplayNameFromAddressBook($cloudId->getDisplayId()),
-				'server' => $cloudId->getRemote(),
-			];
-		}
-
-		// Fallback to empty dummy data
-		return [
-			'type' => 'user',
-			'id' => $uid,
-			'name' => $uid,
-		];
-	}
-
-	protected function getDisplayNameFromAddressBook(string $search): string {
-		if (isset($this->displayNames[$search])) {
-			return $this->displayNames[$search];
-		}
-
-		$addressBookContacts = $this->contactsManager->search($search, ['CLOUD'], [
-			'limit' => 1,
-			'enumeration' => false,
-			'fullmatch' => false,
-			'strict_search' => true,
-		]);
-		foreach ($addressBookContacts as $contact) {
-			if (isset($contact['isLocalSystemBook'])) {
-				continue;
-			}
-
-			if (isset($contact['CLOUD'])) {
-				$cloudIds = $contact['CLOUD'];
-				if (is_string($cloudIds)) {
-					$cloudIds = [$cloudIds];
-				}
-
-				$lowerSearch = strtolower($search);
-				foreach ($cloudIds as $cloudId) {
-					if (strtolower($cloudId) === $lowerSearch) {
-						$this->displayNames[$search] = $contact['FN'] . " ($cloudId)";
-						return $this->displayNames[$search];
-					}
-				}
-			}
-		}
-
-		return $search;
-	}
+    /** @var IFactory */
+    protected $languageFactory;
+
+    /** @var IL10N */
+    protected $l;
+
+    /** @var IURLGenerator */
+    protected $url;
+
+    /** @var IManager */
+    protected $activityManager;
+
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var IEventMerger */
+    protected $eventMerger;
+
+    /** @var IContactsManager */
+    protected $contactsManager;
+
+    /** @var ICloudIdManager */
+    protected $cloudIdManager;
+
+    /** @var array */
+    protected $displayNames = [];
+
+    public function __construct(IFactory $languageFactory,
+                                IURLGenerator $url,
+                                IManager $activityManager,
+                                IUserManager $userManager,
+                                ICloudIdManager $cloudIdManager,
+                                IContactsManager $contactsManager,
+                                IEventMerger $eventMerger) {
+        $this->languageFactory = $languageFactory;
+        $this->url = $url;
+        $this->activityManager = $activityManager;
+        $this->userManager = $userManager;
+        $this->cloudIdManager = $cloudIdManager;
+        $this->contactsManager = $contactsManager;
+        $this->eventMerger = $eventMerger;
+    }
+
+    /**
+     * @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() !== 'files_sharing') {
+            throw new \InvalidArgumentException();
+        }
+
+        $this->l = $this->languageFactory->get('files_sharing', $language);
+
+        if ($this->activityManager->isFormattingFilteredObject()) {
+            try {
+                return $this->parseShortVersion($event);
+            } catch (\InvalidArgumentException $e) {
+                // Ignore and simply use the long version...
+            }
+        }
+
+        return $this->parseLongVersion($event, $previousEvent);
+    }
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    abstract protected function parseShortVersion(IEvent $event);
+
+    /**
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    abstract protected function parseLongVersion(IEvent $event, IEvent $previousEvent = null);
+
+    /**
+     * @param IEvent $event
+     * @param string $subject
+     * @param array $parameters
+     * @throws \InvalidArgumentException
+     */
+    protected function setSubjects(IEvent $event, $subject, array $parameters) {
+        $placeholders = $replacements = [];
+        foreach ($parameters as $placeholder => $parameter) {
+            $placeholders[] = '{' . $placeholder . '}';
+            if ($parameter['type'] === 'file') {
+                $replacements[] = $parameter['path'];
+            } else {
+                $replacements[] = $parameter['name'];
+            }
+        }
+
+        $event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
+            ->setRichSubject($subject, $parameters);
+    }
+
+    /**
+     * @param array|string $parameter
+     * @param IEvent|null $event
+     * @return array
+     * @throws \InvalidArgumentException
+     */
+    protected function getFile($parameter, IEvent $event = null) {
+        if (is_array($parameter)) {
+            $path = reset($parameter);
+            $id = (string) key($parameter);
+        } elseif ($event !== null) {
+            // Legacy from before ownCloud 8.2
+            $path = $parameter;
+            $id = $event->getObjectId();
+        } else {
+            throw new \InvalidArgumentException('Could not generate file parameter');
+        }
+
+        return [
+            'type' => 'file',
+            'id' => $id,
+            'name' => basename($path),
+            'path' => trim($path, '/'),
+            'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
+        ];
+    }
+
+    /**
+     * @param string $uid
+     * @return array
+     */
+    protected function getUser($uid) {
+        // First try local user
+        $displayName = $this->userManager->getDisplayName($uid);
+        if ($displayName !== null) {
+            return [
+                'type' => 'user',
+                'id' => $uid,
+                'name' => $displayName,
+            ];
+        }
+
+        // Then a contact from the addressbook
+        if ($this->cloudIdManager->isValidCloudId($uid)) {
+            $cloudId = $this->cloudIdManager->resolveCloudId($uid);
+            return [
+                'type' => 'user',
+                'id' => $cloudId->getUser(),
+                'name' => $this->getDisplayNameFromAddressBook($cloudId->getDisplayId()),
+                'server' => $cloudId->getRemote(),
+            ];
+        }
+
+        // Fallback to empty dummy data
+        return [
+            'type' => 'user',
+            'id' => $uid,
+            'name' => $uid,
+        ];
+    }
+
+    protected function getDisplayNameFromAddressBook(string $search): string {
+        if (isset($this->displayNames[$search])) {
+            return $this->displayNames[$search];
+        }
+
+        $addressBookContacts = $this->contactsManager->search($search, ['CLOUD'], [
+            'limit' => 1,
+            'enumeration' => false,
+            'fullmatch' => false,
+            'strict_search' => true,
+        ]);
+        foreach ($addressBookContacts as $contact) {
+            if (isset($contact['isLocalSystemBook'])) {
+                continue;
+            }
+
+            if (isset($contact['CLOUD'])) {
+                $cloudIds = $contact['CLOUD'];
+                if (is_string($cloudIds)) {
+                    $cloudIds = [$cloudIds];
+                }
+
+                $lowerSearch = strtolower($search);
+                foreach ($cloudIds as $cloudId) {
+                    if (strtolower($cloudId) === $lowerSearch) {
+                        $this->displayNames[$search] = $contact['FN'] . " ($cloudId)";
+                        return $this->displayNames[$search];
+                    }
+                }
+            }
+        }
+
+        return $search;
+    }
 }

apps/systemtags/lib/Activity/Provider.php

Indentation +289 added lines, -289 removed lines

@@ -33,319 +33,319 @@
 use OCP\L10N\IFactory;
 
 class Provider implements IProvider {
-	public const CREATE_TAG = 'create_tag';
-	public const UPDATE_TAG = 'update_tag';
-	public const DELETE_TAG = 'delete_tag';
+    public const CREATE_TAG = 'create_tag';
+    public const UPDATE_TAG = 'update_tag';
+    public const DELETE_TAG = 'delete_tag';
 
-	public const ASSIGN_TAG = 'assign_tag';
-	public const UNASSIGN_TAG = 'unassign_tag';
+    public const ASSIGN_TAG = 'assign_tag';
+    public const UNASSIGN_TAG = 'unassign_tag';
 
-	/** @var IFactory */
-	protected $languageFactory;
+    /** @var IFactory */
+    protected $languageFactory;
 
-	/** @var IL10N */
-	protected $l;
+    /** @var IL10N */
+    protected $l;
 
-	/** @var IURLGenerator */
-	protected $url;
+    /** @var IURLGenerator */
+    protected $url;
 
-	/** @var IManager */
-	protected $activityManager;
+    /** @var IManager */
+    protected $activityManager;
 
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	/**
-	 * @param IFactory $languageFactory
-	 * @param IURLGenerator $url
-	 * @param IManager $activityManager
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager) {
-		$this->languageFactory = $languageFactory;
-		$this->url = $url;
-		$this->activityManager = $activityManager;
-		$this->userManager = $userManager;
-	}
+    /**
+     * @param IFactory $languageFactory
+     * @param IURLGenerator $url
+     * @param IManager $activityManager
+     * @param IUserManager $userManager
+     */
+    public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager) {
+        $this->languageFactory = $languageFactory;
+        $this->url = $url;
+        $this->activityManager = $activityManager;
+        $this->userManager = $userManager;
+    }
 
-	/**
-	 * @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() !== 'systemtags') {
-			throw new \InvalidArgumentException();
-		}
+    /**
+     * @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() !== 'systemtags') {
+            throw new \InvalidArgumentException();
+        }
 
-		$this->l = $this->languageFactory->get('systemtags', $language);
+        $this->l = $this->languageFactory->get('systemtags', $language);
 
-		if ($this->activityManager->isFormattingFilteredObject()) {
-			try {
-				return $this->parseShortVersion($event);
-			} catch (\InvalidArgumentException $e) {
-				// Ignore and simply use the long version...
-			}
-		}
+        if ($this->activityManager->isFormattingFilteredObject()) {
+            try {
+                return $this->parseShortVersion($event);
+            } catch (\InvalidArgumentException $e) {
+                // Ignore and simply use the long version...
+            }
+        }
 
-		return $this->parseLongVersion($event);
-	}
+        return $this->parseLongVersion($event);
+    }
 
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseShortVersion(IEvent $event) {
-		$parsedParameters = $this->getParameters($event);
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseShortVersion(IEvent $event) {
+        $parsedParameters = $this->getParameters($event);
 
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.svg')));
-		}
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.svg')));
+        }
 
-		if ($event->getSubject() === self::ASSIGN_TAG) {
-			if ($parsedParameters['actor']['id'] === '') {
-				$event->setParsedSubject($this->l->t('System tag %1$s added by the system', [
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('Added system tag {systemtag}'), [
-						'systemtag' => $parsedParameters['systemtag'],
-					]);
-			} elseif ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
-				$event->setParsedSubject($this->l->t('Added system tag %1$s', [
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('Added system tag {systemtag}'), [
-						'systemtag' => $parsedParameters['systemtag'],
-					]);
-			} else {
-				$event->setParsedSubject($this->l->t('%1$s added system tag %2$s', [
-					$parsedParameters['actor']['name'],
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('{actor} added system tag {systemtag}'), [
-						'actor' => $parsedParameters['actor'],
-						'systemtag' => $parsedParameters['systemtag'],
-					]);
-			}
-		} elseif ($event->getSubject() === self::UNASSIGN_TAG) {
-			if ($parsedParameters['actor']['id'] === '') {
-				$event->setParsedSubject($this->l->t('System tag %1$s removed by the system', [
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('Removed system tag {systemtag}'), [
-						'systemtag' => $parsedParameters['systemtag'],
-					]);
-			} elseif ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
-				$event->setParsedSubject($this->l->t('Removed system tag %1$s', [
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('Removed system tag {systemtag}'), [
-						'systemtag' => $parsedParameters['systemtag'],
-					]);
-			} else {
-				$event->setParsedSubject($this->l->t('%1$s removed system tag %2$s', [
-					$parsedParameters['actor']['name'],
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('{actor} removed system tag {systemtag}'), [
-						'actor' => $parsedParameters['actor'],
-						'systemtag' => $parsedParameters['systemtag'],
-					]);
-			}
-		} else {
-			throw new \InvalidArgumentException();
-		}
+        if ($event->getSubject() === self::ASSIGN_TAG) {
+            if ($parsedParameters['actor']['id'] === '') {
+                $event->setParsedSubject($this->l->t('System tag %1$s added by the system', [
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('Added system tag {systemtag}'), [
+                        'systemtag' => $parsedParameters['systemtag'],
+                    ]);
+            } elseif ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
+                $event->setParsedSubject($this->l->t('Added system tag %1$s', [
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('Added system tag {systemtag}'), [
+                        'systemtag' => $parsedParameters['systemtag'],
+                    ]);
+            } else {
+                $event->setParsedSubject($this->l->t('%1$s added system tag %2$s', [
+                    $parsedParameters['actor']['name'],
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('{actor} added system tag {systemtag}'), [
+                        'actor' => $parsedParameters['actor'],
+                        'systemtag' => $parsedParameters['systemtag'],
+                    ]);
+            }
+        } elseif ($event->getSubject() === self::UNASSIGN_TAG) {
+            if ($parsedParameters['actor']['id'] === '') {
+                $event->setParsedSubject($this->l->t('System tag %1$s removed by the system', [
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('Removed system tag {systemtag}'), [
+                        'systemtag' => $parsedParameters['systemtag'],
+                    ]);
+            } elseif ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
+                $event->setParsedSubject($this->l->t('Removed system tag %1$s', [
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('Removed system tag {systemtag}'), [
+                        'systemtag' => $parsedParameters['systemtag'],
+                    ]);
+            } else {
+                $event->setParsedSubject($this->l->t('%1$s removed system tag %2$s', [
+                    $parsedParameters['actor']['name'],
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('{actor} removed system tag {systemtag}'), [
+                        'actor' => $parsedParameters['actor'],
+                        'systemtag' => $parsedParameters['systemtag'],
+                    ]);
+            }
+        } else {
+            throw new \InvalidArgumentException();
+        }
 
-		return $event;
-	}
+        return $event;
+    }
 
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseLongVersion(IEvent $event) {
-		$parsedParameters = $this->getParameters($event);
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseLongVersion(IEvent $event) {
+        $parsedParameters = $this->getParameters($event);
 
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.svg')));
-		}
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.svg')));
+        }
 
-		if ($event->getSubject() === self::CREATE_TAG) {
-			if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
-				$event->setParsedSubject($this->l->t('You created system tag %1$s', [
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('You created system tag {systemtag}'), $parsedParameters);
-			} else {
-				$event->setParsedSubject($this->l->t('%1$s created system tag %2$s', [
-					$parsedParameters['actor']['name'],
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('{actor} created system tag {systemtag}'), $parsedParameters);
-			}
-		} elseif ($event->getSubject() === self::DELETE_TAG) {
-			if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
-				$event->setParsedSubject($this->l->t('You deleted system tag %1$s', [
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('You deleted system tag {systemtag}'), $parsedParameters);
-			} else {
-				$event->setParsedSubject($this->l->t('%1$s deleted system tag %2$s', [
-					$parsedParameters['actor']['name'],
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('{actor} deleted system tag {systemtag}'), $parsedParameters);
-			}
-		} elseif ($event->getSubject() === self::UPDATE_TAG) {
-			if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
-				$event->setParsedSubject($this->l->t('You updated system tag %2$s to %1$s', [
-					$this->generatePlainSystemTag($parsedParameters['newsystemtag']),
-					$this->generatePlainSystemTag($parsedParameters['oldsystemtag']),
-				]))
-					->setRichSubject($this->l->t('You updated system tag {oldsystemtag} to {newsystemtag}'), $parsedParameters);
-			} else {
-				$event->setParsedSubject($this->l->t('%1$s updated system tag %3$s to %2$s', [
-					$parsedParameters['actor']['name'],
-					$this->generatePlainSystemTag($parsedParameters['newsystemtag']),
-					$this->generatePlainSystemTag($parsedParameters['oldsystemtag']),
-				]))
-					->setRichSubject($this->l->t('{actor} updated system tag {oldsystemtag} to {newsystemtag}'), $parsedParameters);
-			}
-		} elseif ($event->getSubject() === self::ASSIGN_TAG) {
-			if ($parsedParameters['actor']['id'] === '') {
-				unset($parsedParameters['actor']);
-				$event->setParsedSubject($this->l->t('System tag %2$s was added to %1$s by the system', [
-					$parsedParameters['file']['path'],
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('System tag {systemtag} was added to {file} by the system'), $parsedParameters);
-			} elseif ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
-				$event->setParsedSubject($this->l->t('You added system tag %2$s to %1$s', [
-					$parsedParameters['file']['path'],
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('You added system tag {systemtag} to {file}'), $parsedParameters);
-			} else {
-				$event->setParsedSubject($this->l->t('%1$s added system tag %3$s to %2$s', [
-					$parsedParameters['actor']['name'],
-					$parsedParameters['file']['path'],
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('{actor} added system tag {systemtag} to {file}'), $parsedParameters);
-			}
-		} elseif ($event->getSubject() === self::UNASSIGN_TAG) {
-			if ($parsedParameters['actor']['id'] === '') {
-				unset($parsedParameters['actor']);
-				$event->setParsedSubject($this->l->t('System tag %2$s was removed from %1$s by the system', [
-					$parsedParameters['file']['path'],
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('System tag {systemtag} was removed from {file} by the system'), $parsedParameters);
-			} elseif ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
-				$event->setParsedSubject($this->l->t('You removed system tag %2$s from %1$s', [
-					$parsedParameters['file']['path'],
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('You removed system tag {systemtag} from {file}'), $parsedParameters);
-			} else {
-				$event->setParsedSubject($this->l->t('%1$s removed system tag %3$s from %2$s', [
-					$parsedParameters['actor']['name'],
-					$parsedParameters['file']['path'],
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('{actor} removed system tag {systemtag} from {file}'), $parsedParameters);
-			}
-		} else {
-			throw new \InvalidArgumentException();
-		}
+        if ($event->getSubject() === self::CREATE_TAG) {
+            if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
+                $event->setParsedSubject($this->l->t('You created system tag %1$s', [
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('You created system tag {systemtag}'), $parsedParameters);
+            } else {
+                $event->setParsedSubject($this->l->t('%1$s created system tag %2$s', [
+                    $parsedParameters['actor']['name'],
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('{actor} created system tag {systemtag}'), $parsedParameters);
+            }
+        } elseif ($event->getSubject() === self::DELETE_TAG) {
+            if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
+                $event->setParsedSubject($this->l->t('You deleted system tag %1$s', [
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('You deleted system tag {systemtag}'), $parsedParameters);
+            } else {
+                $event->setParsedSubject($this->l->t('%1$s deleted system tag %2$s', [
+                    $parsedParameters['actor']['name'],
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('{actor} deleted system tag {systemtag}'), $parsedParameters);
+            }
+        } elseif ($event->getSubject() === self::UPDATE_TAG) {
+            if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
+                $event->setParsedSubject($this->l->t('You updated system tag %2$s to %1$s', [
+                    $this->generatePlainSystemTag($parsedParameters['newsystemtag']),
+                    $this->generatePlainSystemTag($parsedParameters['oldsystemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('You updated system tag {oldsystemtag} to {newsystemtag}'), $parsedParameters);
+            } else {
+                $event->setParsedSubject($this->l->t('%1$s updated system tag %3$s to %2$s', [
+                    $parsedParameters['actor']['name'],
+                    $this->generatePlainSystemTag($parsedParameters['newsystemtag']),
+                    $this->generatePlainSystemTag($parsedParameters['oldsystemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('{actor} updated system tag {oldsystemtag} to {newsystemtag}'), $parsedParameters);
+            }
+        } elseif ($event->getSubject() === self::ASSIGN_TAG) {
+            if ($parsedParameters['actor']['id'] === '') {
+                unset($parsedParameters['actor']);
+                $event->setParsedSubject($this->l->t('System tag %2$s was added to %1$s by the system', [
+                    $parsedParameters['file']['path'],
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('System tag {systemtag} was added to {file} by the system'), $parsedParameters);
+            } elseif ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
+                $event->setParsedSubject($this->l->t('You added system tag %2$s to %1$s', [
+                    $parsedParameters['file']['path'],
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('You added system tag {systemtag} to {file}'), $parsedParameters);
+            } else {
+                $event->setParsedSubject($this->l->t('%1$s added system tag %3$s to %2$s', [
+                    $parsedParameters['actor']['name'],
+                    $parsedParameters['file']['path'],
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('{actor} added system tag {systemtag} to {file}'), $parsedParameters);
+            }
+        } elseif ($event->getSubject() === self::UNASSIGN_TAG) {
+            if ($parsedParameters['actor']['id'] === '') {
+                unset($parsedParameters['actor']);
+                $event->setParsedSubject($this->l->t('System tag %2$s was removed from %1$s by the system', [
+                    $parsedParameters['file']['path'],
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('System tag {systemtag} was removed from {file} by the system'), $parsedParameters);
+            } elseif ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
+                $event->setParsedSubject($this->l->t('You removed system tag %2$s from %1$s', [
+                    $parsedParameters['file']['path'],
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('You removed system tag {systemtag} from {file}'), $parsedParameters);
+            } else {
+                $event->setParsedSubject($this->l->t('%1$s removed system tag %3$s from %2$s', [
+                    $parsedParameters['actor']['name'],
+                    $parsedParameters['file']['path'],
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('{actor} removed system tag {systemtag} from {file}'), $parsedParameters);
+            }
+        } else {
+            throw new \InvalidArgumentException();
+        }
 
-		return $event;
-	}
+        return $event;
+    }
 
-	protected function getParameters(IEvent $event) {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
+    protected function getParameters(IEvent $event) {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
 
-		switch ($subject) {
-			case self::CREATE_TAG:
-			case self::DELETE_TAG:
-				return [
-					'actor' => $this->getUserParameter((string) $parameters[0]),
-					'systemtag' => $this->getSystemTagParameter($parameters[1]),
-				];
-			case self::UPDATE_TAG:
-				return [
-					'actor' => $this->getUserParameter((string) $parameters[0]),
-					'newsystemtag' => $this->getSystemTagParameter($parameters[1]),
-					'oldsystemtag' => $this->getSystemTagParameter($parameters[2]),
-				];
-			case self::ASSIGN_TAG:
-			case self::UNASSIGN_TAG:
-				return [
-					'actor' => $this->getUserParameter((string) $parameters[0]),
-					'file' => $this->getFileParameter($event->getObjectId(), $parameters[1]),
-					'systemtag' => $this->getSystemTagParameter($parameters[2]),
-				];
-		}
-		return [];
-	}
+        switch ($subject) {
+            case self::CREATE_TAG:
+            case self::DELETE_TAG:
+                return [
+                    'actor' => $this->getUserParameter((string) $parameters[0]),
+                    'systemtag' => $this->getSystemTagParameter($parameters[1]),
+                ];
+            case self::UPDATE_TAG:
+                return [
+                    'actor' => $this->getUserParameter((string) $parameters[0]),
+                    'newsystemtag' => $this->getSystemTagParameter($parameters[1]),
+                    'oldsystemtag' => $this->getSystemTagParameter($parameters[2]),
+                ];
+            case self::ASSIGN_TAG:
+            case self::UNASSIGN_TAG:
+                return [
+                    'actor' => $this->getUserParameter((string) $parameters[0]),
+                    'file' => $this->getFileParameter($event->getObjectId(), $parameters[1]),
+                    'systemtag' => $this->getSystemTagParameter($parameters[2]),
+                ];
+        }
+        return [];
+    }
 
-	protected function getFileParameter($id, $path) {
-		return [
-			'type' => 'file',
-			'id' => $id,
-			'name' => basename($path),
-			'path' => trim($path, '/'),
-		];
-	}
+    protected function getFileParameter($id, $path) {
+        return [
+            'type' => 'file',
+            'id' => $id,
+            'name' => basename($path),
+            'path' => trim($path, '/'),
+        ];
+    }
 
-	protected function getSystemTagParameter($parameter) {
-		$tagData = json_decode($parameter, true);
-		if ($tagData === null) {
-			[$name, $status] = explode('|||', substr($parameter, 3, -3));
-			$tagData = [
-				'id' => 0,// No way to recover the ID
-				'name' => $name,
-				'assignable' => $status === 'assignable',
-				'visible' => $status !== 'invisible',
-			];
-		}
+    protected function getSystemTagParameter($parameter) {
+        $tagData = json_decode($parameter, true);
+        if ($tagData === null) {
+            [$name, $status] = explode('|||', substr($parameter, 3, -3));
+            $tagData = [
+                'id' => 0,// No way to recover the ID
+                'name' => $name,
+                'assignable' => $status === 'assignable',
+                'visible' => $status !== 'invisible',
+            ];
+        }
 
-		return [
-			'type' => 'systemtag',
-			'id' => (int) $tagData['id'],
-			'name' => $tagData['name'],
-			'assignable' => $tagData['assignable'] ? '1' : '0',
-			'visibility' => $tagData['visible'] ? '1' : '0',
-		];
-	}
+        return [
+            'type' => 'systemtag',
+            'id' => (int) $tagData['id'],
+            'name' => $tagData['name'],
+            'assignable' => $tagData['assignable'] ? '1' : '0',
+            'visibility' => $tagData['visible'] ? '1' : '0',
+        ];
+    }
 
-	protected function getUserParameter(string $uid): array {
-		return [
-			'type' => 'user',
-			'id' => $uid,
-			'name' => $this->userManager->getDisplayName($uid) ?? $uid,
-		];
-	}
+    protected function getUserParameter(string $uid): array {
+        return [
+            'type' => 'user',
+            'id' => $uid,
+            'name' => $this->userManager->getDisplayName($uid) ?? $uid,
+        ];
+    }
 
-	protected function generatePlainSystemTag(array $parameter) {
-		if ($parameter['assignable'] === '1') {
-			return $parameter['name'];
-		} elseif ($parameter['visibility'] === '1') {
-			return $this->l->t('%s (restricted)', $parameter['name']);
-		} else {
-			return $this->l->t('%s (invisible)', $parameter['name']);
-		}
-	}
+    protected function generatePlainSystemTag(array $parameter) {
+        if ($parameter['assignable'] === '1') {
+            return $parameter['name'];
+        } elseif ($parameter['visibility'] === '1') {
+            return $this->l->t('%s (restricted)', $parameter['name']);
+        } else {
+            return $this->l->t('%s (invisible)', $parameter['name']);
+        }
+    }
 }

apps/dav/lib/CardDAV/Activity/Provider/Base.php

Indentation +96 added lines, -96 removed lines

@@ -37,100 +37,100 @@
 
 abstract class Base implements IProvider {
 
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var string[]  */
-	protected $userDisplayNames = [];
-
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	/** @var string[] */
-	protected $groupDisplayNames = [];
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	public function __construct(IUserManager $userManager,
-								IGroupManager $groupManager,
-								IURLGenerator $urlGenerator) {
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		$this->url = $urlGenerator;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @param string $subject
-	 * @param array $parameters
-	 */
-	protected function setSubjects(IEvent $event, string $subject, array $parameters): void {
-		$placeholders = $replacements = [];
-		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
-			$replacements[] = $parameter['name'];
-		}
-
-		$event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
-			->setRichSubject($subject, $parameters);
-	}
-
-	/**
-	 * @param array $data
-	 * @param IL10N $l
-	 * @return array
-	 */
-	protected function generateAddressbookParameter(array $data, IL10N $l): array {
-		if ($data['uri'] === CardDavBackend::PERSONAL_ADDRESSBOOK_URI &&
-			$data['name'] === CardDavBackend::PERSONAL_ADDRESSBOOK_NAME) {
-			return [
-				'type' => 'addressbook',
-				'id' => $data['id'],
-				'name' => $l->t('Personal'),
-			];
-		}
-
-		return [
-			'type' => 'addressbook',
-			'id' => $data['id'],
-			'name' => $data['name'],
-		];
-	}
-
-	protected function generateUserParameter(string $uid): array {
-		return [
-			'type' => 'user',
-			'id' => $uid,
-			'name' => $this->userManager->getDisplayName($uid) ?? $uid,
-		];
-	}
-
-	/**
-	 * @param string $gid
-	 * @return array
-	 */
-	protected function generateGroupParameter(string $gid): array {
-		if (!isset($this->groupDisplayNames[$gid])) {
-			$this->groupDisplayNames[$gid] = $this->getGroupDisplayName($gid);
-		}
-
-		return [
-			'type' => 'user-group',
-			'id' => $gid,
-			'name' => $this->groupDisplayNames[$gid],
-		];
-	}
-
-	/**
-	 * @param string $gid
-	 * @return string
-	 */
-	protected function getGroupDisplayName(string $gid): string {
-		$group = $this->groupManager->get($gid);
-		if ($group instanceof IGroup) {
-			return $group->getDisplayName();
-		}
-		return $gid;
-	}
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var string[]  */
+    protected $userDisplayNames = [];
+
+    /** @var IGroupManager */
+    protected $groupManager;
+
+    /** @var string[] */
+    protected $groupDisplayNames = [];
+
+    /** @var IURLGenerator */
+    protected $url;
+
+    public function __construct(IUserManager $userManager,
+                                IGroupManager $groupManager,
+                                IURLGenerator $urlGenerator) {
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        $this->url = $urlGenerator;
+    }
+
+    /**
+     * @param IEvent $event
+     * @param string $subject
+     * @param array $parameters
+     */
+    protected function setSubjects(IEvent $event, string $subject, array $parameters): void {
+        $placeholders = $replacements = [];
+        foreach ($parameters as $placeholder => $parameter) {
+            $placeholders[] = '{' . $placeholder . '}';
+            $replacements[] = $parameter['name'];
+        }
+
+        $event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
+            ->setRichSubject($subject, $parameters);
+    }
+
+    /**
+     * @param array $data
+     * @param IL10N $l
+     * @return array
+     */
+    protected function generateAddressbookParameter(array $data, IL10N $l): array {
+        if ($data['uri'] === CardDavBackend::PERSONAL_ADDRESSBOOK_URI &&
+            $data['name'] === CardDavBackend::PERSONAL_ADDRESSBOOK_NAME) {
+            return [
+                'type' => 'addressbook',
+                'id' => $data['id'],
+                'name' => $l->t('Personal'),
+            ];
+        }
+
+        return [
+            'type' => 'addressbook',
+            'id' => $data['id'],
+            'name' => $data['name'],
+        ];
+    }
+
+    protected function generateUserParameter(string $uid): array {
+        return [
+            'type' => 'user',
+            'id' => $uid,
+            'name' => $this->userManager->getDisplayName($uid) ?? $uid,
+        ];
+    }
+
+    /**
+     * @param string $gid
+     * @return array
+     */
+    protected function generateGroupParameter(string $gid): array {
+        if (!isset($this->groupDisplayNames[$gid])) {
+            $this->groupDisplayNames[$gid] = $this->getGroupDisplayName($gid);
+        }
+
+        return [
+            'type' => 'user-group',
+            'id' => $gid,
+            'name' => $this->groupDisplayNames[$gid],
+        ];
+    }
+
+    /**
+     * @param string $gid
+     * @return string
+     */
+    protected function getGroupDisplayName(string $gid): string {
+        $group = $this->groupManager->get($gid);
+        if ($group instanceof IGroup) {
+            return $group->getDisplayName();
+        }
+        return $gid;
+    }
 }

apps/dav/lib/CalDAV/Activity/Provider/Base.php

Indentation +112 added lines, -112 removed lines

@@ -35,116 +35,116 @@
 
 abstract class Base implements IProvider {
 
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var string[]  */
-	protected $userDisplayNames = [];
-
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	/** @var string[] */
-	protected $groupDisplayNames = [];
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	/**
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 * @param IURLGenerator $urlGenerator
-	 */
-	public function __construct(IUserManager $userManager, IGroupManager $groupManager, IURLGenerator $urlGenerator) {
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		$this->url = $urlGenerator;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @param string $subject
-	 * @param array $parameters
-	 */
-	protected function setSubjects(IEvent $event, $subject, array $parameters) {
-		$placeholders = $replacements = [];
-		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
-			$replacements[] = $parameter['name'];
-		}
-
-		$event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
-			->setRichSubject($subject, $parameters);
-	}
-
-	/**
-	 * @param array $data
-	 * @param IL10N $l
-	 * @return array
-	 */
-	protected function generateCalendarParameter($data, IL10N $l) {
-		if ($data['uri'] === CalDavBackend::PERSONAL_CALENDAR_URI &&
-			$data['name'] === CalDavBackend::PERSONAL_CALENDAR_NAME) {
-			return [
-				'type' => 'calendar',
-				'id' => $data['id'],
-				'name' => $l->t('Personal'),
-			];
-		}
-
-		return [
-			'type' => 'calendar',
-			'id' => $data['id'],
-			'name' => $data['name'],
-		];
-	}
-
-	/**
-	 * @param int $id
-	 * @param string $name
-	 * @return array
-	 */
-	protected function generateLegacyCalendarParameter($id, $name) {
-		return [
-			'type' => 'calendar',
-			'id' => $id,
-			'name' => $name,
-		];
-	}
-
-	protected function generateUserParameter(string $uid): array {
-		return [
-			'type' => 'user',
-			'id' => $uid,
-			'name' => $this->userManager->getDisplayName($uid) ?? $uid,
-		];
-	}
-
-	/**
-	 * @param string $gid
-	 * @return array
-	 */
-	protected function generateGroupParameter($gid) {
-		if (!isset($this->groupDisplayNames[$gid])) {
-			$this->groupDisplayNames[$gid] = $this->getGroupDisplayName($gid);
-		}
-
-		return [
-			'type' => 'user-group',
-			'id' => $gid,
-			'name' => $this->groupDisplayNames[$gid],
-		];
-	}
-
-	/**
-	 * @param string $gid
-	 * @return string
-	 */
-	protected function getGroupDisplayName($gid) {
-		$group = $this->groupManager->get($gid);
-		if ($group instanceof IGroup) {
-			return $group->getDisplayName();
-		}
-		return $gid;
-	}
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var string[]  */
+    protected $userDisplayNames = [];
+
+    /** @var IGroupManager */
+    protected $groupManager;
+
+    /** @var string[] */
+    protected $groupDisplayNames = [];
+
+    /** @var IURLGenerator */
+    protected $url;
+
+    /**
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     * @param IURLGenerator $urlGenerator
+     */
+    public function __construct(IUserManager $userManager, IGroupManager $groupManager, IURLGenerator $urlGenerator) {
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        $this->url = $urlGenerator;
+    }
+
+    /**
+     * @param IEvent $event
+     * @param string $subject
+     * @param array $parameters
+     */
+    protected function setSubjects(IEvent $event, $subject, array $parameters) {
+        $placeholders = $replacements = [];
+        foreach ($parameters as $placeholder => $parameter) {
+            $placeholders[] = '{' . $placeholder . '}';
+            $replacements[] = $parameter['name'];
+        }
+
+        $event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
+            ->setRichSubject($subject, $parameters);
+    }
+
+    /**
+     * @param array $data
+     * @param IL10N $l
+     * @return array
+     */
+    protected function generateCalendarParameter($data, IL10N $l) {
+        if ($data['uri'] === CalDavBackend::PERSONAL_CALENDAR_URI &&
+            $data['name'] === CalDavBackend::PERSONAL_CALENDAR_NAME) {
+            return [
+                'type' => 'calendar',
+                'id' => $data['id'],
+                'name' => $l->t('Personal'),
+            ];
+        }
+
+        return [
+            'type' => 'calendar',
+            'id' => $data['id'],
+            'name' => $data['name'],
+        ];
+    }
+
+    /**
+     * @param int $id
+     * @param string $name
+     * @return array
+     */
+    protected function generateLegacyCalendarParameter($id, $name) {
+        return [
+            'type' => 'calendar',
+            'id' => $id,
+            'name' => $name,
+        ];
+    }
+
+    protected function generateUserParameter(string $uid): array {
+        return [
+            'type' => 'user',
+            'id' => $uid,
+            'name' => $this->userManager->getDisplayName($uid) ?? $uid,
+        ];
+    }
+
+    /**
+     * @param string $gid
+     * @return array
+     */
+    protected function generateGroupParameter($gid) {
+        if (!isset($this->groupDisplayNames[$gid])) {
+            $this->groupDisplayNames[$gid] = $this->getGroupDisplayName($gid);
+        }
+
+        return [
+            'type' => 'user-group',
+            'id' => $gid,
+            'name' => $this->groupDisplayNames[$gid],
+        ];
+    }
+
+    /**
+     * @param string $gid
+     * @return string
+     */
+    protected function getGroupDisplayName($gid) {
+        $group = $this->groupManager->get($gid);
+        if ($group instanceof IGroup) {
+            return $group->getDisplayName();
+        }
+        return $gid;
+    }
 }

apps/settings/lib/Activity/Provider.php

Indentation +171 added lines, -171 removed lines

@@ -38,175 +38,175 @@
 use OCP\L10N\IFactory;
 
 class Provider implements IProvider {
-	public const PASSWORD_CHANGED_BY = 'password_changed_by';
-	public const PASSWORD_CHANGED_SELF = 'password_changed_self';
-	public const PASSWORD_RESET = 'password_changed';
-	public const PASSWORD_RESET_SELF = 'password_reset_self';
-	public const EMAIL_CHANGED_BY = 'email_changed_by';
-	public const EMAIL_CHANGED_SELF = 'email_changed_self';
-	public const EMAIL_CHANGED = 'email_changed';
-	public const APP_TOKEN_CREATED = 'app_token_created';
-	public const APP_TOKEN_DELETED = 'app_token_deleted';
-	public const APP_TOKEN_RENAMED = 'app_token_renamed';
-	public const APP_TOKEN_FILESYSTEM_GRANTED = 'app_token_filesystem_granted';
-	public const APP_TOKEN_FILESYSTEM_REVOKED = 'app_token_filesystem_revoked';
-
-	/** @var IFactory */
-	protected $languageFactory;
-
-	/** @var IL10N */
-	protected $l;
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var IManager */
-	private $activityManager;
-
-	public function __construct(IFactory $languageFactory,
-								IURLGenerator $url,
-								IUserManager $userManager,
-								IManager $activityManager) {
-		$this->languageFactory = $languageFactory;
-		$this->url = $url;
-		$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): IEvent {
-		if ($event->getApp() !== 'settings') {
-			throw new \InvalidArgumentException('Unknown app');
-		}
-
-		$this->l = $this->languageFactory->get('settings', $language);
-
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('settings', 'personal.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('settings', 'personal.svg')));
-		}
-
-		if ($event->getSubject() === self::PASSWORD_CHANGED_BY) {
-			$subject = $this->l->t('{actor} changed your password');
-		} elseif ($event->getSubject() === self::PASSWORD_CHANGED_SELF) {
-			$subject = $this->l->t('You changed your password');
-		} elseif ($event->getSubject() === self::PASSWORD_RESET) {
-			$subject = $this->l->t('Your password was reset by an administrator');
-		} elseif ($event->getSubject() === self::PASSWORD_RESET_SELF) {
-			$subject = $this->l->t('Your password was reset');
-		} elseif ($event->getSubject() === self::EMAIL_CHANGED_BY) {
-			$subject = $this->l->t('{actor} changed your email address');
-		} elseif ($event->getSubject() === self::EMAIL_CHANGED_SELF) {
-			$subject = $this->l->t('You changed your email address');
-		} elseif ($event->getSubject() === self::EMAIL_CHANGED) {
-			$subject = $this->l->t('Your email address was changed by an administrator');
-		} elseif ($event->getSubject() === self::APP_TOKEN_CREATED) {
-			if ($event->getAffectedUser() === $event->getAuthor()) {
-				$subject = $this->l->t('You created app password "{token}"');
-			} else {
-				$subject = $this->l->t('An administrator created app password "{token}"');
-			}
-		} elseif ($event->getSubject() === self::APP_TOKEN_DELETED) {
-			$subject = $this->l->t('You deleted app password "{token}"');
-		} elseif ($event->getSubject() === self::APP_TOKEN_RENAMED) {
-			$subject = $this->l->t('You renamed app password "{token}" to "{newToken}"');
-		} elseif ($event->getSubject() === self::APP_TOKEN_FILESYSTEM_GRANTED) {
-			$subject = $this->l->t('You granted filesystem access to app password "{token}"');
-		} elseif ($event->getSubject() === self::APP_TOKEN_FILESYSTEM_REVOKED) {
-			$subject = $this->l->t('You revoked filesystem access from app password "{token}"');
-		} else {
-			throw new \InvalidArgumentException('Unknown subject');
-		}
-
-		$parsedParameters = $this->getParameters($event);
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return array
-	 * @throws \InvalidArgumentException
-	 */
-	protected function getParameters(IEvent $event): array {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
-
-		switch ($subject) {
-			case self::PASSWORD_CHANGED_SELF:
-			case self::PASSWORD_RESET:
-			case self::PASSWORD_RESET_SELF:
-			case self::EMAIL_CHANGED_SELF:
-			case self::EMAIL_CHANGED:
-				return [];
-			case self::PASSWORD_CHANGED_BY:
-			case self::EMAIL_CHANGED_BY:
-				return [
-					'actor' => $this->generateUserParameter($parameters[0]),
-				];
-			case self::APP_TOKEN_CREATED:
-			case self::APP_TOKEN_DELETED:
-			case self::APP_TOKEN_FILESYSTEM_GRANTED:
-			case self::APP_TOKEN_FILESYSTEM_REVOKED:
-				return [
-					'token' => [
-						'type' => 'highlight',
-						'id' => $event->getObjectId(),
-						'name' => $parameters['name'],
-					]
-				];
-			case self::APP_TOKEN_RENAMED:
-				return [
-					'token' => [
-						'type' => 'highlight',
-						'id' => $event->getObjectId(),
-						'name' => $parameters['name'],
-					],
-					'newToken' => [
-						'type' => 'highlight',
-						'id' => $event->getObjectId(),
-						'name' => $parameters['newName'],
-					]
-				];
-		}
-
-		throw new \InvalidArgumentException('Unknown subject');
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @param string $subject
-	 * @param array $parameters
-	 * @throws \InvalidArgumentException
-	 */
-	protected function setSubjects(IEvent $event, string $subject, array $parameters): void {
-		$placeholders = $replacements = [];
-		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
-			$replacements[] = $parameter['name'];
-		}
-
-		$event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
-			->setRichSubject($subject, $parameters);
-	}
-
-	protected function generateUserParameter(string $uid): array {
-		return [
-			'type' => 'user',
-			'id' => $uid,
-			'name' => $this->userManager->getDisplayName($uid) ?? $uid,
-		];
-	}
+    public const PASSWORD_CHANGED_BY = 'password_changed_by';
+    public const PASSWORD_CHANGED_SELF = 'password_changed_self';
+    public const PASSWORD_RESET = 'password_changed';
+    public const PASSWORD_RESET_SELF = 'password_reset_self';
+    public const EMAIL_CHANGED_BY = 'email_changed_by';
+    public const EMAIL_CHANGED_SELF = 'email_changed_self';
+    public const EMAIL_CHANGED = 'email_changed';
+    public const APP_TOKEN_CREATED = 'app_token_created';
+    public const APP_TOKEN_DELETED = 'app_token_deleted';
+    public const APP_TOKEN_RENAMED = 'app_token_renamed';
+    public const APP_TOKEN_FILESYSTEM_GRANTED = 'app_token_filesystem_granted';
+    public const APP_TOKEN_FILESYSTEM_REVOKED = 'app_token_filesystem_revoked';
+
+    /** @var IFactory */
+    protected $languageFactory;
+
+    /** @var IL10N */
+    protected $l;
+
+    /** @var IURLGenerator */
+    protected $url;
+
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var IManager */
+    private $activityManager;
+
+    public function __construct(IFactory $languageFactory,
+                                IURLGenerator $url,
+                                IUserManager $userManager,
+                                IManager $activityManager) {
+        $this->languageFactory = $languageFactory;
+        $this->url = $url;
+        $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): IEvent {
+        if ($event->getApp() !== 'settings') {
+            throw new \InvalidArgumentException('Unknown app');
+        }
+
+        $this->l = $this->languageFactory->get('settings', $language);
+
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('settings', 'personal.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('settings', 'personal.svg')));
+        }
+
+        if ($event->getSubject() === self::PASSWORD_CHANGED_BY) {
+            $subject = $this->l->t('{actor} changed your password');
+        } elseif ($event->getSubject() === self::PASSWORD_CHANGED_SELF) {
+            $subject = $this->l->t('You changed your password');
+        } elseif ($event->getSubject() === self::PASSWORD_RESET) {
+            $subject = $this->l->t('Your password was reset by an administrator');
+        } elseif ($event->getSubject() === self::PASSWORD_RESET_SELF) {
+            $subject = $this->l->t('Your password was reset');
+        } elseif ($event->getSubject() === self::EMAIL_CHANGED_BY) {
+            $subject = $this->l->t('{actor} changed your email address');
+        } elseif ($event->getSubject() === self::EMAIL_CHANGED_SELF) {
+            $subject = $this->l->t('You changed your email address');
+        } elseif ($event->getSubject() === self::EMAIL_CHANGED) {
+            $subject = $this->l->t('Your email address was changed by an administrator');
+        } elseif ($event->getSubject() === self::APP_TOKEN_CREATED) {
+            if ($event->getAffectedUser() === $event->getAuthor()) {
+                $subject = $this->l->t('You created app password "{token}"');
+            } else {
+                $subject = $this->l->t('An administrator created app password "{token}"');
+            }
+        } elseif ($event->getSubject() === self::APP_TOKEN_DELETED) {
+            $subject = $this->l->t('You deleted app password "{token}"');
+        } elseif ($event->getSubject() === self::APP_TOKEN_RENAMED) {
+            $subject = $this->l->t('You renamed app password "{token}" to "{newToken}"');
+        } elseif ($event->getSubject() === self::APP_TOKEN_FILESYSTEM_GRANTED) {
+            $subject = $this->l->t('You granted filesystem access to app password "{token}"');
+        } elseif ($event->getSubject() === self::APP_TOKEN_FILESYSTEM_REVOKED) {
+            $subject = $this->l->t('You revoked filesystem access from app password "{token}"');
+        } else {
+            throw new \InvalidArgumentException('Unknown subject');
+        }
+
+        $parsedParameters = $this->getParameters($event);
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @return array
+     * @throws \InvalidArgumentException
+     */
+    protected function getParameters(IEvent $event): array {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
+
+        switch ($subject) {
+            case self::PASSWORD_CHANGED_SELF:
+            case self::PASSWORD_RESET:
+            case self::PASSWORD_RESET_SELF:
+            case self::EMAIL_CHANGED_SELF:
+            case self::EMAIL_CHANGED:
+                return [];
+            case self::PASSWORD_CHANGED_BY:
+            case self::EMAIL_CHANGED_BY:
+                return [
+                    'actor' => $this->generateUserParameter($parameters[0]),
+                ];
+            case self::APP_TOKEN_CREATED:
+            case self::APP_TOKEN_DELETED:
+            case self::APP_TOKEN_FILESYSTEM_GRANTED:
+            case self::APP_TOKEN_FILESYSTEM_REVOKED:
+                return [
+                    'token' => [
+                        'type' => 'highlight',
+                        'id' => $event->getObjectId(),
+                        'name' => $parameters['name'],
+                    ]
+                ];
+            case self::APP_TOKEN_RENAMED:
+                return [
+                    'token' => [
+                        'type' => 'highlight',
+                        'id' => $event->getObjectId(),
+                        'name' => $parameters['name'],
+                    ],
+                    'newToken' => [
+                        'type' => 'highlight',
+                        'id' => $event->getObjectId(),
+                        'name' => $parameters['newName'],
+                    ]
+                ];
+        }
+
+        throw new \InvalidArgumentException('Unknown subject');
+    }
+
+    /**
+     * @param IEvent $event
+     * @param string $subject
+     * @param array $parameters
+     * @throws \InvalidArgumentException
+     */
+    protected function setSubjects(IEvent $event, string $subject, array $parameters): void {
+        $placeholders = $replacements = [];
+        foreach ($parameters as $placeholder => $parameter) {
+            $placeholders[] = '{' . $placeholder . '}';
+            $replacements[] = $parameter['name'];
+        }
+
+        $event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
+            ->setRichSubject($subject, $parameters);
+    }
+
+    protected function generateUserParameter(string $uid): array {
+        return [
+            'type' => 'user',
+            'id' => $uid,
+            'name' => $this->userManager->getDisplayName($uid) ?? $uid,
+        ];
+    }
 }

apps/settings/lib/Activity/GroupProvider.php

Indentation +139 added lines, -139 removed lines

@@ -35,143 +35,143 @@
 use OCP\L10N\IFactory as L10nFactory;
 
 class GroupProvider implements IProvider {
-	public const ADDED_TO_GROUP = 'group_added';
-	public const REMOVED_FROM_GROUP = 'group_removed';
-
-	/** @var L10nFactory */
-	private $l10n;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var IManager */
-	private $activityManager;
-	/** @var IUserManager */
-	protected $userManager;
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	/** @var string[] */
-	protected $groupDisplayNames = [];
-
-
-	public function __construct(L10nFactory $l10n,
-								IURLGenerator $urlGenerator,
-								IManager $activityManager,
-								IUserManager $userManager,
-								IGroupManager $groupManager) {
-		$this->urlGenerator = $urlGenerator;
-		$this->l10n = $l10n;
-		$this->activityManager = $activityManager;
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-	}
-
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
-		if ($event->getType() !== 'group_settings') {
-			throw new InvalidArgumentException();
-		}
-
-		$l = $this->l10n->get('settings', $language);
-
-		$params = $event->getSubjectParameters();
-		$parsedParameters = [
-			'user' => $this->generateUserParameter($params['user']),
-			'group' => $this->generateGroupParameter($params['group']),
-		];
-
-		if (isset($params['actor'])) {
-			$parsedParameters['actor'] = $this->generateUserParameter($params['actor']);
-		}
-
-		switch ($event->getSubject()) {
-			case self::ADDED_TO_GROUP:
-				if (isset($parsedParameters['actor'])) {
-					if ($this->activityManager->getCurrentUserId() === $params['user']) {
-						$subject = $l->t('{actor} added you to group {group}');
-					} elseif (isset($params['actor']) && $this->activityManager->getCurrentUserId() === $params['actor']) {
-						$subject = $l->t('You added {user} to group {group}');
-					} else {
-						$subject = $l->t('{actor} added {user} to group {group}');
-					}
-				} elseif ($this->activityManager->getCurrentUserId() === $params['user']) {
-					$subject = $l->t('An administrator added you to group {group}');
-				} else {
-					$subject = $l->t('An administrator added {user} to group {group}');
-				}
-				break;
-			case self::REMOVED_FROM_GROUP:
-				if (isset($parsedParameters['actor'])) {
-					if ($this->activityManager->getCurrentUserId() === $params['user']) {
-						$subject = $l->t('{actor} removed you from group {group}');
-					} elseif (isset($params['actor']) && $this->activityManager->getCurrentUserId() === $params['actor']) {
-						$subject = $l->t('You removed {user} from group {group}');
-					} else {
-						$subject = $l->t('{actor} removed {user} from group {group}');
-					}
-				} elseif ($this->activityManager->getCurrentUserId() === $params['user']) {
-					$subject = $l->t('An administrator removed you from group {group}');
-				} else {
-					$subject = $l->t('An administrator removed {user} from group {group}');
-				}
-				break;
-			default:
-				throw new InvalidArgumentException();
-		}
-
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @param string $subject
-	 * @param array $parameters
-	 * @throws \InvalidArgumentException
-	 */
-	protected function setSubjects(IEvent $event, string $subject, array $parameters): void {
-		$placeholders = $replacements = [];
-		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
-			$replacements[] = $parameter['name'];
-		}
-
-		$event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
-			->setRichSubject($subject, $parameters);
-	}
-
-	/**
-	 * @param string $gid
-	 * @return array
-	 */
-	protected function generateGroupParameter(string $gid): array {
-		if (!isset($this->groupDisplayNames[$gid])) {
-			$this->groupDisplayNames[$gid] = $this->getGroupDisplayName($gid);
-		}
-
-		return [
-			'type' => 'user-group',
-			'id' => $gid,
-			'name' => $this->groupDisplayNames[$gid],
-		];
-	}
-
-	/**
-	 * @param string $gid
-	 * @return string
-	 */
-	protected function getGroupDisplayName(string $gid): string {
-		$group = $this->groupManager->get($gid);
-		if ($group instanceof IGroup) {
-			return $group->getDisplayName();
-		}
-		return $gid;
-	}
-
-	protected function generateUserParameter(string $uid): array {
-		return [
-			'type' => 'user',
-			'id' => $uid,
-			'name' => $this->userManager->getDisplayName($uid) ?? $uid,
-		];
-	}
+    public const ADDED_TO_GROUP = 'group_added';
+    public const REMOVED_FROM_GROUP = 'group_removed';
+
+    /** @var L10nFactory */
+    private $l10n;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var IManager */
+    private $activityManager;
+    /** @var IUserManager */
+    protected $userManager;
+    /** @var IGroupManager */
+    protected $groupManager;
+
+    /** @var string[] */
+    protected $groupDisplayNames = [];
+
+
+    public function __construct(L10nFactory $l10n,
+                                IURLGenerator $urlGenerator,
+                                IManager $activityManager,
+                                IUserManager $userManager,
+                                IGroupManager $groupManager) {
+        $this->urlGenerator = $urlGenerator;
+        $this->l10n = $l10n;
+        $this->activityManager = $activityManager;
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+    }
+
+    public function parse($language, IEvent $event, IEvent $previousEvent = null) {
+        if ($event->getType() !== 'group_settings') {
+            throw new InvalidArgumentException();
+        }
+
+        $l = $this->l10n->get('settings', $language);
+
+        $params = $event->getSubjectParameters();
+        $parsedParameters = [
+            'user' => $this->generateUserParameter($params['user']),
+            'group' => $this->generateGroupParameter($params['group']),
+        ];
+
+        if (isset($params['actor'])) {
+            $parsedParameters['actor'] = $this->generateUserParameter($params['actor']);
+        }
+
+        switch ($event->getSubject()) {
+            case self::ADDED_TO_GROUP:
+                if (isset($parsedParameters['actor'])) {
+                    if ($this->activityManager->getCurrentUserId() === $params['user']) {
+                        $subject = $l->t('{actor} added you to group {group}');
+                    } elseif (isset($params['actor']) && $this->activityManager->getCurrentUserId() === $params['actor']) {
+                        $subject = $l->t('You added {user} to group {group}');
+                    } else {
+                        $subject = $l->t('{actor} added {user} to group {group}');
+                    }
+                } elseif ($this->activityManager->getCurrentUserId() === $params['user']) {
+                    $subject = $l->t('An administrator added you to group {group}');
+                } else {
+                    $subject = $l->t('An administrator added {user} to group {group}');
+                }
+                break;
+            case self::REMOVED_FROM_GROUP:
+                if (isset($parsedParameters['actor'])) {
+                    if ($this->activityManager->getCurrentUserId() === $params['user']) {
+                        $subject = $l->t('{actor} removed you from group {group}');
+                    } elseif (isset($params['actor']) && $this->activityManager->getCurrentUserId() === $params['actor']) {
+                        $subject = $l->t('You removed {user} from group {group}');
+                    } else {
+                        $subject = $l->t('{actor} removed {user} from group {group}');
+                    }
+                } elseif ($this->activityManager->getCurrentUserId() === $params['user']) {
+                    $subject = $l->t('An administrator removed you from group {group}');
+                } else {
+                    $subject = $l->t('An administrator removed {user} from group {group}');
+                }
+                break;
+            default:
+                throw new InvalidArgumentException();
+        }
+
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @param string $subject
+     * @param array $parameters
+     * @throws \InvalidArgumentException
+     */
+    protected function setSubjects(IEvent $event, string $subject, array $parameters): void {
+        $placeholders = $replacements = [];
+        foreach ($parameters as $placeholder => $parameter) {
+            $placeholders[] = '{' . $placeholder . '}';
+            $replacements[] = $parameter['name'];
+        }
+
+        $event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
+            ->setRichSubject($subject, $parameters);
+    }
+
+    /**
+     * @param string $gid
+     * @return array
+     */
+    protected function generateGroupParameter(string $gid): array {
+        if (!isset($this->groupDisplayNames[$gid])) {
+            $this->groupDisplayNames[$gid] = $this->getGroupDisplayName($gid);
+        }
+
+        return [
+            'type' => 'user-group',
+            'id' => $gid,
+            'name' => $this->groupDisplayNames[$gid],
+        ];
+    }
+
+    /**
+     * @param string $gid
+     * @return string
+     */
+    protected function getGroupDisplayName(string $gid): string {
+        $group = $this->groupManager->get($gid);
+        if ($group instanceof IGroup) {
+            return $group->getDisplayName();
+        }
+        return $gid;
+    }
+
+    protected function generateUserParameter(string $uid): array {
+        return [
+            'type' => 'user',
+            'id' => $uid,
+            'name' => $this->userManager->getDisplayName($uid) ?? $uid,
+        ];
+    }
 }

apps/comments/lib/Activity/Provider.php

Indentation +180 added lines, -180 removed lines

@@ -37,184 +37,184 @@
 
 class Provider implements IProvider {
 
-	protected IFactory $languageFactory;
-	protected ?IL10N $l = null;
-	protected IUrlGenerator $url;
-	protected ICommentsManager $commentsManager;
-	protected IUserManager $userManager;
-	protected 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();
-		}
-	}
-
-	/**
-	 * @throws \InvalidArgumentException
-	 */
-	protected function parseShortVersion(IEvent $event): IEvent {
-		$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;
-	}
-
-	/**
-	 * @throws \InvalidArgumentException
-	 */
-	protected function parseLongVersion(IEvent $event): IEvent {
-		$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): array {
-		$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' => $event->getObjectId(),
-			'filePath' => trim($subjectParameters[1], '/'),
-		];
-	}
-
-	protected function parseMessage(IEvent $event): void {
-		$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;
-				}
-
-				$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);
-				}
-
-				$mentions['mention' . $mentionCount] = $this->generateUserParameter($mention['id']);
-				$mentionCount++;
-			}
-
-			$event->setParsedMessage($comment->getMessage())
-				->setRichMessage($message, $mentions);
-		} catch (NotFoundException $e) {
-		}
-	}
-
-	protected function generateFileParameter(int $id, string $path): array {
-		return [
-			'type' => 'file',
-			'id' => $id,
-			'name' => basename($path),
-			'path' => $path,
-			'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
-		];
-	}
-
-	protected function generateUserParameter(string $uid): array {
-		return [
-			'type' => 'user',
-			'id' => $uid,
-			'name' => $this->userManager->getDisplayName($uid) ?? $uid,
-		];
-	}
+    protected IFactory $languageFactory;
+    protected ?IL10N $l = null;
+    protected IUrlGenerator $url;
+    protected ICommentsManager $commentsManager;
+    protected IUserManager $userManager;
+    protected 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();
+        }
+    }
+
+    /**
+     * @throws \InvalidArgumentException
+     */
+    protected function parseShortVersion(IEvent $event): IEvent {
+        $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;
+    }
+
+    /**
+     * @throws \InvalidArgumentException
+     */
+    protected function parseLongVersion(IEvent $event): IEvent {
+        $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): array {
+        $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' => $event->getObjectId(),
+            'filePath' => trim($subjectParameters[1], '/'),
+        ];
+    }
+
+    protected function parseMessage(IEvent $event): void {
+        $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;
+                }
+
+                $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);
+                }
+
+                $mentions['mention' . $mentionCount] = $this->generateUserParameter($mention['id']);
+                $mentionCount++;
+            }
+
+            $event->setParsedMessage($comment->getMessage())
+                ->setRichMessage($message, $mentions);
+        } catch (NotFoundException $e) {
+        }
+    }
+
+    protected function generateFileParameter(int $id, string $path): array {
+        return [
+            'type' => 'file',
+            'id' => $id,
+            'name' => basename($path),
+            'path' => $path,
+            'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
+        ];
+    }
+
+    protected function generateUserParameter(string $uid): array {
+        return [
+            'type' => 'user',
+            'id' => $uid,
+            'name' => $this->userManager->getDisplayName($uid) ?? $uid,
+        ];
+    }
 }