Skip to content

Compute notification parsed subject from rich subject when possible #34807

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
come-nc merged 8 commits into from
Dec 19, 2022
Merged

Compute notification parsed subject from rich subject when possible #34807

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
323963e
Compute parsed from rich subject and message in Notification
come-nc Oct 25, 2022
db995d4
Same thing for Activity
come-nc Oct 25, 2022
d9151ff
Get rid of all useless calls to setParsedSubject now that setRichSubj…
come-nc Oct 25, 2022
2a3090d
Throw instead of using a bogus value if name field is missing
come-nc Nov 21, 2022
cf8d97c
Revert changes to systemtags application
come-nc Nov 21, 2022
8a04bf5
Apply the same changes to richToParsed in Notification
come-nc Nov 21, 2022
f676076
Throw on missing type of rich subject parameter
come-nc Dec 8, 2022
e553cd1
Fix comments and dav tests with Notifications and Activity changes
come-nc Dec 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Throw on missing type of rich subject parameter 
Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc
come-nc committed Dec 8, 2022
commit f676076482433da01ce7d60ea68f04fa84a33f86
12 changes: 7 additions & 5 deletions lib/private/Activity/Event.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,19 +276,21 @@ public function setRichSubject(string $subject, array $parameters = []): IEvent
}

/**
* @throws \InvalidArgumentException if a parameter has no name
* @throws \InvalidArgumentException if a parameter has no name or no type
*/
private function richToParsed(string $message, array $parameters): string {
$placeholders = [];
$replacements = [];
foreach ($parameters as $placeholder => $parameter) {
$placeholders[] = '{' . $placeholder . '}';
if (!isset($parameter['name']) || !is_string($parameter['name'])) {
throw new \InvalidArgumentException('Invalid rich object, name field is missing');
foreach (['name','type'] as $requiredField) {
if (!isset($parameter[$requiredField]) || !is_string($parameter[$requiredField])) {
throw new \InvalidArgumentException("Invalid rich object, {$requiredField} field is missing");
}
}
if (($parameter['type'] ?? '') === 'user') {
if ($parameter['type'] === 'user') {
$replacements[] = '@' . $parameter['name'];
} elseif (($parameter['type'] ?? '') === 'file') {
} elseif ($parameter['type'] === 'file') {
$replacements[] = $parameter['path'] ?? $parameter['name'];
} else {
$replacements[] = $parameter['name'];
Expand Down
12 changes: 7 additions & 5 deletions lib/private/Notification/Notification.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,19 +303,21 @@ public function setRichSubject(string $subject, array $parameters = []): INotifi
}

/**
* @throws \InvalidArgumentException if a parameter has no name
* @throws \InvalidArgumentException if a parameter has no name or no type
*/
private function richToParsed(string $message, array $parameters): string {
$placeholders = [];
$replacements = [];
foreach ($parameters as $placeholder => $parameter) {
$placeholders[] = '{' . $placeholder . '}';
if (!isset($parameter['name']) || !is_string($parameter['name'])) {
throw new \InvalidArgumentException('Invalid rich object, name field is missing');
foreach (['name','type'] as $requiredField) {
if (!isset($parameter[$requiredField]) || !is_string($parameter[$requiredField])) {
throw new \InvalidArgumentException("Invalid rich object, {$requiredField} field is missing");
}
}
if (($parameter['type'] ?? '') === 'user') {
if ($parameter['type'] === 'user') {
$replacements[] = '@' . $parameter['name'];
} elseif (($parameter['type'] ?? '') === 'file') {
} elseif ($parameter['type'] === 'file') {
$replacements[] = $parameter['path'] ?? $parameter['name'];
} else {
$replacements[] = $parameter['name'];
Expand Down