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-25 21:42:19 +02:00
parent 28a6478ea0
commit a585bcb51d
1 changed files with 96 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
components/ComposeEmail.tsx
View File

@ -10,6 +10,8 @@ import { decodeComposeContent, encodeComposeContent } from '@/lib/compose-mime-d
import { Email } from '@/app/courrier/page';
import mime from 'mime';
import { simpleParser } from 'mailparser';
import { decodeEmail, cleanHtml } from '@/lib/mail-parser-wrapper';
import DOMPurify from 'dompurify';
interface ComposeEmailProps {
showCompose: boolean;
@ -126,62 +128,29 @@ export default function ComposeEmail({
// Format the reply/forward content
const type = replyTo ? 'reply' : 'forward';
// Use simple, reliable formatting for the quoted content
const formatEmailAddresses = (addresses: any) => {
if (!addresses) return 'Unknown';
if (typeof addresses === 'string') return addresses;
if (Array.isArray(addresses)) {
return addresses.map(addr => addr.name || addr.address).join(', ');
}
return String(addresses);
};
// Extract plain text content for reliable display
let emailContent = '';
try {
// Parse the original email to get clean content
const response = await fetch('/api/parse-email', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ email: emailToProcess.content }),
});
if (response.ok) {
const data = await response.json();
emailContent = data.text || '';
// If no text content, try to extract from HTML
if (!emailContent && data.html) {
// Create a temporary div to extract text from HTML
const tempDiv = document.createElement('div');
tempDiv.innerHTML = data.html;
emailContent = tempDiv.textContent || tempDiv.innerText || '';
}
}
} catch (error) {
console.error('[DEBUG] Error parsing email:', error);
// Fallback to simple content extraction
emailContent = emailToProcess.content.replace(/<[^>]*>/g, '');
}
// Parse the email to get headers and content - using the same function as panel 3
const decoded = await decodeEmail(emailToProcess.content);
// Format the content based on reply type
const quotedContent = type === 'forward' ? `
<div class="forwarded-message" style="border-top: 1px solid #e5e7eb; padding-top: 20px; margin-top: 20px; color: #6b7280; font-size: 0.875rem;">
---------- Forwarded message ---------<br/>
From: ${formatEmailAddresses(emailToProcess.from) || 'Unknown Sender'}<br/>
Date: ${new Date(emailToProcess.date || Date.now()).toLocaleString()}<br/>
Subject: ${emailToProcess.subject || 'No Subject'}<br/>
To: ${formatEmailAddresses(emailToProcess.to) || ''}<br/>
${emailToProcess.cc ? `Cc: ${formatEmailAddresses(emailToProcess.cc)}<br/>` : ''}
From: ${decoded.from || 'Unknown Sender'}<br/>
Date: ${decoded.date ? decoded.date.toLocaleString() : new Date().toLocaleString()}<br/>
Subject: ${decoded.subject || 'No Subject'}<br/>
To: ${decoded.to || ''}<br/>
${decoded.cc ? `Cc: ${decoded.cc}<br/>` : ''}
</div>
<div class="message-content" style="margin-top: 10px; border: 1px solid #e5e7eb; padding: 10px; border-radius: 4px; max-height: 300px; overflow-y: auto; color: #374151;">
<pre style="white-space: pre-wrap; word-break: break-word; font-family: system-ui, sans-serif; margin: 0;">${emailContent}</pre>
${decoded.html ? DOMPurify.sanitize(decoded.html) : (decoded.text ? `<pre style="white-space: pre-wrap; word-break: break-word; font-family: system-ui, sans-serif; margin: 0;">${decoded.text}</pre>` : 'No content available')}
</div>
` : `
<div class="quoted-message" style="border-top: 1px solid #e5e7eb; padding-top: 20px; margin-top: 20px; color: #6b7280; font-size: 0.875rem;">
On ${new Date(emailToProcess.date || Date.now()).toLocaleString()}, ${formatEmailAddresses(emailToProcess.from) || 'Unknown Sender'} wrote:
On ${decoded.date ? decoded.date.toLocaleString() : new Date().toLocaleString()}, ${decoded.from || 'Unknown Sender'} wrote:
</div>
<div class="message-content" style="margin: 10px 0 0 10px; padding: 10px; border-left: 2px solid #e5e7eb; border: 1px solid #e5e7eb; border-radius: 4px; max-height: 300px; overflow-y: auto; color: #374151;">
<pre style="white-space: pre-wrap; word-break: break-word; font-family: system-ui, sans-serif; margin: 0;">${emailContent}</pre>
${decoded.html ? DOMPurify.sanitize(decoded.html) : (decoded.text ? `<pre style="white-space: pre-wrap; word-break: break-word; font-family: system-ui, sans-serif; margin: 0;">${decoded.text}</pre>` : 'No content available')}
</div>
`;
@ -245,6 +214,22 @@ export default function ComposeEmail({
setLocalContent(formattedContent);
console.log('[DEBUG] Successfully set compose content with scrollable message area');
}
} catch (error) {
console.error('[DEBUG] Error parsing email:', error);
// Fallback to simple content extraction
const fallbackContent = emailToProcess.content.replace(/<[^>]*>/g, '');
composeBodyRef.current.innerHTML = `
<div class="compose-area" contenteditable="true">
<br/>
<div style="color: #ef4444;">Error loading original message.</div>
<div style="color: #64748b; font-size: 0.875rem; margin-top: 0.5rem;">
Technical details: ${error instanceof Error ? error.message : 'Unknown error'}
</div>
</div>
`;
setComposeBody(fallbackContent);
setLocalContent(fallbackContent);
}
} catch (error) {
console.error('[DEBUG] Error initializing compose content:', error);
if (composeBodyRef.current) {