${contentHtml}
-
- Info of ${postHtml}:
-${sourceHtml}(${sourceHost})
-${uploadByHtml}
-Score: ${score || '-'}
-Tags:
${tags}
- `; -} - -async function handler(ctx: Context) { - const tags = (decodeURIComponent(ctx.req.param('tags')) || '').trim(); - const { apiKey = '', userId = '', limit = 40, quality = 'sample' }: { apiKey?: string; userId?: string; limit?: number; quality?: 'sample' | 'orig' } = ctx.req.query(); + const { limit = 40 }: { limit?: number } = ctx.req.query(); + const { apiKey, useId } = getAPIKeys(); const response = await got({ url: 'https://gelbooru.com/index.php', @@ -87,7 +75,7 @@ async function handler(ctx: Context) { q: 'index', tags, api_key: apiKey, - user_id: userId, + user_id: useId, limit: limit <= 0 || limit > 100 ? 40 : limit, json: 1, }), @@ -96,7 +84,7 @@ async function handler(ctx: Context) { const posts = response.data.post; return { - title: tags ? `${tags} - gelbooru.com` : `gelbooru.com post list`, + title: tags ? `${tags} - gelbooru.com` : 'gelbooru.com post list', link: `https://gelbooru.com/index.php?page=post&s=list&tags=${tags}`, icon: 'https://gelbooru.com/favicon.png', logo: 'https://gelbooru.com/favicon.png', @@ -107,7 +95,7 @@ async function handler(ctx: Context) { link: `https://gelbooru.com/index.php?page=post&s=view&id=${post.id}`, author: post.owner, pubDate: parseDate(post.created_at), - description: generatePostDescription(post, `https://gelbooru.com/index.php?page=post&s=view&id=${post.id}`, quality), + description: renderDesc(post, `https://gelbooru.com/index.php?page=post&s=view&id=${post.id}`, quality), upvotes: post.score, updated: parseDate(post.change), media: { diff --git a/lib/routes/gelbooru/templates/description.art b/lib/routes/gelbooru/templates/description.art new file mode 100644 index 00000000000000..401fa8eb2a3239 --- /dev/null +++ b/lib/routes/gelbooru/templates/description.art @@ -0,0 +1,19 @@ +
+ {{if isVideo}}
+
+ {{else}}
+ 
+ {{/if}}
+
+Info of #{{id}}:
++ {{if isHttp}} + Source + {{else}} + Source: {{source}} + {{/if}} + ({{sourceHost}}) +
+Upload by: {{owner}}
+Score: {{score}}
+Tags:
{{tags}}
diff --git a/lib/routes/gelbooru/utils.ts b/lib/routes/gelbooru/utils.ts new file mode 100644 index 00000000000000..175c4f51ab27f7 --- /dev/null +++ b/lib/routes/gelbooru/utils.ts @@ -0,0 +1,40 @@ +import path from 'node:path'; +import { art } from '@/utils/render'; +import { config } from '@/config'; + +export function renderDesc(post, link, quality: 'sample' | 'orig') { + const { id, source, owner, file_url: fileUrl, tags, score } = post; + const isHttp = /^https?:\/\//.test(source); + const sourceHost = isHttp ? new URL(source).host : source || 'unknown'; + const imgQualityMap = { sample: 'sample_url', orig: 'file_url' }; + + // 判断是否是视频链接 + const videoExtList = ['mp4', 'webm']; + const fileExt = fileUrl.slice(fileUrl.lastIndexOf('.') + 1); + const isVideo = videoExtList.includes(fileExt); + // 如果是视频则始终使用 fileUrl（原文件） + let contentURL = post[imgQualityMap[quality]] || fileUrl; + if (isVideo) { + contentURL = fileUrl; + } + + return art(path.join(__dirname, 'templates/description.art'), { + id, + source, + owner, + tags, + link, + isHttp, + sourceHost, + contentURL, + isVideo, + score: score || 0, + }); +} + +export function getAPIKeys() { + return { + apiKey: config.gelbooru.apiKey || '', + apiKey: config.gelbooru.userId || '', + }; +} From c2e5748afe0f8e48eedd1921016b17d922a82fab Mon Sep 17 00:00:00 2001 From: undefined <33629016+magicFeirl@users.noreply.github.com> Date: Sat, 15 Feb 2025 11:11:17 +0000 Subject: [PATCH 08/12] fix: Apply code review --- lib/routes/gelbooru/post.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/routes/gelbooru/post.ts b/lib/routes/gelbooru/post.ts index b867edf2aebda9..b6c1258dbc7302 100644 --- a/lib/routes/gelbooru/post.ts +++ b/lib/routes/gelbooru/post.ts @@ -1,7 +1,8 @@ import { Route, ViewType } from '@/types'; import { Context } from 'hono'; import { parseDate } from '@/utils/parse-date'; -import { renderDesc } from './utils'; +import { renderDesc, getAPIKeys } from './utils'; + import got from '@/utils/got'; import queryString from 'query-string'; From 101637a43737a71b8a17c86cf0ecdb514fd3b172 Mon Sep 17 00:00:00 2001 From: undefined <33629016+magicFeirl@users.noreply.github.com> Date: Sat, 15 Feb 2025 11:44:02 +0000 Subject: [PATCH 09/12] fix: add __dirname var --- lib/config.ts | 4 ++++ lib/routes/gelbooru/utils.ts | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/config.ts b/lib/config.ts index 598cc5ff3f1cf4..a9ddad62030554 100644 --- a/lib/config.ts +++ b/lib/config.ts @@ -393,6 +393,10 @@ export type Config = { zsxq: { accessToken?: string; }; + gelbooru: { + apiKey?: string; + userId?: string; + }; }; const value: Config | Record
{{if isVideo}}
-
+
{{else}}
{{/if}}
From 253bf6334ec16f520d52bd68671fe7adb26fc8ad Mon Sep 17 00:00:00 2001
From: undefined <2100709458@qq.com>
Date: Sun, 16 Feb 2025 14:28:42 +0800
Subject: [PATCH 11/12] Update lib/routes/gelbooru/post.ts
Co-authored-by: Tony
---
lib/routes/gelbooru/post.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/routes/gelbooru/post.ts b/lib/routes/gelbooru/post.ts
index b6c1258dbc7302..83ddce77a6ed5e 100644
--- a/lib/routes/gelbooru/post.ts
+++ b/lib/routes/gelbooru/post.ts
@@ -43,7 +43,7 @@ export const route: Route = {
source: ['gelbooru.com/index.php'],
},
],
- name: 'Gelbooru标签查询',
+ name: '标签查询',
maintainers: ['magicFeirl'],
description: `
- 默认查询: \`/gelbooru/post\` 功能等同查询 Gelbooru 网站最新的投稿
From 915dfcea9eb442321d3c87ebd8c939db98d19154 Mon Sep 17 00:00:00 2001
From: undefined <33629016+magicFeirl@users.noreply.github.com>
Date: Sun, 16 Feb 2025 06:32:32 +0000
Subject: [PATCH 12/12] fix: Add config key by alphabetical order
---
lib/config.ts | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/lib/config.ts b/lib/config.ts
index a9ddad62030554..f681d37d431f8f 100644
--- a/lib/config.ts
+++ b/lib/config.ts
@@ -176,6 +176,10 @@ export type Config = {
guozaoke: {
cookies?: string;
};
+ gelbooru: {
+ apiKey?: string;
+ userId?: string;
+ };
hefeng: {
key?: string;
};
@@ -393,10 +397,6 @@ export type Config = {
zsxq: {
accessToken?: string;
};
- gelbooru: {
- apiKey?: string;
- userId?: string;
- };
};
const value: Config | Record = {};
@@ -613,6 +613,10 @@ const calculateValue = () => {
guozaoke: {
cookies: envs.GUOZAOKE_COOKIES,
},
+ gelbooru: {
+ apiKey: envs.GELBOORU_API_KEY,
+ userId: envs.GELBOORU_USER_ID,
+ },
hefeng: {
// weather
key: envs.HEFENG_KEY,
@@ -831,10 +835,6 @@ const calculateValue = () => {
zsxq: {
accessToken: envs.ZSXQ_ACCESS_TOKEN,
},
- gelbooru: {
- apiKey: envs.GELBOORU_API_KEY,
- userId: envs.GELBOORU_USER_ID,
- },
};
for (const name in _value) {