implement new notifyDelete() method called from nc core notification …

…code. part of changes to allow notifications via unified push app. Signed-off-by: Gavin Element <[email protected]>
nextcloud · Sep 5, 2024 · df46667 · df46667
1 parent 498615b
commit df46667
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/App.php b/lib/App.php
@@ -43,6 +43,12 @@ public function notify(INotification $notification): void {
 		}
 	}
 
+  public function notifyDelete(string $user, ?int $id, ?INotification $notification): void {
+    $idAsArray = ($id !== null) ? [ $id ] : null;
+    $appName = ($notification !== null) ? $notification->getApp() : "";
+    $this->push->pushDeleteToDevice($user, $idAsArray, $appName);
+  }
+
 	public function getLastInsertedId(): ?int {
 		return $this->lastInsertedId;
 	}

diff --git a/lib/Controller/EndpointController.php b/lib/Controller/EndpointController.php
@@ -229,7 +229,7 @@ public function deleteNotification(int $id): DataResponse {
 			$deleted = $this->handler->deleteById($id, $this->getCurrentUser(), $notification);
 
 			if ($deleted) {
-				$this->push->pushDeleteToDevice($this->getCurrentUser(), [$id], $notification->getApp());
+        $this->manager->notifyDelete($this->getCurrentUser(), $id, $notification);
 			}
 		} catch (NotificationNotFoundException $e) {
 		}
@@ -255,7 +255,7 @@ public function deleteAllNotifications(): DataResponse {
 
 		$deletedSomething = $this->handler->deleteByUser($this->getCurrentUser());
 		if ($deletedSomething) {
-			$this->push->pushDeleteToDevice($this->getCurrentUser(), null);
+			$this->manager->notifyDelete($this->getCurrentUser(), null, null);
 		}
 
 		if ($shouldFlush) {