diff options
| author | Côme Chilliet <91878298+come-nc@users.noreply.github.com> | 2022-12-19 10:46:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-19 10:46:39 +0100 |
| commit | cbbb0712db0f33a41ef66ae59d5c70ba1e23748f (patch) | |
| tree | db09b311f4a6a62451dd25db25ae9f8e80a3064c /apps/files/lib/Activity | |
| parent | 884da19198d15a764487e6a6d615968c0e63203d (diff) | |
| parent | e553cd1bb9cec6bf6200298bcca6637e81163953 (diff) | |
| download | nextcloud-server-cbbb0712db0f33a41ef66ae59d5c70ba1e23748f.tar.gz nextcloud-server-cbbb0712db0f33a41ef66ae59d5c70ba1e23748f.zip | |
Merge pull request #34807 from nextcloud/fix/compute-notification-parsed-subject
Compute notification parsed subject from rich subject when possible
Diffstat (limited to 'apps/files/lib/Activity')
| -rw-r--r-- | apps/files/lib/Activity/FavoriteProvider.php | 3 | ||||
| -rw-r--r-- | apps/files/lib/Activity/Provider.php | 17 |
2 files changed, 3 insertions, 17 deletions
diff --git a/apps/files/lib/Activity/FavoriteProvider.php b/apps/files/lib/Activity/FavoriteProvider.php index a1c08370e4e..9c7018e6a5c 100644 --- a/apps/files/lib/Activity/FavoriteProvider.php +++ b/apps/files/lib/Activity/FavoriteProvider.php @@ -172,7 +172,6 @@ class FavoriteProvider implements IProvider { 'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $subjectParams['id']]), ]; - $event->setParsedSubject(str_replace('{file}', $parameter['path'], $subject)) - ->setRichSubject($subject, ['file' => $parameter]); + $event->setRichSubject($subject, ['file' => $parameter]); } } diff --git a/apps/files/lib/Activity/Provider.php b/apps/files/lib/Activity/Provider.php index c21e8f9ad16..2cfd48ede3b 100644 --- a/apps/files/lib/Activity/Provider.php +++ b/apps/files/lib/Activity/Provider.php @@ -38,12 +38,10 @@ use OCP\Files\Node; use OCP\Files\NotFoundException; use OCP\IL10N; use OCP\IURLGenerator; -use OCP\IUser; use OCP\IUserManager; use OCP\L10N\IFactory; class Provider implements IProvider { - /** @var IFactory */ protected $languageFactory; @@ -306,19 +304,8 @@ class Provider implements IProvider { 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); + protected function setSubjects(IEvent $event, string $subject, array $parameters): void { + $event->setRichSubject($subject, $parameters); } /** |