johanels/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-12-11 22:14:05 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge pull request #7866 from penpot/niwinz-staging-fix-emails

Browse Source 
🐛 Change internal ordering on how email parts are assembled
This commit is contained in:
Alejandro Alonso
2025-12-04 09:56:22 +01:00
committed by GitHub
parent 38efa88460 95b7784a42
commit 2105c3a68c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
backend/src/app/email.clj
View File

@@ -106,17 +106,17 @@
(let [content-part (MimeBodyPart.) (let [content-part (MimeBodyPart.)
alternative-mpart (MimeMultipart. "alternative")] alternative-mpart (MimeMultipart. "alternative")]
(when-let [content (get body "text/plain")]
(let [text-part (MimeBodyPart.)]
(.setText text-part ^String content ^String charset)
(.addBodyPart alternative-mpart text-part)))
(when-let [content (get body "text/html")] (when-let [content (get body "text/html")]
(let [html-part (MimeBodyPart.)] (let [html-part (MimeBodyPart.)]
(.setContent html-part ^String content (.setContent html-part ^String content
(str "text/html; charset=" charset)) (str "text/html; charset=" charset))
(.addBodyPart alternative-mpart html-part))) (.addBodyPart alternative-mpart html-part)))
(when-let [content (get body "text/plain")]
(let [text-part (MimeBodyPart.)]
(.setText text-part ^String content ^String charset)
(.addBodyPart alternative-mpart text-part)))
(.setContent content-part alternative-mpart) (.setContent content-part alternative-mpart)
(.addBodyPart mixed-mpart content-part)) (.addBodyPart mixed-mpart content-part))