fix(bluesky): expand allowed Post types (#67)

ascorbic · web-flow · commit 348dd1d1ef63 · 2024-11-17T08:19:03.000Z
* fix(bluesky): expand allowed Post types

* Chanegset
diff --git a/.changeset/bright-ladybugs-deliver.md b/.changeset/bright-ladybugs-deliver.md
@@ -0,0 +1,5 @@
+---
+"@ascorbic/bluesky-loader": patch
+---
+
+Correctly handle all post types
diff --git a/demos/loaders/package.json b/demos/loaders/package.json
@@ -16,6 +16,7 @@
 		"@ascorbic/csv-loader": "workspace:^",
 		"@ascorbic/feed-loader": "workspace:^",
 		"@ascorbic/mock-loader": "workspace:^",
+		"@astro-community/astro-embed-bluesky": "^0.1.1",
 		"@astrojs/check": "^0.9.4",
 		"@astrojs/netlify": "^5.5.4",
 		"@atproto/api": "^0.13.14",
diff --git a/demos/loaders/src/pages/bluesky.astro b/demos/loaders/src/pages/bluesky.astro
@@ -1,6 +1,6 @@
 ---
-import { getCollection, render } from "astro:content";
-import { AppBskyEmbedImages, AppBskyEmbedRecordWithMedia } from "@atproto/api";
+import { getCollection } from "astro:content";
+import { BlueskyPost } from "@astro-community/astro-embed-bluesky";
 
 const posts = await getCollection("bluesky");
 ---
@@ -13,54 +13,19 @@ const posts = await getCollection("bluesky");
   <body>
     <h1>Bluesky</h1>
     {
-      posts.map(async (post) => {
-        const { Content } = await render(post);
-        const { embed } = post.data;
-        return (
-          <section>
-            <Content />
-            <p>{post.data.likeCount} likes</p>
-
-            <div>
-              {AppBskyEmbedImages.isView(embed)
-                ? embed?.images.map(
-                    (image) =>
-                      image && <img src={image.thumb} alt={image.alt} />
-                  )
-                : undefined}
-              {AppBskyEmbedRecordWithMedia.isView(embed) &&
-              embed.media.external.uri ? (
-                <img
-                  src={embed.media.external.uri}
-                  alt={embed.media.external.description}
-                />
-              ) : undefined}
-            </div>
-          </section>
-        );
-      })
+      posts
+        .sort(
+          (a, b) =>
+            new Date(b.data.record.createdAt).getTime() -
+            new Date(a.data.record.createdAt).getTime()
+        )
+        .map(async (post) => {
+          return (
+            <section>
+              <BlueskyPost post={post.data} />
+            </section>
+          );
+        })
     }
-    <style>
-      * {
-        font-family:
-          system-ui,
-          -apple-system,
-          BlinkMacSystemFont,
-          "Segoe UI",
-          Roboto,
-          Oxygen,
-          Ubuntu,
-          Cantarell,
-          "Open Sans",
-          "Helvetica Neue",
-          sans-serif;
-      }
-      section {
-        background-color: white;
-        box-shadow: 0 0 1rem rgba(0, 0, 0, 0.4);
-        margin: 1rem 0;
-        padding: 1rem;
-      }
-    </style>
   </body>
 </html>
diff --git a/demos/loaders/tsconfig.json b/demos/loaders/tsconfig.json
@@ -1,3 +1,6 @@
 {
-	"extends": "astro/tsconfigs/strictest"
+	"extends": "astro/tsconfigs/strict",
+	"compilerOptions": {
+		"noErrorTruncation": true
+	}
 }
diff --git a/packages/bluesky/src/index.ts b/packages/bluesky/src/index.ts
@@ -40,10 +40,12 @@ export const authorFeedLoader = ({
           for (const { post } of data.feed) {
             if (
               (mostRecent && mostRecent === post.cid) ||
-              (limit && count++ >= limit)
+              (limit && count >= limit)
             ) {
+              count++;
               break fetching;
             }
+            count++;
             if (!first) {
               first = post.cid;
             }
@@ -61,6 +63,7 @@ export const authorFeedLoader = ({
             });
           }
           cursor = data.cursor;
+          logger.info(`Fetched ${count} posts`);
         } while (cursor);
 
         if (first) {
diff --git a/packages/bluesky/src/schema.ts b/packages/bluesky/src/schema.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@ascorbic/bluesky-loader": patch
 +---
++
 +Correctly handle all post types
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,6 @@`
`1`	`1`	`{`
`2`		`- "extends": "astro/tsconfigs/strictest"`
	`2`	`+ "extends": "astro/tsconfigs/strict",`
	`3`	`+ "compilerOptions": {`
	`4`	`+ "noErrorTruncation": true`
	`5`	`+ }`
`3`	`6`	`}`