From 66d37e31b196f295ca07d896894c79f2762d9ef8 Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Tue, 27 Sep 2022 21:41:01 +0800
Subject: [PATCH] Use siteIcon

---
 packages/api/src/services/save_email.ts            | 1 +
 packages/api/src/services/save_newsletter_email.ts | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/api/src/services/save_email.ts b/packages/api/src/services/save_email.ts
index 100858745..da623b7a0 100644
--- a/packages/api/src/services/save_email.ts
+++ b/packages/api/src/services/save_email.ts
@@ -70,6 +70,7 @@ export const saveEmail = async (
     readingProgressPercent: 0,
     subscription: input.author,
     state: ArticleSavingRequestStatus.Succeeded,
+    siteIcon: parseResult.parsedContent?.siteIcon,
   }
 
   const page = await getPageByParam({
diff --git a/packages/api/src/services/save_newsletter_email.ts b/packages/api/src/services/save_newsletter_email.ts
index 1144ec80e..4db8373ad 100644
--- a/packages/api/src/services/save_newsletter_email.ts
+++ b/packages/api/src/services/save_newsletter_email.ts
@@ -22,6 +22,7 @@ interface NewsletterMessage {
   unsubMailTo?: string
   unsubHttpUrl?: string
   newsletterEmail?: NewsletterEmail
+  icon?: string
 }
 
 // Returns true if the link was created successfully. Can still fail to
@@ -33,7 +34,6 @@ export const saveNewsletterEmail = async (
   // get user from newsletter email
   const newsletterEmail =
     data.newsletterEmail || (await getNewsletterEmail(data.email))
-
   if (!newsletterEmail) {
     console.log('newsletter email not found', data.email)
     return false
@@ -54,7 +54,6 @@ export const saveNewsletterEmail = async (
     pubsub: createPubSubClient(),
     uid: newsletterEmail.user.id,
   }
-
   const input: SaveEmailInput = {
     url: data.url,
     originalContent: data.content,
@@ -63,7 +62,6 @@ export const saveNewsletterEmail = async (
     unsubMailTo: data.unsubMailTo,
     unsubHttpUrl: data.unsubHttpUrl,
   }
-
   const page = await saveEmail(saveCtx, input)
   if (!page) {
     console.log('newsletter not created:', input)
@@ -77,7 +75,7 @@ export const saveNewsletterEmail = async (
     newsletterEmail: newsletterEmail.address,
     unsubscribeMailTo: data.unsubMailTo,
     unsubscribeHttpUrl: data.unsubHttpUrl,
-    icon: page.image,
+    icon: page.siteIcon,
   })
   console.log('subscription saved', subscription)