diff --git a/src/components/sidebar/RandomPosts.astro b/src/components/sidebar/RandomPosts.astro
index 35233fe..eb4ce89 100644
--- a/src/components/sidebar/RandomPosts.astro
+++ b/src/components/sidebar/RandomPosts.astro
@@ -1,7 +1,8 @@
---
import _ from 'lodash';
-import { options, type Post } from '@/helpers/schema';
+import type { Post } from '@/helpers/schema';
+import options from '@/options';
interface Props {
posts: Post[];
diff --git a/src/components/sidebar/RandomTags.astro b/src/components/sidebar/RandomTags.astro
index 0fe216a..eabe3af 100644
--- a/src/components/sidebar/RandomTags.astro
+++ b/src/components/sidebar/RandomTags.astro
@@ -1,7 +1,8 @@
---
import _ from 'lodash';
-import { options, type Tag } from '@/helpers/schema';
+import type { Tag } from '@/helpers/schema';
+import options from '@/options';
interface Props {
tags: Tag[];
diff --git a/src/components/sidebar/RecentComments.astro b/src/components/sidebar/RecentComments.astro
index cf8c6dc..cc95d4a 100644
--- a/src/components/sidebar/RecentComments.astro
+++ b/src/components/sidebar/RecentComments.astro
@@ -1,6 +1,6 @@
---
import { latestComments } from '@/helpers/db/query';
-import { options } from '@/helpers/schema';
+import options from '@/options';
const comments = await latestComments();
---
diff --git a/src/content/config.ts b/src/content/config.ts
index 779bf66..23dbc06 100644
--- a/src/content/config.ts
+++ b/src/content/config.ts
@@ -1,4 +1,6 @@
import { imageMetadata } from '@/helpers/images';
+import { urlJoin } from '@/helpers/tools';
+import options from '@/options';
import { defineCollection, z } from 'astro:content';
export const defaultCover = '/images/default-cover.jpg';
@@ -40,7 +42,9 @@ const friendsCollection = defineCollection({
website: z.string().max(40),
description: z.string().optional(),
homepage: z.string().url(),
- poster: z.string(),
+ poster: z
+ .string()
+ .transform((poster) => (poster.startsWith('/') ? urlJoin(options.assetsPrefix(), poster) : poster)),
favicon: z.string().optional(),
})
.transform((data) => {
@@ -52,61 +56,6 @@ const friendsCollection = defineCollection({
),
});
-// Options Collection
-const optionsCollection = defineCollection({
- type: 'data',
- schema: z.object({
- title: z.string().max(40),
- website: z.string().url(),
- description: z.string().max(100),
- keywords: z.array(z.string()),
- author: z.object({ name: z.string(), email: z.string().email(), url: z.string().url() }),
- navigation: z.array(z.object({ text: z.string(), link: z.string(), target: z.string().optional() })),
- socials: z.array(
- z.object({
- name: z.string(),
- icon: z.string(),
- type: z.enum(['link', 'qrcode']),
- title: z.string().optional(),
- link: z.string().url(),
- }),
- ),
- settings: z.object({
- initialYear: z.number().max(2024),
- icpNo: z.string().optional(),
- locale: z.string().optional().default('zh-CN'),
- timeZone: z.string().optional().default('Asia/Shanghai'),
- timeFormat: z.string().optional().default('yyyy-MM-dd HH:mm:ss'),
- twitter: z.string(),
- post: z.object({
- sort: z.enum(['asc', 'desc']),
- feature: z.array(z.string()).optional(),
- category: z.array(z.string()).optional(),
- }),
- pagination: z.object({
- posts: z.number().optional().default(5),
- category: z.number().optional().default(7),
- tags: z.number().optional().default(7),
- search: z.number().optional().default(7),
- }),
- feed: z.object({
- full: z.boolean().optional().default(true),
- size: z.number().optional().default(20),
- }),
- sidebar: z.object({
- search: z.boolean().default(false),
- post: z.number().default(6),
- comment: z.number().default(0),
- tag: z.number().default(20),
- }),
- comments: z.object({
- server: z.string().url().readonly(),
- admins: z.array(z.number()),
- }),
- }),
- }),
-});
-
// Posts Collection
const postsCollection = defineCollection({
type: 'content',
@@ -151,7 +100,6 @@ const tagsCollection = defineCollection({
export const collections = {
categories: categoriesCollection,
friends: friendsCollection,
- options: optionsCollection,
pages: pagesCollection,
posts: postsCollection,
tags: tagsCollection,
diff --git a/src/content/options/index.yml b/src/content/options/index.yml
deleted file mode 100644
index 1da44e5..0000000
--- a/src/content/options/index.yml
+++ /dev/null
@@ -1,92 +0,0 @@
-title: 且听书吟
-website: https://yufan.me
-description: 诗与梦想的远方
-keywords:
- - 雨帆
- - 且听书吟
- - syhily
- - amehochan
- - yufan
-author:
- name: 雨帆
- email: syhily@gmail.com
- url: https://yufan.me
-navigation:
- - text: 首页
- link: /
- - text: 关于
- link: /about
- - text: 留言
- link: /guestbook
- - text: 友链
- link: /links
- - text: 笔记
- link: https://note.yufan.me
- target: _blank
-socials:
- - name: GitHub
- icon: icon-github-fill
- type: link
- link: https://github.com/syhily
- - name: Twitter
- icon: icon-twitter
- type: link
- link: https://twitter.com/amehochan
- - name: Wechat
- icon: icon-wechat
- type: qrcode
- title: 扫码加我微信好友
- link: https://u.wechat.com/EBpmuKmrVz4YVFnoCJdnruA
-settings:
- initialYear: 2011
- icpNo: 皖ICP备2021002315号-2
- locale: zh-CN
- timeZone: Asia/Shanghai
- timeFormat: yyyy-MM-dd
- twitter: amehochan
- post:
- # asc or desc
- sort: desc
- # This is the PINGED posts on top of your homepage.
- # You can add the posts id here.
- # We only show the first three feature posts.
- feature:
- - secret-of-boys-mind
- - my-darling
- - happiness-caprice
- # The pinned category slugs.
- category:
- - article
- - think
- - gossip
- - coding
- pagination:
- # Number of posts per home page.
- posts: 5
- # Number of posts per category page.
- category: 7
- # Number of posts per tag page.
- tags: 7
- # Number of posts in search results.
- search: 7
- feed:
- # Whether to show the post's content.
- full: true
- # The counts of the latest post to show.
- size: 10
- sidebar:
- # Display search bar.
- search: true
- # Display the number of random posts. Set 0 or a negation number to disable it.
- post: 6
- # Display recent blog comments. Set 0 or a negative number to disable it.
- comment: 6
- # Display the tag cloud. Set 0 or a negative number to disable it.
- tag: 20
- # Artalk configuration
- comments:
- # The artalk server endpoint
- server: https://comment.yufan.me
- # The administrator user id.
- admins:
- - 3
diff --git a/src/helpers/db/query.ts b/src/helpers/db/query.ts
index 0bb24e0..bbe1afb 100644
--- a/src/helpers/db/query.ts
+++ b/src/helpers/db/query.ts
@@ -1,7 +1,7 @@
import { db } from '@/helpers/db/pool';
import { atk_comments, atk_likes, atk_pages, atk_users } from '@/helpers/db/schema';
-import { options } from '@/helpers/schema';
import { makeToken, urlJoin } from '@/helpers/tools';
+import options from '@/options';
import { and, desc, eq, isNull, notInArray, sql } from 'drizzle-orm';
export interface Comment {
diff --git a/src/helpers/formatter.ts b/src/helpers/formatter.ts
index 00d3bde..3cce141 100644
--- a/src/helpers/formatter.ts
+++ b/src/helpers/formatter.ts
@@ -1,4 +1,5 @@
-import { options, type Post } from '@/helpers/schema';
+import type { Post } from '@/helpers/schema';
+import options from '@/options';
import { DateTime } from 'luxon';
export const slicePosts = (
diff --git a/src/helpers/images.ts b/src/helpers/images.ts
index bf3a4d7..4c88850 100644
--- a/src/helpers/images.ts
+++ b/src/helpers/images.ts
@@ -1,5 +1,7 @@
import fs from 'node:fs/promises';
import { join } from 'node:path';
+import options from '../../options';
+import { urlJoin } from './tools';
export interface Image {
/**
@@ -55,7 +57,7 @@ export const imageMetadata = async (publicPath: string): Promise
=> {
const { default: sharp } = await import('sharp');
if (!publicPath.startsWith('/')) {
- throw new Error('We only support image path in public direct. It should start with "/".');
+ throw new Error('We only support image path in "public/images" directory. The path should start with "/images/".');
}
const root = join(process.cwd(), 'public');
@@ -71,5 +73,5 @@ export const imageMetadata = async (publicPath: string): Promise => {
const blurImage = await img.resize(blurWidth, blurHeight).webp({ quality: 1 }).toBuffer();
const blurDataURL = `data:image/webp;base64,${blurImage.toString('base64')}`;
- return { src: publicPath, height, width, blurDataURL, blurWidth, blurHeight };
+ return { src: urlJoin(options.assetsPrefix(), publicPath), height, width, blurDataURL, blurWidth, blurHeight };
};
diff --git a/src/helpers/og.ts b/src/helpers/og.ts
index ead9ea5..83a90c0 100644
--- a/src/helpers/og.ts
+++ b/src/helpers/og.ts
@@ -5,7 +5,7 @@
* But I have get the approvement to use them here by asking the author https://twitter.com/yuaanlin.
*/
import { openGraphHeight, openGraphWidth } from '@/helpers/images';
-import { options } from '@/helpers/schema';
+import options from '@/options';
import { Canvas, GlobalFonts, Image, type SKRSContext2D } from '@napi-rs/canvas';
import { readFile } from 'node:fs/promises';
import { join } from 'node:path';
@@ -117,6 +117,11 @@ const drawImageProp = (
};
const fetchCover = async (cover: string): Promise => {
+ if (cover.startsWith(options.assetsPrefix())) {
+ const coverPath = join(process.cwd(), 'public', cover.substring(options.assetsPrefix().length));
+ return await readFile(coverPath);
+ }
+
if (cover.startsWith('http')) {
return Buffer.from(await (await fetch(cover)).arrayBuffer());
}
@@ -132,7 +137,7 @@ export interface OpenGraphProps {
}
export const defaultOpenGraph = async (): Promise => {
- return await fetchCover('/images/default-cover.jpg');
+ return await fetchCover('/images/open-graph.png');
};
// Register the font if it doesn't exist
diff --git a/src/helpers/schema.ts b/src/helpers/schema.ts
index e901186..355e942 100644
--- a/src/helpers/schema.ts
+++ b/src/helpers/schema.ts
@@ -1,10 +1,10 @@
import { defaultCover } from '@/content/config.ts';
+import options from '@/options';
import { getCollection, getEntryBySlug, type Render } from 'astro:content';
// Import the collections from the astro content.
const categoriesCollection = await getCollection('categories');
const friendsCollection = await getCollection('friends');
-const optionsCollection = await getCollection('options');
const pagesCollection = await getCollection('pages');
const postsCollection = await getCollection('posts');
const tagsCollection = await getCollection('tags');
@@ -12,7 +12,6 @@ const tagsCollection = await getCollection('tags');
// Redefine the types from the astro content.
export type Category = (typeof categoriesCollection)[number]['data'] & { counts: number; permalink: string };
export type Friend = (typeof friendsCollection)[number]['data'][number];
-export type Options = (typeof optionsCollection)[number]['data'];
export type Page = (typeof pagesCollection)[number]['data'] & {
slug: string;
permalink: string;
@@ -28,10 +27,9 @@ export type Tag = (typeof tagsCollection)[number]['data'][number] & { counts: nu
// Translate the Astro content into the original content for dealing with different configuration types.
export const friends: Friend[] = friendsCollection[0].data;
-export const options: Options = optionsCollection[0].data;
// Override the website for local debugging
export const pages: Page[] = pagesCollection
- .filter((page) => page.data.published || !import.meta.env.PROD)
+ .filter((page) => page.data.published || !options.isProd())
.map((page) => ({
slug: page.slug,
permalink: `/${page.slug}`,
@@ -42,7 +40,7 @@ export const pages: Page[] = pagesCollection
...page.data,
}));
export const posts: Post[] = postsCollection
- .filter((post) => post.data.published || !import.meta.env.PROD)
+ .filter((post) => post.data.published || !options.isProd())
.map((post) => ({
slug: post.slug,
permalink: `/posts/${post.slug}`,
@@ -90,7 +88,7 @@ if (missingTags.length > 0) {
const missingCovers = posts
.filter((post) => post.cover.src === defaultCover)
.map((post) => ({ title: post.title, slug: post.slug }));
-if (!import.meta.env.PROD && missingCovers.length > 0) {
+if (!options.isProd() && missingCovers.length > 0) {
// We only warn here for this is a known improvement.
console.warn(`The following ${missingCovers.length} posts don't have a cover.`);
console.warn(missingCovers);
@@ -124,13 +122,6 @@ if (invalidPinnedCategories.length > 0) {
throw new Error(`The bellowing pinned categories are invalid:\n$${invalidPinnedCategories.join('\n')}`);
}
-// Validate the options with the Astro configuration.
-if (import.meta.env.PROD && import.meta.env.SITE !== options.website) {
- throw new Error(
- `Invalid configuration in options.website: ${options.website} with astro site: ${import.meta.env.SITE}`,
- );
-}
-
export const getPost = (slug: string): Post | undefined => {
return posts.find((post) => post.slug === slug);
};
diff --git a/src/helpers/seo.ts b/src/helpers/seo.ts
index 621f0d8..12ef2d7 100644
--- a/src/helpers/seo.ts
+++ b/src/helpers/seo.ts
@@ -1,7 +1,45 @@
// This file is copied from https://github.com/flexdinesh/blogster/blob/main/packages/shared/src/seo.ts
// I just modified it for my personal needs.
+import { urlJoin } from '@/helpers/tools';
+import options from '@/options';
-type PageOgMeta = {
+export interface PageMeta {
+ title: string;
+ description: string;
+ baseUrl?: string;
+ ogImageUrl?: string;
+ ogImageAltText: string;
+ ogImageWidth?: number;
+ ogImageHeight?: number;
+ siteOwnerTwitterHandle?: string;
+ contentAuthorTwitterHandle?: string;
+}
+
+export interface PostMeta {
+ title: string;
+ description: string;
+ pageUrl?: string;
+ authorName?: string;
+ publishDate: string;
+ ogImageUrl?: string;
+ ogImageAltText: string;
+ ogImageWidth?: number;
+ ogImageHeight?: number;
+ siteOwnerTwitterHandle?: string;
+ contentAuthorTwitterHandle?: string;
+}
+
+export interface TwitterOgMeta {
+ title: string;
+ description?: string;
+ card: 'summary_large_image';
+ site?: string;
+ creator?: string;
+ image?: string;
+ imageAlt?: string;
+}
+
+export interface PageOgMeta {
title: string;
description?: string;
type: 'website';
@@ -10,19 +48,9 @@ type PageOgMeta = {
imageAlt?: string;
imageWidth?: string;
imageHeight?: string;
-};
+}
-type PageTwitterMeta = {
- title: string;
- description?: string;
- card: 'summary_large_image';
- site?: string;
- creator?: string;
- image?: string;
- imageAlt?: string;
-};
-
-type PostOgMeta = {
+export interface PostOgMeta {
title: string;
description?: string;
type: 'article';
@@ -34,130 +62,93 @@ type PostOgMeta = {
imageAlt?: string;
imageWidth?: string;
imageHeight?: string;
-};
+}
-type PostTwitterMeta = {
- title: string;
- description?: string;
- card: 'summary_large_image';
- site?: string;
- creator?: string;
- image?: string;
- imageAlt?: string;
-};
+const parseOgImageUrl = (ogImageUrl?: string): string =>
+ typeof ogImageUrl === 'undefined'
+ ? options.defaultOpenGraph()
+ : ogImageUrl.startsWith('/')
+ ? urlJoin(options.assetsPrefix(), ogImageUrl)
+ : ogImageUrl;
-export function getPageMeta({
- title: pageTitle,
+export const getPageMeta = ({
+ title,
description,
baseUrl,
- ogImageAbsoluteUrl,
+ ogImageUrl,
ogImageAltText,
ogImageWidth,
ogImageHeight,
siteOwnerTwitterHandle,
contentAuthorTwitterHandle,
-}: {
- title: string;
- description: string;
- baseUrl?: string;
- ogImageAbsoluteUrl?: string; // should always be absolute
- ogImageAltText?: string;
- ogImageWidth?: number;
- ogImageHeight?: number;
- siteOwnerTwitterHandle?: string;
- contentAuthorTwitterHandle?: string;
-}): { og: PageOgMeta; twitter: PageTwitterMeta } {
- if (!pageTitle) {
+}: PageMeta): { og: PageOgMeta; twitter: TwitterOgMeta } => {
+ if (!title) {
throw Error('title is required for page SEO');
}
- if (ogImageAbsoluteUrl) {
- ogImageAltText = !ogImageAltText ? `Preview image for ${pageTitle}` : ogImageAltText;
- }
-
- const og: PageOgMeta = {
- title: pageTitle,
- description: description,
- type: 'website',
- url: baseUrl,
- image: ogImageAbsoluteUrl,
- imageAlt: ogImageAltText,
- imageWidth: ogImageWidth ? String(ogImageWidth) : undefined,
- imageHeight: ogImageHeight ? String(ogImageHeight) : undefined,
- };
-
- const twitter: PageTwitterMeta = {
- title: pageTitle,
- description: description,
- card: 'summary_large_image',
- site: siteOwnerTwitterHandle,
- creator: contentAuthorTwitterHandle || siteOwnerTwitterHandle,
- image: ogImageAbsoluteUrl,
- imageAlt: ogImageAltText,
- };
+ const ogImageAbsoluteUrl = parseOgImageUrl(ogImageUrl);
return {
- og,
- twitter,
+ og: {
+ title: title,
+ description: description,
+ type: 'website',
+ url: baseUrl,
+ image: ogImageAbsoluteUrl,
+ imageAlt: ogImageAltText,
+ imageWidth: ogImageWidth ? String(ogImageWidth) : undefined,
+ imageHeight: ogImageHeight ? String(ogImageHeight) : undefined,
+ },
+ twitter: {
+ title: title,
+ description: description,
+ card: 'summary_large_image',
+ site: siteOwnerTwitterHandle,
+ creator: contentAuthorTwitterHandle || siteOwnerTwitterHandle,
+ image: ogImageAbsoluteUrl,
+ imageAlt: ogImageAltText,
+ },
};
-}
+};
-export function getBlogPostMeta({
- title: pageTitle,
+export const getBlogPostMeta = ({
+ title,
description,
pageUrl,
authorName,
publishDate,
- ogImageAbsoluteUrl,
+ ogImageUrl,
ogImageAltText,
ogImageWidth,
ogImageHeight,
siteOwnerTwitterHandle,
contentAuthorTwitterHandle,
-}: {
- title: string;
- description: string;
- pageUrl?: string;
- authorName?: string;
- publishDate: string;
- ogImageAbsoluteUrl?: string; // should always be absolute
- ogImageAltText?: string;
- ogImageWidth?: number;
- ogImageHeight?: number;
- siteOwnerTwitterHandle?: string;
- contentAuthorTwitterHandle?: string;
-}): { og: PostOgMeta; twitter: PostTwitterMeta } {
- if (!pageTitle) {
+}: PostMeta): { og: PostOgMeta; twitter: TwitterOgMeta } => {
+ if (!title) {
throw Error('title is required for page SEO');
}
- if (ogImageAbsoluteUrl && !ogImageAltText) {
- ogImageAltText = `Preview image for ${pageTitle}`;
- }
-
- const og: PostOgMeta = {
- title: pageTitle,
- description: description,
- type: 'article',
- url: pageUrl,
- author: authorName,
- publishDate: publishDate,
- image: ogImageAbsoluteUrl,
- imageAlt: ogImageAltText,
- imageWidth: ogImageWidth ? String(ogImageWidth) : undefined,
- imageHeight: ogImageHeight ? String(ogImageHeight) : undefined,
- };
-
- const twitter: PostTwitterMeta = {
- title: pageTitle,
- description: description,
- card: 'summary_large_image',
- site: siteOwnerTwitterHandle,
- creator: contentAuthorTwitterHandle || siteOwnerTwitterHandle,
- image: ogImageAbsoluteUrl,
- imageAlt: ogImageAltText,
- };
+ const ogImageAbsoluteUrl = parseOgImageUrl(ogImageUrl);
return {
- og,
- twitter,
+ og: {
+ title: title,
+ description: description,
+ type: 'article',
+ url: pageUrl,
+ author: authorName,
+ publishDate: publishDate,
+ image: ogImageAbsoluteUrl,
+ imageAlt: ogImageAltText,
+ imageWidth: ogImageWidth ? String(ogImageWidth) : undefined,
+ imageHeight: ogImageHeight ? String(ogImageHeight) : undefined,
+ },
+ twitter: {
+ title: title,
+ description: description,
+ card: 'summary_large_image',
+ site: siteOwnerTwitterHandle,
+ creator: contentAuthorTwitterHandle || siteOwnerTwitterHandle,
+ image: ogImageAbsoluteUrl,
+ imageAlt: ogImageAltText,
+ },
};
-}
+};
diff --git a/src/layouts/BaseLayout.astro b/src/layouts/BaseLayout.astro
index 592ac96..395e627 100644
--- a/src/layouts/BaseLayout.astro
+++ b/src/layouts/BaseLayout.astro
@@ -7,10 +7,9 @@ import '@/assets/styles/reset.css';
import '@/assets/styles/globals.css';
import Footer from '@/components/footer/Footer.astro';
-import GoTop from '@/components/footer/GoTop.astro';
import Header from '@/components/header/Header.astro';
import PageMeta from '@/components/meta/PageMeta.astro';
-import { options } from '@/helpers/schema';
+import options from '@/options';
interface Props {
title?: string;
@@ -54,7 +53,15 @@ const description = Astro.props.description || options.description;
-
+