Aaron Guise
7a483b3dd4
buildForwardAsAttachmentPayload called emailExportFilename(email) with no options, always using the default naming template regardless of the user's configured emailDownloadTemplate (and space/case/diacritics transforms) - the same settings the neighboring "Export as .eml" action already respects. That could produce inconsistent .eml filenames between the two actions for the same message. Accept an optional EmailFilenameOptions parameter and pass it through. handleForwardAsAttachment now reads the same settings email-viewer.tsx's emailFilenameOptions useMemo does, via useSettingsStore.getState() (a one-off read inside an event handler, matching this file's existing pattern, rather than a new reactive subscription). Add a unit test covering a custom template. Caught by GitHub Copilot's automated PR review.
53 lines
1.8 KiB
TypeScript
53 lines
1.8 KiB
TypeScript
import type { Email } from "@/lib/jmap/types";
|
|
import { buildForwardSubject } from "@/lib/subject-prefix";
|
|
import { emailExportFilename, type EmailFilenameOptions } from "@/lib/download-filename";
|
|
|
|
export interface ForwardAsAttachmentEntry {
|
|
blobId: string;
|
|
name: string;
|
|
type: "message/rfc822";
|
|
size: number;
|
|
}
|
|
|
|
export interface ForwardAsAttachmentPayload {
|
|
subject: string;
|
|
attachment: ForwardAsAttachmentEntry;
|
|
}
|
|
|
|
/**
|
|
* Build the subject and synthetic attachment entry for forwarding a
|
|
* message as a message/rfc822 attachment instead of inline-quoted text
|
|
* (e.g. reporting spam to an upstream gateway that expects the raw
|
|
* original as an attachment, or preserving exact formatting/headers).
|
|
*
|
|
* Referenced by blobId, not re-uploaded - JMAP blobs are account-scoped,
|
|
* not per-email, so the same blobId a message already has can be attached
|
|
* to a brand new outgoing email directly.
|
|
*
|
|
* `filenameOptions`, when passed, should be the same options the caller
|
|
* uses for "Export as .eml" / drag-out (the user's configured filename
|
|
* template, space/case/diacritics transforms - see
|
|
* useSettingsStore's emailDownloadTemplate and friends), so the two
|
|
* actions produce consistent filenames for the same message. Falls back
|
|
* to emailExportFilename's own default template when omitted.
|
|
*
|
|
* Returns null when the email has no blobId (nothing to reference).
|
|
*/
|
|
export function buildForwardAsAttachmentPayload(
|
|
email: Email,
|
|
forwardPrefix: string,
|
|
filenameOptions?: EmailFilenameOptions,
|
|
): ForwardAsAttachmentPayload | null {
|
|
if (!email.blobId) return null;
|
|
|
|
return {
|
|
subject: buildForwardSubject(email.subject, forwardPrefix),
|
|
attachment: {
|
|
blobId: email.blobId,
|
|
name: emailExportFilename(email, filenameOptions),
|
|
type: "message/rfc822",
|
|
size: email.size,
|
|
},
|
|
};
|
|
}
|