hash
stringlengths 40
40
| date
stringdate 2018-04-19 20:42:56
2025-03-25 18:01:26
| author
stringlengths 1
23
| commit_message
stringlengths 9
121
| is_merge
bool 1
class | masked_commit_message
stringlengths 3
111
| type
stringclasses 10
values | git_diff
stringlengths 108
2.8M
|
|---|---|---|---|---|---|---|---|
bed9a34c99a494a64c8b59dbe785fa6698a95761
|
2019-12-19 14:45:23
|
WenryXu
|
feat: 新增人人都是产品经理 - 天天问 (#3596)
| false
|
新增人人都是产品经理 - 天天问 (#3596)
|
feat
|
diff --git a/docs/new-media.md b/docs/new-media.md
index 0aa980891f3438..707ebd59a41cd8 100644
--- a/docs/new-media.md
+++ b/docs/new-media.md
@@ -618,6 +618,10 @@ pageClass: routes
<Route author="WenryXu" example="/woshipm/popular" path="/woshipm/popular"/>
+### 天天问
+
+<Route author="WenryXu" example="/woshipm/wen" path="/woshipm/wen"/>
+
### 用户收藏
<Route author="LogicJake" example="/woshipm/bookmarks/324696" path="/woshipm/bookmarks/:id" :paramsDesc="['用户 id']"/>
diff --git a/lib/router.js b/lib/router.js
index a3a0037348ce68..2f21208e05f7f1 100644
--- a/lib/router.js
+++ b/lib/router.js
@@ -1133,6 +1133,7 @@ router.get('/dockerhub/build/:owner/:image/:tag?', require('./routes/dockerhub/b
// 人人都是产品经理
router.get('/woshipm/popular', require('./routes/woshipm/popular'));
+router.get('/woshipm/wen', require('./routes/woshipm/wen'));
router.get('/woshipm/bookmarks/:id', require('./routes/woshipm/bookmarks'));
router.get('/woshipm/user_article/:id', require('./routes/woshipm/user_article'));
diff --git a/lib/routes/woshipm/wen.js b/lib/routes/woshipm/wen.js
new file mode 100644
index 00000000000000..ad3951d11d9ff5
--- /dev/null
+++ b/lib/routes/woshipm/wen.js
@@ -0,0 +1,45 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+
+module.exports = async (ctx) => {
+ const response = await got('https://wen.woshipm.com/m/main/indexNewData.html');
+ const $ = cheerio.load(response.data);
+ const postList = $('.article-list-item').get();
+ const result = await Promise.all(
+ postList.map(async (item) => {
+ const title = $(item)
+ .find('.went-head-text')
+ .text();
+ const link =
+ 'https://wen.woshipm.com/' +
+ $(item)
+ .find('.went-head')
+ .attr('href');
+ const pubDate = new Date().toUTCString();
+
+ const single = {
+ title: title,
+ link: link,
+ guid: link,
+ pubDate: pubDate,
+ description: '',
+ };
+
+ const key = link;
+ const value = await ctx.cache.get(key);
+
+ if (value) {
+ single.description = value;
+ } else {
+ const temp = await got(link);
+ const $ = cheerio.load(temp.data);
+ single.description = $('.wt-desc').html();
+
+ ctx.cache.set(key, single.description);
+ }
+
+ return Promise.resolve(single);
+ })
+ );
+ ctx.state.data = { title: '天天问 - 人人都是产品经理', link: 'http://wen.woshipm.com/', item: result };
+};
|
b334aa49bb8dcc4e5c425ac6162495bd290b7da4
|
2023-04-09 00:32:47
|
TonyRL
|
docs: fix advanced feed tips
| false
|
fix advanced feed tips
|
docs
|
diff --git a/docs/en/joinus/advanced-feed.md b/docs/en/joinus/advanced-feed.md
index 309c311d071af3..d3f380baf21a6c 100644
--- a/docs/en/joinus/advanced-feed.md
+++ b/docs/en/joinus/advanced-feed.md
@@ -138,7 +138,7 @@ ctx.state.data = {
By including these fields in your RSS feed, you'll be able to create podcast feeds that are compatible with many podcast players.
-::: info Further Reading
+::: tip Further Reading
- [A Podcaster’s Guide to RSS](https://help.apple.com/itc/podcasts_connect/#/itcb54353390)
- [RSS feed guidelines for Google Podcasts](https://support.google.com/podcast-publishers/answer/9889544)
diff --git a/docs/joinus/advanced-feed.md b/docs/joinus/advanced-feed.md
index c3696f7aa6ba79..495c0c91a024f9 100644
--- a/docs/joinus/advanced-feed.md
+++ b/docs/joinus/advanced-feed.md
@@ -138,7 +138,7 @@ ctx.state.data = {
通过在 RSS 源中包含这些字段，您将能够制作与播客播放器兼容的播客订阅源。
-::: info 进一步阅读
+::: tip 进一步阅读
- [A Podcaster’s Guide to RSS](https://help.apple.com/itc/podcasts_connect/#/itcb54353390)
- [Google 播客的 RSS Feed 指南](https://support.google.com/podcast-publishers/answer/9889544)
|
4c0925157f97b662999a5ba80b8e6c3dfd3596ce
|
2024-12-02 09:03:35
|
pseudoyu
|
feat(route/qingting): return first page program instead of 10
| false
|
return first page program instead of 10
|
feat
|
diff --git a/lib/routes/qingting/channel.ts b/lib/routes/qingting/channel.ts
index 27c08b96c768af..8833715da67f22 100644
--- a/lib/routes/qingting/channel.ts
+++ b/lib/routes/qingting/channel.ts
@@ -1,6 +1,6 @@
import { Route } from '@/types';
import cache from '@/utils/cache';
-import got from '@/utils/got';
+import ofetch from '@/utils/ofetch';
import timezone from '@/utils/timezone';
import { parseDate } from '@/utils/parse-date';
@@ -18,18 +18,18 @@ export const route: Route = {
supportScihub: false,
},
name: '专辑',
- maintainers: ['nczitzk'],
+ maintainers: ['nczitzk', 'pseudoyu'],
handler,
};
async function handler(ctx) {
const channelUrl = `https://i.qingting.fm/capi/v3/channel/${ctx.req.param('id')}`;
- let response = await got(channelUrl);
- const title = response.data.data.title;
- const programUrl = `https://i.qingting.fm/capi/channel/${ctx.req.param('id')}/programs/${response.data.data.v}?curpage=1&pagesize=10&order=asc`;
- response = await got(programUrl);
+ let response = await ofetch(channelUrl);
+ const title = response.data.title;
+ const programUrl = `https://i.qingting.fm/capi/channel/${ctx.req.param('id')}/programs/${response.data.v}?curpage=1&order=asc`;
+ response = await ofetch(programUrl);
- const items = response.data.data.programs.map((item) => ({
+ const items = response.data.programs.map((item) => ({
title: item.title,
link: `https://www.qingting.fm/channels/${ctx.req.param('id')}/programs/${item.id}/`,
pubDate: timezone(parseDate(item.update_time), +8),
@@ -41,8 +41,8 @@ async function handler(ctx) {
item: await Promise.all(
items.map((item) =>
cache.tryGet(item.link, async () => {
- response = await got(item.link);
- const data = JSON.parse(response.data.match(/},"program":(.*?),"plist":/)[1]);
+ response = await ofetch(item.link);
+ const data = JSON.parse(response.match(/},"program":(.*?),"plist":/)[1]);
item.description = data.richtext;
return item;
})
diff --git a/lib/routes/qingting/podcast.ts b/lib/routes/qingting/podcast.ts
index 17d1c6b4bab23a..5df881379fcd6d 100644
--- a/lib/routes/qingting/podcast.ts
+++ b/lib/routes/qingting/podcast.ts
@@ -1,7 +1,7 @@
import type { DataItem, Route } from '@/types';
import cache from '@/utils/cache';
import crypto from 'crypto';
-import got from '@/utils/got';
+import ofetch from '@/utils/ofetch';
import timezone from '@/utils/timezone';
import { parseDate } from '@/utils/parse-date';
import { config } from '@/config';
@@ -29,7 +29,7 @@ export const route: Route = {
},
],
name: '播客',
- maintainers: ['RookieZoe', 'huyyi'],
+ maintainers: ['RookieZoe', 'huyyi', 'pseudoyu'],
handler,
description: `获取的播放 URL 有效期只有 1 天，需要开启播客 APP 的自动下载功能。`,
};
@@ -44,35 +44,27 @@ async function handler(ctx) {
const channelId = ctx.req.param('id');
const channelUrl = `https://i.qingting.fm/capi/v3/channel/${channelId}`;
- const response = await got({
- method: 'get',
- url: channelUrl,
+ const response = await ofetch(channelUrl, {
headers: {
Referer: 'https://www.qingting.fm/',
},
});
- const title = response.data.data.title;
- const channel_img = response.data.data.thumbs['400_thumb'];
- const authors = response.data.data.podcasters.map((author) => author.nick_name).join(',');
- const desc = response.data.data.description;
- const programUrl = `https://i.qingting.fm/capi/channel/${channelId}/programs/${response.data.data.v}?curpage=1&pagesize=10&order=asc`;
+ const title = response.data.title;
+ const channel_img = response.data.thumbs['400_thumb'];
+ const authors = response.data.podcasters.map((author) => author.nick_name).join(',');
+ const desc = response.data.description;
+ const programUrl = `https://i.qingting.fm/capi/channel/${channelId}/programs/${response.data.v}?curpage=1&pagesize=10&order=asc`;
const {
- data: {
- data: { programs },
- },
- } = await got({
- method: 'get',
- url: programUrl,
+ data: { programs },
+ } = await ofetch(programUrl, {
headers: {
Referer: 'https://www.qingting.fm/',
},
});
- const {
- data: { data: channelInfo },
- } = await got(`https://i.qingting.fm/capi/v3/channel/${channelId}?user_id=${qingtingId}`);
+ const { data: channelInfo } = await ofetch(`https://i.qingting.fm/capi/v3/channel/${channelId}?user_id=${qingtingId}`);
const isCharged = channelInfo.purchase?.item_type !== 0;
@@ -83,15 +75,13 @@ async function handler(ctx) {
const data = (await cache.tryGet(`qingting:podcast:${channelId}:${item.id}`, async () => {
const link = `https://www.qingting.fm/channels/${channelId}/programs/${item.id}/`;
- const detailRes = await got({
- method: 'get',
- url: link,
+ const detailRes = await ofetch(link, {
headers: {
Referer: 'https://www.qingting.fm/',
},
});
- const detail = JSON.parse(detailRes.data.match(/},"program":(.*?),"plist":/)[1]);
+ const detail = JSON.parse(detailRes.match(/},"program":(.*?),"plist":/)[1]);
const rssItem = {
title: item.title,
|
121763bb6d2c434bc41b0e36146fb85a3ce51f29
|
2023-08-30 21:48:48
|
JimenezLi
|
feat(core): add logger timestamp (#13165)
| false
|
add logger timestamp (#13165)
|
feat
|
diff --git a/lib/config.js b/lib/config.js
index 4e76cf06d8118f..d435c4e50e0dd4 100644
--- a/lib/config.js
+++ b/lib/config.js
@@ -94,6 +94,7 @@ const calculateValue = () => {
debugInfo: envs.DEBUG_INFO || 'true',
loggerLevel: envs.LOGGER_LEVEL || 'info',
noLogfiles: envs.NO_LOGFILES,
+ showLoggerTimestamp: envs.SHOW_LOGGER_TIMESTAMP,
sentry: {
dsn: envs.SENTRY,
routeTimeout: parseInt(envs.SENTRY_ROUTE_TIMEOUT) || 30000,
diff --git a/lib/utils/logger.js b/lib/utils/logger.js
index 6b9136ccc39ae7..c92e4f13dfe644 100644
--- a/lib/utils/logger.js
+++ b/lib/utils/logger.js
@@ -14,7 +14,16 @@ if (!config.noLogfiles) {
}
const logger = winston.createLogger({
level: config.loggerLevel,
- format: winston.format.json(),
+ format: winston.format.combine(
+ winston.format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss.SSS' }),
+ winston.format.printf((info) =>
+ JSON.stringify({
+ timestamp: info.timestamp,
+ level: info.level,
+ message: info.message,
+ })
+ )
+ ),
transports,
});
@@ -25,7 +34,10 @@ const logger = winston.createLogger({
if (!config.isPackage) {
logger.add(
new winston.transports.Console({
- format: winston.format.combine(winston.format.colorize(), winston.format.simple()),
+ format: winston.format.printf((info) => {
+ const infoLevel = winston.format.colorize().colorize(info.level, config.showLoggerTimestamp ? `[${info.timestamp}] ${info.level}` : info.level);
+ return `${infoLevel}: ${info.message}`;
+ }),
silent: process.env.NODE_ENV === 'test',
})
);
diff --git a/website/docs/install/README.md b/website/docs/install/README.md
index ea25ad0e7e2d6c..d45c831d237c33 100644
--- a/website/docs/install/README.md
+++ b/website/docs/install/README.md
@@ -677,6 +677,8 @@ See the relation between access key/code and white/blacklisting.
`NO_LOGFILES`: disable logging to log files, default to `false`
+`SHOW_LOGGER_TIMESTAMP`: Show timestamp in log, default to `false`
+
`SENTRY`: [Sentry](https://sentry.io) dsn, used for error tracking
`SENTRY_ROUTE_TIMEOUT`: Report Sentry if route execution takes more than this milliseconds, default to `3000`
diff --git a/website/i18n/zh/docusaurus-plugin-content-docs/current/install/README.md b/website/i18n/zh/docusaurus-plugin-content-docs/current/install/README.md
index 6244cdb0af95f6..fb04235912a261 100644
--- a/website/i18n/zh/docusaurus-plugin-content-docs/current/install/README.md
+++ b/website/i18n/zh/docusaurus-plugin-content-docs/current/install/README.md
@@ -672,6 +672,8 @@ RSSHub 支持使用访问密钥 / 码，白名单和黑名单三种方式进行
`NO_LOGFILES`: 是否禁用日志文件输出，默认 `false`
+`SHOW_LOGGER_TIMESTAMP`: 在控制台输出中显示日志时间戳，默认 `false`
+
`SENTRY`: [Sentry](https://sentry.io) dsn，用于错误追踪
`SENTRY_ROUTE_TIMEOUT`: 路由耗时超过此毫秒值上报 Sentry，默认 `3000`
|
01ca8a755b736a1c79410aa679bccfe4e93738e0
|
2019-07-15 09:19:55
|
renovate[bot]
|
chore(deps): update dependency nock to v11.0.0-beta.24 (#2619)
| false
|
update dependency nock to v11.0.0-beta.24 (#2619)
|
chore
|
diff --git a/package.json b/package.json
index 2801df8f7230bc..e71e38f2db8457 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
"eslint-plugin-prettier": "3.1.0",
"jest": "24.8.0",
"mockdate": "2.0.3",
- "nock": "11.0.0-beta.23",
+ "nock": "11.0.0-beta.24",
"nodemon": "1.19.1",
"pinyin": "2.9.0",
"prettier": "1.18.2",
diff --git a/yarn.lock b/yarn.lock
index cb2f827b1af81f..a240b6e628fe8c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6910,10 +6910,10 @@ no-case@^2.2.0:
dependencies:
lower-case "^1.1.1"
[email protected]:
- version "11.0.0-beta.23"
- resolved "https://registry.yarnpkg.com/nock/-/nock-11.0.0-beta.23.tgz#e18d1d9b11e7444f8a4925331f5f4b6172b770e4"
- integrity sha512-D03++S4wWPxqM3XUXaHTvU9TrwjypaSrroVK1k7CT3w95i93js2TUwZ3KvR08pbmO23bG747RK4LVl7vEemteQ==
[email protected]:
+ version "11.0.0-beta.24"
+ resolved "https://registry.yarnpkg.com/nock/-/nock-11.0.0-beta.24.tgz#cb6b8a06c08be4b8238df932b4c52aa0911e35dc"
+ integrity sha512-upcZWT+jQ3gZGYgn3uW+zA0OjfPemHU+l4quyZvwvjKd6UxB7fUQJmrTF6qNvO+MmZtq5QSjfqCHyHQz9oj0rw==
dependencies:
chai "^4.1.2"
debug "^4.1.0"
|
7ef0be848f522861dbffd62dbf8b09708450dda4
|
2024-10-31 22:37:28
|
liyaozhong
|
feat(route): add enterprisecraftsmanship (#17371)
| false
|
add enterprisecraftsmanship (#17371)
|
feat
|
diff --git a/lib/routes/enterprisecraftsmanship/index.ts b/lib/routes/enterprisecraftsmanship/index.ts
new file mode 100644
index 00000000000000..044571c253b994
--- /dev/null
+++ b/lib/routes/enterprisecraftsmanship/index.ts
@@ -0,0 +1,74 @@
+import { Route } from '@/types';
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import logger from '@/utils/logger';
+import { parseDate } from '@/utils/parse-date';
+import cache from '@/utils/cache';
+
+export const route: Route = {
+ path: '/archives',
+ categories: ['blog'],
+ example: '/enterprisecraftsmanship/archives',
+ radar: [
+ {
+ source: ['enterprisecraftsmanship.com/archives/'],
+ },
+ ],
+ url: 'enterprisecraftsmanship.com/',
+ name: 'Archives',
+ maintainers: ['liyaozhong'],
+ handler,
+ description: 'Enterprise Craftsmanship blog archives',
+};
+
+async function handler() {
+ const rootUrl = 'https://enterprisecraftsmanship.com';
+ const currentUrl = `${rootUrl}/archives`;
+
+ const response = await got(currentUrl);
+
+ const $ = load(response.data);
+
+ let items = $('.postIndexItem')
+ .toArray()
+ .map((item) => {
+ const $item = $(item);
+ const title = $item.find('.title a').text().trim();
+ const link = new URL($item.find('.title a').attr('href'), currentUrl).href;
+ const dateStr = $item.find('.date').text().trim();
+ const pubDate = parseDate(dateStr);
+
+ return {
+ title,
+ link,
+ pubDate,
+ };
+ });
+
+ items = await Promise.all(
+ items.map((item) =>
+ cache.tryGet(item.link, async () => {
+ try {
+ const detailResponse = await got(item.link);
+ const $detail = load(detailResponse.data);
+
+ // 获取 .post 内容，但排除 .post-info
+ const $post = $detail('.post');
+ $post.find('.post-info').remove();
+ item.description = $post.html();
+
+ return item;
+ } catch (error) {
+ logger.error(`处理文章 ${item.link} 时发生错误: ${error}`);
+ return item;
+ }
+ })
+ )
+ );
+
+ return {
+ title: 'Enterprise Craftsmanship - Archives',
+ link: currentUrl,
+ item: items,
+ };
+}
diff --git a/lib/routes/enterprisecraftsmanship/namespace.ts b/lib/routes/enterprisecraftsmanship/namespace.ts
new file mode 100644
index 00000000000000..3bf4dfa48f3eba
--- /dev/null
+++ b/lib/routes/enterprisecraftsmanship/namespace.ts
@@ -0,0 +1,6 @@
+import type { Namespace } from '@/types';
+
+export const namespace: Namespace = {
+ name: 'Enterprise Craftsmanship',
+ url: 'enterprisecraftsmanship.com',
+};
|
e8beb4029c6ee45b2cc3c6624674ff4e3f94101a
|
2021-01-25 15:33:06
|
DIYgod
|
chore: fix dependabot ci error
| false
|
fix dependabot ci error
|
chore
|
diff --git a/scripts/workflow/test-route/identify.js b/scripts/workflow/test-route/identify.js
index 1348642f64de21..2a81f548e6ed63 100644
--- a/scripts/workflow/test-route/identify.js
+++ b/scripts/workflow/test-route/identify.js
@@ -1,6 +1,7 @@
const noFound = 'Auto: Route No Found';
module.exports = async ({ github, context, core }, body, number) => {
+ core.debug(`sender: ${context.payload.sender.login}`);
core.debug(`body: ${body}`);
const m = body.match(/```routes\r\n((.|\r\n)*)```/);
core.debug(`match: ${m}`);
@@ -22,7 +23,7 @@ module.exports = async ({ github, context, core }, body, number) => {
res = m[1].trim().split('\r\n');
core.info(`routes detected: ${res}`);
- if (res.length > 0 && res[0] === 'NOROUTE') {
+ if ((res.length > 0 && res[0] === 'NOROUTE') || context.payload.sender.login === 'dependabot-preview') {
core.info('PR stated no route, passing');
await removeLabel();
await github.issues
|
eecf84bdf817f9b369befdc5608475ba6ec11fca
|
2020-07-16 22:37:53
|
dependabot-preview[bot]
|
chore(deps): bump got from 11.5.0 to 11.5.1
| false
|
bump got from 11.5.0 to 11.5.1
|
chore
|
diff --git a/package.json b/package.json
index 04bd631427c644..2c66d03f216aaf 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
"fanfou-sdk": "4.1.0",
"git-rev-sync": "2.0.0",
"googleapis": "54.1.0",
- "got": "11.5.0",
+ "got": "11.5.1",
"he": "1.2.0",
"hooman": "1.2.5",
"https-proxy-agent": "5.0.0",
diff --git a/yarn.lock b/yarn.lock
index 9e6720da3dd958..52fcf183807ecf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5792,10 +5792,10 @@ [email protected]:
google-auth-library "^6.0.0"
googleapis-common "^4.4.0"
[email protected]:
- version "11.5.0"
- resolved "https://registry.yarnpkg.com/got/-/got-11.5.0.tgz#55dd61050f666679f46c49c877e1b2e064a7a523"
- integrity sha512-vOZEcEaK0b6x11uniY0HcblZObKPRO75Jvz53VKuqGSaKCM/zEt0sj2LGYVdqDYJzO3wYdG+FPQQ1hsgoXy7vQ==
[email protected]:
+ version "11.5.1"
+ resolved "https://registry.yarnpkg.com/got/-/got-11.5.1.tgz#bf098a270fe80b3fb88ffd5a043a59ebb0a391db"
+ integrity sha512-reQEZcEBMTGnujmQ+Wm97mJs/OK6INtO6HmLI+xt3+9CvnRwWjXutUvb2mqr+Ao4Lu05Rx6+udx9sOQAmExMxA==
dependencies:
"@sindresorhus/is" "^3.0.0"
"@szmarczak/http-timer" "^4.0.5"
@@ -5804,7 +5804,7 @@ [email protected]:
cacheable-lookup "^5.0.3"
cacheable-request "^7.0.1"
decompress-response "^6.0.0"
- http2-wrapper "^1.0.0-beta.4.8"
+ http2-wrapper "^1.0.0-beta.5.0"
lowercase-keys "^2.0.0"
p-cancelable "^2.0.0"
responselike "^2.0.0"
@@ -6200,10 +6200,10 @@ http-signature@~1.2.0:
jsprim "^1.2.2"
sshpk "^1.7.0"
-http2-wrapper@^1.0.0-beta.4.8:
- version "1.0.0-beta.4.8"
- resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.0-beta.4.8.tgz#d3285f7421d7795f9dbcd4b57d92a2f73c0d958d"
- integrity sha512-3XyRMia2QMy59nbxvXNX+57opqcy7/GlkJEaB7uRNw+TZw6mOiK3936IO83mVy7mzCttE66Cy9QEZ/xPXYmoCQ==
+http2-wrapper@^1.0.0-beta.5.0:
+ version "1.0.0-beta.5.2"
+ resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.0-beta.5.2.tgz#8b923deb90144aea65cf834b016a340fc98556f3"
+ integrity sha512-xYz9goEyBnC8XwXDTuC/MZ6t+MrKVQZOk4s7+PaDkwIsQd8IwqvM+0M6bA/2lvG8GHXcPdf+MejTUeO2LCPCeQ==
dependencies:
quick-lru "^5.1.1"
resolve-alpn "^1.0.0"
|
c1fbc64255841815f56f578731e984e78ef71276
|
2022-05-04 03:38:10
|
Rongrong
|
chore(*): detailed info for PR route test (#9689)
| false
|
detailed info for PR route test (#9689)
|
chore
|
diff --git a/.github/workflows/pr-deploy-route-test.yml b/.github/workflows/pr-deploy-route-test.yml
index ffe99c9060fd74..3517a5dd0f00b1 100644
--- a/.github/workflows/pr-deploy-route-test.yml
+++ b/.github/workflows/pr-deploy-route-test.yml
@@ -58,7 +58,7 @@ jobs:
run: |
set -ex
gzip -cvd docker-image/rsshub.tar.gz | docker load
- docker run -d -p 1200:1200 rsshub:latest
+ docker run -d --name rsshub -e NODE_ENV=dev -p 1200:1200 rsshub:latest
- uses: actions/setup-node@v3 # just need its cache
if: (env.TEST_CONTINUE)
@@ -88,3 +88,7 @@ jobs:
const got = require("got");
const script = require(`${process.env.GITHUB_WORKSPACE}/scripts/workflow/test-route/test.js`)
return await script({ github, context, core, got }, link, routes, number)
+
+ - name: Print Docker container logs
+ if: (env.TEST_CONTINUE)
+ run: docker logs rsshub # logs/combined.log? Not so readable...
diff --git a/scripts/workflow/test-route/test.js b/scripts/workflow/test-route/test.js
index dde6b82eb21cbb..3e28c9f04b1465 100644
--- a/scripts/workflow/test-route/test.js
+++ b/scripts/workflow/test-route/test.js
@@ -10,18 +10,27 @@ module.exports = async ({ github, context, core, got }, baseUrl, routes, number)
return `${baseUrl}${l}`;
});
- let com = 'Successfully generated as following:\n\n';
+ let com = `Successfully [generated](https://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}) as following:\n\n`;
for (const lks of links) {
core.info(`testing route: ${lks}`);
// Intended, one at a time
const res = await got(lks).catch((err) => {
+ let errMsg = err.toString();
+ const errInfoList = err.response && err.response.body && err.response.body.match(/(?<=<pre class="message">)(.+?)(?=<\/pre>)/gs);
+ if (errInfoList) {
+ errMsg += '\n\n';
+ errMsg += errInfoList
+ .slice(0, 3)
+ .map((e) => e.trim())
+ .join('\n');
+ }
com += `
<details>
<summary><a href="${lks}">${lks}</a> - <b>Failed</b></summary>
\`\`\`
-${err}
+${errMsg}
\`\`\`
</details>
|
9531b268c9cf9272ed0b585f47ea06e7e726e2b2
|
2019-10-02 08:42:56
|
dependabot-preview[bot]
|
chore(deps-dev): bump cross-env from 6.0.0 to 6.0.2
| false
|
bump cross-env from 6.0.0 to 6.0.2
|
chore
|
diff --git a/package.json b/package.json
index 10a69000e71a9b..ea0373edcf4350 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
"@vuepress/plugin-back-to-top": "1.1.0",
"@vuepress/plugin-google-analytics": "1.1.0",
"@vuepress/plugin-pwa": "1.1.0",
- "cross-env": "6.0.0",
+ "cross-env": "6.0.2",
"eslint": "6.5.1",
"eslint-config-prettier": "6.3.0",
"eslint-plugin-prettier": "3.1.1",
diff --git a/yarn.lock b/yarn.lock
index ff078b84d69f4a..49c4f3ccae1c0c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -627,10 +627,10 @@
core-js "^2.6.5"
regenerator-runtime "^0.13.2"
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.3.4":
- version "7.4.5"
- resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.5.tgz#582bb531f5f9dc67d2fcb682979894f75e253f12"
- integrity sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.3.4", "@babel/runtime@^7.6.2":
+ version "7.6.2"
+ resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.2.tgz#c3d6e41b304ef10dcf13777a33e7694ec4a9a6dd"
+ integrity sha512-EXxN64agfUqqIGeEjI5dL5z0Sw0ZwWo1mLTi4mQowCZ42O59b7DRpZAnTC6OqdF28wMBMFKNb/4uFGrVaigSpg==
dependencies:
regenerator-runtime "^0.13.2"
@@ -3119,11 +3119,12 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
safe-buffer "^5.0.1"
sha.js "^2.4.8"
[email protected]:
- version "6.0.0"
- resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-6.0.0.tgz#3c8e71440ea20aa6faaf5aec541235efc565dac6"
- integrity sha512-G/B6gtkjgthT8AP/xN1wdj5Xe18fVyk58JepK8GxpUbqcz3hyWxegocMbvnZK+KoTslwd0ACZ3woi/DVUdVjyQ==
[email protected]:
+ version "6.0.2"
+ resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-6.0.2.tgz#2ec3c4b9b90cc074fed375415fc229cb7d6ce612"
+ integrity sha512-lA44HlqWCzrv7/l2pY3sfLDvMhXXhx8oztvD6rg34PdCIcP0yk77UwOL2nacsZXlrzPUMtbfagVbK6Itx8pwng==
dependencies:
+ "@babel/runtime" "^7.6.2"
cross-spawn "^7.0.0"
cross-spawn@^5.0.1:
|
39af963b3c3fa3ec63f0a10903ec86b1ebb3a530
|
2024-05-24 10:59:49
|
dependabot[bot]
|
chore(deps): bump @sentry/node from 7.114.0 to 8.3.0 (#15675)
| false
|
bump @sentry/node from 7.114.0 to 8.3.0 (#15675)
|
chore
|
diff --git a/lib/errors/index.tsx b/lib/errors/index.tsx
index 56ba079e455fc3..dd996a7f4fdce8 100644
--- a/lib/errors/index.tsx
+++ b/lib/errors/index.tsx
@@ -1,7 +1,7 @@
import { type NotFoundHandler, type ErrorHandler } from 'hono';
import { getDebugInfo, setDebugInfo } from '@/utils/debug-info';
import { config } from '@/config';
-import Sentry from '@sentry/node';
+import * as Sentry from '@sentry/node';
import logger from '@/utils/logger';
import Error from '@/views/error';
diff --git a/package.json b/package.json
index a5748f85055cba..3325b591d82ae9 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
"@hono/zod-openapi": "0.13.0",
"@notionhq/client": "2.2.15",
"@postlight/parser": "2.2.3",
- "@sentry/node": "7.114.0",
+ "@sentry/node": "8.3.0",
"@tonyrl/rand-user-agent": "2.0.64",
"aes-js": "3.1.2",
"art-template": "4.13.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 09fd0a840dc9b1..361c875186a32b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -24,8 +24,8 @@ importers:
specifier: 2.2.3
version: 2.2.3
'@sentry/node':
- specifier: 7.114.0
- version: 7.114.0
+ specifier: 8.3.0
+ version: 8.3.0
'@tonyrl/rand-user-agent':
specifier: 2.0.64
version: 2.0.64
@@ -1321,6 +1321,154 @@ packages:
'@open-draft/[email protected]':
resolution: {integrity: sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==}
+ '@opentelemetry/[email protected]':
+ resolution: {integrity: sha512-E3skn949Pk1z2XtXu/lxf6QAZpawuTM/IUEXcAzpiUkTd73Hmvw26FiN3cJuTmkpM5hZzHwkomVdtrh/n/zzwA==}
+ engines: {node: '>=14'}
+
+ '@opentelemetry/[email protected]':
+ resolution: {integrity: sha512-I/s6F7yKUDdtMsoBWXJe8Qz40Tui5vsuKCWJEWVL+5q9sSWRzzx6v2KeNsOBEwd94j0eWkpWCH4yB6rZg9Mf0w==}
+ engines: {node: '>=8.0.0'}
+
+ '@opentelemetry/[email protected]':
+ resolution: {integrity: sha512-R5r6DO4kgEOVBxFXhXjwospLQkv+sYxwCfjvoZBe7Zm6KKXAV9kDSJhi/D1BweowdZmO+sdbENLs374gER8hpQ==}
+ engines: {node: '>=14'}
+ peerDependencies:
+ '@opentelemetry/api': '>=1.0.0 <1.9.0'
+
+ '@opentelemetry/[email protected]':
+ resolution: {integrity: sha512-wMSGfsdmibI88K9wB498zXY04yThPexo8jvwNNlm542HZB7XrrMRBbAyKJqG8qDRJwIBdBrPMi4V9ZPW/sqrcg==}
+ engines: {node: '>=14'}
+ peerDependencies:
+ '@opentelemetry/api': '>=1.0.0 <1.9.0'
+
+ '@opentelemetry/[email protected]':
+ resolution: {integrity: sha512-k9++bmJZ9zDEs3u3DnKTn2l7QTiNFg3gPx7G9rW0TPnP+xZoBSBTrEcGYBaqflQlrFG23Q58+X1sM2ayWPv5Fg==}
+ engines: {node: '>=14'}
+ peerDependencies:
+ '@opentelemetry/api': ^1.3.0
+
+ '@opentelemetry/[email protected]':
+ resolution: {integrity: sha512-AG8U7z7D0JcBu/7dDcwb47UMEzj9/FMiJV2iQZqrsZnxR3FjB9J9oIH2iszJYci2eUdp2WbdvtpD9RV/zmME5A==}
+ engines: {node: '>=14'}
+ peerDependencies:
+ '@opentelemetry/api': ^1.3.0
+
+ '@opentelemetry/[email protected]':
+ resolution: {integrity: sha512-3Nfm43PI0I+3EX+1YbSy6xbDu276R1Dh1tqAk68yd4yirnIh52Kd5B+nJ8CgHA7o3UKakpBjj6vSzi5vNCzJIA==}
+ engines: {node: '>=14'}
+ peerDependencies:
+ '@opentelemetry/api': ^1.3.0
+
+ '@opentelemetry/[email protected]':
+ resolution: {integrity: sha512-LVRdEHWACWOczv2imD+mhUrLMxsEjPPi32vIZJT57zygR5aUiA4em8X3aiGOCycgbMWkIu8xOSGSxdx3JmzN+w==}
+ engines: {node: '>=14'}
+ peerDependencies:
+ '@opentelemetry/api': ^1.3.0
+
+ '@opentelemetry/[email protected]':
+ resolution: {integrity: sha512-ZcOqEuwuutTDYIjhDIStix22ECblG/i9pHje23QGs4Q4YS4RMaZ5hKCoQJxW88Z4K7T53rQkdISmoXFKDV8xMg==}
+ engines: {node: '>=14'}
+ peerDependencies:
+ '@opentelemetry/api': ^1.3.0
+
+ '@opentelemetry/[email protected]':
+ resolution: {integrity: sha512-6b3nZnFFEz/3xZ6w8bVxctPUWIPWiXuPQ725530JgxnN1cvYFd8CJ75PrHZNjynmzSSnqBkN3ef4R9N+RpMh8Q==}
+ engines: {node: '>=14'}
+ peerDependencies:
+ '@opentelemetry/api': ^1.3.0
+
+ '@opentelemetry/[email protected]':
+ resolution: {integrity: sha512-Jv/fH7KhpWe4KBirsiqeUJIYrsdR2iu2l4nWhfOlRvaZ+zYIiLEzTQR6QhBbyRoAbU4OuYJzjWusOmmpGBnwng==}
+ engines: {node: '>=14'}
+ peerDependencies:
+ '@opentelemetry/api': ^1.3.0
+
+ '@opentelemetry/[email protected]':
+ resolution: {integrity: sha512-dJc3H/bKMcgUYcQpLF+1IbmUKus0e5Fnn/+ru/3voIRHwMADT3rFSUcGLWSczkg68BCgz0vFWGDTvPtcWIFr7A==}
+ engines: {node: '>=14'}
+ peerDependencies:
+ '@opentelemetry/api': ^1.3.0
+
+ '@opentelemetry/[email protected]':
+ resolution: {integrity: sha512-bMKej7Y76QVUD3l55Q9YqizXybHUzF3pujsBFjqbZrRn2WYqtsDtTUlbCK7fvXNPwFInqZ2KhnTqd0gwo8MzaQ==}
+ engines: {node: '>=14'}
+ peerDependencies:
+ '@opentelemetry/api': ^1.3.0
+
+ '@opentelemetry/[email protected]':
+ resolution: {integrity: sha512-zaeiasdnRjXe6VhYCBMdkmAVh1S5MmXC/0spet+yqoaViGnYst/DOxPvhwg3yT4Yag5crZNWsVXnA538UjP6Ow==}
+ engines: {node: '>=14'}
+ peerDependencies:
+ '@opentelemetry/api': ^1.3.0
+
+ '@opentelemetry/[email protected]':
+ resolution: {integrity: sha512-qkpHMgWSDTYVB1vlZ9sspf7l2wdS5DDq/rbIepDwX5BA0N0068JTQqh0CgAh34tdFqSCnWXIhcyOXC2TtRb0sg==}
+ engines: {node: '>=14'}
+ peerDependencies:
+ '@opentelemetry/api': ^1.3.0
+
+ '@opentelemetry/[email protected]':
+ resolution: {integrity: sha512-+iBAawUaTfX/HAlvySwozx0C2B6LBfNPXX1W8Z2On1Uva33AGkw2UjL9XgIg1Pj4eLZ9R4EoJ/aFz+Xj4E/7Fw==}
+ engines: {node: '>=14'}
+ peerDependencies:
+ '@opentelemetry/api': ^1.3.0
+
+ '@opentelemetry/[email protected]':
+ resolution: {integrity: sha512-ebYQjHZEmGHWEALwwDGhSQVLBaurFnuLIkZD5igPXrt7ohfF4lc5/4al1LO+vKc0NHk8SJWStuRueT86ISA8Vg==}
+ engines: {node: '>=14'}
+ peerDependencies:
+ '@opentelemetry/api': ^1.3.0
+
+ '@opentelemetry/[email protected]':
+ resolution: {integrity: sha512-BSlhpivzBD77meQNZY9fS4aKgydA8AJBzv2dqvxXFy/Hq64b7HURgw/ztbmwFeYwdF5raZZUifiiNSMLpOJoSA==}
+ engines: {node: '>=14'}
+ peerDependencies:
+ '@opentelemetry/api': ^1.3.0
+
+ '@opentelemetry/[email protected]':
+ resolution: {integrity: sha512-S1uHE+sxaepgp+t8lvIDuRgyjJWisAb733198kwQTUc9ZtYQ2V2gmyCtR1x21ePGVLoMiX/NWY7WA290hwkjJQ==}
+ engines: {node: '>=14'}
+ peerDependencies:
+ '@opentelemetry/api': ^1.3.0
+
+ '@opentelemetry/[email protected]':
+ resolution: {integrity: sha512-JIrvhpgqY6437QIqToyozrUG1h5UhwHkaGK/WAX+fkrpyPtc+RO5FkRtUd9BH0MibabHHvqsnBGKfKVijbmp8w==}
+ engines: {node: '>=14'}
+ peerDependencies:
+ '@opentelemetry/api': ^1.3.0
+
+ '@opentelemetry/[email protected]':
+ resolution: {integrity: sha512-faYX1N0gpLhej/6nyp6bgRjzAKXn5GOEMYY7YhciSfCoITAktLUtQ36d24QEWNA1/WA1y6qQunCe0OhHRkVl9g==}
+ engines: {node: '>=14'}
+
+ '@opentelemetry/[email protected]':
+ resolution: {integrity: sha512-cyv0MwAaPF7O86x5hk3NNgenMObeejZFLJJDVuSeSMIsknlsj3oOZzRv3qSzlwYomXsICfBeFFlxwHQte5mGXQ==}
+ engines: {node: '>=14'}
+ peerDependencies:
+ '@opentelemetry/api': '>=1.0.0 <1.9.0'
+
+ '@opentelemetry/[email protected]':
+ resolution: {integrity: sha512-FrAqCbbGao9iKI+Mgh+OsC9+U2YMoXnlDHe06yH7dvavCKzE3S892dGtX54+WhSFVxHR/TMRVJiK/CV93GR0TQ==}
+ engines: {node: '>=14'}
+ peerDependencies:
+ '@opentelemetry/api': '>=1.3.0 <1.9.0'
+
+ '@opentelemetry/[email protected]':
+ resolution: {integrity: sha512-zz+N423IcySgjihl2NfjBf0qw1RWe11XIAWVrTNOSSI6dtSPJiVom2zipFB2AEEtJWpv0Iz6DY6+TjnyTV5pWg==}
+ engines: {node: '>=14'}
+ peerDependencies:
+ '@opentelemetry/api': '>=1.0.0 <1.9.0'
+
+ '@opentelemetry/[email protected]':
+ resolution: {integrity: sha512-VkliWlS4/+GHLLW7J/rVBA00uXus1SWvwFvcUDxDwmFxYfg/2VI6ekwdXS28cjI8Qz2ky2BzG8OUHo+WeYIWqw==}
+ engines: {node: '>=14'}
+
+ '@opentelemetry/[email protected]':
+ resolution: {integrity: sha512-nSDlnHSqzC3pXn/wZEZVLuAuJ1MYMXPBwtv2qAbCa3847SaHItdE7SzUq/Jtb0KZmh1zfAbNi3AAMjztTT4Ugg==}
+ engines: {node: '>=14'}
+ peerDependencies:
+ '@opentelemetry/api': ^1.1.0
+
'@otplib/[email protected]':
resolution: {integrity: sha512-4sGntwbA/AC+SbPhbsziRiD+jNDdIzsZ3JUyfZwjtKyc/wufl1pnSIaG4Uqx8ymPagujub0o92kgBnB89cuAMA==}
@@ -1368,6 +1516,9 @@ packages:
'@postman/[email protected]':
resolution: {integrity: sha512-k57fzmAZ2PJGxfOA4SGR05ejorHbVAa/84Hxh/2nAztjNXc4ZjOm9NUIk6/Z6LCrBvJZqjRZbN8e/nROVUPVdg==}
+ '@prisma/[email protected]':
+ resolution: {integrity: sha512-DeybWvIZzu/mUsOYP9MVd6AyBj+MP7xIMrcuIn25MX8FiQX39QBnET5KhszTAip/ToctUuDwSJ46QkIoyo3RFA==}
+
'@puppeteer/[email protected]':
resolution: {integrity: sha512-MC7LxpcBtdfTbzwARXIkqGZ1Osn3nnZJlm+i0+VqHl72t//Xwl9wICrXT8BwtgC6s1xJNHsxOpvzISUqe92+sw==}
engines: {node: '>=18'}
@@ -1463,29 +1614,31 @@ packages:
'@selderee/[email protected]':
resolution: {integrity: sha512-P33hHGdldxGabLFjPPpaTxVolMrzrcegejx+0GxjrIb9Zv48D8yAIA/QTDR2dFl7Uz7urX8aX6+5bCZslr+gWQ==}
- '@sentry-internal/[email protected]':
- resolution: {integrity: sha512-dOuvfJN7G+3YqLlUY4HIjyWHaRP8vbOgF+OsE5w2l7ZEn1rMAaUbPntAR8AF9GBA6j2zWNoSo8e7GjbJxVofSg==}
- engines: {node: '>=8'}
+ '@sentry/[email protected]':
+ resolution: {integrity: sha512-X7r0WujE7DILtgA5zt4hmHMBTF3xbjJB7Dgrw1Hv5C7WG5qkNqhDPpnRX7WswtHcLSgVPY2GRTQ5Iid7i33zEQ==}
+ engines: {node: '>=14.18'}
- '@sentry/[email protected]':
- resolution: {integrity: sha512-YnanVlmulkjgZiVZ9BfY9k6I082n+C+LbZo52MTvx3FY6RE5iyiPMpaOh67oXEZRWcYQEGm+bKruRxLVP6RlbA==}
- engines: {node: '>=8'}
+ '@sentry/[email protected]':
+ resolution: {integrity: sha512-7uAQoO/xUoKuWdjbI44IeNOrEPgRtwyn/RI5apN/JsrCoQUA1Z7wxtIwHRyrIt9jfguHUq9iKRM03S6iVayqkg==}
+ engines: {node: '>=14.18'}
- '@sentry/[email protected]':
- resolution: {integrity: sha512-BJIBWXGKeIH0ifd7goxOS29fBA8BkEgVVCahs6xIOXBjX1IRS6PmX0zYx/GP23nQTfhJiubv2XPzoYOlZZmDxg==}
- engines: {node: '>=8'}
+ '@sentry/[email protected]':
+ resolution: {integrity: sha512-VyvLM5JQryCjRtu5NENuGui9VXMY5ZZ948oY8dEUEfvX8SeOq0XhBp440XTgu2Nku62IwnwAp/m4auhiZ2rR/w==}
+ engines: {node: '>=14.18'}
+ peerDependencies:
+ '@opentelemetry/api': ^1.8.0
+ '@opentelemetry/core': ^1.24.1
+ '@opentelemetry/instrumentation': ^0.51.1
+ '@opentelemetry/sdk-trace-base': ^1.23.0
+ '@opentelemetry/semantic-conventions': ^1.23.0
- '@sentry/[email protected]':
- resolution: {integrity: sha512-cqvi+OHV1Hj64mIGHoZtLgwrh1BG6ntcRjDLlVNMqml5rdTRD3TvG21579FtlqHlwZpbpF7K5xkwl8e5KL2hGw==}
- engines: {node: '>=8'}
+ '@sentry/[email protected]':
+ resolution: {integrity: sha512-DbwRTdx5xn8c2EhElD1UneDbcfqz220INPJYiATGJ9pR+cV5kGohyxI6lJxebPdPhPLEFQqYdLXGA6Cjm/uC6A==}
+ engines: {node: '>=14.18'}
- '@sentry/[email protected]':
- resolution: {integrity: sha512-tsqkkyL3eJtptmPtT0m9W/bPLkU7ILY7nvwpi1hahA5jrM7ppoU0IMaQWAgTD+U3rzFH40IdXNBFb8Gnqcva4w==}
- engines: {node: '>=8'}
-
- '@sentry/[email protected]':
- resolution: {integrity: sha512-319N90McVpupQ6vws4+tfCy/03AdtsU0MurIE4+W5cubHME08HtiEWlfacvAxX+yuKFhvdsO4K4BB/dj54ideg==}
- engines: {node: '>=8'}
+ '@sentry/[email protected]':
+ resolution: {integrity: sha512-WFaUZy0OWsF6Mrjenxj4N8zGzA6+pdH2lCV60/IB+V5PvGPgl40MUyjN6aLA/E9BRpqwLNQRMroZjln+J/3aiA==}
+ engines: {node: '>=14.18'}
'@sinclair/[email protected]':
resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==}
@@ -1538,6 +1691,9 @@ packages:
'@tootallnate/[email protected]':
resolution: {integrity: sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==}
+ '@types/[email protected]':
+ resolution: {integrity: sha512-Pay9fq2lM2wXPWbteBsRAGiWH2hig4ZE2asK+mm7kUzlxRTfL961rj89I6zV/E3PcIkDqyuBEcMxFT7rccugeQ==}
+
'@types/[email protected]':
resolution: {integrity: sha512-v3D66IptpUqh+pHKVNRxY8yvp2ESSZXe0rTzsGdzUhEwag7ljVfgCllkWv2YgiYXDhWFBrEywll4A5JToyTNFA==}
@@ -1547,18 +1703,33 @@ packages:
'@types/[email protected]':
resolution: {integrity: sha512-Jhy+MWRlro6UjVi578V/4ZGNfeCOcNCp0YaFNIUGFKlImowqwb1O/22wDVk3FDGMLqxdpOV3qQHD5fPEH4hK6A==}
+ '@types/[email protected]':
+ resolution: {integrity: sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==}
+
'@types/[email protected]':
resolution: {integrity: sha512-hWtVTC2q7hc7xZ/RLbxapMvDMgUnDvKvMOpKal4DrMyfGBUfB1oKaZlIRr6mJL+If3bAP6sV/QneGzF6tJjZDg==}
'@types/[email protected]':
resolution: {integrity: sha512-V+pm3stv1Mvz8fSKJJod6CglNGVqEQ6OyuqitoDkWywEODM/eJd1eSuIp9xt6DrX8BWZ2eDSIzbw1tPCUTvGbQ==}
+ '@types/[email protected]':
+ resolution: {integrity: sha512-P63Zd/JUGq+PdrM1lv0Wv5SBYeA2+CORvbrXbngriYY0jzLUWfQMQQxOhjONEz/wlHOAxOdY7CY65rgQdTjq2w==}
+
+ '@types/[email protected]':
+ resolution: {integrity: sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==}
+
+ '@types/[email protected]':
+ resolution: {integrity: sha512-QVSSvno3dE0MgO76pJhmv4Qyi/j0Yk9pBp0Y7TJ2Tlj+KCgJWY6qX7nnxCOLkZ3VYRSIk1WTxCvwUSdx6CCLdg==}
+
'@types/[email protected]':
resolution: {integrity: sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==}
'@types/[email protected]':
resolution: {integrity: sha512-he+DHOWReW0nghN24E1WUqM0efK4kI9oTqDm6XmK8ZPe2djZ90BSNdGnIyCLzCPw7/pogPlGbzI2wHGGmi4O/Q==}
+ '@types/[email protected]':
+ resolution: {integrity: sha512-40Zk8qR147RABiQ7NQnBzWzDcjKzNrntB5BAmeGCb2p/MIyOE+4BVvc17wumsUqUw00bJYqoXFHYygQnEFh4/Q==}
+
'@types/[email protected]':
resolution: {integrity: sha512-sDOLlVbHhXpAUAL0YHDUUwDZf3iN4Bwi4W6a0W0b+QcAezUbRtH4FVb+9J4h+XFPW7l/gQ9F8qC7P+Ec4k8QVQ==}
@@ -1577,15 +1748,27 @@ packages:
'@types/[email protected]':
resolution: {integrity: sha512-QYHv9Yeh1ZYSMPQOoxY4XC4F1r+xRUiAriB303F4G6uBsT3KKX60DjiogvVv+2VISVDuJhcIzMdbjT+Bm938QQ==}
+ '@types/[email protected]':
+ resolution: {integrity: sha512-ej0phymbFLoCB26dbbq5PGScsf2JAJ4IJHjG10LalgUV36XKTmA4GdA+PVllKvRk0sEKt64X8975qFnkSi0hqA==}
+
+ '@types/[email protected]':
+ resolution: {integrity: sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==}
+
'@types/[email protected]':
resolution: {integrity: sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ==}
'@types/[email protected]':
resolution: {integrity: sha512-pUY3cKH/Nm2yYrEmDlPR1mR7yszjGx4DrwPjQ702C4/D5CwHuZTgZdIdwPkRbcuhs7BAh2L5rg3CL5cbRiGTCQ==}
+ '@types/[email protected]':
+ resolution: {integrity: sha512-4+tE/lwdAahgZT1g30Jkdm9PzFRde0xwxBNUyRsCitRvCQB90iuA2uJYdUnhnANRcqGXaWOGY4FEoxeElNAK2g==}
+
'@types/[email protected]':
resolution: {integrity: sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==}
+ '@types/[email protected]':
+ resolution: {integrity: sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==}
+
'@types/[email protected]':
resolution: {integrity: sha512-BoWZUoMktji2YJmkRY8z0KsjvyDNpBzeC/rLVMFKcHkPxaKp+SHBFfx/kj7ltKh3l010Lc9RZqnJs8KUMNhf6Q==}
@@ -1607,6 +1790,18 @@ packages:
'@types/[email protected]':
resolution: {integrity: sha512-vvVHLrXxoUZgBWTcJnTMSC4FAQcG2loK7N1Uy20I3nr/aUhetbGdfuwSzXkrMoll2RoYKW0IcMIN0I0bwMwVMQ==}
+ '@types/[email protected]':
+ resolution: {integrity: sha512-lZuNAY9xeJt7Bx4t4dx0rYCDqGPW8RXhQZK1td7d4H6E9zYbLoOtjBvfwdTKpsyxQI/2jv+armjX/RW+ZNpXOQ==}
+
+ '@types/[email protected]':
+ resolution: {integrity: sha512-4Olc63RY+MKvxMwVknCUDhRQX1pFQoBZ/lXcRLP69PQkEpze/0cr8LNqJQe5NFb/b19DWi2a5bTi2VAlQzhJuA==}
+
+ '@types/[email protected]':
+ resolution: {integrity: sha512-DTDUyznHGNHAl+wd1n0z1jxNajduyTh8R53xoewuerdBzGo6Ogj6F2299BFtrexJw4NtgjsI5SMPCmV9gZwGXA==}
+
+ '@types/[email protected]':
+ resolution: {integrity: sha512-5YUJVv6NwM1z7m6FuYpKfNLTZ932Z6EF6xy2BbtpJSyn13DKNQEkXVffFVSnJHxvwwWh2SAeumpjAYUELqgjyw==}
+
'@types/[email protected]':
resolution: {integrity: sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==}
@@ -1628,6 +1823,9 @@ packages:
'@types/[email protected]':
resolution: {integrity: sha512-ymXWVrDiCxTBE3+RIrrP533E70eA+9qu7zdWoHuOmGujkYtzf4HQF96b8nwHLqhuf4ykX61IGRIB38CC6/sImQ==}
+ '@types/[email protected]':
+ resolution: {integrity: sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==}
+
'@types/[email protected]':
resolution: {integrity: sha512-5+G/QXO/DvHZw60FjvbDzO4JmlD/nG5m2/vVGt25VN1eeP3w2bCoks1Wa7VuptMPM1TxJdx6RjO70N9Fw0nZPA==}
@@ -1637,6 +1835,9 @@ packages:
'@types/[email protected]':
resolution: {integrity: sha512-CPM9nzrCPPJHQNA9keH9CVkVI+WR5kMa+7XEs5jcGQ0VoAGnLv242w8lIVgwAEfmE4oufJRaTc9PNLQl0ioAow==}
+ '@types/[email protected]':
+ resolution: {integrity: sha512-wK1pzsJVVAjYCSZWQoWHziQZbNggXFDUEIGf54g4ZM/ERuP86uGdWeKZWMYlqTPMZfHJJvLPyogXGvCOg87yLQ==}
+
'@types/[email protected]':
resolution: {integrity: sha512-24xFj9R5+rfQJLRyM56qh+wnVSYhyXC2tkoBndtY0U+vubqNsYXGjufB2nn8Q6gt0LrARwL6UBtMCSVCwl4B1g==}
@@ -1646,6 +1847,18 @@ packages:
'@types/[email protected]':
resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==}
+ '@types/[email protected]':
+ resolution: {integrity: sha512-qZAvkv1K3QbmHHFYSNRYPkRjOWRLBYrL4B9c+wG0GSVGBw0NtJwPcgx/DSddeDJvRGMHCEQ4VMEVfuJ/0gZ3XQ==}
+
+ '@types/[email protected]':
+ resolution: {integrity: sha512-1Kc4oAGzAl7uqUStZCDvaLFqZrW9qWSjXOmBfdgyBP5La7Us6Mg4GBvRlSoaZMhQF/zSj1C8CtKMBkoiT8eL8w==}
+
+ '@types/[email protected]':
+ resolution: {integrity: sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg==}
+
+ '@types/[email protected]':
+ resolution: {integrity: sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==}
+
'@types/[email protected]':
resolution: {integrity: sha512-qVcP9Fuzh9oaAh8oPxiSoWMFGnWKkJDknnij66vi09Yiy62bsSDqtd+fG5kIM9wLLgZsRP3Y6acqj9O/v2ZtRw==}
@@ -1655,6 +1868,15 @@ packages:
'@types/[email protected]':
resolution: {integrity: sha512-7oxPGNQHXLHE48r/r/qjn7q0hlrs3kL7oZnGj0Wf/h9tj/6ibFyRkNbsDxaBBZ4XUZ0Dx5LGCyDJ04ytSofacQ==}
+ '@types/[email protected]':
+ resolution: {integrity: sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==}
+
+ '@types/[email protected]':
+ resolution: {integrity: sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==}
+
+ '@types/[email protected]':
+ resolution: {integrity: sha512-9Hp0ObzwwO57DpLFF0InUjUm/II8GmKAvzbefxQTihCb7KI6yc9yzf0nLc4mVdby5N4DRCgQM2wCup9KTieeww==}
+
'@types/[email protected]':
resolution: {integrity: sha512-jmIUGWrAiwu3dZpxntxieC+1n/5c3mjrImkmOSQ2NC5uP6cYO4aAZDdSmRcI5C1oiTmqlZGHC+/NmJrKogbP5A==}
@@ -1785,6 +2007,11 @@ packages:
resolution: {integrity: sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==}
engines: {node: '>=6.5'}
+ [email protected]:
+ resolution: {integrity: sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==}
+ peerDependencies:
+ acorn: ^8
+
[email protected]:
resolution: {integrity: sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==}
peerDependencies:
@@ -2159,6 +2386,9 @@ packages:
[email protected]:
resolution: {integrity: sha512-hruuB611QFoUFMsan7xd9B2VPMrA8XC716O/999WW34kmaJUT1hxKF2W8TSXAWkhSqgvbu70DjcDv7/wpM6vow==}
+ [email protected]:
+ resolution: {integrity: sha512-a3KdPAANPbNE4ZUv9h6LckSl9zLsYOP4MBmhIPkRaeyybt+r4UghLvq+xw/YwUcC1gqylCkL4rdVs3Lwupjm4Q==}
+
[email protected]:
resolution: {integrity: sha512-cKFwohpJbuMovS8xVLmn8N2AUbAuc8pVo4zEfsUVo8qgECOogns1WVk/FkOZoxhOPTyTYFckuoH+13FO+MQ8GA==}
@@ -3249,13 +3479,16 @@ packages:
[email protected]:
resolution: {integrity: sha512-pfx45n2gEIC9MeXAadcfehu5MboUzXqgQiZviKbnIxI6a/QkonOSAMXvBBkWbXQ5FXc9M5IpziJs6TP7jikBrg==}
- [email protected]:
- resolution: {integrity: sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==}
-
[email protected]:
resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==}
engines: {node: '>=6'}
+ [email protected]:
+ resolution: {integrity: sha512-9WOz1Yh/cvO/p69sxRmhyQwrIGGSp7EIdcb+fFNVi7CzQGQB8U1/1XrKVSbEd/GNOAeM0peJtmi7+qphe7NvAw==}
+
+ [email protected]:
+ resolution: {integrity: sha512-Lk+qzWmiQuRPPulGQeK5qq0v32k2bHnWrRPFgqyvhw7Kkov5L6MOLOIU3pcWeujc9W4q54Cp3Q2WV16eQkc7Bg==}
+
[email protected]:
resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
engines: {node: '>=0.8.19'}
@@ -3582,9 +3815,6 @@ packages:
[email protected]:
resolution: {integrity: sha512-O6O6/fsG5jiUVbvdgT7YX3xY3uIadR6wEZ7+vy9u7PKHAlSEB6blvC1o5pHBjgsi95Uo0aiBBdkyFecj6jtb7A==}
- [email protected]:
- resolution: {integrity: sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==}
-
[email protected]:
resolution: {integrity: sha512-O18pf7nyvHTckunPWCV1XUNXU1piu01y2b7ATJ0ppkUkk8ocqVWBrYjJBCwHDjD/ZWcfyrA0P4gKhzWGi5EINQ==}
engines: {node: '>=14'}
@@ -3608,9 +3838,6 @@ packages:
resolution: {integrity: sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==}
engines: {node: '>=14'}
- [email protected]:
- resolution: {integrity: sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==}
-
[email protected]:
resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==}
engines: {node: '>=8'}
@@ -3930,6 +4157,9 @@ packages:
[email protected]:
resolution: {integrity: sha512-23g5BFj4zdQL/b6tor7Ji+QY4pEfNH784BMslY9Qb0UnJWRAt+lQGLYmRaM0KDBwIG23ffEBELhZDP2rhi9f/Q==}
+ [email protected]:
+ resolution: {integrity: sha512-ySViT69/76t8VhE1xXHK6Ch4NcDd26gx0MzKXLO+F7NOtnqH68d9zF94nT8ZWSxXh8ELOERsnJO/sWt1xZYw5A==}
+
[email protected]:
resolution: {integrity: sha512-dVgXe6b6DLnv4CHG7a1zUe5mSXaIZ3c6lSHm/EKeVeQI2/4pwe0VRde8OyoCE1Ro2lKT5P6uT9JElF7KDLV+jw==}
@@ -4086,6 +4316,10 @@ packages:
[email protected]:
resolution: {integrity: sha512-ha/kTOLhMQL7MvS9Abu/cpCXx5qwHQ++88YkUzn1CGfmM8JvCOG/4ZE6tRsexgXRFaoJrcwLyf81H2Y/CXALtA==}
+ [email protected]:
+ resolution: {integrity: sha512-aiSt/4ubOTyb1N5C2ZbGrBvaJOXIZhZvpRPYuUVxQJe27wJZqf/o65iPrqgLcgfeOLaQ8cS2Q+762jrYvniTrA==}
+ engines: {node: '>18.0.0'}
+
[email protected]:
resolution: {integrity: sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==}
engines: {node: '>= 0.8.0'}
@@ -4230,6 +4464,17 @@ packages:
[email protected]:
resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==}
+ [email protected]:
+ resolution: {integrity: sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==}
+ engines: {node: '>=4.0.0'}
+
+ [email protected]:
+ resolution: {integrity: sha512-jPIlvgoD63hrEuihvIg+tJhoGjUsLPn6poJY9N5CnlPd91c2T18T/9zBtLxZSb1EhYxBRoZJtzScCaWlYLtktg==}
+
+ [email protected]:
+ resolution: {integrity: sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==}
+ engines: {node: '>=4'}
+
[email protected]:
resolution: {integrity: sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==}
@@ -4267,6 +4512,22 @@ packages:
resolution: {integrity: sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==}
engines: {node: ^10 || ^12 || >=14}
+ [email protected]:
+ resolution: {integrity: sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==}
+ engines: {node: '>=4'}
+
+ [email protected]:
+ resolution: {integrity: sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==}
+ engines: {node: '>=0.10.0'}
+
+ [email protected]:
+ resolution: {integrity: sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==}
+ engines: {node: '>=0.10.0'}
+
+ [email protected]:
+ resolution: {integrity: sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==}
+ engines: {node: '>=0.10.0'}
+
[email protected]:
resolution: {integrity: sha512-uL9sCML4gPH6Z4hreDWbeinKU0p0Ke261nU7OvII95NU22HN6Dk7T/SaVPaj6T4TsQqGKIFw6/woLZnH7ugFNA==}
engines: {node: '>= 6'}
@@ -4540,6 +4801,10 @@ packages:
resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
engines: {node: '>=0.10.0'}
+ [email protected]:
+ resolution: {integrity: sha512-nQFEv9gRw6SJAwWD2LrL0NmQvAcO7FBwJbwmr2ttPAacfy0xuiOjE5zt+zM4xDyuyvUaxBi/9gb2SoCyNEVJcw==}
+ engines: {node: '>=8.6.0'}
+
[email protected]:
resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==}
@@ -4680,6 +4945,9 @@ packages:
resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
engines: {node: '>=8'}
+ [email protected]:
+ resolution: {integrity: sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==}
+
[email protected]:
resolution: {integrity: sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==}
engines: {node: '>= 0.4'}
@@ -5441,6 +5709,10 @@ packages:
[email protected]:
resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==}
+ [email protected]:
+ resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
+ engines: {node: '>=0.4'}
+
[email protected]:
resolution: {integrity: sha512-ibF0Or+FivM9lNrg+HGJfVX8WJqgo+kCLDc4vx6xMeTce7Aj+DLttKbxxRR/gNLSAelRc1omAPlJ77N/Jem07A==}
@@ -6544,6 +6816,203 @@ snapshots:
'@open-draft/[email protected]': {}
+ '@opentelemetry/[email protected]':
+ dependencies:
+ '@opentelemetry/api': 1.8.0
+
+ '@opentelemetry/[email protected]': {}
+
+ '@opentelemetry/[email protected](@opentelemetry/[email protected])':
+ dependencies:
+ '@opentelemetry/api': 1.8.0
+
+ '@opentelemetry/[email protected](@opentelemetry/[email protected])':
+ dependencies:
+ '@opentelemetry/api': 1.8.0
+ '@opentelemetry/semantic-conventions': 1.24.1
+
+ '@opentelemetry/[email protected](@opentelemetry/[email protected])':
+ dependencies:
+ '@opentelemetry/api': 1.8.0
+ '@opentelemetry/core': 1.24.1(@opentelemetry/[email protected])
+ '@opentelemetry/instrumentation': 0.51.1(@opentelemetry/[email protected])
+ '@opentelemetry/semantic-conventions': 1.24.1
+ '@types/connect': 3.4.36
+ transitivePeerDependencies:
+ - supports-color
+
+ '@opentelemetry/[email protected](@opentelemetry/[email protected])':
+ dependencies:
+ '@opentelemetry/api': 1.8.0
+ '@opentelemetry/core': 1.24.1(@opentelemetry/[email protected])
+ '@opentelemetry/instrumentation': 0.51.1(@opentelemetry/[email protected])
+ '@opentelemetry/semantic-conventions': 1.24.1
+ transitivePeerDependencies:
+ - supports-color
+
+ '@opentelemetry/[email protected](@opentelemetry/[email protected])':
+ dependencies:
+ '@opentelemetry/api': 1.8.0
+ '@opentelemetry/core': 1.24.1(@opentelemetry/[email protected])
+ '@opentelemetry/instrumentation': 0.51.1(@opentelemetry/[email protected])
+ '@opentelemetry/semantic-conventions': 1.24.1
+ transitivePeerDependencies:
+ - supports-color
+
+ '@opentelemetry/[email protected](@opentelemetry/[email protected])':
+ dependencies:
+ '@opentelemetry/api': 1.8.0
+ '@opentelemetry/instrumentation': 0.51.1(@opentelemetry/[email protected])
+ transitivePeerDependencies:
+ - supports-color
+
+ '@opentelemetry/[email protected](@opentelemetry/[email protected])':
+ dependencies:
+ '@opentelemetry/api': 1.8.0
+ '@opentelemetry/core': 1.24.1(@opentelemetry/[email protected])
+ '@opentelemetry/instrumentation': 0.51.1(@opentelemetry/[email protected])
+ '@opentelemetry/semantic-conventions': 1.24.1
+ transitivePeerDependencies:
+ - supports-color
+
+ '@opentelemetry/[email protected](@opentelemetry/[email protected])':
+ dependencies:
+ '@opentelemetry/api': 1.8.0
+ '@opentelemetry/core': 1.24.1(@opentelemetry/[email protected])
+ '@opentelemetry/instrumentation': 0.51.1(@opentelemetry/[email protected])
+ '@opentelemetry/semantic-conventions': 1.24.1
+ semver: 7.6.2
+ transitivePeerDependencies:
+ - supports-color
+
+ '@opentelemetry/[email protected](@opentelemetry/[email protected])':
+ dependencies:
+ '@opentelemetry/api': 1.8.0
+ '@opentelemetry/instrumentation': 0.51.1(@opentelemetry/[email protected])
+ '@opentelemetry/redis-common': 0.36.2
+ '@opentelemetry/semantic-conventions': 1.24.1
+ transitivePeerDependencies:
+ - supports-color
+
+ '@opentelemetry/[email protected](@opentelemetry/[email protected])':
+ dependencies:
+ '@opentelemetry/api': 1.8.0
+ '@opentelemetry/core': 1.24.1(@opentelemetry/[email protected])
+ '@opentelemetry/instrumentation': 0.51.1(@opentelemetry/[email protected])
+ '@opentelemetry/semantic-conventions': 1.24.1
+ '@types/koa': 2.14.0
+ '@types/koa__router': 12.0.3
+ transitivePeerDependencies:
+ - supports-color
+
+ '@opentelemetry/[email protected](@opentelemetry/[email protected])':
+ dependencies:
+ '@opentelemetry/api': 1.8.0
+ '@opentelemetry/instrumentation': 0.51.1(@opentelemetry/[email protected])
+ '@opentelemetry/sdk-metrics': 1.24.1(@opentelemetry/[email protected])
+ '@opentelemetry/semantic-conventions': 1.24.1
+ transitivePeerDependencies:
+ - supports-color
+
+ '@opentelemetry/[email protected](@opentelemetry/[email protected])':
+ dependencies:
+ '@opentelemetry/api': 1.8.0
+ '@opentelemetry/core': 1.24.1(@opentelemetry/[email protected])
+ '@opentelemetry/instrumentation': 0.51.1(@opentelemetry/[email protected])
+ '@opentelemetry/semantic-conventions': 1.24.1
+ transitivePeerDependencies:
+ - supports-color
+
+ '@opentelemetry/[email protected](@opentelemetry/[email protected])':
+ dependencies:
+ '@opentelemetry/api': 1.8.0
+ '@opentelemetry/instrumentation': 0.51.1(@opentelemetry/[email protected])
+ '@opentelemetry/semantic-conventions': 1.24.1
+ '@opentelemetry/sql-common': 0.40.1(@opentelemetry/[email protected])
+ transitivePeerDependencies:
+ - supports-color
+
+ '@opentelemetry/[email protected](@opentelemetry/[email protected])':
+ dependencies:
+ '@opentelemetry/api': 1.8.0
+ '@opentelemetry/instrumentation': 0.51.1(@opentelemetry/[email protected])
+ '@opentelemetry/semantic-conventions': 1.24.1
+ '@types/mysql': 2.15.22
+ transitivePeerDependencies:
+ - supports-color
+
+ '@opentelemetry/[email protected](@opentelemetry/[email protected])':
+ dependencies:
+ '@opentelemetry/api': 1.8.0
+ '@opentelemetry/instrumentation': 0.51.1(@opentelemetry/[email protected])
+ '@opentelemetry/semantic-conventions': 1.24.1
+ transitivePeerDependencies:
+ - supports-color
+
+ '@opentelemetry/[email protected](@opentelemetry/[email protected])':
+ dependencies:
+ '@opentelemetry/api': 1.8.0
+ '@opentelemetry/instrumentation': 0.51.1(@opentelemetry/[email protected])
+ '@opentelemetry/semantic-conventions': 1.24.1
+ '@opentelemetry/sql-common': 0.40.1(@opentelemetry/[email protected])
+ '@types/pg': 8.6.1
+ '@types/pg-pool': 2.0.4
+ transitivePeerDependencies:
+ - supports-color
+
+ '@opentelemetry/[email protected](@opentelemetry/[email protected])':
+ dependencies:
+ '@opentelemetry/api': 1.8.0
+ '@types/shimmer': 1.0.5
+ import-in-the-middle: 1.4.2
+ require-in-the-middle: 7.3.0
+ semver: 7.6.2
+ shimmer: 1.2.1
+ transitivePeerDependencies:
+ - supports-color
+ optional: true
+
+ '@opentelemetry/[email protected](@opentelemetry/[email protected])':
+ dependencies:
+ '@opentelemetry/api': 1.8.0
+ '@opentelemetry/api-logs': 0.51.1
+ '@types/shimmer': 1.0.5
+ import-in-the-middle: 1.7.4
+ require-in-the-middle: 7.3.0
+ semver: 7.6.2
+ shimmer: 1.2.1
+ transitivePeerDependencies:
+ - supports-color
+
+ '@opentelemetry/[email protected]': {}
+
+ '@opentelemetry/[email protected](@opentelemetry/[email protected])':
+ dependencies:
+ '@opentelemetry/api': 1.8.0
+ '@opentelemetry/core': 1.24.1(@opentelemetry/[email protected])
+ '@opentelemetry/semantic-conventions': 1.24.1
+
+ '@opentelemetry/[email protected](@opentelemetry/[email protected])':
+ dependencies:
+ '@opentelemetry/api': 1.8.0
+ '@opentelemetry/core': 1.24.1(@opentelemetry/[email protected])
+ '@opentelemetry/resources': 1.24.1(@opentelemetry/[email protected])
+ lodash.merge: 4.6.2
+
+ '@opentelemetry/[email protected](@opentelemetry/[email protected])':
+ dependencies:
+ '@opentelemetry/api': 1.8.0
+ '@opentelemetry/core': 1.24.1(@opentelemetry/[email protected])
+ '@opentelemetry/resources': 1.24.1(@opentelemetry/[email protected])
+ '@opentelemetry/semantic-conventions': 1.24.1
+
+ '@opentelemetry/[email protected]': {}
+
+ '@opentelemetry/[email protected](@opentelemetry/[email protected])':
+ dependencies:
+ '@opentelemetry/api': 1.8.0
+ '@opentelemetry/core': 1.24.1(@opentelemetry/[email protected])
+
'@otplib/[email protected]': {}
'@otplib/[email protected]':
@@ -6615,6 +7084,14 @@ snapshots:
dependencies:
safe-buffer: 5.2.1
+ '@prisma/[email protected]':
+ dependencies:
+ '@opentelemetry/api': 1.8.0
+ '@opentelemetry/instrumentation': 0.51.1(@opentelemetry/[email protected])
+ '@opentelemetry/sdk-trace-base': 1.24.1(@opentelemetry/[email protected])
+ transitivePeerDependencies:
+ - supports-color
+
'@puppeteer/[email protected]':
dependencies:
debug: 4.3.4
@@ -6688,37 +7165,60 @@ snapshots:
domhandler: 5.0.3
selderee: 0.11.0
- '@sentry-internal/[email protected]':
- dependencies:
- '@sentry/core': 7.114.0
- '@sentry/types': 7.114.0
- '@sentry/utils': 7.114.0
-
- '@sentry/[email protected]':
- dependencies:
- '@sentry/types': 7.114.0
- '@sentry/utils': 7.114.0
-
- '@sentry/[email protected]':
- dependencies:
- '@sentry/core': 7.114.0
- '@sentry/types': 7.114.0
- '@sentry/utils': 7.114.0
- localforage: 1.10.0
+ '@sentry/[email protected]':
+ dependencies:
+ '@sentry/types': 8.3.0
+ '@sentry/utils': 8.3.0
+
+ '@sentry/[email protected]':
+ dependencies:
+ '@opentelemetry/api': 1.8.0
+ '@opentelemetry/context-async-hooks': 1.24.1(@opentelemetry/[email protected])
+ '@opentelemetry/core': 1.24.1(@opentelemetry/[email protected])
+ '@opentelemetry/instrumentation': 0.51.1(@opentelemetry/[email protected])
+ '@opentelemetry/instrumentation-connect': 0.36.0(@opentelemetry/[email protected])
+ '@opentelemetry/instrumentation-express': 0.39.0(@opentelemetry/[email protected])
+ '@opentelemetry/instrumentation-fastify': 0.36.1(@opentelemetry/[email protected])
+ '@opentelemetry/instrumentation-graphql': 0.40.0(@opentelemetry/[email protected])
+ '@opentelemetry/instrumentation-hapi': 0.38.0(@opentelemetry/[email protected])
+ '@opentelemetry/instrumentation-http': 0.51.1(@opentelemetry/[email protected])
+ '@opentelemetry/instrumentation-ioredis': 0.40.0(@opentelemetry/[email protected])
+ '@opentelemetry/instrumentation-koa': 0.40.0(@opentelemetry/[email protected])
+ '@opentelemetry/instrumentation-mongodb': 0.43.0(@opentelemetry/[email protected])
+ '@opentelemetry/instrumentation-mongoose': 0.38.1(@opentelemetry/[email protected])
+ '@opentelemetry/instrumentation-mysql': 0.38.1(@opentelemetry/[email protected])
+ '@opentelemetry/instrumentation-mysql2': 0.38.1(@opentelemetry/[email protected])
+ '@opentelemetry/instrumentation-nestjs-core': 0.37.1(@opentelemetry/[email protected])
+ '@opentelemetry/instrumentation-pg': 0.41.0(@opentelemetry/[email protected])
+ '@opentelemetry/resources': 1.24.1(@opentelemetry/[email protected])
+ '@opentelemetry/sdk-trace-base': 1.24.1(@opentelemetry/[email protected])
+ '@opentelemetry/semantic-conventions': 1.24.1
+ '@prisma/instrumentation': 5.14.0
+ '@sentry/core': 8.3.0
+ '@sentry/opentelemetry': 8.3.0(@opentelemetry/[email protected])(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected])
+ '@sentry/types': 8.3.0
+ '@sentry/utils': 8.3.0
+ optionalDependencies:
+ opentelemetry-instrumentation-fetch-node: 1.2.0
+ transitivePeerDependencies:
+ - supports-color
- '@sentry/[email protected]':
+ '@sentry/[email protected](@opentelemetry/[email protected])(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected])':
dependencies:
- '@sentry-internal/tracing': 7.114.0
- '@sentry/core': 7.114.0
- '@sentry/integrations': 7.114.0
- '@sentry/types': 7.114.0
- '@sentry/utils': 7.114.0
+ '@opentelemetry/api': 1.8.0
+ '@opentelemetry/core': 1.24.1(@opentelemetry/[email protected])
+ '@opentelemetry/instrumentation': 0.51.1(@opentelemetry/[email protected])
+ '@opentelemetry/sdk-trace-base': 1.24.1(@opentelemetry/[email protected])
+ '@opentelemetry/semantic-conventions': 1.24.1
+ '@sentry/core': 8.3.0
+ '@sentry/types': 8.3.0
+ '@sentry/utils': 8.3.0
- '@sentry/[email protected]': {}
+ '@sentry/[email protected]': {}
- '@sentry/[email protected]':
+ '@sentry/[email protected]':
dependencies:
- '@sentry/types': 7.114.0
+ '@sentry/types': 8.3.0
'@sinclair/[email protected]': {}
@@ -6781,20 +7281,46 @@ snapshots:
'@tootallnate/[email protected]': {}
+ '@types/[email protected]':
+ dependencies:
+ '@types/node': 20.12.12
+
'@types/[email protected]': {}
'@types/[email protected]': {}
'@types/[email protected]': {}
+ '@types/[email protected]':
+ dependencies:
+ '@types/connect': 3.4.38
+ '@types/node': 20.12.12
+
'@types/[email protected]': {}
'@types/[email protected]': {}
+ '@types/[email protected]':
+ dependencies:
+ '@types/node': 20.12.12
+
+ '@types/[email protected]':
+ dependencies:
+ '@types/node': 20.12.12
+
+ '@types/[email protected]': {}
+
'@types/[email protected]': {}
'@types/[email protected]': {}
+ '@types/[email protected]':
+ dependencies:
+ '@types/connect': 3.4.38
+ '@types/express': 4.17.21
+ '@types/keygrip': 1.0.6
+ '@types/node': 20.12.12
+
'@types/[email protected]': {}
'@types/[email protected]':
@@ -6814,6 +7340,20 @@ snapshots:
dependencies:
'@types/node': 20.12.12
+ '@types/[email protected]':
+ dependencies:
+ '@types/node': 20.12.12
+ '@types/qs': 6.9.15
+ '@types/range-parser': 1.2.7
+ '@types/send': 0.17.4
+
+ '@types/[email protected]':
+ dependencies:
+ '@types/body-parser': 1.19.5
+ '@types/express-serve-static-core': 4.19.1
+ '@types/qs': 6.9.15
+ '@types/serve-static': 1.15.7
+
'@types/[email protected]':
dependencies:
'@types/jsonfile': 6.1.4
@@ -6821,8 +7361,12 @@ snapshots:
'@types/[email protected]': {}
+ '@types/[email protected]': {}
+
'@types/[email protected]': {}
+ '@types/[email protected]': {}
+
'@types/[email protected]':
dependencies:
'@types/node': 20.12.12
@@ -6845,6 +7389,27 @@ snapshots:
'@types/[email protected]': {}
+ '@types/[email protected]': {}
+
+ '@types/[email protected]':
+ dependencies:
+ '@types/koa': 2.14.0
+
+ '@types/[email protected]':
+ dependencies:
+ '@types/accepts': 1.3.7
+ '@types/content-disposition': 0.5.8
+ '@types/cookies': 0.9.0
+ '@types/http-assert': 1.5.5
+ '@types/http-errors': 2.0.4
+ '@types/keygrip': 1.0.6
+ '@types/koa-compose': 3.2.8
+ '@types/node': 20.12.12
+
+ '@types/[email protected]':
+ dependencies:
+ '@types/koa': 2.14.0
+
'@types/[email protected]': {}
'@types/[email protected]': {}
@@ -6867,6 +7432,8 @@ snapshots:
'@types/[email protected]': {}
+ '@types/[email protected]': {}
+
'@types/[email protected]': {}
'@types/[email protected]': {}
@@ -6875,6 +7442,10 @@ snapshots:
dependencies:
'@types/node': 20.12.12
+ '@types/[email protected]':
+ dependencies:
+ '@types/node': 20.12.12
+
'@types/[email protected]':
dependencies:
'@types/node': 20.12.12
@@ -6886,6 +7457,20 @@ snapshots:
'@types/[email protected]': {}
+ '@types/[email protected]':
+ dependencies:
+ '@types/pg': 8.6.1
+
+ '@types/[email protected]':
+ dependencies:
+ '@types/node': 20.12.12
+ pg-protocol: 1.6.1
+ pg-types: 2.2.0
+
+ '@types/[email protected]': {}
+
+ '@types/[email protected]': {}
+
'@types/[email protected]':
dependencies:
'@types/bluebird': 3.5.42
@@ -6902,6 +7487,19 @@ snapshots:
dependencies:
htmlparser2: 8.0.2
+ '@types/[email protected]':
+ dependencies:
+ '@types/mime': 1.3.5
+ '@types/node': 20.12.12
+
+ '@types/[email protected]':
+ dependencies:
+ '@types/http-errors': 2.0.4
+ '@types/node': 20.12.12
+ '@types/send': 0.17.4
+
+ '@types/[email protected]': {}
+
'@types/[email protected]': {}
'@types/[email protected]':
@@ -7091,6 +7689,11 @@ snapshots:
dependencies:
event-target-shim: 5.0.1
+ [email protected]([email protected]):
+ dependencies:
+ acorn: 8.11.3
+ optional: true
+
[email protected]([email protected]):
dependencies:
acorn: 8.11.3
@@ -7497,6 +8100,8 @@ snapshots:
dependencies:
lodash: 4.17.21
+ [email protected]: {}
+
[email protected]: {}
[email protected]:
@@ -8738,13 +9343,26 @@ snapshots:
pino: 9.0.0
socks: 2.8.3
- [email protected]: {}
-
[email protected]:
dependencies:
parent-module: 1.0.1
resolve-from: 4.0.0
+ [email protected]:
+ dependencies:
+ acorn: 8.11.3
+ acorn-import-assertions: 1.9.0([email protected])
+ cjs-module-lexer: 1.3.1
+ module-details-from-path: 1.0.3
+ optional: true
+
+ [email protected]:
+ dependencies:
+ acorn: 8.11.3
+ acorn-import-attributes: 1.9.5([email protected])
+ cjs-module-lexer: 1.3.1
+ module-details-from-path: 1.0.3
+
[email protected]: {}
[email protected]: {}
@@ -9083,10 +9701,6 @@ snapshots:
[email protected]: {}
- [email protected]:
- dependencies:
- immediate: 3.0.6
-
[email protected]: {}
[email protected]: {}
@@ -9124,10 +9738,6 @@ snapshots:
mlly: 1.7.0
pkg-types: 1.1.1
- [email protected]:
- dependencies:
- lie: 3.1.1
-
[email protected]:
dependencies:
p-locate: 4.1.0
@@ -9518,6 +10128,8 @@ snapshots:
[email protected]: {}
+ [email protected]: {}
+
[email protected]: {}
[email protected]: {}
@@ -9667,6 +10279,15 @@ snapshots:
dependencies:
yaml: 2.4.2
+ [email protected]:
+ dependencies:
+ '@opentelemetry/api': 1.8.0
+ '@opentelemetry/instrumentation': 0.43.0(@opentelemetry/[email protected])
+ '@opentelemetry/semantic-conventions': 1.24.1
+ transitivePeerDependencies:
+ - supports-color
+ optional: true
+
[email protected]:
dependencies:
deep-is: 0.1.4
@@ -9819,6 +10440,18 @@ snapshots:
[email protected]: {}
+ [email protected]: {}
+
+ [email protected]: {}
+
+ [email protected]:
+ dependencies:
+ pg-int8: 1.0.1
+ postgres-array: 2.0.0
+ postgres-bytea: 1.0.0
+ postgres-date: 1.0.7
+ postgres-interval: 1.2.0
+
[email protected]: {}
[email protected]: {}
@@ -9862,6 +10495,16 @@ snapshots:
picocolors: 1.0.1
source-map-js: 1.2.0
+ [email protected]: {}
+
+ [email protected]: {}
+
+ [email protected]: {}
+
+ [email protected]:
+ dependencies:
+ xtend: 4.0.2
+
[email protected]:
dependencies:
'@postman/form-data': 3.1.1
@@ -10174,6 +10817,14 @@ snapshots:
[email protected]: {}
+ [email protected]:
+ dependencies:
+ debug: 4.3.4
+ module-details-from-path: 1.0.3
+ resolve: 1.22.8
+ transitivePeerDependencies:
+ - supports-color
+
[email protected]: {}
[email protected]: {}
@@ -10322,6 +10973,8 @@ snapshots:
[email protected]: {}
+ [email protected]: {}
+
[email protected]:
dependencies:
call-bind: 1.0.7
@@ -11070,6 +11723,8 @@ snapshots:
[email protected]: {}
+ [email protected]: {}
+
[email protected]: {}
[email protected]: {}
|
091feba32ab3d34fa61c92a5079723afe3fc8331
|
2025-01-27 00:39:17
|
AiraNadih
|
feat(route): add route "CosplayTele" (#18217)
| false
|
add route "CosplayTele" (#18217)
|
feat
|
diff --git a/lib/routes/cosplaytele/article.ts b/lib/routes/cosplaytele/article.ts
new file mode 100644
index 00000000000000..c5a534cceb448b
--- /dev/null
+++ b/lib/routes/cosplaytele/article.ts
@@ -0,0 +1,13 @@
+import { parseDate } from '@/utils/parse-date';
+import { WPPost } from './types';
+
+function loadArticle(item: WPPost) {
+ return {
+ title: item.title.rendered,
+ description: item.content.rendered,
+ pubDate: parseDate(item.date_gmt),
+ link: item.link,
+ };
+}
+
+export default loadArticle;
diff --git a/lib/routes/cosplaytele/category.ts b/lib/routes/cosplaytele/category.ts
new file mode 100644
index 00000000000000..755f01fd388d88
--- /dev/null
+++ b/lib/routes/cosplaytele/category.ts
@@ -0,0 +1,47 @@
+import { Route } from '@/types';
+import got from '@/utils/got';
+import { SUB_NAME_PREFIX, SUB_URL } from './const';
+import loadArticle from './article';
+import { WPPost } from './types';
+
+export const route: Route = {
+ path: '/category/:category',
+ categories: ['picture'],
+ example: '/cosplaytele/category/cosplay',
+ parameters: { category: 'Category' },
+ features: {
+ requireConfig: false,
+ requirePuppeteer: false,
+ antiCrawler: false,
+ supportBT: false,
+ supportPodcast: false,
+ supportScihub: false,
+ },
+ radar: [
+ {
+ source: ['cosplaytele.com/category/:category'],
+ target: '/category/:category',
+ },
+ ],
+ name: 'Category',
+ maintainers: ['AiraNadih'],
+ handler,
+ url: 'cosplaytele.com/',
+};
+
+async function handler(ctx) {
+ const limit = Number.parseInt(ctx.req.query('limit')) || 20;
+ const category = ctx.req.param('category');
+ const categoryUrl = `${SUB_URL}category/${category}/`;
+
+ const {
+ data: [{ id: categoryId }],
+ } = await got(`${SUB_URL}wp-json/wp/v2/categories?slug=${category}`);
+ const { data: posts } = await got(`${SUB_URL}wp-json/wp/v2/posts?categories=${categoryId}&per_page=${limit}`);
+
+ return {
+ title: `${SUB_NAME_PREFIX} - Category: ${category}`,
+ link: categoryUrl,
+ item: posts.map((post) => loadArticle(post as WPPost)),
+ };
+}
diff --git a/lib/routes/cosplaytele/const.ts b/lib/routes/cosplaytele/const.ts
new file mode 100644
index 00000000000000..c196c2ab8b4595
--- /dev/null
+++ b/lib/routes/cosplaytele/const.ts
@@ -0,0 +1,4 @@
+const SUB_NAME_PREFIX = 'CosplayTele';
+const SUB_URL = 'https://cosplaytele.com/';
+
+export { SUB_NAME_PREFIX, SUB_URL };
diff --git a/lib/routes/cosplaytele/latest.ts b/lib/routes/cosplaytele/latest.ts
new file mode 100644
index 00000000000000..b986a8d731229e
--- /dev/null
+++ b/lib/routes/cosplaytele/latest.ts
@@ -0,0 +1,41 @@
+import { Route } from '@/types';
+import got from '@/utils/got';
+import { SUB_NAME_PREFIX, SUB_URL } from './const';
+import loadArticle from './article';
+import { WPPost } from './types';
+
+export const route: Route = {
+ path: '/',
+ categories: ['picture'],
+ example: '/cosplaytele',
+ parameters: {},
+ features: {
+ requireConfig: false,
+ requirePuppeteer: false,
+ antiCrawler: false,
+ supportBT: false,
+ supportPodcast: false,
+ supportScihub: false,
+ },
+ radar: [
+ {
+ source: ['cosplaytele.com/'],
+ target: '',
+ },
+ ],
+ name: 'Latest',
+ maintainers: ['AiraNadih'],
+ handler,
+ url: 'cosplaytele.com/',
+};
+
+async function handler(ctx) {
+ const limit = Number.parseInt(ctx.req.query('limit')) || 20;
+ const { data: posts } = await got(`${SUB_URL}wp-json/wp/v2/posts?per_page=${limit}`);
+
+ return {
+ title: `${SUB_NAME_PREFIX} - Latest`,
+ link: SUB_URL,
+ item: posts.map((post) => loadArticle(post as WPPost)),
+ };
+}
diff --git a/lib/routes/cosplaytele/namespace.ts b/lib/routes/cosplaytele/namespace.ts
new file mode 100644
index 00000000000000..bcba7214fa5629
--- /dev/null
+++ b/lib/routes/cosplaytele/namespace.ts
@@ -0,0 +1,8 @@
+import type { Namespace } from '@/types';
+
+export const namespace: Namespace = {
+ name: 'CosplayTele',
+ url: 'cosplaytele.com',
+ description: 'Cosplaytele - Fast - Security - Free',
+ lang: 'en',
+};
diff --git a/lib/routes/cosplaytele/popular.ts b/lib/routes/cosplaytele/popular.ts
new file mode 100644
index 00000000000000..fe2b20577f73b5
--- /dev/null
+++ b/lib/routes/cosplaytele/popular.ts
@@ -0,0 +1,75 @@
+import { Route } from '@/types';
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { SUB_NAME_PREFIX, SUB_URL } from './const';
+import loadArticle from './article';
+import { WPPost } from './types';
+
+export const route: Route = {
+ path: '/popular/:period',
+ categories: ['picture'],
+ example: '/cosplaytele/popular/3',
+ parameters: { period: 'Days' },
+ features: {
+ requireConfig: false,
+ requirePuppeteer: false,
+ antiCrawler: false,
+ supportBT: false,
+ supportPodcast: false,
+ supportScihub: false,
+ },
+ radar: [
+ {
+ source: ['cosplaytele.com/:period'],
+ target: '/popular/:period',
+ },
+ ],
+ name: 'Popular',
+ maintainers: ['AiraNadih'],
+ handler,
+ url: 'cosplaytele.com/',
+};
+
+function getPeriodConfig(period) {
+ if (period === '1') {
+ return {
+ url: `${SUB_URL}24-hours/`,
+ range: 'daily',
+ title: `${SUB_NAME_PREFIX} - Top views in 24 hours`,
+ };
+ }
+ return {
+ url: `${SUB_URL}${period}-day/`,
+ range: `last${period}days`,
+ title: `${SUB_NAME_PREFIX} - Top views in ${period} days`,
+ };
+}
+
+async function handler(ctx) {
+ const limit = Number.parseInt(ctx.req.query('limit')) || 20;
+ const period = ctx.req.param('period');
+
+ const { url, range, title } = getPeriodConfig(period);
+
+ const { data } = await got.post(`${SUB_URL}wp-json/wordpress-popular-posts/v2/widget`, {
+ json: {
+ limit,
+ range,
+ order_by: 'views',
+ },
+ });
+
+ const $ = load(data.widget);
+ const links = $('.wpp-list li')
+ .toArray()
+ .map((post) => $(post).find('.wpp-post-title').attr('href'))
+ .filter((link) => link !== undefined);
+ const slugs = links.map((link) => link.split('/').findLast(Boolean));
+ const { data: posts } = await got(`${SUB_URL}wp-json/wp/v2/posts?slug=${slugs.join(',')}&per_page=${limit}`);
+
+ return {
+ title,
+ link: url,
+ item: posts.map((post) => loadArticle(post as WPPost)),
+ };
+}
diff --git a/lib/routes/cosplaytele/tag.ts b/lib/routes/cosplaytele/tag.ts
new file mode 100644
index 00000000000000..41676a57cfef65
--- /dev/null
+++ b/lib/routes/cosplaytele/tag.ts
@@ -0,0 +1,47 @@
+import { Route } from '@/types';
+import got from '@/utils/got';
+import { SUB_NAME_PREFIX, SUB_URL } from './const';
+import loadArticle from './article';
+import { WPPost } from './types';
+
+export const route: Route = {
+ path: '/tag/:tag',
+ categories: ['picture'],
+ example: '/cosplaytele/tag/aqua',
+ parameters: { tag: 'Tag' },
+ features: {
+ requireConfig: false,
+ requirePuppeteer: false,
+ antiCrawler: false,
+ supportBT: false,
+ supportPodcast: false,
+ supportScihub: false,
+ },
+ radar: [
+ {
+ source: ['cosplaytele.com/tag/:tag'],
+ target: '/tag/:tag',
+ },
+ ],
+ name: 'Tag',
+ maintainers: ['AiraNadih'],
+ handler,
+ url: 'cosplaytele.com/',
+};
+
+async function handler(ctx) {
+ const limit = Number.parseInt(ctx.req.query('limit')) || 20;
+ const tag = ctx.req.param('tag');
+ const tagUrl = `${SUB_URL}tag/${tag}/`;
+
+ const {
+ data: [{ id: tagId }],
+ } = await got(`${SUB_URL}wp-json/wp/v2/tags?slug=${tag}`);
+ const { data: posts } = await got(`${SUB_URL}wp-json/wp/v2/posts?tags=${tagId}&per_page=${limit}`);
+
+ return {
+ title: `${SUB_NAME_PREFIX} - Tag: ${tag}`,
+ link: tagUrl,
+ item: posts.map((post) => loadArticle(post as WPPost)),
+ };
+}
diff --git a/lib/routes/cosplaytele/types.ts b/lib/routes/cosplaytele/types.ts
new file mode 100644
index 00000000000000..d3ea3ac2a8cc26
--- /dev/null
+++ b/lib/routes/cosplaytele/types.ts
@@ -0,0 +1,12 @@
+interface WPPost {
+ title: {
+ rendered: string;
+ };
+ content: {
+ rendered: string;
+ };
+ date_gmt: string;
+ link: string;
+}
+
+export type { WPPost };
|
35347a921ded1781c9bebcd37fb18d62ce46003d
|
2022-04-21 11:02:13
|
yuxinliu-alex
|
feat(route): 中国新闻网 (#9584)
| false
|
中国新闻网 (#9584)
|
feat
|
diff --git a/docs/traditional-media.md b/docs/traditional-media.md
index 51e658cf9401d9..6c7675e49df1fe 100644
--- a/docs/traditional-media.md
+++ b/docs/traditional-media.md
@@ -1709,6 +1709,12 @@ category 对应的关键词有
</Route>
+## 中国新闻网
+
+### 最新
+
+<Route author="yuxinliu-alex" example="/chinanews" path="/chinanews" radar="1" rssbud="1" />
+
## 中山网
### 中山网新闻
diff --git a/lib/v2/chinanews/index.js b/lib/v2/chinanews/index.js
new file mode 100644
index 00000000000000..c8e56821ada5fa
--- /dev/null
+++ b/lib/v2/chinanews/index.js
@@ -0,0 +1,65 @@
+const got = require('@/utils/got');
+const timezone = require('@/utils/timezone');
+const { parseDate } = require('@/utils/parse-date');
+const cheerio = require('cheerio');
+
+const rootUrl = 'https://www.chinanews.com.cn';
+
+module.exports = async (ctx) => {
+ const currentUrl = `${rootUrl}/scroll-news/news1.html`;
+ const response = await got({
+ method: 'get',
+ url: currentUrl,
+ });
+ const $ = cheerio.load(response.data);
+ const list = $('a', '.dd_bt')
+ .map((_, item) => ({
+ link: rootUrl + $(item).attr('href'),
+ title: $(item).text(),
+ }))
+ .get()
+ .slice(0, ctx.query.limit ? (parseInt(ctx.query.limit) > 125 ? 125 : parseInt(ctx.query.limit)) : 50);
+
+ const items = await Promise.all(
+ list.map((item) =>
+ ctx.cache.tryGet(item.link, async () => {
+ const detailResponse = await got({
+ method: 'get',
+ url: item.link,
+ });
+ const content = cheerio.load(detailResponse.data);
+ if (content('div.content_desc').length > 0) {
+ item.description = content('div.content_desc').text();
+ item.author = content('a.source').text();
+ const info = content('p', '.left').text().trim().slice(5).split(' ');
+ item.author = info[2].trim();
+ item.pubDate = timezone(parseDate(info[0] + info[1], 'YYYY年MM月DD日HH:mm'), +8);
+ } else if (content('div.t3').length > 0) {
+ item.description = content('div.t3').text();
+ const info = content('div[style="text-align:right;font-size:12px;"]').text().slice(5).split(' ');
+ item.author = info[2];
+ item.pubDate = timezone(parseDate(info[0] + info[1], 'YYYY-MM-DDHH:mm'), +8);
+ } else {
+ item.description = content('div.left_zw').text();
+ const info = content('div.left-t')
+ .contents()
+ .filter(function () {
+ return this.type === 'text';
+ })
+ .text()
+ .split(' ');
+ item.pubDate = timezone(parseDate(info[0], 'YYYY年MM月DD日 HH:mm'), +8);
+ item.author = info[1] + content('a.source').text();
+ }
+ return item;
+ })
+ )
+ );
+ ctx.state.data = {
+ title: '中国新闻网',
+ link: currentUrl,
+ description: '中国新闻网（简称“中新网”），由中国新闻社主办，为中央重点新闻网站。',
+ language: 'zh-cn',
+ item: items,
+ };
+};
diff --git a/lib/v2/chinanews/maintainer.js b/lib/v2/chinanews/maintainer.js
new file mode 100644
index 00000000000000..d50c937c010fcf
--- /dev/null
+++ b/lib/v2/chinanews/maintainer.js
@@ -0,0 +1,3 @@
+module.exports = {
+ '/': ['yuxinliu-alex'],
+};
diff --git a/lib/v2/chinanews/radar.js b/lib/v2/chinanews/radar.js
new file mode 100644
index 00000000000000..8a0fadfc5d2b3a
--- /dev/null
+++ b/lib/v2/chinanews/radar.js
@@ -0,0 +1,13 @@
+module.exports = {
+ 'chinanews.com.cn': {
+ _name: '中国新闻网',
+ '.': [
+ {
+ title: '最新',
+ docs: 'https://docs.rsshub.app/traditional-media.html#zhong-xin-wang',
+ source: ['/'],
+ target: '/chinanews',
+ },
+ ],
+ },
+};
diff --git a/lib/v2/chinanews/router.js b/lib/v2/chinanews/router.js
new file mode 100644
index 00000000000000..20c52b09d72938
--- /dev/null
+++ b/lib/v2/chinanews/router.js
@@ -0,0 +1,3 @@
+module.exports = function (router) {
+ router.get('/', require('./index'));
+};
|
b8a1a5d98bc5a67db8ce3f510c75640113111b9a
|
2024-02-27 23:51:03
|
github-actions[bot]
|
style: auto format
| false
|
auto format
|
style
|
diff --git a/website/docs/routes/anime.mdx b/website/docs/routes/anime.mdx
index 8ecb005ee41c9c..b82463fcb9fa7e 100644
--- a/website/docs/routes/anime.mdx
+++ b/website/docs/routes/anime.mdx
@@ -341,7 +341,7 @@
## lovelive-anime {#lovelive-anime}
-### Love Live! Official Website Latest NEWS {#lovelive-anime-love-live!-official-website-latest-news}
+### Love Live! Official Website Latest NEWS {#lovelive-anime-love-live-official-website-latest-news}
<Route author="axojhf" example="/lovelive-anime/news" path="/lovelive-anime/news/:option?" paramsDesc={['Crawl full text when `option` is `detail`.']} radar="1" />
diff --git a/website/docs/routes/game.mdx b/website/docs/routes/game.mdx
index 207375c1a4696c..272623e79927af 100644
--- a/website/docs/routes/game.mdx
+++ b/website/docs/routes/game.mdx
@@ -431,9 +431,9 @@
<Route author="hoilc" example="/nintendo/system-update" path="/nintendo/system-update" />
-## osu! {#osu!}
+## osu! {#osu}
-### Beatmap Packs {#osu!-beatmap-packs}
+### Beatmap Packs {#osu-beatmap-packs}
<Route author="JimenezLi" example="/osu/packs" path="/osu/packs/:type?" paramsDesc={['pack type, default to `standard`, can choose from `featured`, `tournament`, `loved`, `chart`, `theme` and `artist`']} radar="1" />
|
b1ff4282153d8b6fd45165d8a2ebeddb3ce04f9c
|
2020-05-07 21:33:18
|
dependabot-preview[bot]
|
chore(deps): bump hooman from 1.0.0 to 1.1.0
| false
|
bump hooman from 1.0.0 to 1.1.0
|
chore
|
diff --git a/package.json b/package.json
index 21e52ea19f88e6..0f2c54be7c5e72 100644
--- a/package.json
+++ b/package.json
@@ -84,7 +84,7 @@
"googleapis": "50.0.0",
"got": "11.1.1",
"he": "1.2.0",
- "hooman": "1.0.0",
+ "hooman": "1.1.0",
"https-proxy-agent": "5.0.0",
"iconv-lite": "0.5.1",
"jsdom": "16.2.2",
diff --git a/yarn.lock b/yarn.lock
index a46cd4ee1ef9ba..3bc7e3ee7abbe8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5821,7 +5821,7 @@ [email protected]:
google-auth-library "^6.0.0"
googleapis-common "^4.1.0"
[email protected], got@^11.1.0:
[email protected]:
version "11.1.1"
resolved "https://registry.yarnpkg.com/got/-/got-11.1.1.tgz#11f83049df8155b384413547fe163dd4b35b4240"
integrity sha512-7WxfuTyT02hMZZdDvaAprEoxsU13boxI8rWMpqk/5Mq6t+YVbExVB2L6yRLh2Nw3TeJyFpanId41+ZyXGesmbw==
@@ -6037,15 +6037,15 @@ hogan.js@^3.0.2:
mkdirp "0.3.0"
nopt "1.0.10"
[email protected]:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/hooman/-/hooman-1.0.0.tgz#0769b81d6e3ce94db3c1b1a35d766531403a53a1"
- integrity sha512-XkbN3bTqqkkqU4KfdsKEAmjtxJMJkVD4nlFOcFQEuYXUpnPnZbN3UOjvoR+oWtEsX0Vtjz5ffrJUtdjtzz89mw==
[email protected]:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/hooman/-/hooman-1.1.0.tgz#37eb11aee895f7e0fd97df40b76496aecd670518"
+ integrity sha512-g/rKFrmpVh/xg5MlgiuW5zvwBQ+rfUzHAl7bHJmph46OKMVenSxmFNmrS5rnTvJuNo0IKjWceTNtSGKvWM+c4Q==
dependencies:
- got "^11.1.0"
jsdom "^16.2.2"
tough-cookie "^4.0.0"
user-agents "^1.0.559"
+ vm2 "^3.9.2"
hosted-git-info@^2.1.4:
version "2.8.8"
@@ -12409,6 +12409,11 @@ [email protected]:
dependencies:
indexof "0.0.1"
+vm2@^3.9.2:
+ version "3.9.2"
+ resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.2.tgz#a4085d2d88a808a1b3c06d5478c2db3222a9cc30"
+ integrity sha512-nzyFmHdy2FMg7mYraRytc2jr4QBaUY3TEGe3q3bK8EgS9WC98wxn2jrPxS/ruWm+JGzrEIIeufKweQzVoQEd+Q==
+
vue-hot-reload-api@^2.3.0:
version "2.3.3"
resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.3.tgz#2756f46cb3258054c5f4723de8ae7e87302a1ccf"
|
f2b4bfbff82728712833e52f20f697d95e747a18
|
2020-09-24 23:21:38
|
DIYgod
|
fix: add python in Dockerfile to fix opencc installation
| false
|
add python in Dockerfile to fix opencc installation
|
fix
|
diff --git a/Dockerfile b/Dockerfile
index 8f8c30ab1af6ff..cbb4e1509933a2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,7 @@ ARG PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1;
RUN ln -sf /bin/bash /bin/sh
-RUN apt-get update && apt-get install -yq libgconf-2-4 apt-transport-https git dumb-init --no-install-recommends && apt-get clean \
+RUN apt-get update && apt-get install -yq libgconf-2-4 apt-transport-https git dumb-init python --no-install-recommends && apt-get clean \
&& rm -rf /var/lib/apt/lists/*
WORKDIR /app
|
c459ae71f7a6f7afeb1f7a67cb9f258814204a8a
|
2023-09-28 09:37:30
|
dependabot[bot]
|
chore(deps-dev): bump @types/require-all from 3.0.3 to 3.0.4 (#13431)
| false
|
bump @types/require-all from 3.0.3 to 3.0.4 (#13431)
|
chore
|
diff --git a/package.json b/package.json
index 9e46fb23c9c890..404633ca0944fe 100644
--- a/package.json
+++ b/package.json
@@ -174,7 +174,7 @@
"@types/pidusage": "2.0.3",
"@types/plist": "3.0.3",
"@types/request-promise-native": "1.0.19",
- "@types/require-all": "3.0.3",
+ "@types/require-all": "3.0.4",
"@types/showdown": "2.0.2",
"@types/supertest": "2.0.13",
"@types/tiny-async-pool": "2.0.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a37e1cec7f23f4..63342c924ab651 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -275,8 +275,8 @@ devDependencies:
specifier: 1.0.19
version: 1.0.19
'@types/require-all':
- specifier: 3.0.3
- version: 3.0.3
+ specifier: 3.0.4
+ version: 3.0.4
'@types/showdown':
specifier: 2.0.2
version: 2.0.2
@@ -1711,8 +1711,8 @@ packages:
'@types/tough-cookie': 4.0.3
form-data: 2.5.1
- /@types/[email protected]:
- resolution: {integrity: sha512-y9IkD6jpxoYD2SNK4CHN2NNSL+6EVtTp26Jg3l1VbBjPdXNaKg5PeclIjdAj8lGxh0Cpur5sHRJPKRa3cPtqgA==}
+ /@types/[email protected]:
+ resolution: {integrity: sha512-huqCdyD1zXN7eFJ6Duj3CrSb9Xxqqs8wT6oIKsBlG5x8/sgMUYQq3l9RTAQiHPOkkhKA5N3XPjMavu5sm3WQQQ==}
dev: true
/@types/[email protected]:
|
796981915dd5af48d5ef278f8ba51a1604b203b2
|
2024-07-25 12:08:57
|
Stephen Zhou
|
fix(route): short title, use guid for github activities (#16247)
| false
|
short title, use guid for github activities (#16247)
|
fix
|
diff --git a/lib/routes/github/activity.ts b/lib/routes/github/activity.ts
index 0865e33bf3ea1b..f2f3f72c9a9aa7 100644
--- a/lib/routes/github/activity.ts
+++ b/lib/routes/github/activity.ts
@@ -38,7 +38,7 @@ export const route: Route = {
const image = raw.match(/<media:thumbnail height="30" width="30" url="(.+?)"/)?.[1];
const feed = await parser.parseString(raw);
return {
- title: `${user}'s GitHub Public Timeline Feed`,
+ title: `${user}'s GitHub activities`,
link: feed.link,
image,
item: feed.items.map((item) => ({
@@ -47,7 +47,7 @@ export const route: Route = {
description: item.content?.replace(/href="(.+?)"/g, `href="https://github.com$1"`),
pubDate: item.pubDate ? parseDate(item.pubDate) : undefined,
author: item.author,
- id: item.id,
+ guid: item.id,
image,
})),
};
|
985dbaca7729129961792b014bda295b177466b8
|
2023-12-21 20:14:43
|
DIYgod
|
feat: remove notOperational routes - travel
| false
|
remove notOperational routes - travel
|
feat
|
diff --git a/lib/router.js b/lib/router.js
index daf6ca3046982e..f040a99395b75d 100644
--- a/lib/router.js
+++ b/lib/router.js
@@ -123,13 +123,6 @@ router.get('/zongheng/chapter/:id', lazyloadRouteHandler('./routes/zongheng/chap
// 刺猬猫
router.get('/ciweimao/chapter/:id', lazyloadRouteHandler('./routes/ciweimao/chapter'));
-// 中国美术馆
-router.get('/namoc/announcement', lazyloadRouteHandler('./routes/namoc/announcement'));
-router.get('/namoc/news', lazyloadRouteHandler('./routes/namoc/news'));
-router.get('/namoc/media', lazyloadRouteHandler('./routes/namoc/media'));
-router.get('/namoc/exhibition', lazyloadRouteHandler('./routes/namoc/exhibition'));
-router.get('/namoc/specials', lazyloadRouteHandler('./routes/namoc/specials'));
-
// 维基百科 Wikipedia
router.get('/wikipedia/mainland', lazyloadRouteHandler('./routes/wikipedia/mainland'));
@@ -155,18 +148,9 @@ router.get('/tucaoqq/post/:project/:key', lazyloadRouteHandler('./routes/tencent
// wechat
router.get('/wechat/miniprogram/plugins', lazyloadRouteHandler('./routes/tencent/wechat/miniprogram/plugins'));
-// All the Flight Deals
-router.get('/atfd/:locations/:nearby?', lazyloadRouteHandler('./routes/atfd/index'));
-
// Nvidia Web Driver
router.get('/nvidia/webdriverupdate', lazyloadRouteHandler('./routes/nvidia/webdriverupdate'));
-// 每日环球展览 iMuseum
-router.get('/imuseum/:city/:type?', lazyloadRouteHandler('./routes/imuseum'));
-
-// Hopper
-router.get('/hopper/:lowestOnly/:from/:to?', lazyloadRouteHandler('./routes/hopper/index'));
-
// 马蜂窝
router.get('/mafengwo/note/:type', lazyloadRouteHandler('./routes/mafengwo/note'));
router.get('/mafengwo/ziyouxing/:code', lazyloadRouteHandler('./routes/mafengwo/ziyouxing'));
diff --git a/lib/routes/atfd/index.js b/lib/routes/atfd/index.js
deleted file mode 100644
index b704868ae01630..00000000000000
--- a/lib/routes/atfd/index.js
+++ /dev/null
@@ -1,46 +0,0 @@
-const got = require('@/utils/got');
-const { toTitleCase } = require('@/utils/common-utils');
-const dayjs = require('dayjs');
-
-module.exports = async (ctx) => {
- const locations = ctx.params.locations;
-
- let nearby = ctx.params.nearby || '0';
- nearby = nearby === '1' ? 'true' : 'false';
-
- let host = 'https://alltheflightdeals.com/deals';
-
- let url = 'https://alltheflightdeals.com/deals/locations?origins=[';
-
- locations.split(',').forEach((pair) => {
- const country = pair.split('+')[0];
- const city = toTitleCase(pair.split('+')[1]);
- url += `{"country":"${country}","city":"${city}"},`;
-
- host += `/${country}/${city.replace(' ', '_')}`;
- });
-
- url = url.slice(0, -1) + `]&includeNearbyOrigins=${nearby}`;
-
- const response = await got({
- method: 'get',
- url,
- headers: {
- Referer: host,
- },
- });
- const data = response.data.data.slice(0, 10);
-
- ctx.state.data = {
- title: 'All the Flight Deals',
- link: host,
- description: 'All the Flight Deals',
- item: data.map((item) => ({
- title: `[${item.dateRanges[0] ? dayjs(item.dateRanges[0].start).format('YYYY MMM DD') + ' to ' + dayjs(item.dateRanges[0].end).format('YYYY MMM DD') : ''}] ${item.title}`,
- description: `<img src="https://alltheflightdeals.com/assets/cities/${item.cityPairs[0].destinationCity.id}.jpg" alt="${item.cityPairs[0].destination.city},${item.cityPairs[0].destination.countryName}"> <br><table><tbody><tr><th align="left" style="border: 1px solid black;">From</th><th align="left" style="border: 1px solid black;">To</th><th align="left" style="border: 1px solid black;">Price</th></tr><tr><td style="border: 1px solid black;"><b>${item.cityPairs[0].origin.iata}</b>, ${item.cityPairs[0].origin.city}, ${item.cityPairs[0].origin.countryName}</td><td style="border: 1px solid black;"><b>${item.cityPairs[0].destination.iata}</b>, ${item.cityPairs[0].destination.city}, ${item.cityPairs[0].destination.countryName}</td><td style="border: 1px solid black;">${item.currency} ${item.price}</td></tr></tbody></table>`,
- pubDate: new Date(item.createdAt),
- guid: item.id,
- link: item.url,
- })),
- };
-};
diff --git a/lib/routes/hopper/index.js b/lib/routes/hopper/index.js
deleted file mode 100644
index ead5704a4572e4..00000000000000
--- a/lib/routes/hopper/index.js
+++ /dev/null
@@ -1,82 +0,0 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const dayjs = require('dayjs');
-const queryString = require('query-string');
-
-module.exports = async (ctx) => {
- const from = ctx.params.from.toUpperCase();
- const to = ctx.params.to !== undefined ? ctx.params.to.toUpperCase() : 'Anywhere';
-
- const type = ctx.params.lowestOnly;
-
- const url = `https://www.hopper.com/deals/best/from/${from}/to/${to}`;
- const title = `Hopper - Flights From ${from} to ${to}`;
-
- const response = await got({
- method: 'get',
- url,
- searchParams: queryString.stringify({
- pid: 'website',
- c: 'flexweb',
- }),
- });
-
- const $ = cheerio.load(response.data);
- const list = $('div.prices li a');
- const items = [];
-
- if (list.length !== 0) {
- if (type === '1') {
- let lowest = 99999;
- let lowIndex = 0;
-
- list.each((i, e) => {
- const current = parseInt($(e).find('.price').text().replace(/\D/g, ''));
-
- if (current < lowest) {
- lowest = current;
- lowIndex = i;
- }
- });
-
- items.push(formatDesc($(list[lowIndex])));
- } else {
- list.each((i, e) => {
- items.push(formatDesc($(e)));
- });
- }
- }
-
- ctx.state.data = {
- title,
- link: url,
- description: title,
- item: items,
- };
-};
-
-const formatDesc = (e) => {
- const item = e.attr('href');
- let reg = new RegExp('destination=(.*?)&', 'g');
- const destination = reg.exec(item)[1];
- reg = new RegExp('origin=(.*?)&', 'g');
- const origin = reg.exec(item)[1];
- reg = new RegExp('departureDate=(.*?)&', 'g');
- const departureDate = reg.exec(item)[1];
- reg = new RegExp('returnDate=(.*?)&', 'g');
- const returnDate = reg.exec(item)[1];
-
- const price = e.find('.price').text();
-
- const title = `${origin} ✈ ${destination} ${dayjs(departureDate).format('YYYY MMM')} for ${price}`;
-
- const description = `<table><tbody><tr><th align="left" style="border: 1px solid black;">From</th><th align="left" style="border: 1px solid black;">To</th><th align="left" style="border: 1px solid black;">Price</th></tr><tr><td style="border: 1px solid black;">
- ${origin}</td><td style="border: 1px solid black;">${destination}</td><td style="border: 1px solid black;">${price}</td></tr></tbody></table>${dayjs(departureDate).format('YYYY MMM DD')} ✈ ${dayjs(returnDate).format(
- 'YYYY MMM DD'
- )}`;
- return {
- title,
- description,
- link: item,
- };
-};
diff --git a/lib/routes/imuseum/index.js b/lib/routes/imuseum/index.js
deleted file mode 100644
index fe87e831e8b81b..00000000000000
--- a/lib/routes/imuseum/index.js
+++ /dev/null
@@ -1,49 +0,0 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-
-const baseUrl = 'https://art.icity.ly';
-
-/**
- * type: ['all', 'latest', 'hot', 'end_soon', 'coming', 'outdated']
- * city: ['shanghai', 'beijing',....]
- */
-module.exports = async (ctx) => {
- const city = ctx.params.city;
- const type = ctx.params.type || 'all';
- const url = `${baseUrl}/${city}/${type}`;
- const response = await got({
- method: 'get',
- url,
- headers: {
- Referer: url,
- },
- });
- const data = response.data;
- const $ = cheerio.load(data);
-
- const context = $('.imsm-section');
- const city_name = context.find('a > h3').text();
- const exhibition_type = context.find('li.active > a').text();
- const title = `${city_name} - ${exhibition_type} - 每日环球展览 iMuseum`;
-
- const list = $('.imsm-entries.list li');
- ctx.state.data = {
- title,
- link: url,
- description: $('meta[name="description"]').attr('content'),
- item:
- list &&
- list
- .map((item, index) => {
- item = $(index);
- const pretitle = item.find('.pretitle').children()[0].prev ? item.find('.pretitle').children()[0].prev.data : '';
- const subtitle = item.find('.subtitle').children()[0].next ? item.find('.subtitle').children()[0].next.data : '';
- return {
- title: item.find('div.title').text(),
- description: `${subtitle} ${pretitle} <img src="${item.find('img.cover').attr('src')}">`,
- link: `${baseUrl}${item.find('a.info').attr('href')}`,
- };
- })
- .get(),
- };
-};
diff --git a/lib/routes/namoc/announcement.js b/lib/routes/namoc/announcement.js
deleted file mode 100644
index 4e9849df3ba5e2..00000000000000
--- a/lib/routes/namoc/announcement.js
+++ /dev/null
@@ -1,64 +0,0 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const url = require('url');
-const logger = require('@/utils/logger');
-
-const host = 'http://www.namoc.org/xwzx/tzgg/2017gonggao/';
-
-module.exports = async (ctx) => {
- const response = await got.get(host);
-
- const $ = cheerio.load(response.data);
-
- const list = $('.news-list li:not(.clearfix)').slice(0, 5).get();
-
- const proList = [];
-
- const out = await Promise.all(
- list.map(async (item) => {
- const $ = cheerio.load(item);
- const title = $('a').text();
- const itemUrl = url.resolve(host, $('a').attr('href'));
- const cache = await ctx.cache.get(itemUrl);
- if (cache) {
- return Promise.resolve(JSON.parse(cache));
- }
- const single = {
- title,
- link: itemUrl,
- guid: itemUrl,
- };
-
- try {
- const es = got.get(itemUrl);
- proList.push(es);
- return Promise.resolve(single);
- } catch (err) {
- logger.error(`${title}: ${itemUrl} -- ${err.response.status}: ${err.response.statusText}`);
- }
- })
- );
-
- const responses = await got.all(proList);
- for (let i = 0; i < responses.length; i++) {
- const $ = cheerio.load(responses[i].data);
- const full = $('.content');
-
- const link = out[i].link.split('/');
- link.pop();
- const absLink = link.join('/');
-
- out[i].description = full
- .find('div.TRS_Editor')
- .html()
- .replace(/src="./g, `src="${absLink}`);
- out[i].author = '中国美术馆';
- out[i].pubDate = new Date(full.find('.news-info span:last-of-type').text().replace('时间：', '')).toUTCString();
- ctx.cache.set(out[i].link, JSON.stringify(out[i]));
- }
- ctx.state.data = {
- title: '中国美术馆 -- 通知公告',
- link: host,
- item: out,
- };
-};
diff --git a/lib/routes/namoc/exhibition.js b/lib/routes/namoc/exhibition.js
deleted file mode 100644
index 5f1e3e66853feb..00000000000000
--- a/lib/routes/namoc/exhibition.js
+++ /dev/null
@@ -1,67 +0,0 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const url = require('url');
-const logger = require('@/utils/logger');
-
-const host = 'http://www.namoc.org/zsjs/zlzx/';
-
-module.exports = async (ctx) => {
- const response = await got.get(host);
-
- const $ = cheerio.load(response.data);
-
- const list = $('#content div.rec-exh-news-list div.wrap:nth-of-type(2)').find('li').get();
- const proList = [];
-
- const out = await Promise.all(
- list.map(async (item) => {
- const $ = cheerio.load(item);
- const title = $('a').text();
- const itemUrl = url.resolve(host, $('a').attr('href'));
- const cache = await ctx.cache.get(itemUrl);
- if (cache) {
- return Promise.resolve(JSON.parse(cache));
- }
- const single = {
- title,
- link: itemUrl,
- guid: itemUrl,
- };
-
- try {
- const es = got.get(itemUrl);
- proList.push(es);
- return Promise.resolve(single);
- } catch (err) {
- logger.error(`${title}: ${itemUrl} -- ${err.response.status}: ${err.response.statusText}`);
- }
- })
- );
-
- const responses = await got.all(proList);
- for (let i = 0; i < responses.length; i++) {
- const $ = cheerio.load(responses[i].data);
- const full = $('#content');
-
- let info = full.find('ul.info');
- info = $(info).remove('.fav_btn');
-
- const from = $(info).find('script:first-of-type').html().replace('getExhDate("', '').replace('");', '');
- const to = $(info).find('script:last-of-type').html().replace('getExhDate("', '').replace('");', '');
-
- $(info).find('script:first-of-type').replaceWith(from);
- $(info).find('script:last-of-type').replaceWith(to);
-
- const intro = full.find('div.Custom_UnionStyle').html();
- const cover = full.find('p.image-list').html();
- out[i].description = cover + info + intro;
- out[i].author = full.find('.news-info span:first-of-type').text().replace('来源：', '');
- out[i].pubDate = new Date(full.find('.news-info span:last-of-type').text().replace('时间：', '')).toUTCString();
- ctx.cache.set(out[i].link, JSON.stringify(out[i]));
- }
- ctx.state.data = {
- title: '中国美术馆 -- 展览预告',
- link: host,
- item: out,
- };
-};
diff --git a/lib/routes/namoc/media.js b/lib/routes/namoc/media.js
deleted file mode 100644
index ecfe951e8aaf3e..00000000000000
--- a/lib/routes/namoc/media.js
+++ /dev/null
@@ -1,67 +0,0 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const url = require('url');
-const logger = require('@/utils/logger');
-
-const host = 'http://www.namoc.org/xwzx/mtry/2018/';
-
-module.exports = async (ctx) => {
- const response = await got.get(host);
-
- const $ = cheerio.load(response.data);
-
- const list = $('.news-list li:not(.clearfix)').slice(0, 10).get();
-
- const proList = [];
-
- const out = await Promise.all(
- list.map(async (item) => {
- const $ = cheerio.load(item);
- const title = $('a').text();
- const itemUrl = url.resolve(host, $('a').attr('href'));
-
- const cache = await ctx.cache.get(itemUrl);
- if (cache) {
- return Promise.resolve(JSON.parse(cache));
- }
- const single = {
- title,
- link: itemUrl,
- guid: itemUrl,
- };
-
- try {
- const es = got.get(itemUrl);
- proList.push(es);
- return Promise.resolve(single);
- } catch (err) {
- logger.error(`${title}: ${itemUrl} -- ${err.response.status}: ${err.response.statusText}`);
- }
- })
- );
-
- const responses = await got.all(proList);
- for (let i = 0; i < responses.length; i++) {
- if (url.parse(out[i].link).hostname === url.parse(host).hostname) {
- const $ = cheerio.load(responses[i].data);
- const full = $('.content');
-
- const link = out[i].link.split('/');
- link.pop();
- const absLink = link.join('/');
-
- out[i].description = full
- .find('div.TRS_Editor')
- .html()
- .replace(/src="./g, `src="${absLink}`);
- out[i].author = full.find('.news-info span:first-of-type').text().replace('来源：', '');
- out[i].pubDate = new Date(full.find('.news-info span:last-of-type').text().replace('时间：', '')).toUTCString();
- ctx.cache.set(out[i].link, JSON.stringify(out[i]));
- }
- }
- ctx.state.data = {
- title: '中国美术馆 -- 媒体联报',
- link: host,
- item: out,
- };
-};
diff --git a/lib/routes/namoc/news.js b/lib/routes/namoc/news.js
deleted file mode 100644
index 582549fff8a1bc..00000000000000
--- a/lib/routes/namoc/news.js
+++ /dev/null
@@ -1,67 +0,0 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const url = require('url');
-const logger = require('@/utils/logger');
-
-const host = 'http://www.namoc.org/xwzx/xw/xinwen/';
-
-module.exports = async (ctx) => {
- const response = await got.get(host);
-
- const $ = cheerio.load(response.data);
-
- const list = $('.news-list li:not(.clearfix)').slice(0, 10).get();
-
- const proList = [];
-
- const out = await Promise.all(
- list.map(async (item) => {
- const $ = cheerio.load(item);
- const title = $('a').text();
- const itemUrl = url.resolve(host, $('a').attr('href'));
-
- const cache = await ctx.cache.get(itemUrl);
- if (cache) {
- return Promise.resolve(JSON.parse(cache));
- }
- const single = {
- title,
- link: itemUrl,
- guid: itemUrl,
- };
-
- try {
- const es = got.get(itemUrl);
- proList.push(es);
- return Promise.resolve(single);
- } catch (err) {
- logger.error(`${title}: ${itemUrl} -- ${err.response.status}: ${err.response.statusText}`);
- }
- })
- );
-
- const responses = await got.all(proList);
- for (let i = 0; i < responses.length; i++) {
- if (url.parse(out[i].link).hostname === url.parse(host).hostname) {
- const $ = cheerio.load(responses[i].data);
- const full = $('.content');
-
- const link = out[i].link.split('/');
- link.pop();
- const absLink = link.join('/');
-
- out[i].description = full
- .find('div.TRS_Editor')
- .html()
- .replace(/src="./g, `src="${absLink}`);
- out[i].author = full.find('.news-info span:first-of-type').text().replace('来源：', '');
- out[i].pubDate = new Date(full.find('.news-info span:last-of-type').text().replace('时间：', '')).toUTCString();
- ctx.cache.set(out[i].link, JSON.stringify(out[i]));
- }
- }
- ctx.state.data = {
- title: '中国美术馆 -- 新闻',
- link: host,
- item: out,
- };
-};
diff --git a/lib/routes/namoc/specials.js b/lib/routes/namoc/specials.js
deleted file mode 100644
index b23c685dcc387a..00000000000000
--- a/lib/routes/namoc/specials.js
+++ /dev/null
@@ -1,42 +0,0 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-
-const host = 'http://www.namoc.org/xwzx/jdzt/2018zhuanti/';
-
-module.exports = async (ctx) => {
- const response = await got.get(host);
-
- const $ = cheerio.load(response.data);
-
- const list = $('div.inner div.list li').slice(0, 5).get();
-
- const out = await Promise.all(
- list.map(async (item) => {
- const $ = cheerio.load(item);
- const title = $('div.text a').text();
- const itemUrl = $('div.text a').attr('href');
- const cache = await ctx.cache.get(itemUrl);
- if (cache) {
- return Promise.resolve(JSON.parse(cache));
- }
-
- const cover = $('p.image a')
- .html()
- .replace(/src="./g, `src="${host}`);
-
- const single = {
- title,
- link: itemUrl,
- guid: itemUrl,
- description: cover + $('div.text div').html(),
- pubDate: new Date($('span.date').text()).toUTCString(),
- };
- return Promise.resolve(single);
- })
- );
- ctx.state.data = {
- title: '中国美术馆 -- 焦点专题',
- link: host,
- item: out,
- };
-};
diff --git a/lib/v2/guggenheim/exhibitions.js b/lib/v2/guggenheim/exhibitions.js
deleted file mode 100644
index 150152604d8e80..00000000000000
--- a/lib/v2/guggenheim/exhibitions.js
+++ /dev/null
@@ -1,29 +0,0 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
-
-module.exports = async (ctx) => {
- const link = 'https://www.guggenheim.org/exhibitions';
-
- const response = await got({
- url: link,
- method: 'GET',
- });
-
- const code = cheerio.load(response.data)('#app-js-extra').html();
- const data = JSON.parse(code.match(/var bootstrap = ([^\n]*);/)[1]);
- const exhibitions = data.initial.main.posts.featuredExhibitions;
- const items = [].concat(exhibitions.past.items ?? [], exhibitions.on_view.items ?? [], exhibitions.upcoming.items ?? []);
-
- ctx.state.data = {
- link,
- url: link,
- title: 'The Guggenheim Museums and Foundation - Exhibitions',
- item: items.map((ex) => ({
- title: ex.title,
- link: `https://www.guggenheim.org/exhibition/${ex.slug}`,
- description: ex.excerpt,
- pubDate: ex.dates ? parseDate(`${ex.dates.start.month} ${ex.dates.start.day}, ${ex.dates.start.year}`, 'MMMM D, YYYY') : null,
- })),
- };
-};
diff --git a/lib/v2/guggenheim/maintainer.js b/lib/v2/guggenheim/maintainer.js
deleted file mode 100644
index 2b582f7fce773b..00000000000000
--- a/lib/v2/guggenheim/maintainer.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = {
- '/exhibitions': ['chazeon'],
-};
diff --git a/lib/v2/guggenheim/radar.js b/lib/v2/guggenheim/radar.js
deleted file mode 100644
index 2e5e5d1c3c5531..00000000000000
--- a/lib/v2/guggenheim/radar.js
+++ /dev/null
@@ -1,11 +0,0 @@
-module.exports = {
- 'guggenheim.org': {
- _name: 'Solomon R. Guggenheim Museum',
- www: [
- {
- title: 'Exhibitions',
- docs: 'https://docs.rsshub.app/routes/en/travel#solomon-r-guggenheim-museum',
- },
- ],
- },
-};
diff --git a/lib/v2/guggenheim/router.js b/lib/v2/guggenheim/router.js
deleted file mode 100644
index d98b7c8845a250..00000000000000
--- a/lib/v2/guggenheim/router.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = function (router) {
- router.get('/exhibitions', require('./exhibitions'));
-};
diff --git a/lib/v2/mcachicago/exhibitions.js b/lib/v2/mcachicago/exhibitions.js
deleted file mode 100644
index 9fe1e4b41ea71b..00000000000000
--- a/lib/v2/mcachicago/exhibitions.js
+++ /dev/null
@@ -1,17 +0,0 @@
-const buildData = require('@/utils/common-config');
-
-module.exports = async (ctx) => {
- const link = 'https://mcachicago.org/exhibitions';
-
- ctx.state.data = await buildData({
- link,
- url: link,
- title: 'MCA Chicago - Exhibitions',
- item: {
- item: '#exhibitions .card',
- title: `$('.title').text()`,
- link: `$('a').attr('href')`,
- // description: `$('a').html()`,
- },
- });
-};
diff --git a/lib/v2/mcachicago/maintainer.js b/lib/v2/mcachicago/maintainer.js
deleted file mode 100644
index 2b582f7fce773b..00000000000000
--- a/lib/v2/mcachicago/maintainer.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = {
- '/exhibitions': ['chazeon'],
-};
diff --git a/lib/v2/mcachicago/radar.js b/lib/v2/mcachicago/radar.js
deleted file mode 100644
index 9fcf2d4c4ea6e3..00000000000000
--- a/lib/v2/mcachicago/radar.js
+++ /dev/null
@@ -1,11 +0,0 @@
-module.exports = {
- 'mcachicago.org': {
- _name: 'MCA Chicago',
- '.': [
- {
- title: 'Exhibitions',
- docs: 'https://docs.rsshub.app/routes/en/travel#museum-of-contemporary-art-chicago',
- },
- ],
- },
-};
diff --git a/lib/v2/mcachicago/router.js b/lib/v2/mcachicago/router.js
deleted file mode 100644
index d98b7c8845a250..00000000000000
--- a/lib/v2/mcachicago/router.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = function (router) {
- router.get('/exhibitions', require('./exhibitions'));
-};
diff --git a/website/docs/routes/travel.mdx b/website/docs/routes/travel.mdx
index 6d7936285c30bb..4ff25ff2831c36 100644
--- a/website/docs/routes/travel.mdx
+++ b/website/docs/routes/travel.mdx
@@ -10,50 +10,12 @@
<Route author="Fatpandac" example="/12306/2022-02-19/重庆/永川东" path="/12306/:date/:from/:to/:type?" paramsDesc={['时间，格式为（YYYY-MM-DD）', '始发站', '终点站', '售票类型，成人和学生可选，默认为成人']} />
-## All the Flight Deals {#all-the-flight-deals}
-
-### Flight Deals {#all-the-flight-deals-flight-deals}
-
-<Route author="HenryQW" path="/atfd/:locations/:nearby?" example="/atfd/us+new%20york,gb+london/1" paramsDesc={['the departing city, consists of an 「ISO 3166-1 country code」 and a 「city name」. Origin\'s ISO 3166-1 country code + city name, eg. `us+new york`, [https://rsshub.app/atfd/us+new york](https://rsshub.app/atfd/us+new%20york). Multiple origins are supported via a comma separated string, eg. `us+new york,gb+london`, [https://rsshub.app/atfd/us+new york,gb+london/](https://rsshub.app/atfd/us+new%20york,gb+london/).', 'whether includes nearby airports, optional value of 0 or 1, default to 0 (exclude nearby airports)']} notOperational="1">
- For ISO 3166-1 country codes please refer to [Wikipedia ISO\_3166-1](https://en.wikipedia.org/wiki/ISO_3166-1)
-
- :::tip
- If the city name contains a space like `Mexico City`, replace the space with `%20`, `Mexico%20City`.
- :::
-</Route>
-
## Brooklyn Museum 纽约布鲁克林博物馆 {#brooklyn-museum-niu-yue-bu-lu-ke-lin-bo-wu-guan}
### Exhibitions {#brooklyn-museum-niu-yue-bu-lu-ke-lin-bo-wu-guan-exhibitions}
<Route author="chazeon" example="/brooklynmuseum/exhibitions" path="/brooklynmuseum/exhibitions/:state?" paramsDesc={['展览进行的状态：`current` 对应展览当前正在进行，`past` 对应过去的展览，`upcoming` 对应即将举办的展览，默认为 `current`']} />
-## Hopper {#hopper}
-
-### Flight Deals {#hopper-flight-deals}
-
-<Route author="HenryQW" path="/hopper/:lowestOnly/:from/:to?" example="/hopper/1/LHR/PEK" paramsDesc={['set to `1` will return the cheapest deal only, instead of all deals, so you don\'t get spammed', 'origin airport IATA code', 'destination airport IATA code, if unset the destination will be set to `anywhere`']} notOperational="1">
- This route returns a list of flight deals (in most cases, 6 flight deals) for a period defined by Hopper's algorithm, which means the travel date will be totally random (could be tomorrow or 10 months from now).
-
- For airport IATA code please refer to [Wikipedia List of airports by IATA code](https://en.wikipedia.org/wiki/List_of_airports_by_IATA_code:_A)
-</Route>
-
-## iMuseum {#imuseum}
-
-### 展览信息 {#imuseum-zhan-lan-xin-xi}
-
-<Route author="sinchang" example="/imuseum/shanghai/all" path="/imuseum/:city/:type?" paramsDesc={['如 shanghai, beijing', '不填则默认为 `all`']} notOperational="1">
- | 全部 | 最新 | 热门 | 即将结束 | 即将开始 | 已结束 |
- | ---- | ------ | ---- | --------- | -------- | -------- |
- | all | latest | hot | end\_soon | coming | outdated |
-</Route>
-
-## Museum of Contemporary Art Chicago 芝加哥当代艺术博物馆 {#museum-of-contemporary-art-chicago-zhi-jia-ge-dang-dai-yi-shu-bo-wu-guan}
-
-### Exhibitions {#museum-of-contemporary-art-chicago-zhi-jia-ge-dang-dai-yi-shu-bo-wu-guan-exhibitions}
-
-<Route author="chazeon" example="/mcachicago/exhibitions" path="/mcachicago/exhibitions" notOperational="1" />
-
## National Geographic {#national-geographic}
### Latest Stories {#national-geographic-latest-stories}
@@ -66,12 +28,6 @@
<Route author="chazeon" example="/newmuseum/exhibitions" path="/newmuseum/exhibitions" />
-## The Guggenheim Museums and Foundation {#the-guggenheim-museums-and-foundation}
-
-### Solomon R. Guggenheim Museum 纽约古根海姆基金会 - Exhibitions {#the-guggenheim-museums-and-foundation-solomon-r-guggenheim-museum-niu-yue-gu-gen-hai-mu-ji-jin-hui-exhibitions}
-
-<Route author="chazeon" example="/guggenheim/exhibitions" path="/guggenheim/exhibitions" notOperational="1" />
-
## 飞客茶馆 {#fei-ke-cha-guan}
### 优惠信息 {#fei-ke-cha-guan-you-hui-xin-xi}
@@ -158,16 +114,6 @@
<Route author="LandonLi" example="/airchina/announcement" path="/airchina/announcement" radar="1" />
-## 中国美术馆 {#zhong-guo-mei-shu-guan}
-
-### 美术馆新闻 {#zhong-guo-mei-shu-guan-mei-shu-guan-xin-wen}
-
-<Route author="HenryQW" example="/namoc/announcement" path="/namoc/:type" paramsDesc={['新闻类型， 可选如下']} notOperational="1">
- | 通知公告 | 新闻 | 媒体联报 | 展览预告 | 焦点专题 |
- | ------------ | ---- | -------- | ---------- | -------- |
- | announcement | news | media | exhibition | specials |
-</Route>
-
## 走进日本 {#zou-jin-ri-ben}
### 政治外交 {#zou-jin-ri-ben-zheng-zhi-wai-jiao}
|
abbf0166f7c4f972a88ac3ebafe384622952e4c2
|
2020-09-07 15:45:39
|
Ethan Shen
|
feat: add 1X photos (#5616)
| false
|
add 1X photos (#5616)
|
feat
|
diff --git a/docs/en/picture.md b/docs/en/picture.md
index 89ab7cd6b61d7e..bca8033c03fe1e 100644
--- a/docs/en/picture.md
+++ b/docs/en/picture.md
@@ -4,6 +4,38 @@ pageClass: routes
# Picture
+## 1X
+
+### Photos
+
+<RouteEn author="nczitzk" example="/1x/latest/all" path="/1x/:type?/:caty?" :paramsDesc="['sort type, `latest` by default, or `popular` or `curators-choice`', 'picture category, `all` by default, see below']">
+
+| Picture Category | Code |
+| -------------- | ------------- |
+| All categories | all |
+| Abstract | abstract |
+| Action | action |
+| Animals | animals |
+| Architecture | architecture |
+| Conceptual | conceptual |
+| Creative edit | creative-edit |
+| Documentary | documentary |
+| Everyday | everyday |
+| Fine Art Nude | fine-art-nude |
+| Humour | humour |
+| Landscape | landscape |
+| Macro | macro |
+| Mood | mood |
+| Night | night |
+| Performance | performance |
+| Portrait | portrait |
+| Still life | still-life |
+| Street | street |
+| Underwater | underwater |
+| Wildlife | wildlife |
+
+</RouteEn>
+
## Awesome Pigtails
### New
diff --git a/docs/picture.md b/docs/picture.md
index c474be23f1bcfe..b0bf368512f294 100644
--- a/docs/picture.md
+++ b/docs/picture.md
@@ -4,6 +4,38 @@ pageClass: routes
# 图片
+## 1X
+
+### Photos
+
+<Route author="nczitzk" example="/1x/latest/all" path="/1x/:type?/:caty?" :paramsDesc="['排序类型，默认为 `latest`，亦可选 `popular` 或 `curators-choice`', '图片类别，默认为 `all`，见下表']">
+
+| 图片类别 | 代码 |
+| -------------- | ------------- |
+| All categories | all |
+| Abstract | abstract |
+| Action | action |
+| Animals | animals |
+| Architecture | architecture |
+| Conceptual | conceptual |
+| Creative edit | creative-edit |
+| Documentary | documentary |
+| Everyday | everyday |
+| Fine Art Nude | fine-art-nude |
+| Humour | humour |
+| Landscape | landscape |
+| Macro | macro |
+| Mood | mood |
+| Night | night |
+| Performance | performance |
+| Portrait | portrait |
+| Still life | still-life |
+| Street | street |
+| Underwater | underwater |
+| Wildlife | wildlife |
+
+</Route>
+
## Awesome Pigtails
### 最新图片
diff --git a/lib/router.js b/lib/router.js
index 29265341939b01..6028e96b2d2cf4 100644
--- a/lib/router.js
+++ b/lib/router.js
@@ -3188,4 +3188,7 @@ router.get('/chuhaibiji', require('./routes/chuhaibiji/index'));
// 建宁闲谈
router.get('/blogs/jianning', require('./routes/blogs/jianning'));
+// 1X
+router.get('/1x/:type?/:caty?', require('./routes/1x/index'));
+
module.exports = router;
diff --git a/lib/routes/1x/index.js b/lib/routes/1x/index.js
new file mode 100644
index 00000000000000..5e4fc0c2b91f28
--- /dev/null
+++ b/lib/routes/1x/index.js
@@ -0,0 +1,36 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+
+module.exports = async (ctx) => {
+ ctx.params.type = ctx.params.type || 'latest';
+ ctx.params.caty = ctx.params.caty || 'all';
+
+ const rootUrl = `https://1x.com`;
+ const currentUrl = `${rootUrl}/photos/${ctx.params.type}/${ctx.params.caty}`;
+ const response = await got({
+ method: 'get',
+ url: currentUrl,
+ });
+
+ const $ = cheerio.load(response.data);
+
+ const list = $('#photos_target')
+ .find('td a img')
+ .slice(0, 30)
+ .map((_, item) => {
+ item = $(item);
+ return {
+ title: item.attr('title'),
+ link: `${rootUrl}/${item.parent().attr('href')}`,
+ description: `<img src="${item.attr('src')}">`,
+ author: item.attr('title'),
+ };
+ })
+ .get();
+
+ ctx.state.data = {
+ title: `${$('title').text()} - ${ctx.params.caty}`,
+ link: currentUrl,
+ item: list,
+ };
+};
|
f0ce97976f0420370c97fb15306c445b5f2adbd2
|
2024-05-09 17:44:58
|
dependabot[bot]
|
chore(deps-dev): bump eslint-plugin-n from 17.5.0 to 17.5.1 (#15527)
| false
|
bump eslint-plugin-n from 17.5.0 to 17.5.1 (#15527)
|
chore
|
diff --git a/package.json b/package.json
index 14797239775a47..459fb6b50e41dc 100644
--- a/package.json
+++ b/package.json
@@ -160,7 +160,7 @@
"eslint": "8.57.0",
"eslint-config-prettier": "9.1.0",
"eslint-nibble": "8.1.0",
- "eslint-plugin-n": "17.5.0",
+ "eslint-plugin-n": "17.5.1",
"eslint-plugin-prettier": "5.1.3",
"eslint-plugin-unicorn": "52.0.0",
"eslint-plugin-yml": "1.14.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7b27232591d711..e4df6ed716d0f4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -334,8 +334,8 @@ importers:
specifier: 8.1.0
version: 8.1.0([email protected])
eslint-plugin-n:
- specifier: 17.5.0
- version: 17.5.0([email protected])
+ specifier: 17.5.1
+ version: 17.5.1([email protected])
eslint-plugin-prettier:
specifier: 5.1.3
version: 5.1.3(@types/[email protected])([email protected]([email protected]))([email protected])([email protected])
@@ -2688,8 +2688,8 @@ packages:
peerDependencies:
eslint: '>=8'
- [email protected]:
- resolution: {integrity: sha512-r7i+NY+RVXQi4Q7sKCG5H4464saJWddDk7QFQjtj+wU//sf15QCq3M8LwZU2yiE45yhVUT9DXW+8AbXRQKJLPQ==}
+ [email protected]:
+ resolution: {integrity: sha512-+E242KoY16xtwqqBRgSsDCrZ3K40jg3Np9fOgQyakcHaqymK3bnxYB1F1oe8Ksts8TDDViROFgraoLzbWhfHVw==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
peerDependencies:
eslint: '>=8.23.0'
@@ -8032,7 +8032,7 @@ snapshots:
eslint: 8.57.0
eslint-compat-utils: 0.5.0([email protected])
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
'@eslint-community/eslint-utils': 4.4.0([email protected])
enhanced-resolve: 5.16.1
|
f2ac1e1e64dc8b09b118946cbb91ef241af50bf3
|
2024-10-03 17:48:14
|
dependabot[bot]
|
chore(deps-dev): bump @babel/preset-typescript from 7.24.7 to 7.25.7 (#16995)
| false
|
bump @babel/preset-typescript from 7.24.7 to 7.25.7 (#16995)
|
chore
|
diff --git a/package.json b/package.json
index 1d19cc14dc5db2..798aa469ffc922 100644
--- a/package.json
+++ b/package.json
@@ -136,7 +136,7 @@
},
"devDependencies": {
"@babel/preset-env": "7.25.7",
- "@babel/preset-typescript": "7.24.7",
+ "@babel/preset-typescript": "7.25.7",
"@eslint/eslintrc": "3.1.0",
"@eslint/js": "9.11.1",
"@microsoft/eslint-formatter-sarif": "3.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f6d449ced1eac9..78acf105d75368 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -262,8 +262,8 @@ importers:
specifier: 7.25.7
version: 7.25.7(@babel/[email protected])
'@babel/preset-typescript':
- specifier: 7.24.7
- version: 7.24.7(@babel/[email protected])
+ specifier: 7.25.7
+ version: 7.25.7(@babel/[email protected])
'@eslint/eslintrc':
specifier: 3.1.0
version: 3.1.0
@@ -1012,8 +1012,8 @@ packages:
peerDependencies:
'@babel/core': ^7.0.0-0 || ^8.0.0-0 <8.0.0
- '@babel/[email protected]':
- resolution: {integrity: sha512-SyXRe3OdWwIwalxDg5UtJnJQO+YPcTfwiIY2B0Xlddh9o7jpWLvv8X1RthIeDOxQ+O1ML5BLPCONToObyVQVuQ==}
+ '@babel/[email protected]':
+ resolution: {integrity: sha512-rkkpaXJZOFN45Fb+Gki0c+KMIglk4+zZXOoMJuyEK8y8Kkc8Jd3BDmP7qPsz0zQMJj+UD7EprF+AqAXcILnexw==}
engines: {node: '>=6.9.0'}
peerDependencies:
'@babel/core': ^7.0.0-0
@@ -6631,7 +6631,7 @@ snapshots:
'@babel/types': 7.25.7
esutils: 2.0.3
- '@babel/[email protected](@babel/[email protected])':
+ '@babel/[email protected](@babel/[email protected])':
dependencies:
'@babel/core': 7.25.7
'@babel/helper-plugin-utils': 7.25.7
|
01a16fd04a8fa9538f6865240b127d62f3cb7045
|
2024-03-19 10:46:10
|
MajexH
|
fix(route): Fix gov/chongqing/sydwgkzp error (#14827)
| false
|
Fix gov/chongqing/sydwgkzp error (#14827)
|
fix
|
diff --git a/lib/routes/gov/chongqing/gzw.ts b/lib/routes/gov/chongqing/gzw.ts
index 58e79b6391f85e..39ee3786b6f9f1 100644
--- a/lib/routes/gov/chongqing/gzw.ts
+++ b/lib/routes/gov/chongqing/gzw.ts
@@ -7,9 +7,22 @@ import { parseDate } from '@/utils/parse-date';
export const route: Route = {
path: '/chongqing/gzw/:category{.+}?',
- name: 'Unknown',
- maintainers: [],
+ parameters: {
+ category: '分类，见下表，默认为通知公告',
+ },
+ name: '重庆市人民政府 国有资产监督管理委员会',
+ url: 'gzw.cq.gov.cn',
+ maintainers: ['nczitzk'],
handler,
+ radar: [
+ {
+ source: 'gzw.cq.gov.cn/*category',
+ target: '/chongqing/gzw/*category',
+ },
+ ],
+ description: `| 通知公告 | 国企资讯 | 国企简介 | 国企招聘 |
+ | --------- | -------- | -------- | -------- |
+ | tzgg\_191 | gqdj | gqjj | gqzp |`,
};
async function handler(ctx) {
diff --git a/lib/routes/gov/chongqing/rsks.ts b/lib/routes/gov/chongqing/rsks.ts
index 6ef3db5be522ad..09f6f66be11ab1 100644
--- a/lib/routes/gov/chongqing/rsks.ts
+++ b/lib/routes/gov/chongqing/rsks.ts
@@ -8,21 +8,12 @@ export const route: Route = {
path: '/chongqing/rsks',
categories: ['government'],
example: '/gov/chongqing/rsks',
- parameters: {},
- features: {
- requireConfig: false,
- requirePuppeteer: false,
- antiCrawler: false,
- supportBT: false,
- supportPodcast: false,
- supportScihub: false,
- },
radar: [
{
source: ['rlsbj.cq.gov.cn/'],
},
],
- name: '重庆人事考试通知公告',
+ name: '重庆市人民政府 人力社保局 - 人事考试通知',
maintainers: ['Mai19930513'],
handler,
url: 'rlsbj.cq.gov.cn/',
diff --git a/lib/routes/gov/chongqing/sydwgkzp.ts b/lib/routes/gov/chongqing/sydwgkzp.ts
index b7c256277b8aef..7133a02a3a50d3 100644
--- a/lib/routes/gov/chongqing/sydwgkzp.ts
+++ b/lib/routes/gov/chongqing/sydwgkzp.ts
@@ -1,47 +1,41 @@
-import { Route } from '@/types';
+import { Route, Data } from '@/types';
import cache from '@/utils/cache';
import got from '@/utils/got';
import { load } from 'cheerio';
import { parseDate } from '@/utils/parse-date';
-
-// 重庆市事业单位公开招聘
-const sydwgkzpUrl = 'https://rlsbj.cq.gov.cn/zwxx_182/sydw/';
+import type { Context } from 'hono';
export const route: Route = {
- path: '/chongqing/sydwgkzp',
+ path: '/chongqing/sydwgkzp/:year?',
+ url: 'rlsbj.cq.gov.cn/',
categories: ['government'],
example: '/gov/chongqing/sydwgkzp',
- parameters: {},
- features: {
- requireConfig: false,
- requirePuppeteer: false,
- antiCrawler: false,
- supportBT: false,
- supportPodcast: false,
- supportScihub: false,
+ parameters: {
+ year: '需要订阅的年份，格式为`YYYY`，必须小于等于当前年份，默认为当前年份',
},
radar: [
{
source: ['rlsbj.cq.gov.cn/'],
},
],
- name: '人力社保局',
+ name: '重庆市人民政府 人力社保局 - 事业单位公开招聘',
maintainers: ['MajexH'],
handler,
- url: 'rlsbj.cq.gov.cn/',
- description: `#### 人事考试通知 {#chong-qing-shi-ren-min-zheng-fu-ren-li-she-bao-ju-ren-shi-kao-shi-tong-zhi}
+};
+async function handler(ctx: Context): Promise<Data> {
+ // 获取用户输入的 year
+ const { year = currentYear() }: { year?: number } = ctx.req.param();
-#### 事业单位公开招聘 {#chong-qing-shi-ren-min-zheng-fu-ren-li-she-bao-ju-shi-ye-dan-wei-gong-kai-zhao-pin}`,
-};
+ // 替换 url
+ const sydwgkzpUrl = `https://rlsbj.cq.gov.cn/zwxx_182/sydw/sydwgkzp${year}/`;
-async function handler() {
- const { data: response } = await got(sydwgkzpUrl);
+ const { data: response }: { data: any } = await got(sydwgkzpUrl);
const $ = load(response);
// 获取所有的标题
- const list = $('div.page-list .tab-item > li')
+ const list = $('div[class="p-rt rt"] .tab-item > li')
.toArray()
.map((item) => {
item = $(item);
@@ -60,10 +54,10 @@ async function handler() {
const items = await Promise.all(
list.map((item) =>
cache.tryGet(item.link, async () => {
- const { data: response } = await got(item.link);
+ const { data: response }: { data: any } = await got(item.link);
const $ = load(response);
// 主题正文
- item.description = $('div[class="view TRS_UEDITOR trs_paper_default trs_web"]').first().html();
+ item.description = $('div[class="trs_editor_view TRS_UEDITOR trs_paper_default trs_web"]').first().html();
return item;
})
)
@@ -75,3 +69,7 @@ async function handler() {
item: items,
};
}
+
+function currentYear(): number {
+ return new Date().getFullYear();
+}
|
2e5df2aa53b08df66231af6f1def25e8ba173030
|
2023-02-15 01:39:36
|
DIYgod
|
feat: add crossbell
| false
|
add crossbell
|
feat
|
diff --git a/docs/en/social-media.md b/docs/en/social-media.md
index fe0ecf5166d709..7e33349a797a57 100644
--- a/docs/en/social-media.md
+++ b/docs/en/social-media.md
@@ -4,6 +4,24 @@ pageClass: routes
# Social Media
+## Crossbell
+
+### Notes
+
+<RouteEn author="DIYgod" example="/crossbell/notes" path="/crossbell/notes" radar="1" rssbud="1"/>
+
+### Notes of character
+
+<RouteEn author="DIYgod" example="/crossbell/notes/character/10" path="/crossbell/notes/character/:characterId" radar="1" rssbud="1"/>
+
+### Notes of source
+
+<RouteEn author="DIYgod" example="/crossbell/notes/source/xlog" path="/crossbell/notes/source/:source" radar="1" rssbud="1"/>
+
+### Feeds of following
+
+<RouteEn author="DIYgod" example="/crossbell/feeds/following/10" path="/crossbell/feeds/following/:characterId" radar="1" rssbud="1"/>
+
## CuriousCat
### User
diff --git a/docs/social-media.md b/docs/social-media.md
index 34d44f97ac0145..6279d19f5ccadd 100644
--- a/docs/social-media.md
+++ b/docs/social-media.md
@@ -344,6 +344,24 @@ Tiny Tiny RSS 会给所有 iframe 元素添加 `sandbox="allow-scripts"` 属性
</Route>
+## Crossbell
+
+### Notes
+
+<Route author="DIYgod" example="/crossbell/notes" path="/crossbell/notes" radar="1" rssbud="1"/>
+
+### Notes of character
+
+<Route author="DIYgod" example="/crossbell/notes/character/10" path="/crossbell/notes/character/:characterId" radar="1" rssbud="1"/>
+
+### Notes of source
+
+<Route author="DIYgod" example="/crossbell/notes/source/xlog" path="/crossbell/notes/source/:source" radar="1" rssbud="1"/>
+
+### Feeds of following
+
+<Route author="DIYgod" example="/crossbell/feeds/following/10" path="/crossbell/feeds/following/:characterId" radar="1" rssbud="1"/>
+
## Curius
### 用户
diff --git a/lib/v2/crossbell/feeds/following.js b/lib/v2/crossbell/feeds/following.js
new file mode 100644
index 00000000000000..65cea84d46e2b4
--- /dev/null
+++ b/lib/v2/crossbell/feeds/following.js
@@ -0,0 +1,22 @@
+const got = require('@/utils/got');
+
+module.exports = async (ctx) => {
+ const characterId = ctx.params.characterId;
+ const response = await got(`https://indexer.crossbell.io/v1/characters/${characterId}/feed/follow`);
+ ctx.state.data = {
+ title: 'Crossbell Feeds of ' + characterId,
+ link: 'https://crossbell.io/',
+ item: response.data?.list?.map((item) => ({
+ title: `${item.type} ${item.character.metadata?.content?.name}@${item.character.handle}`,
+ description: `${item.type} ${item.note && `<br>Note: ${item.note.metadata?.content?.title || item.note.metadata?.content?.content}`}${
+ item.character && `<br>Character: ${item.character.metadata?.content?.name}@${item.character.handle}`
+ }`,
+ link: item.note ? item.note?.metadata?.content?.external_urls || `https://crossbell.io/notes/${item.note?.characterId}-${item.note?.noteId}` : 'https://xchar.app/' + item.character?.handle,
+ pubDate: item.createdAt,
+ updated: item.updatedAt,
+ author: item.note?.metadata?.content?.authors?.[0] || item.note?.character?.metadata?.content?.name || item.note?.character?.handle || item.owner,
+ guid: item.transactionHash + item.logIndex + item.type,
+ category: [...(item.note?.metadata?.content?.sources || []), ...(item.note?.metadata?.content?.tags || [])],
+ })),
+ };
+};
diff --git a/lib/v2/crossbell/maintainer.js b/lib/v2/crossbell/maintainer.js
new file mode 100644
index 00000000000000..1414ea3b0bafec
--- /dev/null
+++ b/lib/v2/crossbell/maintainer.js
@@ -0,0 +1,6 @@
+module.exports = {
+ '/notes': ['DIYgod'],
+ '/notes/character/:characterId': ['DIYgod'],
+ '/notes/source/:source': ['DIYgod'],
+ '/feeds/following/:characterId': ['DIYgod'],
+};
diff --git a/lib/v2/crossbell/notes/character.js b/lib/v2/crossbell/notes/character.js
new file mode 100644
index 00000000000000..c688feb1a22e67
--- /dev/null
+++ b/lib/v2/crossbell/notes/character.js
@@ -0,0 +1,22 @@
+const got = require('@/utils/got');
+const { getItem } = require('./utils');
+
+module.exports = async (ctx) => {
+ const characterId = ctx.params.characterId;
+
+ const response = await got('https://indexer.crossbell.io/v1/notes', {
+ searchParams: {
+ characterId,
+ includeCharacter: true,
+ },
+ });
+
+ const name = response.data?.list?.[0]?.character?.metadata?.content?.name || response.data?.list?.[0]?.character?.handle || characterId;
+ const handle = response.data?.list?.[0]?.character?.handle;
+
+ ctx.state.data = {
+ title: 'Crossbell Notes from ' + name,
+ link: 'https://xchar.app/' + handle,
+ item: response.data?.list?.map((item) => getItem(item)),
+ };
+};
diff --git a/lib/v2/crossbell/notes/index.js b/lib/v2/crossbell/notes/index.js
new file mode 100644
index 00000000000000..1450ddc4b89c98
--- /dev/null
+++ b/lib/v2/crossbell/notes/index.js
@@ -0,0 +1,16 @@
+const got = require('@/utils/got');
+const { getItem } = require('./utils');
+
+module.exports = async (ctx) => {
+ const response = await got('https://indexer.crossbell.io/v1/notes', {
+ searchParams: {
+ includeCharacter: true,
+ },
+ });
+
+ ctx.state.data = {
+ title: 'Crossbell Notes',
+ link: 'https://crossbell.io/',
+ item: response.data?.list?.map((item) => getItem(item)),
+ };
+};
diff --git a/lib/v2/crossbell/notes/source.js b/lib/v2/crossbell/notes/source.js
new file mode 100644
index 00000000000000..53edab3c4747f6
--- /dev/null
+++ b/lib/v2/crossbell/notes/source.js
@@ -0,0 +1,19 @@
+const got = require('@/utils/got');
+const { getItem } = require('./utils');
+
+module.exports = async (ctx) => {
+ const source = ctx.params.source;
+
+ const response = await got('https://indexer.crossbell.io/v1/notes', {
+ searchParams: {
+ sources: source,
+ includeCharacter: true,
+ },
+ });
+
+ ctx.state.data = {
+ title: 'Crossbell Notes from ' + source,
+ link: 'https://crossbell.io/',
+ item: response.data?.list?.map((item) => getItem(item)),
+ };
+};
diff --git a/lib/v2/crossbell/notes/utils.js b/lib/v2/crossbell/notes/utils.js
new file mode 100644
index 00000000000000..a1f45e9eabb000
--- /dev/null
+++ b/lib/v2/crossbell/notes/utils.js
@@ -0,0 +1,12 @@
+module.exports = {
+ getItem: (note) => ({
+ title: note.metadata?.content?.title || '',
+ description: note.metadata?.content?.content,
+ link: note.metadata?.content?.external_urls || `https://crossbell.io/notes/${note.characterId}-${note.noteId}`,
+ pubDate: note.metadata?.content?.publishedAt,
+ updated: note.metadata?.content?.updatedAt,
+ author: note.metadata?.content?.authors?.[0] || note.character?.metadata?.content?.name || note.character?.handle,
+ guid: `${note.characterId}-${note.noteId}`,
+ category: [...(note.metadata?.content?.sources || []), ...(note.metadata?.content?.tags || [])],
+ }),
+};
diff --git a/lib/v2/crossbell/radar.js b/lib/v2/crossbell/radar.js
new file mode 100644
index 00000000000000..1052da1fb89cf4
--- /dev/null
+++ b/lib/v2/crossbell/radar.js
@@ -0,0 +1,24 @@
+module.exports = {
+ 'crossbell.io': {
+ _name: 'Crossbell',
+ '.': [
+ {
+ title: 'Notes',
+ docs: 'https://docs.rsshub.app/social-media.html#crossbell',
+ source: '/*',
+ target: '/notes',
+ },
+ ],
+ },
+ 'xlog.app': {
+ _name: 'xLog',
+ '.': [
+ {
+ title: 'Notes',
+ docs: 'https://docs.rsshub.app/social-media.html#crossbell',
+ source: '/*',
+ target: '/notes/source/xlog',
+ },
+ ],
+ },
+};
diff --git a/lib/v2/crossbell/router.js b/lib/v2/crossbell/router.js
new file mode 100644
index 00000000000000..1558bc62538d34
--- /dev/null
+++ b/lib/v2/crossbell/router.js
@@ -0,0 +1,6 @@
+module.exports = function (router) {
+ router.get('/notes/character/:characterId', require('./notes/character'));
+ router.get('/notes/source/:source', require('./notes/source'));
+ router.get('/notes', require('./notes/index'));
+ router.get('/feeds/following/:characterId', require('./feeds/following'));
+};
|
485628eae811c7ab57ec8161264f0bef5a5aa0d6
|
2023-02-21 21:02:37
|
qizidog
|
feat(route): add description of /swjtu/jtyu/yjs (#11923)
| false
|
add description of /swjtu/jtyu/yjs (#11923)
|
feat
|
diff --git a/lib/v2/swjtu/jtys/yjs.js b/lib/v2/swjtu/jtys/yjs.js
index e16134c618fe4e..2727225ec616b0 100644
--- a/lib/v2/swjtu/jtys/yjs.js
+++ b/lib/v2/swjtu/jtys/yjs.js
@@ -5,6 +5,31 @@ const { parseDate } = require('@/utils/parse-date');
const rootURL = 'https://ctt.swjtu.edu.cn';
const url_addr = `${rootURL}/yethan/WebIndexAction?setAction=newsList&bigTypeId=0E4BF4D36E232918`;
+const getItem = (item, cache) => {
+ const news_info = item.find('div[class="news-title newsInfo"]');
+ const news_month = item.find('.month').text();
+ const news_day = item.find('.day').text();
+
+ const info_id = news_info.attr('newsid');
+ const info_title = news_info.text();
+ const link = `${rootURL}/yethan/WebIndexAction?setAction=newsInfo&newsId=${info_id}`;
+ return cache.tryGet(link, async () => {
+ const resp = await got({
+ method: 'get',
+ url: link,
+ });
+ const $$ = cheerio.load(resp.data);
+ const info_text = $$('.news-left').html();
+
+ return {
+ title: info_title,
+ pubDate: parseDate(`${news_month}.${news_day}`),
+ link,
+ description: info_text,
+ };
+ });
+};
+
module.exports = async (ctx) => {
const resp = await got({
method: 'get',
@@ -14,22 +39,17 @@ module.exports = async (ctx) => {
const $ = cheerio.load(resp.data);
const list = $("[class='news-list flex']");
+ const items = await Promise.all(
+ list.toArray().map((i) => {
+ const item = $(i);
+ return getItem(item, ctx.cache);
+ })
+ );
+
ctx.state.data = {
title: '西南交大交运学院-研究生通知',
link: url_addr,
- item:
- list &&
- list.toArray().map((i) => {
- const item = $(i);
- const news_info = item.find('div[class="news-title newsInfo"]');
- const news_month = item.find('.month');
- const news_day = item.find('.day');
- return {
- title: `标题：${news_info.text()}`,
- pubDate: parseDate(`${news_month.text()}.${news_day.text()}`),
- link: `${rootURL}/yethan/WebIndexAction?setAction=newsInfo&newsId=${news_info.attr('newsid')}`,
- };
- }),
+ item: items,
allowEmpty: true,
};
};
|
ffeca603af797b7da2230eedaaf56d61fe38fe40
|
2019-10-05 23:40:34
|
dependabot-preview[bot]
|
chore(deps-dev): bump nock from 11.3.5 to 11.3.6
| false
|
bump nock from 11.3.5 to 11.3.6
|
chore
|
diff --git a/package.json b/package.json
index 6bf5bdf23e442d..35e2fde5033144 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
"eslint-plugin-prettier": "3.1.1",
"jest": "24.9.0",
"mockdate": "2.0.5",
- "nock": "11.3.5",
+ "nock": "11.3.6",
"nodejieba": "2.3.2",
"nodemon": "1.19.3",
"pinyin": "2.9.0",
diff --git a/yarn.lock b/yarn.lock
index ab4322ddea6ef0..2219d8348a1695 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7449,10 +7449,10 @@ no-case@^2.2.0:
dependencies:
lower-case "^1.1.1"
[email protected]:
- version "11.3.5"
- resolved "https://registry.yarnpkg.com/nock/-/nock-11.3.5.tgz#f2c7b4b672a04c35342593b6bfd821497881199c"
- integrity sha512-6WGeZcWc3RExkBcMSYSrUm/5YukDo52m/jhwniQyrnuiCnKRljBwwje9vTwJyEi4J6m2bq0Aj6C1vzuM6iuaeg==
[email protected]:
+ version "11.3.6"
+ resolved "https://registry.yarnpkg.com/nock/-/nock-11.3.6.tgz#cd87eb47ed9755d6d1e04dee1d56722267cb3283"
+ integrity sha512-54MSX4qeRnhwQQ2PSHlHc6pM6zNf7Dq9ni0BTFTurnDbUUssXl2Jy3E95ffaE8rZ/W/FWa9VSfzWDDnbdAsoTg==
dependencies:
chai "^4.1.2"
debug "^4.1.0"
|
5d66e646979f0160a0f8ca2325f9001e0ba42948
|
2025-02-28 14:04:09
|
wolfg
|
fix(route/instructables): get api key from #js-page-context (#18326)
| false
|
get api key from #js-page-context (#18326)
|
fix
|
diff --git a/lib/routes/instructables/projects.ts b/lib/routes/instructables/projects.ts
index 00d48f9dc9cf81..5708fd6ed818b3 100644
--- a/lib/routes/instructables/projects.ts
+++ b/lib/routes/instructables/projects.ts
@@ -1,5 +1,7 @@
import { Route } from '@/types';
-import got from '@/utils/got';
+import ofetch from '@/utils/ofetch';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
export const route: Route = {
path: '/projects/:category?',
@@ -30,10 +32,10 @@ export const route: Route = {
};
async function handler(ctx) {
- const category = ctx.req.param('category') ?? 'all';
+ const { category = 'all' } = ctx.req.param();
+ const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 50;
- const siteDomain = 'www.instructables.com';
- const apiKey = 'NU5CdGwyRDdMVnVmM3l4cWNqQzFSVzJNZU5jaUxFU3dGK3J2L203MkVmVT02ZWFYeyJleGNsdWRlX2ZpZWxkcyI6WyJvdXRfb2YiLCJzZWFyY2hfdGltZV9tcyIsInN0ZXBCb2R5Il0sInBlcl9wYWdlIjo1MH0=';
+ const siteDomain = 'instructables.com';
let pathPrefix, projectFilter;
if (category === 'all') {
@@ -45,32 +47,35 @@ async function handler(ctx) {
projectFilter = category === 'teachers' ? `&& teachers:=${filterValue}` : ` && category:=${filterValue}`;
}
- const link = `https://${siteDomain}/${pathPrefix}projects?projects=all`;
+ const pageLink = `https://${siteDomain}/${pathPrefix}projects`;
- const response = await got({
+ const pageResponse = await ofetch(pageLink);
+ const $ = load(pageResponse);
+ const { typesenseProxy, typesenseApiKey } = JSON.parse($('script#js-page-context').text());
+
+ const data = await ofetch(`${typesenseProxy}/collections/projects/documents/search`, {
method: 'get',
- url: `https://${siteDomain}/api_proxy/search/collections/projects/documents/search`,
+ baseURL: `https://${siteDomain}`,
headers: {
- Referer: link,
+ Referer: pageLink,
Host: siteDomain,
- 'x-typesense-api-key': apiKey,
+ 'x-typesense-api-key': typesenseApiKey,
},
- searchParams: {
+ query: {
q: '*',
query_by: 'title,stepBody,screenName',
page: 1,
- per_page: 50,
+ per_page: limit,
sort_by: 'publishDate:desc',
include_fields: 'title,urlString,coverImageUrl,screenName,publishDate,favorites,views,primaryClassification,featureFlag,prizeLevel,IMadeItCount',
filter_by: `featureFlag:=true${projectFilter}`,
},
+ parseResponse: JSON.parse,
});
- const data = response.data;
-
return {
title: 'Instructables Projects', // 项目的标题
- link, // 指向项目的链接
+ link: `https://${siteDomain}/projects`, // 指向项目的链接
description: 'Instructables Projects', // 描述项目
language: 'en', // 频道语言
item: data.hits.map((item) => ({
@@ -78,7 +83,7 @@ async function handler(ctx) {
link: `https://${siteDomain}/${item.document.urlString}`,
author: item.document.screenName,
description: `<img src="${item.document.coverImageUrl}?auto=webp&crop=1.2%3A1&frame=1&width=500" width="500">`,
- pubDate: new Date(item.document.publishDate).toUTCString(),
+ pubDate: parseDate(item.document.publishDate),
category: item.document.primaryClassification,
})),
};
|
19b981f4d3098afa3a7ce06938358e50bbc5370d
|
2020-01-20 13:22:25
|
DIYgod
|
fix: discuz param
| false
|
discuz param
|
fix
|
diff --git a/lib/router.js b/lib/router.js
index 9e2a141428e6dc..b4b8f01fa02d38 100644
--- a/lib/router.js
+++ b/lib/router.js
@@ -2138,7 +2138,7 @@ router.get('/gbcc/trust', require('./routes/gbcc/trust'));
router.get('/apnews/topics/:topic', require('./routes/apnews/topics'));
// discuz
-router.get('/discuz/:link', require('./routes/discuz/discuz'));
+router.get('/discuz/:link(.*)', require('./routes/discuz/discuz'));
// China Dialogue 中外对话
router.get('/chinadialogue/topics/:topic', require('./routes/chinadialogue/topics'));
diff --git a/lib/routes/discuz/discuz.js b/lib/routes/discuz/discuz.js
index 07f9a3454ec32b..fa27cc5328e14e 100644
--- a/lib/routes/discuz/discuz.js
+++ b/lib/routes/discuz/discuz.js
@@ -1,6 +1,7 @@
const buildData = require('@/utils/common-config');
module.exports = async (ctx) => {
- const link = ctx.params.link;
+ let link = ctx.params.link;
+ link = link.replace(/:\/\//, ':/').replace(/:\//, '://');
ctx.state.data = await buildData({
link,
url: link,
|
192f538435c3efe4d1a581bf8f7d484ae44e5b53
|
2024-10-24 18:51:17
|
dependabot[bot]
|
chore(deps): bump @opentelemetry/sdk-trace-base from 1.26.0 to 1.27.0 (#17283)
| false
|
bump @opentelemetry/sdk-trace-base from 1.26.0 to 1.27.0 (#17283)
|
chore
|
diff --git a/package.json b/package.json
index e2a8010302bb53..357d93dbb6c5e1 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
"@opentelemetry/exporter-trace-otlp-http": "0.53.0",
"@opentelemetry/resources": "1.26.0",
"@opentelemetry/sdk-metrics": "1.26.0",
- "@opentelemetry/sdk-trace-base": "1.26.0",
+ "@opentelemetry/sdk-trace-base": "1.27.0",
"@opentelemetry/semantic-conventions": "1.27.0",
"@postlight/parser": "2.2.3",
"@rss3/sdk": "0.0.23",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0ce1166f0940c9..d7072fcb1ae0db 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -33,8 +33,8 @@ importers:
specifier: 1.26.0
version: 1.26.0(@opentelemetry/[email protected])
'@opentelemetry/sdk-trace-base':
- specifier: 1.26.0
- version: 1.26.0(@opentelemetry/[email protected])
+ specifier: 1.27.0
+ version: 1.27.0(@opentelemetry/[email protected])
'@opentelemetry/semantic-conventions':
specifier: 1.27.0
version: 1.27.0
@@ -1463,6 +1463,12 @@ packages:
peerDependencies:
'@opentelemetry/api': '>=1.0.0 <1.10.0'
+ '@opentelemetry/[email protected]':
+ resolution: {integrity: sha512-yQPKnK5e+76XuiqUH/gKyS8wv/7qITd5ln56QkBTf3uggr0VkXOXfcaAuG330UfdYu83wsyoBwqwxigpIG+Jkg==}
+ engines: {node: '>=14'}
+ peerDependencies:
+ '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
'@opentelemetry/[email protected]':
resolution: {integrity: sha512-STP2FZQOykUByPnibbouTirNxnG69Ph8TiMXDsaZuWxGDJ7wsYsRQydJkAVpvG+p0hTMP/hIfZp9zT/1iHpIkQ==}
engines: {node: '>=14'}
@@ -1493,6 +1499,12 @@ packages:
peerDependencies:
'@opentelemetry/api': '>=1.0.0 <1.10.0'
+ '@opentelemetry/[email protected]':
+ resolution: {integrity: sha512-jOwt2VJ/lUD5BLc+PMNymDrUCpm5PKi1E9oSVYAvz01U/VdndGmrtV3DU1pG4AwlYhJRHbHfOUIlpBeXCPw6QQ==}
+ engines: {node: '>=14'}
+ peerDependencies:
+ '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
'@opentelemetry/[email protected]':
resolution: {integrity: sha512-dhSisnEgIj/vJZXZV6f6KcTnyLDx/VuQ6l3ejuZpMpPlh9S1qMHiZU9NMmOkVkwwHkMy3G6mEBwdP23vUZVr4g==}
engines: {node: '>=14'}
@@ -1511,6 +1523,12 @@ packages:
peerDependencies:
'@opentelemetry/api': '>=1.0.0 <1.10.0'
+ '@opentelemetry/[email protected]':
+ resolution: {integrity: sha512-btz6XTQzwsyJjombpeqCX6LhiMQYpzt2pIYNPnw0IPO/3AhT6yjnf8Mnv3ZC2A4eRYOjqrg+bfaXg9XHDRJDWQ==}
+ engines: {node: '>=14'}
+ peerDependencies:
+ '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
'@opentelemetry/[email protected]':
resolution: {integrity: sha512-sAay1RrB+ONOem0OZanAR1ZI/k7yDpnOQSQmTMuGImUQb2y8EbSaCJ94FQluM74xoU03vlb2d2U90hZluL6nQg==}
engines: {node: '>=14'}
@@ -2186,8 +2204,8 @@ packages:
[email protected]:
resolution: {integrity: sha512-lh/eITfU8hrj9Ru5quUp0Io1kJWIk1bTjzo7JH1P5dWmQ2EL4hFUlfI8FonAhSlgIfhn63p84CDY/x+PisgcXA==}
- [email protected]:
- resolution: {integrity: sha512-Vm8kAeOcfzHPTH8sq0tHBnUqYrkXdroaBVVylqFT4cF5wnMfKEIxxy2jIGu2zKVNl9P8MAP9XBWwXJ9N2+jfEw==}
+ [email protected]:
+ resolution: {integrity: sha512-EFZHSIBkDgSHIwj2l2QZfP4U5OcD4xFAOwhSb/vlr9PIqyGJGvB/nfClJbcnh3EY4jtPE4zsb5ztae96bVF79A==}
[email protected]:
resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
@@ -2307,8 +2325,8 @@ packages:
[email protected]:
resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==}
- [email protected]:
- resolution: {integrity: sha512-pT1ZgP8rPNqUgieVaEY+ryQr6Q4HXNg8Ei9UnLUrjN4IA7dvQC5JB+/kxVcPNDHyBcc/26CXPkbNzq3qwrOEKA==}
+ [email protected]:
+ resolution: {integrity: sha512-aGtmf24DW6MLHHG5gCx4zaI3uBq3KRtxeVs0DjFH6Z0rDNbsvTxFASFvdj79pxjxZ8/5u3PIiN3IwEIQkiiuPw==}
engines: {node: '>=12'}
[email protected]:
@@ -2756,8 +2774,8 @@ packages:
engines: {node: '>=14'}
hasBin: true
- [email protected]:
- resolution: {integrity: sha512-NxnmFBHDl5Sachd2P46O7UJiMaMHMLSofoIWVJq3mj8NJgG0umiSeljAVP9lGzjI0UDLJJ5jjoGjcrB8RSbjLQ==}
+ [email protected]:
+ resolution: {integrity: sha512-vOzZS6uZwhhbkZbcRyiy99Wg+pYFV5hk+5YaECvx0+Z31NR3Tt5zS6dze2OepT6PCTzVzT0dIJItti+uAW5zmw==}
[email protected]:
resolution: {integrity: sha512-5gxbEjcb/Z2n6TTmXZx9wVi3N/DOzE7RXY3Xg9dakDuhX/izwumB9rGjeWUV6dTA0D0+juvo+JonZgNR9sgA5A==}
@@ -6907,6 +6925,11 @@ snapshots:
'@opentelemetry/api': 1.9.0
'@opentelemetry/semantic-conventions': 1.27.0
+ '@opentelemetry/[email protected](@opentelemetry/[email protected])':
+ dependencies:
+ '@opentelemetry/api': 1.9.0
+ '@opentelemetry/semantic-conventions': 1.27.0
+
'@opentelemetry/[email protected](@opentelemetry/[email protected])':
dependencies:
'@opentelemetry/api': 1.9.0
@@ -6946,6 +6969,12 @@ snapshots:
'@opentelemetry/core': 1.26.0(@opentelemetry/[email protected])
'@opentelemetry/semantic-conventions': 1.27.0
+ '@opentelemetry/[email protected](@opentelemetry/[email protected])':
+ dependencies:
+ '@opentelemetry/api': 1.9.0
+ '@opentelemetry/core': 1.27.0(@opentelemetry/[email protected])
+ '@opentelemetry/semantic-conventions': 1.27.0
+
'@opentelemetry/[email protected](@opentelemetry/[email protected])':
dependencies:
'@opentelemetry/api': 1.9.0
@@ -6966,6 +6995,13 @@ snapshots:
'@opentelemetry/resources': 1.26.0(@opentelemetry/[email protected])
'@opentelemetry/semantic-conventions': 1.27.0
+ '@opentelemetry/[email protected](@opentelemetry/[email protected])':
+ dependencies:
+ '@opentelemetry/api': 1.9.0
+ '@opentelemetry/core': 1.27.0(@opentelemetry/[email protected])
+ '@opentelemetry/resources': 1.27.0(@opentelemetry/[email protected])
+ '@opentelemetry/semantic-conventions': 1.27.0
+
'@opentelemetry/[email protected]': {}
'@otplib/[email protected]': {}
@@ -7498,7 +7534,7 @@ snapshots:
dependencies:
'@vitest/spy': 2.0.5
'@vitest/utils': 2.0.5
- chai: 5.1.1
+ chai: 5.1.2
tinyrainbow: 1.2.0
'@vitest/[email protected]':
@@ -7693,7 +7729,7 @@ snapshots:
dependencies:
bare-events: 2.5.0
bare-path: 2.1.3
- bare-stream: 2.3.1
+ bare-stream: 2.3.2
optional: true
[email protected]:
@@ -7704,7 +7740,7 @@ snapshots:
bare-os: 2.4.4
optional: true
- [email protected]:
+ [email protected]:
dependencies:
streamx: 2.20.1
optional: true
@@ -7759,7 +7795,7 @@ snapshots:
[email protected]:
dependencies:
caniuse-lite: 1.0.30001669
- electron-to-chromium: 1.5.43
+ electron-to-chromium: 1.5.45
node-releases: 2.0.18
update-browserslist-db: 1.1.1([email protected])
@@ -7837,7 +7873,7 @@ snapshots:
[email protected]: {}
- [email protected]:
+ [email protected]:
dependencies:
assertion-error: 2.0.1
check-error: 2.1.1
@@ -8300,7 +8336,7 @@ snapshots:
minimatch: 9.0.1
semver: 7.6.3
- [email protected]: {}
+ [email protected]: {}
[email protected]: {}
@@ -11458,7 +11494,7 @@ snapshots:
'@vitest/snapshot': 2.0.5
'@vitest/spy': 2.0.5
'@vitest/utils': 2.0.5
- chai: 5.1.1
+ chai: 5.1.2
debug: 4.3.7
execa: 8.0.1
magic-string: 0.30.12
|
7e53e2268ab6de5874e09dbfe04f3d1f2ef5f713
|
2023-12-21 11:29:41
|
dependabot[bot]
|
chore(deps-dev): bump eslint-plugin-n from 16.4.0 to 16.5.0 (#14091)
| false
|
bump eslint-plugin-n from 16.4.0 to 16.5.0 (#14091)
|
chore
|
diff --git a/package.json b/package.json
index 7879d11765d9f2..d58992d3c79235 100644
--- a/package.json
+++ b/package.json
@@ -185,7 +185,7 @@
"cross-env": "7.0.3",
"eslint": "8.56.0",
"eslint-config-prettier": "9.1.0",
- "eslint-plugin-n": "16.4.0",
+ "eslint-plugin-n": "16.5.0",
"eslint-plugin-prettier": "5.1.0",
"eslint-plugin-yml": "1.11.0",
"fs-extra": "11.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bf7ecfc4eb7637..e72c95b91fd0ac 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -308,8 +308,8 @@ devDependencies:
specifier: 9.1.0
version: 9.1.0([email protected])
eslint-plugin-n:
- specifier: 16.4.0
- version: 16.4.0([email protected])
+ specifier: 16.5.0
+ version: 16.5.0([email protected])
eslint-plugin-prettier:
specifier: 5.1.0
version: 5.1.0(@types/[email protected])([email protected])([email protected])([email protected])
@@ -3313,8 +3313,8 @@ packages:
eslint-compat-utils: 0.1.2([email protected])
dev: true
- /[email protected]([email protected]):
- resolution: {integrity: sha512-IkqJjGoWYGskVaJA7WQuN8PINIxc0N/Pk/jLeYT4ees6Fo5lAhpwGsYek6gS9tCUxgDC4zJ+OwY2bY/6/9OMKQ==}
+ /[email protected]([email protected]):
+ resolution: {integrity: sha512-Hw02Bj1QrZIlKyj471Tb1jSReTl4ghIMHGuBGiMVmw+s0jOPbI4CBuYpGbZr+tdQ+VAvSK6FDSta3J4ib/SKHQ==}
engines: {node: '>=16.0.0'}
peerDependencies:
eslint: '>=7.0.0'
|
aa72a2c78c8eb6302ad90412d55d1fb7feae2db3
|
2021-05-11 03:15:18
|
AgFlore
|
fix(route): douban 404 from resharing a deleted status (#7409)
| false
|
douban 404 from resharing a deleted status (#7409)
|
fix
|
diff --git a/lib/routes/douban/people/status.js b/lib/routes/douban/people/status.js
index 88971be86b93e8..0378b32df30ab6 100644
--- a/lib/routes/douban/people/status.js
+++ b/lib/routes/douban/people/status.js
@@ -433,7 +433,7 @@ async function getFullTextItems(ctx, items) {
cache = await ctx.cache.get(url);
if (cache) {
item.status.reshared_status.text = cache;
- } else {
+ } else if (tryFixStatus(item.status.reshared_status).isFixSuccess) {
const {
data: { text },
} = await got({ url, headers });
|
cec102b4724997d22bf7fceb8ca38a9906c63159
|
2024-07-15 14:14:32
|
dependabot[bot]
|
chore(deps): bump @tonyrl/rand-user-agent from 2.0.71 to 2.0.72 (#16172)
| false
|
bump @tonyrl/rand-user-agent from 2.0.71 to 2.0.72 (#16172)
|
chore
|
diff --git a/package.json b/package.json
index a8aed7283a5749..6dbe788bd8a14c 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
"@postlight/parser": "2.2.3",
"@scalar/hono-api-reference": "0.5.101",
"@sentry/node": "7.116.0",
- "@tonyrl/rand-user-agent": "2.0.71",
+ "@tonyrl/rand-user-agent": "2.0.72",
"aes-js": "3.1.2",
"art-template": "4.13.2",
"bbcodejs": "0.0.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 73a00b978e4a9e..8852b2000b487d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -48,8 +48,8 @@ importers:
specifier: 7.116.0
version: 7.116.0
'@tonyrl/rand-user-agent':
- specifier: 2.0.71
- version: 2.0.71
+ specifier: 2.0.72
+ version: 2.0.72
aes-js:
specifier: 3.1.2
version: 3.1.2
@@ -1953,8 +1953,8 @@ packages:
peerDependencies:
'@testing-library/dom': '>=7.21.4'
- '@tonyrl/[email protected]':
- resolution: {integrity: sha512-Eccx69YHUryoNMIwJGZaqPBl+aR1bo05cMWeVQm0JiiUAIvz+Lkdwfa+vWFh703XuVowm+odgniC1Jc0NBZWjQ==}
+ '@tonyrl/[email protected]':
+ resolution: {integrity: sha512-LBmF4dJnWlEjEZA+UBMx0+RSGqfe7jybVVQlhhp96CNirmUpJGOE6cHzvOlrB8z7efIE2jd2DKONvqsW8tTYyw==}
engines: {node: '>=14.16'}
'@tootallnate/[email protected]':
@@ -9155,7 +9155,7 @@ snapshots:
dependencies:
'@testing-library/dom': 10.1.0
- '@tonyrl/[email protected]': {}
+ '@tonyrl/[email protected]': {}
'@tootallnate/[email protected]': {}
|
ecba4f7a1f4b94a407b755dc59f0769cfc820f20
|
2024-08-19 17:37:02
|
Andvari
|
feat(route/gis): Add route (#16461)
| false
|
Add route (#16461)
|
feat
|
diff --git a/lib/routes/gisreportsonline/index.ts b/lib/routes/gisreportsonline/index.ts
new file mode 100644
index 00000000000000..fb90dd51d490d1
--- /dev/null
+++ b/lib/routes/gisreportsonline/index.ts
@@ -0,0 +1,60 @@
+import { Route } from '@/types';
+
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
+import cache from '@/utils/cache';
+import ofetch from '@/utils/ofetch';
+
+export const route: Route = {
+ path: '/:path{.*}',
+ categories: ['new-media'],
+ example: '/gis/c/security-challenges/',
+ parameters: { path: '包含"Reports"页面下的路径' },
+ name: '报告',
+ maintainers: ['dzx-dzx'],
+ radar: [
+ {
+ source: ['www.gisreportsonline.com'],
+ },
+ ],
+ handler,
+};
+
+async function handler(ctx) {
+ const rootUrl = 'https://www.gisreportsonline.com';
+ const currentUrl = `${rootUrl}/${ctx.req.param('path')}`;
+ const response = await ofetch(currentUrl);
+
+ const $ = load(response);
+
+ const list = $('article h3 a')
+ .toArray()
+ .map((e) => ({ link: $(e).attr('href'), title: $(e).text() }));
+
+ const items = await Promise.all(
+ list.map((item) =>
+ cache.tryGet(item.link, async () => {
+ const content = load(await ofetch(item.link));
+ const ldjson = JSON.parse(content('script.rank-math-schema-pro').text())['@graph'].find((e) => e['@type'] === 'NewsArticle');
+
+ item.pubDate = parseDate(ldjson.datePublished);
+ item.updated = parseDate(ldjson.dateModified);
+ item.author = [ldjson.author];
+ item.category = ldjson.keywords.split(',');
+ item.language = ldjson.inLanguage;
+
+ item.description = content('header.entry-header ~ :not(#pos-conclusion ~ *)')
+ .toArray()
+ .map((e) => content(e).html())
+ .join('');
+
+ return item;
+ })
+ )
+ );
+ return {
+ title: $('title').text(),
+ link: currentUrl,
+ item: items,
+ };
+}
diff --git a/lib/routes/gisreportsonline/namespace.ts b/lib/routes/gisreportsonline/namespace.ts
new file mode 100644
index 00000000000000..80c606cbf384b5
--- /dev/null
+++ b/lib/routes/gisreportsonline/namespace.ts
@@ -0,0 +1,6 @@
+import type { Namespace } from '@/types';
+
+export const namespace: Namespace = {
+ name: 'GIS Reports',
+ url: 'www.gisreportsonline.com',
+};
|
b71250ee67283c0915fcf5ed58334789b3daaffe
|
2020-05-06 23:26:01
|
dependabot-preview[bot]
|
chore(deps): bump puppeteer from 3.0.2 to 3.0.3
| false
|
bump puppeteer from 3.0.2 to 3.0.3
|
chore
|
diff --git a/package.json b/package.json
index 74f09e55a4ff5c..eccbcffe34c34a 100644
--- a/package.json
+++ b/package.json
@@ -102,7 +102,7 @@
"parse-torrent": "7.1.2",
"pidusage": "2.0.18",
"plist": "3.0.1",
- "puppeteer": "3.0.2",
+ "puppeteer": "3.0.3",
"query-string": "6.12.1",
"redis": "3.0.2",
"require-all": "3.0.0",
diff --git a/yarn.lock b/yarn.lock
index 807226625681b6..4b016df5b42969 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9987,10 +9987,10 @@ punycode@^2.1.0, punycode@^2.1.1:
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
[email protected]:
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-3.0.2.tgz#1d08cdb7c0c2666f5e743221b1cb1946fea493f0"
- integrity sha512-5jS/POFVDW9fqb76O8o0IBpXOnq+Na8ocGMggYtnjCRBRqmAFvX0csmwgLOHkYnQ/vCBcBPYlOq0Pp60z1850Q==
[email protected]:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-3.0.3.tgz#91c4ce46b3822b849e096413457fe8ced7d5aeca"
+ integrity sha512-sWtx9XezIwXdXHNelvnyPEmMjXXiCAuUulEONZFqRO3l+w0vP7dNcGDUIf2HLr4HLLi6r9hcUuO62s/W6rkD/w==
dependencies:
"@types/mime-types" "^2.1.0"
debug "^4.1.0"
|
a434c9a50b60a1c4a1b99f28eee7b5fbc66ce016
|
2019-05-12 12:32:54
|
阿卡琳
|
refactor: bangumi 每日放送添加id 修改缓存时间 (#2097)
| false
|
bangumi 每日放送添加id 修改缓存时间 (#2097)
|
refactor
|
diff --git a/lib/routes/bangumi/calendar/_base.js b/lib/routes/bangumi/calendar/_base.js
index 06f4040f1e769c..4af04917fe893b 100644
--- a/lib/routes/bangumi/calendar/_base.js
+++ b/lib/routes/bangumi/calendar/_base.js
@@ -1,5 +1,19 @@
const axios = require('../../../utils/axios');
+/** @type { (timezoneOffset: number) => Date } */
+const tomorrowMidnight = (timezoneOffset) => {
+ const result = new Date(Date.now());
+ const localHour = result.getHours() + timezoneOffset;
+ if (localHour < 0) {
+ result.setUTCHours(-timezoneOffset, 0, 0, 0);
+ } else if (localHour < 24) {
+ result.setUTCHours(24 - timezoneOffset, 0, 0, 0);
+ } else {
+ result.setUTCHours(48 - timezoneOffset, 0, 0, 0);
+ }
+ return result;
+};
+
module.exports = async (ctx) => {
const bgmCalendarUrl = 'https://api.bgm.tv/calendar';
const bgmDataUrl = 'https://cdn.jsdelivr.net/npm/bangumi-data/dist/data.json';
@@ -33,7 +47,7 @@ module.exports = async (ctx) => {
data.items = items;
}
- ctx.cache.set(url[i], JSON.stringify(data), 86400);
+ ctx.cache.set(url[i], JSON.stringify(data), tomorrowMidnight(8).getTime() - Date.now());
return Promise.resolve(data);
}
})
diff --git a/lib/routes/bangumi/calendar/today.js b/lib/routes/bangumi/calendar/today.js
index f6efaecacf3cbb..e3e0ef805cbe6a 100644
--- a/lib/routes/bangumi/calendar/today.js
+++ b/lib/routes/bangumi/calendar/today.js
@@ -4,10 +4,12 @@ module.exports = async (ctx) => {
const [list, data] = await getData(ctx);
const siteMeta = data.siteMeta;
- const now = new Date(Date.now());
+ const today = new Date(Date.now());
- now.setHours(now.getHours() + 9);
- const day = now.getUTCDay();
+ // 将 UTC 时间向前移动9小时，即可在数值上表示东京时间
+ today.setUTCHours(today.getUTCHours() + 9);
+
+ const day = today.getUTCDay();
const todayList = list.filter((l) => l.weekday.id % 7 === day)[0];
@@ -33,6 +35,9 @@ module.exports = async (ctx) => {
updated.setMinutes(begin.getMinutes());
updated.setSeconds(begin.getSeconds());
+ const link = `http://bangumi.tv/subject/${bgm.bgm_id}`;
+ const id = `${link}#${new Intl.DateTimeFormat('zh-CN').format(updated)}`;
+
const image = `<img referrerpolicy="no-referrer" src=${bgm.image} />`;
const html =
image +
@@ -51,6 +56,8 @@ module.exports = async (ctx) => {
'</ul>';
return {
+ id,
+ guid: id,
title: [
bgm.title,
Object.values(bgm.titleTranslate)
@@ -59,7 +66,7 @@ module.exports = async (ctx) => {
].join('｜'),
updated: updated.toISOString(),
pubDate: updated.toUTCString(),
- link: `http://bangumi.tv/subject/${bgm.bgm_id}`,
+ link,
description: html,
content: { html },
};
|
6a39068ee3fa69d1a453e82bc40872690e4c2bd8
|
2024-06-06 19:49:40
|
dependabot[bot]
|
chore(deps-dev): bump @babel/preset-typescript from 7.24.6 to 7.24.7 (#15831)
| false
|
bump @babel/preset-typescript from 7.24.6 to 7.24.7 (#15831)
|
chore
|
diff --git a/package.json b/package.json
index 32b0de0031debb..b237329240bf24 100644
--- a/package.json
+++ b/package.json
@@ -127,7 +127,7 @@
},
"devDependencies": {
"@babel/preset-env": "7.24.6",
- "@babel/preset-typescript": "7.24.6",
+ "@babel/preset-typescript": "7.24.7",
"@microsoft/eslint-formatter-sarif": "3.1.0",
"@stylistic/eslint-plugin": "2.1.0",
"@types/aes-js": "3.1.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 57498f9addebee..aa821b7c168b8a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -235,8 +235,8 @@ importers:
specifier: 7.24.6
version: 7.24.6(@babel/[email protected])
'@babel/preset-typescript':
- specifier: 7.24.6
- version: 7.24.6(@babel/[email protected])
+ specifier: 7.24.7
+ version: 7.24.7(@babel/[email protected])
'@microsoft/eslint-formatter-sarif':
specifier: 3.1.0
version: 3.1.0
@@ -980,8 +980,8 @@ packages:
peerDependencies:
'@babel/core': ^7.0.0-0 || ^8.0.0-0 <8.0.0
- '@babel/[email protected]':
- resolution: {integrity: sha512-U10aHPDnokCFRXgyT/MaIRTivUu2K/mu0vJlwRS9LxJmJet+PFQNKpggPyFCUtC6zWSBPjvxjnpNkAn3Uw2m5w==}
+ '@babel/[email protected]':
+ resolution: {integrity: sha512-SyXRe3OdWwIwalxDg5UtJnJQO+YPcTfwiIY2B0Xlddh9o7jpWLvv8X1RthIeDOxQ+O1ML5BLPCONToObyVQVuQ==}
engines: {node: '>=6.9.0'}
peerDependencies:
'@babel/core': ^7.0.0-0
@@ -2791,8 +2791,8 @@ packages:
engines: {node: '>=14'}
hasBin: true
- [email protected]:
- resolution: {integrity: sha512-6FlqP0NSWvxFf1v+gHu+LCn5wjr1pmkj5nPr7BsxPnj41EDR4EWhK/KmQN0ytHUqgTR1lkpHRYxvHBLZFQtkKw==}
+ [email protected]:
+ resolution: {integrity: sha512-rkg5/N3L+Y844JyfgPUyuKK0Hk0efo3JNxUDKvz3HgP6EmN4rNGhr2D8boLsfTV/hGo7ZGAL8djw+jlg99zQyA==}
[email protected]:
resolution: {integrity: sha512-5gxbEjcb/Z2n6TTmXZx9wVi3N/DOzE7RXY3Xg9dakDuhX/izwumB9rGjeWUV6dTA0D0+juvo+JonZgNR9sgA5A==}
@@ -6570,7 +6570,7 @@ snapshots:
'@babel/types': 7.24.7
esutils: 2.0.3
- '@babel/[email protected](@babel/[email protected])':
+ '@babel/[email protected](@babel/[email protected])':
dependencies:
'@babel/core': 7.24.7
'@babel/helper-plugin-utils': 7.24.7
@@ -8017,7 +8017,7 @@ snapshots:
[email protected]:
dependencies:
caniuse-lite: 1.0.30001629
- electron-to-chromium: 1.4.791
+ electron-to-chromium: 1.4.792
node-releases: 2.0.14
update-browserslist-db: 1.0.16([email protected])
@@ -8568,7 +8568,7 @@ snapshots:
minimatch: 9.0.1
semver: 7.6.2
- [email protected]: {}
+ [email protected]: {}
[email protected]: {}
|
End of preview. Expand
in Data Studio
No dataset card yet
- Downloads last month
- 11