ses + raw mjml + filemanager

Author: pierre-b

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [26.10] - 2026-01-23
+
+- **File Manager**: Added warning modal when selecting images larger than 200KB from email editor to prevent slow email loading times
+- **SES Email**: Fixed incorrect quoted-printable encoding in raw emails causing Gmail to break rendering for broadcasts with List-Unsubscribe headers or attachments (#230)
+- **Email Builder**: Fixed Raw HTML block content not appearing in preview or sent emails (#229)
+
 ## [26.9] - 2026-01-21
 
 - **Contacts**: Fixed CSV import not trimming non-breaking spaces (NBSP) from email addresses and string fields (#223)

config/config.go

@@ -14,7 +14,7 @@ import (
 	"github.com/spf13/viper"
 )
 
-const VERSION = "26.9"
+const VERSION = "26.10"
 
 type Config struct {
 	Server              ServerConfig

console/package-lock.json

@@ -70,7 +70,7 @@
     "html2canvas": "^1.4.1",
     "is-hotkey": "^0.2.0",
     "liquidjs": "^10.24.0",
-    "lodash": "^4.17.21",
+    "lodash": "^4.17.23",
     "lodash.throttle": "^4.1.1",
     "lowlight": "^3.3.0",
     "lucide-react": "^0.487.0",

console/package.json

@@ -468,12 +468,14 @@ export class EmailBlockClass {
       block.children = []
     }
 
-    // Special handling for mj-text blocks to ensure EditorJS content
+    // Special handling for blocks that support content
     if (
       type === 'mj-text' ||
       type === 'mj-button' ||
       type === 'mj-title' ||
-      type === 'mj-preview'
+      type === 'mj-preview' ||
+      type === 'mj-raw' ||
+      type === 'mj-style'
     ) {
       // For mj-text blocks, ensure content is wrapped in <p> tags (Tiptap always wraps in <p>)
       if (type === 'mj-text') {
@@ -486,8 +488,9 @@ export class EmailBlockClass {
           block.content = '<p></p>'
         }
       } else {
-        // For other content-supporting blocks, use content as-is
-        block.content = content
+        // For other content-supporting blocks, use content as-is or initialize to empty string
+        // This ensures the content field exists on the block for mj-raw and mj-style blocks
+        block.content = content ?? ''
       }
     }
 

console/src/components/email_builder/EmailBlockClass.tsx

@@ -18,6 +18,7 @@ interface SelectFileButtonProps {
   type?: 'primary' | 'default' | 'dashed' | 'link' | 'text'
   ghost?: boolean
   style?: React.CSSProperties
+  maxFileSizeWarning?: number // Threshold in bytes, default 200KB (204800)
 }
 
 interface FileManagerProviderProps {
@@ -44,7 +45,10 @@ export const FileManagerProvider: React.FC<FileManagerProviderProps> = ({
     onSelect: (url: string) => void
     acceptFileType?: string
     acceptItem?: (item: StorageObject) => boolean
+    maxFileSizeWarning?: number
   } | null>(null)
+  const [warningModalVisible, setWarningModalVisible] = useState(false)
+  const [pendingFile, setPendingFile] = useState<StorageObject | null>(null)
 
   // Close file manager modal
   const closeModal = () => {
@@ -57,13 +61,40 @@ export const FileManagerProvider: React.FC<FileManagerProviderProps> = ({
     if (currentOptions?.onSelect && items.length > 0) {
       const selectedFile = items[0]
       if (selectedFile.file_info?.url) {
+        const maxSize = currentOptions.maxFileSizeWarning ?? 204800 // Default 200KB
+
+        // Check if file exceeds size threshold
+        if (selectedFile.file_info.size > maxSize) {
+          setPendingFile(selectedFile)
+          setWarningModalVisible(true)
+          return
+        }
+
+        // File is under threshold, proceed normally
         currentOptions.onSelect(selectedFile.file_info.url)
         message.success(`Selected: ${selectedFile.name}`)
         closeModal()
       }
     }
   }
 
+  // Handle confirm large file selection
+  const handleConfirmLargeFile = () => {
+    if (pendingFile && currentOptions?.onSelect) {
+      currentOptions.onSelect(pendingFile.file_info.url)
+      message.success(`Selected: ${pendingFile.name}`)
+    }
+    setWarningModalVisible(false)
+    setPendingFile(null)
+    closeModal()
+  }
+
+  // Handle cancel large file selection
+  const handleCancelLargeFile = () => {
+    setWarningModalVisible(false)
+    setPendingFile(null)
+  }
+
   // Handle file manager errors
   const handleFileManagerError = (error: Error) => {
     console.error('File manager error:', error)
@@ -81,13 +112,15 @@ export const FileManagerProvider: React.FC<FileManagerProviderProps> = ({
     block = false,
     type = 'primary',
     ghost = false,
-    style
+    style,
+    maxFileSizeWarning
   }) => {
     const handleOpenFileManager = () => {
       setCurrentOptions({
         onSelect,
         acceptFileType,
-        acceptItem
+        acceptItem,
+        maxFileSizeWarning
       })
       setIsModalVisible(true)
     }
@@ -146,6 +179,32 @@ export const FileManagerProvider: React.FC<FileManagerProviderProps> = ({
           />
         )}
       </Modal>
+
+      {/* Large File Warning Modal */}
+      <Modal
+        title="Large File Warning"
+        open={warningModalVisible}
+        onCancel={handleCancelLargeFile}
+        footer={[
+          <Button key="cancel" onClick={handleCancelLargeFile}>
+            Cancel
+          </Button>,
+          <Button key="confirm" type="primary" onClick={handleConfirmLargeFile}>
+            Use Anyway
+          </Button>
+        ]}
+        zIndex={1400}
+      >
+        <p>
+          The selected file <strong>{pendingFile?.name}</strong> is{' '}
+          <strong>{pendingFile?.file_info?.size_human}</strong>.
+        </p>
+        <p>
+          Large images can significantly slow down email loading times for recipients,
+          especially on mobile devices or slow connections.
+        </p>
+        <p>Are you sure you want to use this file?</p>
+      </Modal>
     </FileManagerContext.Provider>
   )
 }

console/src/components/file_manager/context.tsx

@@ -1744,3 +1744,149 @@ func TestEmailTemplate_UnmarshalJSON_Minimal_ExistingFile(t *testing.T) {
 		t.Fatalf("unexpected error: %v", err)
 	}
 }
+
+// TestEmailTemplate_MjRawContent_JSONRoundTrip tests that mj-raw block content is preserved
+// through JSON serialization/deserialization (GitHub issue #229)
+func TestEmailTemplate_MjRawContent_JSONRoundTrip(t *testing.T) {
+	// JSON that represents a template with mj-raw content
+	jsonData := []byte(`{
+		"sender_id": "test-sender",
+		"subject": "Test Subject",
+		"compiled_preview": "<html>test</html>",
+		"visual_editor_tree": {
+			"id": "mjml-1",
+			"type": "mjml",
+			"children": [
+				{
+					"id": "body-1",
+					"type": "mj-body",
+					"children": [
+						{
+							"id": "section-1",
+							"type": "mj-section",
+							"children": [
+								{
+									"id": "column-1",
+									"type": "mj-column",
+									"children": [
+										{
+											"id": "raw-1",
+											"type": "mj-raw",
+											"content": "<table><tr><td>Cell 1</td><td>Cell 2</td></tr></table>",
+											"attributes": {}
+										}
+									]
+								}
+							]
+						}
+					]
+				}
+			]
+		}
+	}`)
+
+	// Unmarshal the JSON
+	var emailTemplate EmailTemplate
+	err := emailTemplate.UnmarshalJSON(jsonData)
+	assert.NoError(t, err, "Failed to unmarshal EmailTemplate")
+
+	// Verify the visual_editor_tree was unmarshaled correctly
+	assert.NotNil(t, emailTemplate.VisualEditorTree, "VisualEditorTree should not be nil")
+	assert.Equal(t, notifuse_mjml.MJMLComponentMjml, emailTemplate.VisualEditorTree.GetType())
+
+	// Find the mj-raw block and verify content
+	var rawBlock notifuse_mjml.EmailBlock
+	bodyBlock := emailTemplate.VisualEditorTree.GetChildren()[0]
+	sectionBlock := bodyBlock.GetChildren()[0]
+	columnBlock := sectionBlock.GetChildren()[0]
+	rawBlock = columnBlock.GetChildren()[0]
+
+	assert.Equal(t, notifuse_mjml.MJMLComponentMjRaw, rawBlock.GetType(), "Expected mj-raw block")
+	content := rawBlock.GetContent()
+	assert.NotNil(t, content, "mj-raw content should not be nil")
+	assert.Equal(t, "<table><tr><td>Cell 1</td><td>Cell 2</td></tr></table>", *content)
+
+	// Marshal back to JSON
+	marshaledJSON, err := emailTemplate.MarshalJSON()
+	assert.NoError(t, err, "Failed to marshal EmailTemplate")
+
+	// Verify the content is preserved in the marshaled JSON
+	assert.Contains(t, string(marshaledJSON), "Cell 1", "Marshaled JSON should contain mj-raw content")
+	assert.Contains(t, string(marshaledJSON), "Cell 2", "Marshaled JSON should contain mj-raw content")
+
+	// Unmarshal again to verify round-trip
+	var emailTemplate2 EmailTemplate
+	err = emailTemplate2.UnmarshalJSON(marshaledJSON)
+	assert.NoError(t, err, "Failed to unmarshal EmailTemplate after round-trip")
+
+	// Find the mj-raw block again and verify content
+	var rawBlock2 notifuse_mjml.EmailBlock
+	bodyBlock2 := emailTemplate2.VisualEditorTree.GetChildren()[0]
+	sectionBlock2 := bodyBlock2.GetChildren()[0]
+	columnBlock2 := sectionBlock2.GetChildren()[0]
+	rawBlock2 = columnBlock2.GetChildren()[0]
+
+	content2 := rawBlock2.GetContent()
+	assert.NotNil(t, content2, "mj-raw content should not be nil after round-trip")
+	assert.Equal(t, "<table><tr><td>Cell 1</td><td>Cell 2</td></tr></table>", *content2)
+}
+
+// TestEmailTemplate_MjRawContent_Value_Scan tests that mj-raw content is preserved
+// when using database Value() and Scan() methods (simulating database save/load)
+func TestEmailTemplate_MjRawContent_Value_Scan(t *testing.T) {
+	// Create an EmailTemplate with mj-raw content
+	rawContent := "<table><tr><td>Cell 1</td><td>Cell 2</td></tr></table>"
+
+	rawBase := notifuse_mjml.NewBaseBlock("raw-1", notifuse_mjml.MJMLComponentMjRaw)
+	rawBase.Content = &rawContent
+	rawBlock := &notifuse_mjml.MJRawBlock{BaseBlock: rawBase}
+
+	columnBlock := &notifuse_mjml.MJColumnBlock{BaseBlock: notifuse_mjml.NewBaseBlock("column-1", notifuse_mjml.MJMLComponentMjColumn)}
+	columnBlock.Children = []notifuse_mjml.EmailBlock{rawBlock}
+
+	sectionBlock := &notifuse_mjml.MJSectionBlock{BaseBlock: notifuse_mjml.NewBaseBlock("section-1", notifuse_mjml.MJMLComponentMjSection)}
+	sectionBlock.Children = []notifuse_mjml.EmailBlock{columnBlock}
+
+	bodyBlock := &notifuse_mjml.MJBodyBlock{BaseBlock: notifuse_mjml.NewBaseBlock("body-1", notifuse_mjml.MJMLComponentMjBody)}
+	bodyBlock.Children = []notifuse_mjml.EmailBlock{sectionBlock}
+
+	mjmlBlock := &notifuse_mjml.MJMLBlock{BaseBlock: notifuse_mjml.NewBaseBlock("mjml-1", notifuse_mjml.MJMLComponentMjml)}
+	mjmlBlock.Children = []notifuse_mjml.EmailBlock{bodyBlock}
+
+	emailTemplate := &EmailTemplate{
+		SenderID:         "test-sender",
+		Subject:          "Test Subject",
+		CompiledPreview:  "<html>test</html>",
+		VisualEditorTree: mjmlBlock,
+	}
+
+	// Test Value() - simulates database save
+	value, err := emailTemplate.Value()
+	assert.NoError(t, err, "Value() should not return error")
+	assert.NotNil(t, value, "Value() should return data")
+
+	// Verify the value contains the content
+	valueBytes, ok := value.([]byte)
+	assert.True(t, ok, "Value() should return []byte")
+	assert.Contains(t, string(valueBytes), "Cell 1", "Value() should contain mj-raw content")
+
+	// Test Scan() - simulates database load
+	var emailTemplate2 EmailTemplate
+	err = emailTemplate2.Scan(valueBytes)
+	assert.NoError(t, err, "Scan() should not return error")
+
+	// Verify the visual_editor_tree was scanned correctly
+	assert.NotNil(t, emailTemplate2.VisualEditorTree, "VisualEditorTree should not be nil after Scan")
+
+	// Find the mj-raw block and verify content
+	var rawBlock2 notifuse_mjml.EmailBlock
+	bodyBlock2 := emailTemplate2.VisualEditorTree.GetChildren()[0]
+	sectionBlock2 := bodyBlock2.GetChildren()[0]
+	columnBlock2 := sectionBlock2.GetChildren()[0]
+	rawBlock2 = columnBlock2.GetChildren()[0]
+
+	assert.Equal(t, notifuse_mjml.MJMLComponentMjRaw, rawBlock2.GetType(), "Expected mj-raw block after Scan")
+	content2 := rawBlock2.GetContent()
+	assert.NotNil(t, content2, "mj-raw content should not be nil after Scan")
+	assert.Equal(t, rawContent, *content2, "mj-raw content should be preserved after Value/Scan round-trip")
+}

internal/domain/template_test.go

@@ -8,6 +8,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/Notifuse/notifuse/pkg/crypto"
@@ -360,6 +361,18 @@ func (ws *WorkspaceSettings) Validate(passphrase string) error {
 		return fmt.Errorf("invalid cover URL: %s", ws.CoverURL)
 	}
 
+	// Validate custom endpoint URL if provided
+	if ws.CustomEndpointURL != nil && *ws.CustomEndpointURL != "" {
+		customURL := *ws.CustomEndpointURL
+		if !govalidator.IsURL(customURL) {
+			return fmt.Errorf("invalid custom endpoint URL: %s", customURL)
+		}
+		// Ensure it uses http or https scheme
+		if !strings.HasPrefix(customURL, "http://") && !strings.HasPrefix(customURL, "https://") {
+			return fmt.Errorf("custom endpoint URL must use http or https scheme: %s", customURL)
+		}
+	}
+
 	// FileManager is completely optional, but if any fields are set, validate them
 	if err := ws.FileManager.Validate(passphrase); err != nil {
 		return fmt.Errorf("invalid file manager settings: %w", err)