Merge branch 'main' into fix-article-cover

# Conflicts:
#	lib/notion/getAllPosts.js
#	lib/notion/getNotionData.js

.env.local

@@ -1,2 +1,2 @@
 # 环境变量 @see https://www.nextjs.cn/docs/basic-features/environment-variables
-NEXT_PUBLIC_VERSION=3.3.5
+NEXT_PUBLIC_VERSION=3.3.6

components/CommonHead.js

@@ -6,7 +6,7 @@ const CommonHead = ({ meta, children }) => {
   let image
   if (meta) {
     url = `${url}/${meta.slug}`
-    image = meta.image || ''
+    image = meta.image || '/bg_image.jpg'
   }
   const title = meta?.title || BLOG.TITLE
   const description = meta?.description || BLOG.DESCRIPTION

lib/notion.js

@@ -1,3 +1,2 @@
-export { getAllPosts } from './notion/getAllPosts'
 export { getAllTags } from './notion/getAllTags'
 export { getPostBlocks } from './notion/getPostBlocks'

lib/notion/getNotionData.js

@@ -5,7 +5,6 @@ import { idToUuid } from 'notion-utils'
 import { defaultMapImageUrl } from 'react-notion-x'
 import { deepClone, isIterable } from '../utils'
 import getAllPageIds from './getAllPageIds'
-import { getAllPosts } from './getAllPosts'
 import { getAllTags } from './getAllTags'
 import getPageProperties from './getPageProperties'
 
@@ -81,14 +80,16 @@ export async function getNotionPageData({ pageId, from }) {
  * @param notionPageData
  * @returns {Promise<[]|*[]>}
  */
-function getCustomNav({ allPage }) {
+function getCustomNav({ allPages }) {
   const customNav = []
-  if (allPage && allPage.length > 0) {
+  if (allPages && allPages.length > 0) {
-    allPage.forEach(p => {
+    allPages.forEach(p => {
-      if (p?.slug?.indexOf('http') === 0) {
+      if (p?.status?.[0] === 'Published') {
-        customNav.push({ icon: p.icon || null, name: p.title, to: p.slug, show: true })
+        if (p?.slug?.indexOf('http') === 0) {
-      } else {
+          customNav.push({ icon: p.icon || null, name: p.title, to: p.slug, show: true })
-        customNav.push({ icon: p.icon || null, name: p.title, to: '/' + p.slug, show: true })
+        } else {
+          customNav.push({ icon: p.icon || null, name: p.title, to: '/' + p.slug, show: true })
+        }
       }
     })
   }
@@ -235,11 +236,11 @@ async function getPageRecordMapByNotionAPI({ pageId, from }) {
   const tagOptions = getTagOptions(schema)
   const categoryOptions = getCategoryOptions(schema)
   const viewIds = rawMetadata?.view_ids
-  const data = []
+  const collectionData = []
   const pageIds = getAllPageIds(collectionQuery, collectionId, collectionView, viewIds)
   const siteInfo = getBlogInfo({ collection, block })
   if (pageIds?.length === 0) {
-    console.error('获取到的文章列表为空，请检查notion模板', collectionQuery, collection, pageRecordMap)
+    console.error('获取到的文章列表为空，请检查notion模板', collectionQuery, collection, collectionView, viewIds, pageRecordMap)
   }
   for (let i = 0; i < pageIds.length; i++) {
     const id = pageIds[i]
@@ -247,20 +248,30 @@ async function getPageRecordMapByNotionAPI({ pageId, from }) {
     if (!value) {
       continue
     }
+    collectionData.push(properties)
     const properties = (await getPageProperties(id, block, schema, null, tagOptions, siteInfo)) || null
     if (properties) {
       data.push(properties)
     }
   }
 
-  const allPage = data.filter(post => {
+  const allPages = collectionData.filter(post => {
-    return post.title && post?.status?.[0] === 'Published' && ['Page'].indexOf(post?.type?.[0]) > -1
+    return post.title && ['Page'].indexOf(post?.type?.[0]) > -1 && (post?.status?.[0] === 'Published' || post?.status?.[0] === 'Invisible')
   })
-  const allPosts = data.filter(post => {
+  const allPosts = collectionData.filter(post => {
-    return post.title && post?.status?.[0] === 'Published' && ['Post'].indexOf(post?.type?.[0]) > -1
+    return post.title && ['Post'].indexOf(post?.type?.[0]) > -1 && post?.status?.[0] === 'Published'
   })
 
-  const customNav = getCustomNav({ allPage })
+  // Sort by date
+  if (BLOG.POSTS_SORT_BY === 'date') {
+    allPosts.sort((a, b) => {
+      const dateA = new Date(a?.date?.start_date || a.createdTime)
+      const dateB = new Date(b?.date?.start_date || b.createdTime)
+      return dateB - dateA
+    })
+  }
+
+  const customNav = getCustomNav({ allPages })
   const postCount = allPosts?.length || 0
   const categories = getAllCategories({ allPosts, categoryOptions, sliceCount: BLOG.PREVIEW_CATEGORY_COUNT })
   const tags = getAllTags({ allPosts, tagOptions, sliceCount: BLOG.PREVIEW_TAG_COUNT })
@@ -268,6 +279,8 @@ async function getPageRecordMapByNotionAPI({ pageId, from }) {
 
   return {
     siteInfo,
+    allPages,
+    allPosts,
     collection,
     collectionQuery,
     collectionId,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "notion-next",
-  "version": "3.3.5",
+  "version": "3.3.6",
   "homepage": "https://github.com/tangly1024/NotionNext.git",
   "license": "MIT",
   "repository": {

pages/404.js

@@ -8,9 +8,9 @@ import { useGlobal } from '@/lib/global'
  * @returns
  */
 const NoFound = props => {
-  const { theme } = useGlobal()
+  const { theme, siteInfo } = useGlobal()
   const ThemeComponents = ThemeMap[theme]
-  const meta = { title: `${props?.siteInfo?.title} | 页面找不到啦` }
+  const meta = { title: `${props?.siteInfo?.title} | 页面找不到啦`, image: siteInfo?.pageCover }
   return <ThemeComponents.Layout404 {...props} meta={meta}/>
 }
 

pages/[slug].js

@@ -80,12 +80,10 @@ export async function getStaticPaths() {
   }
 
   const from = 'slug-paths'
-  const { allPosts } = await getGlobalNotionData({ from, pageType: ['Page'] })
+  const { allPages } = await getGlobalNotionData({ from, pageType: ['Page'] })
-  const filterPosts =
-    allPosts?.filter(e => e?.slug?.indexOf('http') !== 0) || []
 
   return {
-    paths: filterPosts.map(row => ({ params: { slug: row.slug } })),
+    paths: allPages.map(row => ({ params: { slug: row.slug } })),
     fallback: true
   }
 }
@@ -93,19 +91,19 @@ export async function getStaticPaths() {
 export async function getStaticProps({ params: { slug } }) {
   const from = `slug-props-${slug}`
   const props = await getGlobalNotionData({ from, pageType: ['Page'] })
-  const { allPosts } = props
+  const { allPages } = props
-  const post = allPosts.find(p => p.slug === slug)
+  const page = allPages?.find(p => p.slug === slug)
-  if (!post) {
+  if (!page) {
     return { props: {}, revalidate: 1 }
   }
 
   try {
-    post.blockMap = await getPostBlocks(post.id, 'slug')
+    page.blockMap = await getPostBlocks(page.id, 'slug')
   } catch (error) {
     console.error('获取文章详情失败', error)
   }
 
-  props.post = post
+  props.post = page
 
   return {
     props,

pages/archive/index.js

@@ -10,6 +10,7 @@ const ArchiveIndex = props => {
   const meta = {
     title: `${locale.NAV.ARCHIVE} | ${siteInfo?.title}`,
     description: siteInfo?.description,
+    image: siteInfo?.pageCover,
     slug: 'archive',
     type: 'website'
   }

pages/article/[slug].js

@@ -15,7 +15,7 @@ import { useRouter } from 'next/router'
 const Slug = props => {
   const { theme, changeLoadingState } = useGlobal()
   const ThemeComponents = ThemeMap[theme]
-  const { post } = props
+  const { post, siteInfo } = props
 
   if (!post) {
     changeLoadingState(true)
@@ -30,7 +30,7 @@ const Slug = props => {
         }
       }
     }, 10000)
-    const meta = { title: `${props?.siteInfo?.title || BLOG.TITLE} | loading` }
+    const meta = { title: `${props?.siteInfo?.title || BLOG.TITLE} | loading`, image: siteInfo?.pageCover }
     return <ThemeComponents.LayoutSlug {...props} showArticleInfo={true} meta={meta} />
   }
 
@@ -58,7 +58,6 @@ const Slug = props => {
 
   props = { ...props, lock, setLock, validPassword }
 
-  const { siteInfo } = props
   const meta = {
     title: `${post?.title} | ${siteInfo?.title}`,
     description: post?.summary,

pages/category/[category].js

@@ -17,6 +17,7 @@ export default function Category(props) {
     }`,
     description: siteInfo?.description,
     slug: 'category/' + props.category,
+    image: siteInfo?.pageCover,
     type: 'website'
   }
   return <ThemeComponents.LayoutCategory {...props} meta={meta} />

pages/category/index.js

@@ -11,6 +11,7 @@ export default function Category(props) {
   const meta = {
     title: `${locale.COMMON.CATEGORY} | ${siteInfo?.title}`,
     description: siteInfo?.description,
+    image: siteInfo?.pageCover,
     slug: 'category',
     type: 'website'
   }

pages/page/[page].js

@@ -14,6 +14,7 @@ const Page = props => {
   const meta = {
     title: `${props.page} | Page | ${siteInfo?.title}`,
     description: siteInfo?.description,
+    image: siteInfo?.pageCover,
     slug: 'page/' + props.page,
     type: 'website'
   }

pages/search/[keyword].js

@@ -10,6 +10,7 @@ const Index = props => {
   const meta = {
     title: `${keyword || ''}${keyword ? ' | ' : ''}${locale.NAV.SEARCH} | ${siteInfo?.title}`,
     description: siteInfo?.title,
+    image: siteInfo?.pageCover,
     slug: 'search/' + (keyword || ''),
     type: 'website'
   }

pages/search/index.js

@@ -26,6 +26,7 @@ const Search = props => {
       siteInfo?.title
     }`,
     description: siteInfo?.description,
+    image: siteInfo?.pageCover,
     slug: 'search',
     type: 'website'
   }

pages/tag/[tag].js

@@ -15,6 +15,7 @@ const Tag = props => {
   const meta = {
     title: `${tag} | ${locale.COMMON.TAGS} | ${siteInfo?.title}`,
     description: siteInfo?.description,
+    image: siteInfo?.pageCover,
     slug: 'tag/' + tag,
     type: 'website'
   }

pages/tag/index.js

@@ -11,6 +11,7 @@ const TagIndex = props => {
   const meta = {
     title: `${locale.COMMON.TAGS} | ${siteInfo?.title}`,
     description: siteInfo?.description,
+    image: siteInfo?.pageCover,
     slug: 'tag',
     type: 'website'
   }

themes/fukasawa/components/ArticleDetail.js

@@ -37,13 +37,16 @@ export default function ArticleDetail(props) {
 
         <section className="flex-wrap flex mt-2 text-gray-400 dark:text-gray-400 font-light leading-8">
           <div>
-            <Link href={`/category/${post.category}`} passHref>
+
-              <a className="cursor-pointer text-md mr-2 hover:text-black dark:hover:text-white border-b dark:border-gray-500 border-dashed">
+            {post?.category && (<>
-                <i className="mr-1 fas fa-folder-open" />
+                <Link href={`/category/${post.category}`} passHref>
-                {post.category}
+                <a className="cursor-pointer text-md mr-2 hover:text-black dark:hover:text-white border-b dark:border-gray-500 border-dashed">
-              </a>
+                  <i className="mr-1 fas fa-folder-open" />
-            </Link>
+                  {post.category}
-            <span className='mr-2'>|</span>
+                </a>
+              </Link>
+              <span className='mr-2'>|</span>
+            </>)}
 
             {post?.type[0] !== 'Page' && (<>
               <Link

themes/hexo/LayoutBase.js

@@ -53,7 +53,7 @@ const LayoutBase = props => {
 
   return (
     <div className="bg-hexo-background-gray dark:bg-black">
-      <CommonHead meta={meta} />
+      <CommonHead meta={meta} siteInfo={siteInfo}/>
 
       <TopNav {...props} />