Merge pull request #39711 from nextcloud/backport/39689/stable26

[stable26] fix(notifications): Remove share notification when the node is deleted
nextcloud · Aug 16, 2023 · 297938a · 297938a
2 parents eba8266 + 94f22e7
commit 297938a
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/apps/files_sharing/lib/Notification/Notifier.php b/apps/files_sharing/lib/Notification/Notifier.php
@@ -29,6 +29,7 @@
 namespace OCA\Files_Sharing\Notification;
 
 use OCP\Files\IRootFolder;
+use OCP\Files\NotFoundException;
 use OCP\IGroupManager;
 use OCP\IL10N;
 use OCP\IURLGenerator;
@@ -117,6 +118,13 @@ public function prepare(INotification $notification, string $languageCode): INot
 			throw new AlreadyProcessedException();
 		}
 
+		try {
+			$share->getNode();
+		} catch (NotFoundException $e) {
+			// Node is already deleted, so discard the notification
+			throw new AlreadyProcessedException();
+		}
+
 		if ($notification->getSubject() === 'expiresTomorrow') {
 			$notification = $this->parseShareExpiration($share, $notification, $l);
 		} else {