Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
rot1024 committed Jun 7, 2024
2 parents 8f57e7d + 525a9a1 commit 6a5f346
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
3 changes: 3 additions & 0 deletions src/interfaces.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ export type Config = {
description?: string;
dateFormat?: string;
postsPerPage?: number;
head?: {
titleSeparator?: string;
};
og?: {
siteImagePath?: string;
baseImagePath?: string;
Expand Down
4 changes: 3 additions & 1 deletion src/layouts/Layout.astro
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ type Props = {
const { title = "", description = "", path = "/", ogImage = "" } = Astro.props;
const database = await client.getDatabase();
const siteTitle = title ? `${title} - ${database.title}` : database.title;
const siteTitle = title
? `${title}${config.head?.titleSeparator || " | "}${database.title}`
: database.title;
const siteDescription = description ? description : database.description;
const siteURL = getUrl(path, Astro.site);
const siteOGImage = getUrl(
Expand Down
2 changes: 2 additions & 0 deletions src/notion/utils.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ test("expiresIn", () => {
expiry_time: exp.toISOString(),
},
},
in_trash: false,
});

expect(
Expand Down Expand Up @@ -64,6 +65,7 @@ test("expiresIn", () => {
color: "default",
rich_text: [],
},
in_trash: false,
} satisfies ParagraphBlockObjectResponse),
).toBeUndefined();

Expand Down

0 comments on commit 6a5f346

Please sign in to comment.