@social-mail/social-mail-client 1.2.91 → 1.2.93

package/src/web/page/mails/service/ConversationService.tsx

@@ -79,38 +79,6 @@ export const renderMail = AtomControl.registerProperty("data-html", "html", (c,
     return;
 });
 
-const downloadEmailContent = async (es: EntityService, email: IEmail) => {
-    if (email.replyCount) {
-        const children = await es.query(Email)
-        .where({ emailID: email.emailID }, (p) => (x) => x.emailID === p.emailID && x.engagement !== null)
-        .orderByDescending((x) => x.emailID)
-        .toPagedList({
-            start: 0,
-            size: 4,
-            cacheVersion: "a",
-            cacheSeconds: 900
-        });
-        email.children = children?.items ?? [];
-    } else {
-        email.children ??= [];
-    }
-
-    if (!email.originalFileID) {
-        return;
-    }
-
-    for(let i=0;i < 10;i++) {
-        try {
-            const rs = await fetch(email.htmlBodyUrl);
-            const text = await rs.text();
-            email.htmlBody = text;
-            return;
-        } catch (error) {
-            console.error(error);
-        }
-    }
-};
-
 @DISingleton()
 export default class ConversationService {
 
@@ -210,7 +178,8 @@ export default class ConversationService {
         const d = BusyProgress.create();
 
         try {
-            for (const { email } of emails.items) {
+            for (const mce of emails.items) {
+                const { email } = mce;
                 // if (email.htmlBody || typeof email.htmlBody === "string") {
                 //     continue;
                 // }
@@ -219,7 +188,7 @@ export default class ConversationService {
                 email.htmlBody ??= "";
                 email.textBody ??= "";
 
-                tasks.push(this.downloadEmailContent(email));
+                tasks.push(this.downloadEmailContent(mce));
                 tasks.push(this.engagementService.downloadEngagements(email));
             }
             await Promise.all(tasks);
@@ -236,7 +205,8 @@ export default class ConversationService {
         CommonEvents.onEmailUnscheduled.dispatchEvent(mce);
     }
 
-    async downloadEmailContent(email: IEmail) {
+    async downloadEmailContent(mce: IMailboxContactEmail) {
+        const { email } = mce;
         if (email.replyCount) {
             const children = await this.entityService.query(Email)
             .where({ emailID: email.emailID }, (p) => (x) => x.emailID === p.emailID && x.engagement !== null)
@@ -251,7 +221,7 @@ export default class ConversationService {
         } else {
             email.children ??= [];
         }
-        await this.emailContentDownloader.download(email);
+        await this.emailContentDownloader.download(mce);
     }