Skip to content

Commit

Permalink
Merge pull request #13247 from nextcloud/backport/13200/stable30
Browse files Browse the repository at this point in the history
  • Loading branch information
provokateurin authored Sep 10, 2024
2 parents 64f630b + 305ffee commit 1aad1bc
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions lib/Notification/Notifier.php
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

0 comments on commit 1aad1bc

Please sign in to comment.