Merge pull request transitive-bullshit#273 from transitive-bullshit/feature/rss

Author: transitive-bullshit

lib/config.ts

@@ -12,7 +12,8 @@ import { NavigationLink } from './site-config'
 import {
   PageUrlOverridesInverseMap,
   PageUrlOverridesMap,
-  NavigationStyle
+  NavigationStyle,
+  Site
 } from './types'
 
 export const rootNotionPageId: string = parsePageId(
@@ -132,6 +133,14 @@ export const api = {
 
 // ----------------------------------------------------------------------------
 
+export const site: Site = {
+  domain,
+  name,
+  rootNotionPageId,
+  rootNotionSpaceId,
+  description
+}
+
 export const fathomId = isDev ? null : process.env.NEXT_PUBLIC_FATHOM_ID
 export const fathomConfig = fathomId
   ? {

lib/get-site-for-domain.ts

@@ -1,18 +1,31 @@
 import pMemoize from 'p-memoize'
 import { getAllPagesInSpace, uuidToId } from 'notion-utils'
 
-import * as types from './types'
 import { includeNotionIdInUrls } from './config'
 import { notion } from './notion-api'
 import { getCanonicalPageId } from './get-canonical-page-id'
+import * as config from './config'
+import * as types from './types'
 
 const uuid = !!includeNotionIdInUrls
 
-export const getAllPages = pMemoize(getAllPagesImpl, {
+export async function getSiteMap(): Promise<types.SiteMap> {
+  const partialSiteMap = await getAllPages(
+    config.rootNotionPageId,
+    config.rootNotionSpaceId
+  )
+
+  return {
+    site: config.site,
+    ...partialSiteMap
+  } as types.SiteMap
+}
+
+const getAllPages = pMemoize(getAllPagesImpl, {
   cacheKey: (...args) => JSON.stringify(args)
 })
 
-export async function getAllPagesImpl(
+async function getAllPagesImpl(
   rootNotionPageId: string,
   rootNotionSpaceId: string
 ): Promise<Partial<types.SiteMap>> {

lib/get-all-pages.ts renamed to lib/get-site-map.ts

@@ -2,15 +2,12 @@ import { parsePageId } from 'notion-utils'
 import { ExtendedRecordMap } from 'notion-types'
 
 import * as acl from './acl'
-import * as types from './types'
-import { pageUrlOverrides, pageUrlAdditions, environment } from './config'
+import { pageUrlOverrides, pageUrlAdditions, environment, site } from './config'
 import { db } from './db'
 import { getPage } from './notion'
-import { getSiteMaps } from './get-site-maps'
-import { getSiteForDomain } from './get-site-for-domain'
+import { getSiteMap } from './get-site-map'
 
 export async function resolveNotionPage(domain: string, rawPageId?: string) {
-  let site: types.Site
   let pageId: string
   let recordMap: ExtendedRecordMap
 
@@ -47,27 +44,19 @@ export async function resolveNotionPage(domain: string, rawPageId?: string) {
     }
 
     if (pageId) {
-      ;[site, recordMap] = await Promise.all([
-        getSiteForDomain(domain),
-        getPage(pageId)
-      ])
+      recordMap = await getPage(pageId)
     } else {
       // handle mapping of user-friendly canonical page paths to Notion page IDs
       // e.g., /developer-x-entrepreneur versus /71201624b204481f862630ea25ce62fe
-      const siteMaps = await getSiteMaps()
-      const siteMap = siteMaps[0]
+      const siteMap = await getSiteMap()
       pageId = siteMap?.canonicalPageMap[rawPageId]
 
       if (pageId) {
         // TODO: we're not re-using the page recordMap from siteMaps because it is
         // cached aggressively
-        // site = await getSiteForDomain(domain)
         // recordMap = siteMap.pageMap[pageId]
 
-        ;[site, recordMap] = await Promise.all([
-          getSiteForDomain(domain),
-          getPage(pageId)
-        ])
+        recordMap = await getPage(pageId)
 
         if (useUriToPageIdCache) {
           try {
@@ -91,7 +80,6 @@ export async function resolveNotionPage(domain: string, rawPageId?: string) {
       }
     }
   } else {
-    site = await getSiteForDomain(domain)
     pageId = site.rootNotionPageId
 
     console.log(site)

lib/get-site-maps.ts

@@ -16,15 +16,7 @@ export interface PageProps {
   error?: PageError
 }
 
-export interface Model {
-  id: string
-  userId: string
-
-  createdAt: number
-  updatedAt: number
-}
-
-export interface Site extends Model {
+export interface Site {
   name: string
   domain: string
 
@@ -40,10 +32,6 @@ export interface Site extends Model {
   // opengraph metadata
   description?: string
   image?: string
-
-  timestamp: Date
-
-  isDisabled: boolean
 }
 
 export interface SiteMap {

lib/get-sites.ts

@@ -50,7 +50,8 @@
     "react-dom": "^17.0.2",
     "react-notion-x": "^6.12.3",
     "react-tweet-embed": "^2.0.0",
-    "react-use": "^17.3.2"
+    "react-use": "^17.3.2",
+    "rss": "^1.2.2"
   },
   "devDependencies": {
     "@next/bundle-analyzer": "^12.1.0",

lib/resolve-notion-page.ts

@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { isDev, domain } from 'lib/config'
-import { getSiteMaps } from 'lib/get-site-maps'
+import { getSiteMap } from 'lib/get-site-map'
 import { resolveNotionPage } from 'lib/resolve-notion-page'
 import { NotionPage } from 'components'
 
@@ -28,22 +28,20 @@ export async function getStaticPaths() {
     }
   }
 
-  const siteMaps = await getSiteMaps()
+  const siteMap = await getSiteMap()
 
-  const ret = {
-    paths: siteMaps.flatMap((siteMap) =>
-      Object.keys(siteMap.canonicalPageMap).map((pageId) => ({
-        params: {
-          pageId
-        }
-      }))
-    ),
+  const staticPaths = {
+    paths: Object.keys(siteMap.canonicalPageMap).map((pageId) => ({
+      params: {
+        pageId
+      }
+    })),
     // paths: [],
     fallback: true
   }
 
-  console.log(ret.paths)
-  return ret
+  console.log(staticPaths.paths)
+  return staticPaths
 }
 
 export default function NotionDomainDynamicPage(props) {

lib/types.ts

@@ -11,10 +11,9 @@ import {
 import { PageBlock } from 'notion-types'
 
 import { notion } from 'lib/notion-api'
-import { getSiteForDomain } from 'lib/get-site-for-domain'
 import { mapImageUrl } from 'lib/map-image-url'
-import * as config from 'lib/config'
 import { interRegular } from 'lib/fonts'
+import * as config from 'lib/config'
 
 /**
  * Social image generation via headless chrome.
@@ -35,7 +34,6 @@ export default withOGImage<'query', 'id'>({
         throw new Error('Invalid notion page id')
       }
 
-      const site = await getSiteForDomain(config.domain)
       const recordMap = await notion.getPage(pageId)
 
       const keys = Object.keys(recordMap?.block || {})
@@ -47,7 +45,7 @@ export default withOGImage<'query', 'id'>({
 
       const isBlogPost =
         block.type === 'page' && block.parent_table === 'collection'
-      const title = getBlockTitle(block, recordMap) || site.name
+      const title = getBlockTitle(block, recordMap) || config.name
       const image = mapImageUrl(
         getPageProperty<string>('Social Image', block, recordMap) ||
           (block as PageBlock).format?.page_cover ||
@@ -96,7 +94,7 @@ export default withOGImage<'query', 'id'>({
               month: 'long'
             })} ${dateUpdated.getFullYear()}`
           : undefined
-      const detail = date || site.domain
+      const detail = date || config.domain
 
       return (
         <html>