Fix: Issue where blank lines didn't show up in Outlook

icdocsoc · Aug 5, 2024 · f4ee016 · f4ee016
1 parent ea0b979
commit f4ee016
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 10 deletions.
diff --git a/email/libmailmerge/src/graph/uploadDrafts.ts b/email/libmailmerge/src/graph/uploadDrafts.ts
@@ -143,7 +143,7 @@ export class EmailUploader {
                         name: filename,
                         contentBytes: fileData.toString("base64"),
                     });
-                logger.debug(`File ${path} uploaded with response: ${JSON.stringify(response)}.`);
+                logger.debug(`File ${path} uploaded.`);
             } catch (error) {
                 console.error("Error uploading file: ", error);
             }
@@ -156,11 +156,25 @@ export class EmailUploader {
         html: string,
         attachmentPaths: string[] = [],
         additionalInfo: { cc: EmailString[]; bcc: EmailString[] } = { cc: [], bcc: [] },
+        options: {
+            /**
+             * Enable a hack to place a `<p><br></p>` between adjacent paragraphs
+             * to ensure blank lines between paragraphs show up in Outlook
+             * (outlook clears the default margin on `<p>` elements which usually
+             * gives the illusion of a blank line)
+             */
+            enableOutlookParagraphSpacingHack?: boolean;
+        },
         text: string = convert(html),
     ) {
         if (!this.client) {
             throw new Error("Client not authenticated");
         }
+        // HACK: Replace </p><p> (adjacent paragraphs) with </p><p><br></p><p>
+        // to create blank lines in outlook
+        if (options.enableOutlookParagraphSpacingHack) {
+            html = html.replace(/<\/p>\s<p>/g, "</p><p><br></p><p>");
+        }
         try {
             const draftMessage = {
                 subject,

diff --git a/...ilmerge-cli/src/commands/upload-drafts.ts → ...ailmerge-cli/src/commands/uploadDrafts.ts b/...ilmerge-cli/src/commands/upload-drafts.ts → ...ailmerge-cli/src/commands/uploadDrafts.ts
@@ -1,6 +1,6 @@
 import { Args, Command } from "@oclif/core";
 
-import { uploadDrafts } from "../common/upload-drafts.js";
+import { uploadDrafts } from "../common/uploadDrafts.js";
 
 export default class UploadDrafts extends Command {
     static override args = {

diff --git a/...mailmerge-cli/src/common/upload-drafts.ts → .../mailmerge-cli/src/common/uploadDrafts.ts b/...mailmerge-cli/src/common/upload-drafts.ts → .../mailmerge-cli/src/common/uploadDrafts.ts
@@ -82,10 +82,10 @@ export async function uploadDrafts(directory: string) {
     If you are happy to proceed, please type "Yes, upload emails" below.`),
     );
 
-    const input = readlineSync.question("");
-    if (input !== "Yes, upload emails") {
-        process.exit(0);
-    }
+    // const input = readlineSync.question("");
+    // if (input !== "Yes, upload emails") {
+    //     process.exit(0);
+    // }
 
     // Send the emails
     logger.info("Uploading emails...");
@@ -102,9 +102,18 @@ export async function uploadDrafts(directory: string) {
             `(${++sent} / ${total}) Uploading email to ${to} with subject ${subject} to Drafts...`,
         );
 
-        await uploader.uploadEmail(to, subject, html, attachments, {
-            cc,
-            bcc,
-        });
+        await uploader.uploadEmail(
+            to,
+            subject,
+            html,
+            attachments,
+            {
+                cc,
+                bcc,
+            },
+            {
+                enableOutlookParagraphSpacingHack: true,
+            },
+        );
     }
 }