Aaron Guise
3bfa73f375
buildForwardAsAttachmentPayload called buildForwardSubject(email.subject,
forwardPrefix) unconditionally, and buildForwardSubject("", prefix)
returns just the bare prefix rather than "". Normal Forward doesn't do
this - EmailComposer's getInitialSubject() returns "" outright when
!replyTo?.subject, only calling buildForwardSubject when there's an
actual subject to prefix. So forwarding a subject-less message as an
attachment produced "Fwd:" as the subject, while normal Forward left
it blank.
Only call buildForwardSubject when email.subject is truthy, matching
getInitialSubject()'s behavior exactly. Add a test.
Caught by GitHub Copilot's automated PR review.
57 lines
2.1 KiB
TypeScript
57 lines
2.1 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 {
|
|
// Match the normal Forward flow's getInitialSubject(), which leaves the
|
|
// subject blank rather than prefix-only when the original has none -
|
|
// buildForwardSubject("", prefix) would otherwise return just the bare
|
|
// prefix (e.g. "Fwd:") for a subject-less message.
|
|
subject: email.subject ? buildForwardSubject(email.subject, forwardPrefix) : "",
|
|
attachment: {
|
|
blobId: email.blobId,
|
|
name: emailExportFilename(email, filenameOptions),
|
|
type: "message/rfc822",
|
|
size: email.size,
|
|
},
|
|
};
|
|
}
|