🔧 includePages option to filter posts

sd362318 · Jun 20, 2021 · 2f38a36 · 2f38a36
1 parent ad312d6
commit 2f38a36
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 32 deletions.
diff --git a/lib/notion.js b/lib/notion.js
@@ -1,3 +1,3 @@
-export { getAllPosts } from './notion/getAllPosts'
+export { getPosts } from './notion/getPosts'
 export { getAllTagsFromPosts } from './notion/getAllTagsFromPosts'
 export { getPostBlocks } from './notion/getPostBlocks'
diff --git a/lib/notion/filterPublishedPosts.js b/lib/notion/filterPublishedPosts.js
@@ -2,19 +2,24 @@ import BLOG from '@/blog.config'
 
 const currentDate = new Date().toLocaleDateString(BLOG.lang ?? 'en-US')
 
-export default function filterPublishedPosts(posts) {
+export default function filterPublishedPosts({ posts, includePages }) {
   if (!posts || !posts.length) return []
-  const publishedPosts = posts.filter(post => {
-    const postDate = new Date(
-      post?.date?.start_date || post.createdTime
-    ).toLocaleDateString(BLOG.lang ?? 'en-US')
-    return (
-      post.title &&
-      post.slug &&
-      post?.status?.[0] === 'Published' &&
-      (post?.type?.[0] === 'Post' || post?.type?.[0] === 'Page') &&
-      postDate <= currentDate
+  const publishedPosts = posts
+    .filter(post =>
+      includePages
+        ? post?.type?.[0] === 'Post' || post?.type?.[0] === 'Page'
+        : post?.type?.[0] === 'Post'
     )
-  })
+    .filter(post => {
+      const postDate = new Date(
+        post?.date?.start_date || post.createdTime
+      ).toLocaleDateString(BLOG.lang ?? 'en-US')
+      return (
+        post.title &&
+        post.slug &&
+        post?.status?.[0] === 'Published' &&
+        postDate <= currentDate
+      )
+    })
   return publishedPosts
 }
diff --git a/lib/notion/getAllPosts.js → lib/notion/getPosts.js b/lib/notion/getAllPosts.js → lib/notion/getPosts.js
@@ -3,9 +3,12 @@ import { NotionAPI } from 'notion-client'
 import { idToUuid } from 'notion-utils'
 import getAllPageIds from './getAllPageIds'
 import getPageProperties from './getPageProperties'
-import { filterPublishedPosts } from './filterPublishedPosts'
+import filterPublishedPosts from './filterPublishedPosts'
 
-export async function getAllPosts() {
+/**
+ * @param {{ includePages: boolean }} - false: posts only / true: include pages
+ */
+export async function getPosts({ includePages = false }) {
   let id = BLOG.notionPageId
   const authToken = BLOG.notionAccessToken || null
   const api = new NotionAPI({ authToken })
@@ -20,7 +23,10 @@ export async function getAllPosts() {
   const rawMetadata = block[id].value
 
   // Check Type
-  if (rawMetadata?.type !== 'collection_view_page' && rawMetadata?.type !== 'collection_view') {
+  if (
+    rawMetadata?.type !== 'collection_view_page' &&
+    rawMetadata?.type !== 'collection_view'
+  ) {
     console.log(`pageId "${id}" is not a database`)
     return null
   } else {
@@ -39,8 +45,9 @@ export async function getAllPosts() {
 
       data.push(properties)
     }
+
     // remove all the the items doesn't meet requirements
-    const posts = filterPublishedPosts(data)
+    const posts = filterPublishedPosts({ posts: data, includePages })
 
     // Sort by date
     if (BLOG.sortByDate) {

diff --git a/pages/[slug].js b/pages/[slug].js
@@ -1,6 +1,6 @@
 import DefaultLayout from '@/layouts/default'
 import FullWidthLayout from '@/layouts/fullwidth'
-import { getAllPosts, getPostBlocks } from '@/lib/notion'
+import { getPosts, getPostBlocks } from '@/lib/notion'
 import BLOG from '@/blog.config'
 import { createHash } from 'crypto'
 
@@ -26,15 +26,15 @@ const BlogPost = ({ post, blockMap, emailHash }) => {
 }
 
 export async function getStaticPaths() {
-  const posts = await getAllPosts()
+  const posts = await getPosts({ includePages: true })
   return {
     paths: posts.map(row => `${BLOG.path}/${row.slug}`),
     fallback: true
   }
 }
 
 export async function getStaticProps({ params: { slug } }) {
-  const posts = await getAllPosts()
+  const posts = await getPosts({ includePages: true })
   const post = posts.find(t => t.slug === slug)
   const blockMap = await getPostBlocks(post.id)
   const emailHash = createHash('md5').update(BLOG.email).digest('hex')

diff --git a/pages/feed.js b/pages/feed.js
@@ -1,8 +1,8 @@
-import { getAllPosts } from '@/lib/notion'
+import { getPosts } from '@/lib/notion'
 import { generateRss } from '@/lib/rss'
 export async function getServerSideProps({ res }) {
   res.setHeader('Content-Type', 'text/xml')
-  const posts = await getAllPosts()
+  const posts = await getPosts({ includePages: false })
   const latestPosts = posts.slice(0, 10)
   const xmlFeed = generateRss(latestPosts)
   res.write(xmlFeed)

diff --git a/pages/index.js b/pages/index.js
@@ -1,11 +1,11 @@
 import Container from '@/components/Container'
 import BlogPost from '@/components/BlogPost'
 import Pagination from '@/components/Pagination'
-import { getAllPosts } from '@/lib/notion'
+import { getPosts } from '@/lib/notion'
 import BLOG from '@/blog.config'
 
 export async function getStaticProps() {
-  const posts = await getAllPosts()
+  const posts = await getPosts({ includePages: false })
   const postsToShow = posts.slice(0, BLOG.postsPerPage)
   const totalPosts = posts.length
   const showNext = totalPosts > BLOG.postsPerPage

diff --git a/pages/page/[page].js b/pages/page/[page].js
@@ -1,7 +1,7 @@
 import Container from '@/components/Container'
 import BlogPost from '@/components/BlogPost'
 import Pagination from '@/components/Pagination'
-import { getAllPosts } from '@/lib/notion'
+import { getPosts } from '@/lib/notion'
 import BLOG from '@/blog.config'
 
 const Page = ({ postsToShow, page, showNext }) => {
@@ -16,7 +16,7 @@ const Page = ({ postsToShow, page, showNext }) => {
 
 export async function getStaticProps(context) {
   const { page } = context.params // Get Current Page No.
-  const posts = await getAllPosts()
+  const posts = await getPosts({ includePages: false })
   const postsToShow = posts.slice(
     BLOG.postsPerPage * (page - 1),
     BLOG.postsPerPage * page
@@ -34,7 +34,7 @@ export async function getStaticProps(context) {
 }
 
 export async function getStaticPaths() {
-  const posts = await getAllPosts()
+  const posts = await getPosts({ includePages: false })
   const totalPosts = posts.length
   const totalPages = Math.ceil(totalPosts / BLOG.postsPerPage)
   return {

diff --git a/pages/search.js b/pages/search.js
@@ -1,11 +1,11 @@
-import { getAllPosts, getAllTagsFromPosts } from '@/lib/notion'
+import { getPosts, getAllTagsFromPosts } from '@/lib/notion'
 import SearchLayout from '@/layouts/search'
 
 export default function search({ tags, posts }) {
   return <SearchLayout tags={tags} posts={posts} />
 }
 export async function getStaticProps() {
-  const posts = await getAllPosts()
+  const posts = await getPosts({ includePages: false })
   const tags = getAllTagsFromPosts(posts)
   return {
     props: {

diff --git a/pages/tag/[tag].js b/pages/tag/[tag].js
@@ -1,4 +1,4 @@
-import { getAllPosts, getAllTagsFromPosts } from '@/lib/notion'
+import { getPosts, getAllTagsFromPosts } from '@/lib/notion'
 import SearchLayout from '@/layouts/search'
 
 export default function Tag({ tags, posts, currentTag }) {
@@ -7,7 +7,7 @@ export default function Tag({ tags, posts, currentTag }) {
 
 export async function getStaticProps({ params }) {
   const currentTag = params.tag
-  const posts = await getAllPosts()
+  const posts = await getPosts({ includePages: false })
   const tags = getAllTagsFromPosts(posts)
   const filteredPosts = posts.filter(
     post => post && post.tags && post.tags.includes(currentTag)
@@ -23,7 +23,7 @@ export async function getStaticProps({ params }) {
 }
 
 export async function getStaticPaths() {
-  const posts = await getAllPosts()
+  const posts = await getPosts({ includePages: false })
   const tags = getAllTagsFromPosts(posts)
   return {
     paths: Object.keys(tags).map(tag => ({ params: { tag } })),