Rename to EmailAttachmentV2

Author: tristanlabelle

app/backend/proto/internal/jobs.proto

@@ -14,15 +14,14 @@ message SendEmailPayload {
   string list_unsubscribe_header = 7;
   // source data as to where this email came from
   string source_data = 8;
-  repeated EmailAttachment attachments = 9;
+  reserved 9; // Previous "attachments" field, which had mime_type+filename subfields.
+  repeated EmailAttachmentV2 attachments = 10;
 }
 
-message EmailAttachment {
-  reserved 1, 2;
-  reserved "filename", "mime_type";
-  bytes data = 3;
-  string content_disposition = 4; // The Content-Disposition header, including parameters
-  string content_type = 5; // The Content-Type header, including parameters
+message EmailAttachmentV2 {
+  bytes data = 1;
+  string content_disposition = 2; // The Content-Disposition header, including parameters
+  string content_type = 3; // The Content-Type header, including parameters
 }
 
 message HandleNotificationPayload {

app/backend/src/couchers/email/calendar_events.py

@@ -7,15 +7,15 @@
 from couchers.config import config
 from couchers.email.rendering import get_emails_i18next
 from couchers.i18n import LocalizationContext
-from couchers.proto.internal.jobs_pb2 import EmailAttachment
+from couchers.proto.internal.jobs_pb2 import EmailAttachmentV2
 from couchers.proto.requests_pb2 import HostRequest
 
 HOST_REQUEST_ICS_FILENAME = "host_request.ics"
 
 
 def create_host_request_attachment(
     host_request: HostRequest, other_name: str, hosting: bool, loc_context: LocalizationContext
-) -> EmailAttachment:
+) -> EmailAttachmentV2:
     calendar = create_host_request_calendar(host_request, other_name, hosting, loc_context)
     return calendar_to_attachment(calendar, HOST_REQUEST_ICS_FILENAME)
 
@@ -67,7 +67,7 @@ def create_host_request_event(
 
 def create_host_request_cancellation_attachment(
     host_request: HostRequest, other_name: str, hosting: bool, loc_context: LocalizationContext
-) -> EmailAttachment:
+) -> EmailAttachmentV2:
     calendar = create_host_request_cancellation_calendar(host_request, other_name, hosting, loc_context)
     return calendar_to_attachment(calendar, HOST_REQUEST_ICS_FILENAME)
 
@@ -96,7 +96,7 @@ def event_to_calendar(event: Event, method: str | None, loc_context: Localizatio
     return calendar
 
 
-def calendar_to_attachment(calendar: Calendar, filename: str) -> EmailAttachment:
+def calendar_to_attachment(calendar: Calendar, filename: str) -> EmailAttachmentV2:
     data = calendar.serialize().encode("utf-8")
     content_disposition = f'attachment; filename="{filename}"'
     content_type = 'text/calendar; charset="utf-8"'
@@ -105,7 +105,7 @@ def calendar_to_attachment(calendar: Calendar, filename: str) -> EmailAttachment
         # AI recommends avoiding quotes on this parameter for backwards compatibility with old email clients.
         content_type += f"; method={calendar.method}"
 
-    return EmailAttachment(data=data, content_disposition=content_disposition, content_type=content_type)
+    return EmailAttachmentV2(data=data, content_disposition=content_disposition, content_type=content_type)
 
 
 def get_host_request_event_uid(host_request_id: int) -> str:

app/backend/src/couchers/email/smtp.py

@@ -57,11 +57,6 @@ def email_proto_to_message(payload: jobs_pb2.SendEmailPayload, couchers_id: str)
 
     if payload.attachments:
         for attachment in payload.attachments:
-            # Versioning (2026-05): ignore older SendEmailPayload that did not specify headers.
-            # They were used for incorrectly formatted ics attachments.
-            if not attachment.content_type or not attachment.content_disposition:
-                continue
-
             # Create with generic Content-Type/Content-Disposition headers,
             # then overwrite them with the headers specified by the caller.
             msg.add_attachment(

app/backend/src/couchers/notifications/render_email.py

@@ -17,7 +17,7 @@
     generate_unsub_topic_key,
 )
 from couchers.proto import api_pb2, notification_data_pb2
-from couchers.proto.internal.jobs_pb2 import EmailAttachment
+from couchers.proto.internal.jobs_pb2 import EmailAttachmentV2
 from couchers.templating import Jinja2Template, template_folder
 from couchers.utils import now, to_aware_datetime
 
@@ -31,7 +31,7 @@ class RenderedEmailNotification:
     body_html: str | None
     source_data: str | None
     list_unsubscribe_header: str | None
-    attachments: list[EmailAttachment] = field(default_factory=list)
+    attachments: list[EmailAttachmentV2] = field(default_factory=list)
 
 
 def render_email_notification(
@@ -770,7 +770,7 @@ def _get_custom_templated_email(notification: Notification, loc_context: Localiz
     raise NotImplementedError(f"Unknown topic-action: {notification.topic}:{notification.action}")
 
 
-def get_ics_attachment(notification: Notification, loc_context: LocalizationContext) -> EmailAttachment | None:
+def get_ics_attachment(notification: Notification, loc_context: LocalizationContext) -> EmailAttachmentV2 | None:
     data = notification.topic_action.data_type.FromString(notification.data)  # type: ignore[attr-defined]
     if notification.topic_action == NotificationTopicAction.host_request__accept:
         # Caveat: The surfer technically still hasn't confirmed, but when they do they don't receive an email,

app/backend/src/tests/test_smtp.py

@@ -1,5 +1,5 @@
 from couchers.email.smtp import email_proto_to_message
-from couchers.proto.internal.jobs_pb2 import EmailAttachment, SendEmailPayload
+from couchers.proto.internal.jobs_pb2 import EmailAttachmentV2, SendEmailPayload
 
 
 def test_verbatim_attachment_headers():
@@ -15,7 +15,7 @@ def test_verbatim_attachment_headers():
         subject="greeting",
         plain="hello",
         attachments=[
-            EmailAttachment(
+            EmailAttachmentV2(
                 data=bytes([0, 255]),  # Force base64 encoding
                 content_type='maintype/subtype; quoted-header="value"; unquoted-header=value',
                 content_disposition="attachment",