From 5a4cf26218c3ebe227fccc378c4eb65e73c0b02c Mon Sep 17 00:00:00 2001
From: Puria Nafisi Azizi <puria@dyne.org>
Date: Sun, 1 Oct 2023 04:04:23 +0200
Subject: [PATCH] Include substack into articles

---
 src/components/BlogArticlePreview.astro | 2 +-
 src/pages/blog/index.astro              | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/BlogArticlePreview.astro b/src/components/BlogArticlePreview.astro
index 1f3892e..95a1e37 100644
--- a/src/components/BlogArticlePreview.astro
+++ b/src/components/BlogArticlePreview.astro
@@ -17,6 +17,6 @@ const snippet = Astro.props['content:encodedSnippet'];
 		<p class="text-gray-800 text-sm font-medium mb-2 text-clip overflow-hidden max-h-20">
 			{snippet}
 		</p>
-		<Button href={link} text="Read on Medium.com" inverted={true} cls="mt-4 text-base no-underline" />
+		<Button href={link} text="Read all" inverted={true} cls="mt-4 text-base no-underline" />
 	</div>
 </div>
diff --git a/src/pages/blog/index.astro b/src/pages/blog/index.astro
index 27868e3..6aae9a2 100644
--- a/src/pages/blog/index.astro
+++ b/src/pages/blog/index.astro
@@ -4,7 +4,10 @@ import BlogArticlePreview from '~/components/BlogArticlePreview.astro';
 import Parser from 'rss-parser';
 
 const parser = new Parser();
-const feed = await parser.parseURL('https://medium.com/feed/think-do-tank');
+const medium = await parser.parseURL('https://medium.com/feed/think-do-tank');
+const planet = await parser.parseURL('https://dyne.substack.com/feed/');
+const feed = medium.items.concat(planet.items);
+feed.sort((a,b)=>new Date(b.isoDate).getTime()-new Date(a.isoDate).getTime());
 ---
 
 <Layout
@@ -14,6 +17,6 @@ const feed = await parser.parseURL('https://medium.com/feed/think-do-tank');
 	}}
 >
 	<div class="mt-8 grid grid-cols-1 md:grid-cols-2 gap-8">
-		{feed.items.map((f) => <BlogArticlePreview {...f} />)}
+		{feed.map((f) => <BlogArticlePreview {...f} />)}
 	</div>
 </Layout>