Skip to content

[stable30] fix(Notification): Fix rich object parameters with non-string values #13247

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
provokateurin merged 1 commit into from
Sep 10, 2024
Merged

[stable30] fix(Notification): Fix rich object parameters with non-string values #13247

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions lib/Notification/Notifier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ protected function parseStoredRecordingFail(
[
'call' => [
'type' => 'call',
'id' => $room->getId(),
'id' => (string)$room->getId(),
'name' => $room->getDisplayName($participant->getAttendee()->getActorId()),
'call-type' => $this->getRoomType($room),
'icon-url' => $this->avatarService->getAvatarUrl($room),
Expand Down Expand Up @@ -375,16 +375,16 @@ protected function parseStoredRecording(
[
'call' => [
'type' => 'call',
'id' => $room->getId(),
'id' => (string)$room->getId(),
'name' => $room->getDisplayName($participant->getAttendee()->getActorId()),
'call-type' => $this->getRoomType($room),
'icon-url' => $this->avatarService->getAvatarUrl($room),
],
'file' => [
'type' => 'file',
'id' => $file->getId(),
'id' => (string)$file->getId(),
'name' => $file->getName(),
'path' => $path,
'path' => (string)$path,
'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $file->getId()]),
],
]);
Expand Down Expand Up @@ -943,7 +943,7 @@ protected function parseInvitation(INotification $notification, Room $room, IL10
],
'call' => [
'type' => 'call',
'id' => $room->getId(),
'id' => (string)$room->getId(),
'name' => $roomName,
'call-type' => $this->getRoomType($room),
'icon-url' => $this->avatarService->getAvatarUrl($room),
Expand All @@ -969,7 +969,7 @@ protected function parseInvitation(INotification $notification, Room $room, IL10
],
'call' => [
'type' => 'call',
'id' => $room->getId(),
'id' => (string)$room->getId(),
'name' => $roomName,
'call-type' => $this->getRoomType($room),
'icon-url' => $this->avatarService->getAvatarUrl($room),
Expand Down Expand Up @@ -1021,7 +1021,7 @@ protected function parseCall(INotification $notification, Room $room, IL10N $l):
],
'call' => [
'type' => 'call',
'id' => $room->getId(),
'id' => (string)$room->getId(),
'name' => $roomName,
'call-type' => $this->getRoomType($room),
'icon-url' => $this->avatarService->getAvatarUrl($room),
Expand Down Expand Up @@ -1049,7 +1049,7 @@ protected function parseCall(INotification $notification, Room $room, IL10N $l):
$subject, [
'call' => [
'type' => 'call',
'id' => $room->getId(),
'id' => (string)$room->getId(),
'name' => $roomName,
'call-type' => $this->getRoomType($room),
'icon-url' => $this->avatarService->getAvatarUrl($room),
Expand Down Expand Up @@ -1085,7 +1085,7 @@ protected function parsePasswordRequest(INotification $notification, Room $room,
try {
$file = [
'type' => 'highlight',
'id' => $share->getNodeId(),
'id' => (string)$share->getNodeId(),
'name' => $share->getNode()->getName(),
];
} catch (\OCP\Files\NotFoundException $e) {
Expand Down