@remit/mailbox-service 0.0.121 → 0.0.122

package/dist/message-move.d.ts

@@ -249,10 +249,6 @@ export declare class MessageMoveService {
      * batch's total wait is one row's ceiling rather than the sum across it.
      */
     private settledPlacements;
-    /**
-     * Update ThreadMessage for move operations.
-     * Updates mailboxId and optionally isDeleted.
-     */
     private updateThreadMessageForMove;
     /**
      * Delete every ThreadMessage row that points at this messageId.

package/dist/message-move.js

@@ -261,7 +261,7 @@ export class MessageMoveService {
                     continue;
                 }
                 // Update ThreadMessage
-                await this.updateThreadMessageForMove(accountConfigId, messageId, trashMailbox.mailboxId, true);
+                await this.updateThreadMessageForMove(accountConfigId, messageId, trashMailbox.mailboxId);
                 await this.addressService.reconcileJunkOnlyForMessage(messageId, configJunkRoles);
                 events.push({
                     event: {
@@ -380,10 +380,6 @@ export class MessageMoveService {
         }
         const sourceMailbox = await this.mailboxService.get(accountId, message.mailboxId);
         const destinationMailbox = await this.mailboxService.get(accountId, destinationMailboxId);
-        // Check if moving to/from Trash
-        const trashMailbox = await this.mailboxSpecialUseService.findTrashMailbox(accountId);
-        const isMovingToTrash = Boolean(trashMailbox && destinationMailboxId === trashMailbox.mailboxId);
-        const isMovingFromTrash = Boolean(trashMailbox && message.mailboxId === trashMailbox.mailboxId);
         // The optimistic write is a transition off the row this call read
         // (imap-mutations R3). Three mailbox lookups stand between the read and
         // here, and PLACEMENT_MOVE_PUSH runs on a queue this account's FIFO group
@@ -408,12 +404,8 @@ export class MessageMoveService {
             throw new MessagePlacementUnsettledError(`Message ${messageId} was not moved: something else changed where it is while this move was being prepared`, accountId, messageId, "in_flight");
         }
         // Update ThreadMessage
-        await this.updateThreadMessageForMove(accountConfigId, messageId, destinationMailboxId, isMovingToTrash);
+        await this.updateThreadMessageForMove(accountConfigId, messageId, destinationMailboxId);
         await this.addressService.reconcileJunkOnlyForMessage(messageId, await this.mailboxSpecialUseService.resolveJunkRolesForConfig(accountConfigId));
-        // If moving FROM Trash, clear isDeleted
-        if (isMovingFromTrash) {
-            await this.updateThreadMessageDeleted(accountConfigId, messageId, false);
-        }
         this.log.info({
             messageId,
             from: sourceMailbox.fullPath,
@@ -716,11 +708,7 @@ export class MessageMoveService {
      * batch's total wait is one row's ceiling rather than the sum across it.
      */
     settledPlacements = async (messages, accountId) => Promise.all(messages.map((message) => this.settledPlacement(message, accountId)));
-    /**
-     * Update ThreadMessage for move operations.
-     * Updates mailboxId and optionally isDeleted.
-     */
-    updateThreadMessageForMove = async (accountConfigId, messageId, newMailboxId, isDeleted) => {
+    updateThreadMessageForMove = async (accountConfigId, messageId, newMailboxId) => {
         const threadMessage = await this.threadMessageService.getByMessageId(accountConfigId, messageId);
         this.log.info({
             messageId,
@@ -728,9 +716,8 @@ export class MessageMoveService {
             threadMessageId: threadMessage.threadMessageId,
             sentDate: threadMessage.sentDate,
             newMailboxId,
-            isDeleted,
         }, "Updating ThreadMessage for move");
-        await this.threadMessageService.update(threadMessage.accountConfigId, threadMessage.threadMessageId, { mailboxId: newMailboxId, isDeleted }, {
+        await this.threadMessageService.update(threadMessage.accountConfigId, threadMessage.threadMessageId, { mailboxId: newMailboxId, isDeleted: false }, {
             // Composites contain CURRENT values for condition checking
             // ElectroDB uses these to verify the item state before updating
             composites: {
@@ -746,7 +733,6 @@ export class MessageMoveService {
             messageId,
             threadMessageId: threadMessage.threadMessageId,
             newMailboxId,
-            isDeleted,
         }, "Updated ThreadMessage for move");
     };
     /**

package/dist/message-sync.js

@@ -1118,7 +1118,7 @@ export class MessageSyncService {
         // re-point names the placement it read, writes nothing when the row has
         // moved since, and the UID waits for the next round.
         const repointed = repointable &&
-            (await this.messageService.repointIfPlacement(messageId, { status: item.status, mailboxId: item.mailboxId, uid: item.uid }, { mailboxId, uid: msg.uid, isDeleted: sighting === "discarded" }));
+            (await this.messageService.repointIfPlacement(messageId, { status: item.status, mailboxId: item.mailboxId, uid: item.uid }, { mailboxId, uid: msg.uid, isDeleted: false }));
         if (repointable && !repointed)
             unresolvedSighting = true;
         owned = created || item.mailboxId === mailboxId || repointed;

package/dist/thread-message-rows.d.ts

@@ -16,7 +16,6 @@ export declare const buildThreadMessageTrashUpdate: (threadMessage: ThreadMessag
     set: {
         uid: number;
         mailboxId: string;
-        isDeleted: boolean;
     };
     composites: {
         sentDate: number;

package/dist/thread-message-rows.js

@@ -10,7 +10,6 @@ export const buildThreadMessageTrashUpdate = (threadMessage, newUid, destination
     set: {
         uid: newUid,
         mailboxId: destinationMailboxId,
-        isDeleted: true,
     },
     composites: currentComposites(threadMessage),
 });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remit/mailbox-service",
-	"version": "0.0.121",
+	"version": "0.0.122",
 	"type": "module",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",