alma/Neah
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

panel 2 courier api restore

Browse Source
This commit is contained in:
alma 2025-04-26 10:56:09 +02:00
parent 684c0cf4ef
commit d0136a32a5
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/email/ComposeEmail.tsx
View File

@ -198,11 +198,13 @@ export default function ComposeEmail({
// First try the html field which should contain the raw HTML // First try the html field which should contain the raw HTML
if (initialEmail.html && initialEmail.html.trim()) { if (initialEmail.html && initialEmail.html.trim()) {
console.log('Using HTML content for forward'); console.log('Using HTML content for forward');
// Preserve the HTML exactly as-is without any wrapper divs that could break styles
originalContent = initialEmail.html; originalContent = initialEmail.html;
} }
// Then try the content field // Then try the content field
else if (initialEmail.content && initialEmail.content.trim()) { else if (initialEmail.content && initialEmail.content.trim()) {
console.log('Using content field for forward'); console.log('Using content field for forward');
// Preserve the content exactly as-is
originalContent = initialEmail.content; originalContent = initialEmail.content;
} }
// Fall back to text with styling if available // Fall back to text with styling if available
@ -219,9 +221,11 @@ export default function ComposeEmail({
// Preserve all original structure by wrapping, not modifying the original content // Preserve all original structure by wrapping, not modifying the original content
const forwardedContent = ` const forwardedContent = `
${headerHtml} ${headerHtml}
<!-- Start original email content - DO NOT MODIFY THIS CONTENT -->
<div class="original-email-content" style="margin-top: 10px; border-left: 2px solid #e1e1e1; padding-left: 15px;"> <div class="original-email-content" style="margin-top: 10px; border-left: 2px solid #e1e1e1; padding-left: 15px;">
${originalContent} ${originalContent}
</div> </div>
<!-- End original email content -->
`; `;
console.log('Setting body with forwarded content'); console.log('Setting body with forwarded content');

27
lib/services/email-service.ts
View File

@ -665,17 +665,30 @@ export function formatEmailForReplyOrForward(
.map(addr => `${addr.name} <${addr.address}>`) .map(addr => `${addr.name} <${addr.address}>`)
.join(', '); .join(', ');
} else if (type === 'forward') { } else if (type === 'forward') {
formattedContent = ` // Forward case doesn't need to set recipients
to = '';
// Instead, we format the content differently
const formattedDate = email.date ? new Date(email.date).toLocaleString() : '';
const fromText = email.from.map(f => f.name ? `${f.name} <${f.address}>` : f.address).join(', ');
const toText = email.to.map(t => t.name ? `${t.name} <${t.address}>` : t.address).join(', ');
// Return specialized body for forward
return {
to: '',
subject,
body: `
<div class="forwarded-message"> <div class="forwarded-message">
<p>---------- Forwarded message ---------</p> <p>---------- Forwarded message ---------</p>
<p>From: ${decoded.from || ''}</p> <p>From: ${fromText}</p>
<p>Date: ${formatDate(decoded.date ? new Date(decoded.date) : null)}</p> <p>Date: ${formattedDate}</p>
<p>Subject: ${decoded.subject || ''}</p> <p>Subject: ${email.subject || ''}</p>
<p>To: ${decoded.to || ''}</p> <p>To: ${toText}</p>
<br> <br>
${decoded.html || `<pre>${decoded.text || ''}</pre>`} ${email.html || email.text ? (email.html || `<pre>${email.text || ''}</pre>`) : '<p>No content available</p>'}
</div> </div>
`; `
};
} }
// Format the email body with quote // Format the email body with quote