fix: sitemap / feed

Author: SidStraw

packages/karbon/src/runtime/api/feed.ts

@@ -1,7 +1,5 @@
 import { gql } from '@apollo/client/core/index.js'
 import { useStoripressClient } from '../composables/storipress-client'
-import type { TypesenseFilter } from '../composables/typesense-client'
-import { listArticles } from './article'
 
 const GetDesk = gql`
   query GetDesk($slug: String) {
@@ -23,8 +21,9 @@ const GetDesk = gql`
   }
 `
 
-export function listFeedArticles(filter: TypesenseFilter = {}) {
-  return listArticles(filter)
+export async function listFeedArticles() {
+  const allArticles = (await $fetch('/_storipress/posts/__all.json')) ?? []
+  return allArticles
 }
 
 export async function getDeskWithSlug(slug: string) {

packages/karbon/src/runtime/api/normalize-article.ts

@@ -24,6 +24,7 @@ export interface RawArticleLike {
   plaintext: string
   plan: ArticlePlan
   authors: RawUserLike[]
+  published_at: string
 }
 
 export interface PaidContent {

packages/karbon/src/runtime/api/sitemap.ts

@@ -3,7 +3,6 @@ import { identity } from 'remeda'
 import { createStoripressClient } from '../composables/storipress-client'
 import { storipressConfigCtx } from '../composables/storipress-base-client'
 import type { ModuleRuntimeConfig } from '../types'
-import { PER_PAGE, getSearchQuery, useTypesenseClient } from '../composables/typesense-client'
 
 const ListArticles = gql`
   query ListArticles($page: Int!) {
@@ -130,25 +129,13 @@ export const payloadScopes: ResourceScope[] = [
 export async function getResources(runtimeConfig?: ModuleRuntimeConfig['storipress']) {
   runtimeConfig && storipressConfigCtx.set(runtimeConfig)
   const client = createStoripressClient()
-  const typesenseClient = useTypesenseClient()
 
   const result = await Promise.all(
     payloadScopes.map(async ({ payloadScope, query, queryKey, filter = identity }) => {
       let resources: any = []
       switch (payloadScope) {
         case 'posts': {
-          const documents = typesenseClient?.collections('articles').documents()
-
-          let hasMore = true
-          let page = 1
-          while (hasMore) {
-            const searchResult = await documents?.search(getSearchQuery(page), {})
-            const currentPageArticles = searchResult?.hits?.map(({ document }) => document) ?? []
-            resources.push(...currentPageArticles)
-
-            hasMore = searchResult.found > searchResult.page * PER_PAGE
-            page = searchResult.page + 1
-          }
+          resources = (await $fetch('/_storipress/posts/__all.json')) ?? []
           break
         }
         default: {

packages/karbon/src/runtime/routes/atom-desk.xml.ts

@@ -2,8 +2,9 @@ import { defineEventHandler, sendNoContent, setHeader } from 'h3'
 import { Feed } from 'feed'
 import { encodePath, joinURL, withTrailingSlash } from 'ufo'
 import path from 'pathe'
-import { getDeskWithSlug, listFeedArticles } from '@storipress/karbon/internal'
+import { getDeskWithSlug } from '@storipress/karbon/internal'
 import type { Author } from '../composables/page-meta'
+import { listArticles } from '../api/article'
 import { useRuntimeConfig } from '#imports'
 import urls from '#sp-internal/storipress-urls.mjs'
 
@@ -37,47 +38,37 @@ export default defineEventHandler(async (e) => {
 
   const deskIds: string[] = desk.desks?.map(({ id }: { id: string }) => id) ?? []
 
-  type Filter = Record<'desk' | 'desk_ids', string | string[]>
-  const filter = {} as Filter
-  if (deskIds.length !== 0) {
-    filter.desk_ids = deskIds
-  } else {
-    filter.desk = desk.id
-  }
-
   const runtimeConfig = useRuntimeConfig()
-  const articles = await listFeedArticles(filter)
+  const articles = await listArticles({ desk_ids: deskIds })
 
-  const siteUrl = runtimeConfig.public.siteUrl
+  const siteUrl = runtimeConfig.public.siteUrl as string
   const feed = new Feed({
-    id: withTrailingSlash(runtimeConfig.public.siteUrl),
-    link: withTrailingSlash(runtimeConfig.public.siteUrl),
-    title: runtimeConfig.public.siteName,
-    description: runtimeConfig.public.siteDescription,
+    id: withTrailingSlash(runtimeConfig.public.siteUrl as string),
+    link: withTrailingSlash(runtimeConfig.public.siteUrl as string),
+    title: runtimeConfig.public.siteName as string,
+    description: runtimeConfig.public.siteDescription as string,
     updated: new Date(),
     feedLinks: {
       atom: joinURL(siteUrl, `/atom/${fileName}`),
     },
     copyright: `© ${runtimeConfig.public.siteName} ${new Date().getFullYear()} All Rights Reserved`,
   })
 
-  articles
-    .filter((article: TArticle) => article.published_at)
-    .forEach((article: TArticle) => {
-      const id = encodePath(urls.article.toURL(article, urls.article._context))
-      feed.addItem({
-        title: article.title,
-        id: joinURL(siteUrl, id),
-        link: joinURL(siteUrl, id),
-        description: article.plaintext.slice(0, 120),
-        date: new Date(article.published_at),
-        author:
-          article.author?.map((author) => ({
-            name: author.name,
-          })) || [],
-        content: article.html,
-      })
+  articles.forEach((article) => {
+    const id = encodePath(urls.article.toURL(article, urls.article._context))
+    feed.addItem({
+      title: article.title,
+      id: joinURL(siteUrl, id),
+      link: joinURL(siteUrl, id),
+      description: article.plaintext.slice(0, 120),
+      date: new Date(article.published_at),
+      author:
+        article.authors?.map((author) => ({
+          name: author.name,
+        })) || [],
+      content: article.html,
     })
+  })
 
   return feed.atom1()
 })