Reorganize how deletes are deferred so we can properly group them

Signed-off-by: Joas Schilling <coding@schilljs.com>

Author: nickvergessen

lib/App.php

@@ -82,7 +82,7 @@ public function markProcessed(INotification $notification): void {
 		}
 		foreach ($deleted as $user => $notifications) {
 			foreach ($notifications as $data) {
-				$this->push->pushDeleteToDevice((string) $user, $data['id'], $data['app']);
+				$this->push->pushDeleteToDevice((string) $user, [$data['id']], $data['app']);
 			}
 		}
 		if (!$isAlreadyDeferring) {

lib/Controller/EndpointController.php

@@ -185,7 +185,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->push->pushDeleteToDevice($this->getCurrentUser(), [$id], $notification->getApp());
 			}
 		} catch (NotificationNotFoundException $e) {
 		}

lib/Push.php

@@ -79,6 +79,8 @@ class Push {
 	protected $deferPayloads = false;
 	/** @var array[] */
 	protected $deletesToPush = [];
+	/** @var string[] */
+	protected $deleteAllsToPush = [];
 	/** @var INotification[] */
 	protected $notificationsToPush = [];
 
@@ -170,12 +172,18 @@ public function flushPayloads(): void {
 			$this->notificationsToPush = [];
 		}
 
+		if (!empty($this->deleteAllsToPush)) {
+			foreach ($this->deleteAllsToPush as $userId) {
+				$this->pushDeleteToDevice($userId, null);
+			}
+			$this->deleteAllsToPush = [];
+		}
+
 		if (!empty($this->deletesToPush)) {
-			// Check for $id = 0 then only trigger delete all for that user
-			// Otherwise group by "app" (['spreed', 'talk', 'admin_notification_talk'] OR not!)
-			// And trigger each chunk per user
-			foreach ($this->deletesToPush as $id => $data) {
-				$this->pushDeleteToDevice($data['userId'], $id, $data['app']);
+			foreach ($this->deletesToPush as $userId => $data) {
+				foreach ($data as $client => $notificationIds) {
+					$this->pushDeleteToDevice($userId, $notificationIds, $client);
+				}
 			}
 			$this->deletesToPush = [];
 		}
@@ -313,21 +321,47 @@ public function pushToDevice(int $id, INotification $notification, ?OutputInterf
 		}
 	}
 
-	public function pushDeleteToDevice(string $userId, ?int $notificationId, string $app = ''): void {
+	/**
+	 * @param string $userId
+	 * @param ?int[] $notificationIds
+	 * @param string $app
+	 * @throws InvalidTokenException FIXME investigate
+	 */
+	public function pushDeleteToDevice(string $userId, ?array $notificationIds, string $app = ''): void {
 		if (!$this->config->getSystemValueBool('has_internet_connection', true)) {
 			return;
 		}
 
 		if ($this->deferPreparing) {
-			if ($notificationId === null) {
-				$notificationId = 0;
+			if ($notificationIds === null) {
+				$this->deleteAllsToPush[$userId] = true;
+				if (isset($this->deletesToPush[$userId])) {
+					unset($this->deletesToPush[$userId]);
+				}
+			} else {
+				if (isset($this->deleteAllsToPush[$userId])) {
+					return;
+				}
+
+				$isTalkNotification = \in_array($app, ['spreed', 'talk', 'admin_notification_talk'], true);
+				$clientGroup = $isTalkNotification ? 'talk' : 'files';
+
+				if (!isset($this->deletesToPush[$userId])) {
+					$this->deletesToPush[$userId] = [];
+				}
+				if (!isset($this->deletesToPush[$userId][$clientGroup])) {
+					$this->deletesToPush[$userId][$clientGroup] = [];
+				}
+
+				foreach ($notificationIds as $notificationId) {
+					$this->deletesToPush[$userId][$clientGroup][] = $notificationId;
+				}
 			}
-			$this->deletesToPush[$notificationId] = ['userId' => $userId, 'app' => $app]; // FIXME this assumes there is only 1 delete-all per request
 			$this->loadDevicesForUsers[] = $userId;
 			return;
 		}
 
-		$deleteAll = $notificationId !== null;
+		$deleteAll = $notificationIds === null;
 
 		$user = $this->createFakeUserObject($userId);
 
@@ -358,17 +392,21 @@ public function pushDeleteToDevice(string $userId, ?int $notificationId, string
 			}
 
 			try {
-				if ($deleteAll) {
-					$payload = json_encode($this->encryptAndSignDelete($userKey, $device, null));
-				} else {
-					$payload = json_encode($this->encryptAndSignDelete($userKey, $device, [$notificationId]));
-				}
-
 				$proxyServer = rtrim($device['proxyserver'], '/');
 				if (!isset($this->payloadsToSend[$proxyServer])) {
 					$this->payloadsToSend[$proxyServer] = [];
 				}
-				$this->payloadsToSend[$proxyServer][] = $payload;
+
+				if ($deleteAll) {
+					$data = $this->encryptAndSignDelete($userKey, $device, null);
+					$this->payloadsToSend[$proxyServer][] = json_encode($data['payload']);
+				} else {
+					while (!empty($notificationIds)) {
+						$data = $this->encryptAndSignDelete($userKey, $device, $notificationIds);
+						$notificationIds = $data['remaining'];
+						$this->payloadsToSend[$proxyServer][] = json_encode($data['payload']);
+					}
+				}
 			} catch (\InvalidArgumentException $e) {
 				// Failed to encrypt message for device: public key is invalid
 				$this->deletePushToken($device['token']);