fix: folder deletion while in trash

Signed-off-by: Sebastian Krupinski <krupinski01@gmail.com>

lib/Providers/Mail/Service.php

@@ -484,17 +484,34 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
             }
         }
 
-        // we need to determine if the folder being deleted is already in the trash
-        if (str_starts_with((string) $target->collection(), (string) $deleteTargetIdentifier?->collection())) {
-            // if so, we should hard delete instead of moving to avoid duplicates in the trash
-            $deleteMode = 'hard';
+        if ($deleteMode === 'soft') {
+            $targetMailbox = $this->mailService->collectionFetch((string) $target->collection());
+            if ($targetMailbox === null) {
+                throw new \RuntimeException('Collection not found for delete operation');
             }
 
-        $result = match ($deleteMode) {
-            'soft' => $this->collectionMove($deleteTargetIdentifier, $target),
-            'hard' => $this->mailService->collectionDestroy($target->collection(), $force),
-        };
-        return $result;
+            $targetIdentifier = (string) $target->collection();
+            $trashIdentifier = (string) $deleteTargetIdentifier->collection();
+            $parentIdentifier = isset($targetMailbox['parentId'])
+                ? (string) $targetMailbox['parentId']
+                : null;
+
+            // JMAP mailbox IDs are opaque, so containment must be determined
+            // from parentId rather than by comparing ID prefixes.
+            if ($targetIdentifier === $trashIdentifier || $parentIdentifier === $trashIdentifier) {
+                $deleteMode = 'hard';
+            }
+        }
+
+        if ($deleteMode === 'soft') {
+            return $this->collectionMove($deleteTargetIdentifier, $target);
+        }
+
+        if ($this->mailService->collectionDestroy((string) $target->collection(), $force) === null) {
+            throw new \RuntimeException("Failed to delete collection: {$target->collection()}");
+        }
+
+        return true;
     }
 
     public function collectionMove(CollectionIdentifier $target, CollectionIdentifier $source): CollectionBaseInterface

lib/Service/Remote/RemoteMailService.php

@@ -912,21 +912,29 @@ class RemoteMailService {
 	 *
 	 * @since Release 2.0.0
 	 */
-	public function entitySubmitFresh(string $identityId, array $message, string $preSendTarget, string $postSentTarget): string {
+	public function entitySubmitFresh(string $identityId, array $data, string $preSendTarget, string $postSentTarget): string {
 
-		$mail = new MailParametersRequest();
-		$mail->parametersRaw($message);
+		$message = new MailParametersRequest();
+		$message->parametersRaw($data);
 
-		$messageCreateId = 'm_' . uniqid();
-		$submissionCreateId = 's_' . uniqid();
+		$messageId = 'm_' . uniqid();
+		$submissionId = 's_' . uniqid();
 
 		$r0 = new MailSet($this->dataAccount, null, $this->resourceNamespace, $this->resourceEntityLabel);
-		$createdMessage = $r0->create($messageCreateId, $mail);
-		$createdMessage->in($preSendTarget);
+		$m0 = $r0->create($messageId, $message);
+		$m0->in($preSendTarget);
+		$m0->draft(true);
+		$m0->seen(true);
+
 		$r1 = new MailSubmissionSet($this->dataAccount, null, $this->resourceNamespace, $this->resourceEntityLabel);
-		$submission = $r1->create($submissionCreateId);
-		$submission->identity($identityId);
-		$submission->message('#' . $messageCreateId);
+		$r1->completionUpdate('#' . $messageId, [
+			'mailboxIds/' . $postSentTarget => true,
+			'mailboxIds/' . $preSendTarget => null,
+			'keywords/$draft' => null,
+		]);
+		$s0 = $r1->create($submissionId);
+		$s0->identity($identityId);
+		$s0->message('#' . $messageId);
 
 		$bundle = $this->dataStore->perform([$r0, $r1]);
 		$messageResponse = $bundle->response(0);
@@ -934,7 +942,7 @@ class RemoteMailService {
 			throw new Exception($messageResponse->type() . ': ' . $messageResponse->description(), 1);
 		}
 		if (method_exists($messageResponse, 'createFailure')) {
-			$failure = $messageResponse->createFailure($messageCreateId);
+			$failure = $messageResponse->createFailure($messageId);
 			if (is_array($failure)) {
 				$type = $failure['type'] ?? 'unknownError';
 				$description = $failure['description'] ?? 'Email creation failed';
@@ -950,7 +958,7 @@ class RemoteMailService {
 			throw new Exception($response->type() . ': ' . $response->description(), 1);
 		}
 
-		return $this->extractSubmissionIdentifier($response, $submissionCreateId);
+		return $this->extractSubmissionIdentifier($response, $submissionId);
 	}
 
 	/**
@@ -978,18 +986,18 @@ class RemoteMailService {
 		$requests = [];
 
 		if ($patch !== null && $patch !== []) {
-			$draftMutation = new MailParametersRequest();
-			$draftMutation->parametersRaw($patch);
+			$m0 = new MailParametersRequest();
+			$m0->parametersRaw($patch);
 			$r0 = new MailSet($this->dataAccount, null, $this->resourceNamespace, $this->resourceEntityLabel);
-			$r0->update($draftId, $draftMutation);
+			$r0->update($draftId, $m0);
 			$requests[] = $r0;
 		}
 
-		$submissionCreateId = 's_' . uniqid();
+		$submissionId = 's_' . uniqid();
 		$r1 = new MailSubmissionSet($this->dataAccount, null, $this->resourceNamespace, $this->resourceEntityLabel);
-		$submission = $r1->create($submissionCreateId);
-		$submission->identity($identityId);
-		$submission->message($draftId);
+		$s0 = $r1->create($submissionId);
+		$s0->identity($identityId);
+		$s0->message($draftId);
 		$requests[] = $r1;
 
 		$bundle = $this->dataStore->perform($requests);
@@ -1002,19 +1010,7 @@ class RemoteMailService {
 			throw new Exception($response->type() . ': ' . $response->description(), 1);
 		}
 
-		return $this->extractSubmissionIdentifier($response, $submissionCreateId);
-	}
-
-	private function collectionByRole(string $role): ?string {
-		$filter = $this->collectionListFilter();
-		$filter->condition('role', $role);
-
-		$collections = $this->collectionList(null, $filter, null);
-		if ($collections === []) {
-			return null;
-		}
-
-		return (string)array_key_first($collections);
+		return $this->extractSubmissionIdentifier($response, $submissionId);
 	}
 
 	private function extractSubmissionIdentifier(object $response, string $createId): string {