feat: add original email infos

Author: fredleger

hook2mail.py

@@ -26,9 +26,13 @@ def webhook():
         raw_message = base64.b64decode(message_base64).decode('utf-8')
         email_message = Parser().parsestr(raw_message)
 
-        # Extract the original sender
-        original_sender = email_message.get('From', 'Unknown Sender')
-        original_subject = email_message.get('Subject', 'No Subject')
+        # Extract original email information
+        original_infos = {
+            'sender': email_message.get('From', 'Unknown Sender'),
+            'subject': email_message.get('Subject', 'No Subject'),
+            'to': email_message.get('To', ''),
+            'cc': email_message.get('Cc', '')
+        }
 
         payload = None
         if email_message.is_multipart():
@@ -46,21 +50,54 @@ def webhook():
         if len(message_content) < 10:
             raise ValueError("The email body must have at least 10 characters")
 
-        send_email(message_content, original_sender, original_subject)
+        send_email(message_content, original_infos)
         return "OK", 200
     except (KeyError, ValueError, base64.binascii.Error) as e:
         return jsonify({"error": str(e)}), 400
     except Exception as e:
         return jsonify({"error": str(e)}), 500
 
-def send_email(content, original_sender, original_subject):
+def format_forwarded_email_header(original_infos):
+    """
+    Format the header information for forwarded emails.
+    This function can be easily extended to include more information in the future.
+
+    Args:
+        original_infos (dict): Dictionary containing original email information
+                                Expected keys: 'sender', 'to', 'cc', 'subject'
+    """
+    header_lines = [
+        "--- Forwarded Message Information ---",
+        f"Original Sender: {original_infos.get('sender', 'Unknown')}"
+    ]
+
+    if original_infos.get('to'):
+        header_lines.append(f"Original Recipients: {original_infos['to']}")
+
+    if original_infos.get('cc'):
+        header_lines.append(f"Original CC: {original_infos['cc']}")
+
+    header_lines.extend([
+        "--- End of Forwarded Message Information ---",
+        ""  # Empty line to separate from message content
+    ])
+
+    return "\n".join(header_lines)
+
+def send_email(content, original_infos):
     msg = EmailMessage()
-    forward_infos = f"\n\nNote: this message has been forwarded via hook2mail from {original_sender}"
-    msg.set_content(content + forward_infos)
-    msg["Subject"] = original_subject
+
+    # Create header with original email information
+    forwarded_header = format_forwarded_email_header(original_infos)
+
+    # Combine header and original content
+    full_content = forwarded_header + "\n" + content
+
+    msg.set_content(full_content)
+    msg["Subject"] = original_infos.get('subject', 'No Subject')
     msg["From"] = EMAIL_FROM
     msg["To"] = EMAIL_TO
-    msg.add_header('Reply-To', f"{original_sender}, {EMAIL_FROM}")
+    msg.add_header('Reply-To', f"{original_infos.get('sender', EMAIL_FROM)}, {EMAIL_FROM}")
 
     with smtplib.SMTP(SMTP_HOST, SMTP_PORT) as server:
         if USE_STARTTLS: