Skip to content

fix(notifications): Update the notification handling #12112

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
nickvergessen merged 1 commit into from
Apr 15, 2024
Merged

fix(notifications): Update the notification handling #12112

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
29 changes: 17 additions & 12 deletions lib/Notification/Notifier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
use OCP\Notification\IManager as INotificationManager;
use OCP\Notification\INotification;
use OCP\Notification\INotifier;
use OCP\Notification\UnknownNotificationException;
use OCP\RichObjectStrings\Definitions;
use OCP\Share\Exceptions\ShareNotFound;
use OCP\Share\IManager as IShareManager;
Expand Down Expand Up @@ -189,12 +190,13 @@ protected function getParticipant(Room $room, string $userId): Participant {
* @param INotification $notification
* @param string $languageCode The code of the language that should be used to prepare the notification
* @return INotification
* @throws \InvalidArgumentException When the notification was not prepared by a notifier
* @throws AlreadyProcessedException
* @throws UnknownNotificationException
* @since 9.0.0
*/
public function prepare(INotification $notification, string $languageCode): INotification {
if ($notification->getApp() !== Application::APP_ID) {
throw new \InvalidArgumentException('Incorrect app');
throw new UnknownNotificationException('Incorrect app');
}

$userId = $notification->getUser();
Expand Down Expand Up @@ -278,7 +280,7 @@ public function prepare(INotification $notification, string $languageCode): INot
}

$this->notificationManager->markProcessed($notification);
throw new \InvalidArgumentException('Unknown subject');
throw new UnknownNotificationException('Unknown subject');
}

protected function shortenJsonEncodedMultibyteSave(string $subject, int $dataLength): string {
Expand Down Expand Up @@ -471,11 +473,11 @@ protected function parseRemoteInvitationMessage(INotification $notification, IL1
* @param IL10N $l
* @return INotification
* @throws AlreadyProcessedException
* @throws \InvalidArgumentException
* @throws UnknownNotificationException
*/
protected function parseChatMessage(INotification $notification, Room $room, Participant $participant, IL10N $l): INotification {
if ($notification->getObjectType() !== 'chat' && $notification->getObjectType() !== 'reminder') {
throw new \InvalidArgumentException('Unknown object type');
throw new UnknownNotificationException('Unknown object type');
}

$messageParameters = $notification->getMessageParameters();
Expand Down Expand Up @@ -911,12 +913,12 @@ protected function getRoomType(Room $room): string {
* @param Room $room
* @param IL10N $l
* @return INotification
* @throws \InvalidArgumentException
* @throws AlreadyProcessedException
* @throws UnknownNotificationException
*/
protected function parseInvitation(INotification $notification, Room $room, IL10N $l): INotification {
if ($notification->getObjectType() !== 'room') {
throw new \InvalidArgumentException('Unknown object type');
throw new UnknownNotificationException('Unknown object type');
}

$parameters = $notification->getSubjectParameters();
Expand Down Expand Up @@ -992,12 +994,12 @@ protected function parseInvitation(INotification $notification, Room $room, IL10
* @param Room $room
* @param IL10N $l
* @return INotification
* @throws \InvalidArgumentException
* @throws AlreadyProcessedException
* @throws UnknownNotificationException
*/
protected function parseCall(INotification $notification, Room $room, IL10N $l): INotification {
if ($notification->getObjectType() !== 'call') {
throw new \InvalidArgumentException('Unknown object type');
throw new UnknownNotificationException('Unknown object type');
}

$roomName = $room->getDisplayName($notification->getUser());
Expand Down Expand Up @@ -1069,12 +1071,12 @@ protected function parseCall(INotification $notification, Room $room, IL10N $l):
* @param Room $room
* @param IL10N $l
* @return INotification
* @throws \InvalidArgumentException
* @throws AlreadyProcessedException
* @throws UnknownNotificationException
*/
protected function parsePasswordRequest(INotification $notification, Room $room, IL10N $l): INotification {
if ($notification->getObjectType() !== 'call') {
throw new \InvalidArgumentException('Unknown object type');
throw new UnknownNotificationException('Unknown object type');
}

try {
Expand Down Expand Up @@ -1151,6 +1153,9 @@ protected function addActionButton(INotification $notification, string $labelKey
return $notification;
}

/**
* @throws UnknownNotificationException
*/
protected function parseHostedSignalingServer(INotification $notification, IL10N $l): INotification {
$action = $notification->createAction();
$action->setLabel('open_settings')
Expand Down Expand Up @@ -1183,7 +1188,7 @@ protected function parseHostedSignalingServer(INotification $notification, IL10N
];
break;
default:
throw new \InvalidArgumentException('Unknown subject');
throw new UnknownNotificationException('Unknown subject');
}

return $notification
Expand Down