rsshub 1.0.0-master.f9e891b → 1.0.0-master.f9ec483

package/lib/api/category/one.ts

@@ -32,23 +32,50 @@ const ParamsSchema = z.object({
     }),
 });
 
+const QuerySchema = z.object({
+    categories: z
+        .string()
+        .transform((val) => val.split(','))
+        .optional(),
+    lang: z.string().optional(),
+});
+
 const route = createRoute({
     method: 'get',
     path: '/category/{category}',
     tags: ['Category'],
     request: {
+        query: QuerySchema,
         params: ParamsSchema,
     },
     responses: {
         200: {
-            description: 'Namespace list by category',
+            description: 'Namespace list by categories and language',
         },
     },
 });
 
 const handler: RouteHandler<typeof route> = (ctx) => {
+    const { categories, lang } = ctx.req.valid('query');
     const { category } = ctx.req.valid('param');
-    return ctx.json(categoryList[category]);
+
+    let allCategories = [category];
+    if (categories && categories.length > 0) {
+        allCategories = [...allCategories, ...categories];
+    }
+
+    // Get namespaces that exist in all requested categories
+    const commonNamespaces = Object.keys(categoryList[category] || {}).filter((namespace) => allCategories.every((cat) => categoryList[cat]?.[namespace]));
+
+    // Create result directly from common namespaces
+    let result = Object.fromEntries(commonNamespaces.map((namespace) => [namespace, categoryList[category][namespace]]));
+
+    // Filter by language if provided
+    if (lang) {
+        result = Object.fromEntries(Object.entries(result).filter(([, value]) => value.lang === lang));
+    }
+
+    return ctx.json(result);
 };
 
 export { route, handler };

package/lib/config.ts

@@ -81,6 +81,7 @@ export type Config = {
     bilibili: {
         cookies: Record<string, string | undefined>;
         dmImgList?: string;
+        dmImgInter?: string;
     };
     bitbucket: {
         username?: string;
@@ -96,6 +97,9 @@ export type Config = {
     civitai: {
         cookie?: string;
     };
+    dianping: {
+        cookie?: string;
+    };
     dida365: {
         username?: string;
         password?: string;
@@ -150,6 +154,9 @@ export type Config = {
     google: {
         fontsApiKey?: string;
     };
+    guozaoke: {
+        cookies?: string;
+    };
     hefeng: {
         key?: string;
     };
@@ -183,6 +190,11 @@ export type Config = {
     lightnovel: {
         cookie?: string;
     };
+    lorientlejour: {
+        token?: string;
+        username?: string;
+        password?: string;
+    };
     malaysiakini: {
         email?: string;
         password?: string;
@@ -261,6 +273,15 @@ export type Config = {
     scihub: {
         host?: string;
     };
+    sis001: {
+        baseUrl?: string;
+    };
+    skeb: {
+        bearerToken?: string;
+    };
+    sorrycc: {
+        cookie?: string;
+    };
     spotify: {
         clientId?: string;
         clientSecret?: string;
@@ -271,6 +292,7 @@ export type Config = {
     };
     telegram: {
         token?: string;
+        session?: string;
     };
     tophub: {
         cookie?: string;
@@ -282,8 +304,13 @@ export type Config = {
         username?: string[];
         password?: string[];
         authenticationSecret?: string[];
+        phoneOrEmail?: string[];
         authToken?: string[];
     };
+    uestc: {
+        bbsCookie?: string;
+        bbsAuthStr?: string;
+    };
     weibo: {
         app_key?: string;
         app_secret?: string;
@@ -460,6 +487,7 @@ const calculateValue = () => {
         bilibili: {
             cookies: bilibili_cookies,
             dmImgList: envs.BILIBILI_DM_IMG_LIST,
+            dmImgInter: envs.BILIBILI_DM_IMG_INTER,
         },
         bitbucket: {
             username: envs.BITBUCKET_USERNAME,
@@ -475,6 +503,9 @@ const calculateValue = () => {
         civitai: {
             cookie: envs.CIVITAI_COOKIE,
         },
+        dianping: {
+            cookie: envs.DIANPING_COOKIE,
+        },
         dida365: {
             username: envs.DIDA365_USERNAME,
             password: envs.DIDA365_PASSWORD,
@@ -529,6 +560,9 @@ const calculateValue = () => {
         google: {
             fontsApiKey: envs.GOOGLE_FONTS_API_KEY,
         },
+        guozaoke: {
+            cookies: envs.GUOZAOKE_COOKIES,
+        },
         hefeng: {
             // weather
             key: envs.HEFENG_KEY,
@@ -563,6 +597,11 @@ const calculateValue = () => {
         lightnovel: {
             cookie: envs.SECURITY_KEY,
         },
+        lorientlejour: {
+            token: envs.LORIENTLEJOUR_TOKEN,
+            username: envs.LORIENTLEJOUR_USERNAME,
+            password: envs.LORIENTLEJOUR_PASSWORD,
+        },
         malaysiakini: {
             email: envs.MALAYSIAKINI_EMAIL,
             password: envs.MALAYSIAKINI_PASSWORD,
@@ -641,6 +680,15 @@ const calculateValue = () => {
         scihub: {
             host: envs.SCIHUB_HOST || 'https://sci-hub.se/',
         },
+        sis001: {
+            baseUrl: envs.SIS001_BASE_URL || 'https://sis001.com',
+        },
+        skeb: {
+            bearerToken: envs.SKEB_BEARER_TOKEN,
+        },
+        sorrycc: {
+            cookie: envs.SORRYCC_COOKIES,
+        },
         spotify: {
             clientId: envs.SPOTIFY_CLIENT_ID,
             clientSecret: envs.SPOTIFY_CLIENT_SECRET,
@@ -666,8 +714,13 @@ const calculateValue = () => {
             username: envs.TWITTER_USERNAME?.split(','),
             password: envs.TWITTER_PASSWORD?.split(','),
             authenticationSecret: envs.TWITTER_AUTHENTICATION_SECRET?.split(','),
+            phoneOrEmail: envs.TWITTER_PHONE_OR_EMAIL?.split(','),
             authToken: envs.TWITTER_AUTH_TOKEN?.split(','),
         },
+        uestc: {
+            bbsCookie: envs.UESTC_BBS_COOKIE,
+            bbsAuthStr: envs.UESTC_BBS_AUTH_STR,
+        },
         weibo: {
             app_key: envs.WEIBO_APP_KEY,
             app_secret: envs.WEIBO_APP_SECRET,

package/lib/middleware/access-control.ts

@@ -8,7 +8,7 @@ const reject = () => {
 };
 
 const middleware: MiddlewareHandler = async (ctx, next) => {
-    const requestPath = ctx.req.path;
+    const requestPath = new URL(ctx.req.url).pathname;
     const accessKey = ctx.req.query('key');
     const accessCode = ctx.req.query('code');
 

package/lib/middleware/anti-hotlink.ts

@@ -117,6 +117,7 @@ const middleware: MiddlewareHandler = async (ctx, next) => {
     // Force config hotlink template on conflict
     if (config.hotlink.template) {
         imageHotlinkTemplate = filterPath(ctx.req.path) ? config.hotlink.template : undefined;
+        multimediaHotlinkTemplate = filterPath(ctx.req.path) ? config.hotlink.template : undefined;
     }
 
     if (!imageHotlinkTemplate && !multimediaHotlinkTemplate) {

package/lib/middleware/template.tsx

@@ -74,8 +74,16 @@ const middleware: MiddlewareHandler = async (ctx, next) => {
                 }
 
                 if (outputType !== 'rss') {
-                    item.pubDate && (item.pubDate = convertDateToISO8601(item.pubDate) || '');
-                    item.updated && (item.updated = convertDateToISO8601(item.updated) || '');
+                    try {
+                        item.pubDate && (item.pubDate = convertDateToISO8601(item.pubDate) || '');
+                    } catch {
+                        item.pubDate = '';
+                    }
+                    try {
+                        item.updated && (item.updated = convertDateToISO8601(item.updated) || '');
+                    } catch {
+                        item.updated = '';
+                    }
                 }
             }
         }

package/lib/router.js

@@ -47,14 +47,6 @@ router.get('/huya/live/:id', lazyloadRouteHandler('./routes/huya/live'));
 // f-droid
 // router.get('/fdroid/apprelease/:app', lazyloadRouteHandler('./routes/fdroid/apprelease'));
 
-// konachan
-router.get('/konachan/post/popular_recent', lazyloadRouteHandler('./routes/konachan/post-popular-recent'));
-router.get('/konachan.com/post/popular_recent', lazyloadRouteHandler('./routes/konachan/post-popular-recent'));
-router.get('/konachan.net/post/popular_recent', lazyloadRouteHandler('./routes/konachan/post-popular-recent'));
-router.get('/konachan/post/popular_recent/:period', lazyloadRouteHandler('./routes/konachan/post-popular-recent'));
-router.get('/konachan.com/post/popular_recent/:period', lazyloadRouteHandler('./routes/konachan/post-popular-recent'));
-router.get('/konachan.net/post/popular_recent/:period', lazyloadRouteHandler('./routes/konachan/post-popular-recent'));
-
 // PornHub
 // router.get('/pornhub/category/:caty', lazyloadRouteHandler('./routes/pornhub/category'));
 // router.get('/pornhub/search/:keyword', lazyloadRouteHandler('./routes/pornhub/search'));

package/lib/routes/005/namespace.ts

@@ -5,4 +5,5 @@ export const namespace: Namespace = {
     url: '005.tv',
     categories: ['anime'],
     description: '',
+    lang: 'zh-CN',
 };

package/lib/routes/0818tuan/namespace.ts

@@ -3,4 +3,5 @@ import type { Namespace } from '@/types';
 export const namespace: Namespace = {
     name: '0818 团',
     url: '0818tuan.com',
+    lang: 'zh-CN',
 };

package/lib/routes/0x80/namespace.ts

@@ -4,4 +4,5 @@ export const namespace: Namespace = {
     name: 'Wojciech Muła',
     url: '0x80.pl',
     description: '',
+    lang: 'en',
 };

package/lib/routes/10jqka/namespace.ts

@@ -0,0 +1,9 @@
+import type { Namespace } from '@/types';
+
+export const namespace: Namespace = {
+    name: '同花顺财经',
+    url: '10jqka.com.cn',
+    categories: ['finance'],
+    description: '',
+    lang: 'zh-CN',
+};

package/lib/routes/10jqka/realtimenews.ts

@@ -0,0 +1,143 @@
+import { Route } from '@/types';
+
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import iconv from 'iconv-lite';
+import { parseDate } from '@/utils/parse-date';
+
+export const handler = async (ctx) => {
+    const { tag } = ctx.req.param();
+    const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 20;
+
+    const rootUrl = 'https://news.10jqka.com.cn';
+    const apiUrl = new URL('tapp/news/push/stock', rootUrl).href;
+    const currentUrl = new URL('realtimenews.html', rootUrl).href;
+
+    const { data: currentResponse } = await got(currentUrl, {
+        responseType: 'buffer',
+    });
+
+    const $ = load(iconv.decode(currentResponse, 'gbk'));
+
+    const language = $('html').prop('lang');
+
+    const { data: response } = await got(apiUrl, {
+        searchParams: {
+            page: 1,
+            tag: tag ?? '',
+        },
+    });
+
+    const items =
+        response.data?.list.slice(0, limit).map((item) => {
+            const title = item.title;
+            const description = item.digest;
+            const guid = `10jqka-${item.seq}`;
+            const image = item.picUrl;
+
+            return {
+                title,
+                description,
+                pubDate: parseDate(item.ctime, 'X'),
+                link: item.url,
+                category: [...new Set([item.color === '2' ? '重要' : undefined, ...item.tags.map((c) => c.name), ...item.tagInfo.map((c) => c.name)])].filter(Boolean),
+                author: item.source,
+                guid,
+                id: guid,
+                content: {
+                    html: description,
+                    text: description,
+                },
+                image,
+                banner: item.picUrl,
+                updated: parseDate(item.rtime, 'X'),
+                language,
+            };
+        }) ?? [];
+
+    const title = $('title').text();
+    const image = $('h1 a img').prop('src');
+
+    return {
+        title,
+        description: title.split(/_/).pop(),
+        link: currentUrl,
+        item: items,
+        allowEmpty: true,
+        image,
+        author: $('meta[property="og:site_name"]').prop('content'),
+        language,
+    };
+};
+
+export const route: Route = {
+    path: '/realtimenews/:tag?',
+    name: '7×24小时要闻直播',
+    url: 'news.10jqka.com.cn',
+    maintainers: ['nczitzk'],
+    handler,
+    example: '/10jqka/realtimenews',
+    parameters: { tag: '标签，默认为全部' },
+    description: `:::tip
+  若订阅 [7×24小时要闻直播](https://news.10jqka.com.cn/realtimenews.html) 的 \`公告\` 标签。将 \`公告\` 作为标签参数填入，此时路由为 [\`/10jqka/realtimenews/公告\`](https://rsshub.app/10jqka/realtimenews/公告)。
+  
+  若订阅 [7×24小时要闻直播](https://news.10jqka.com.cn/realtimenews.html) 的 \`公告\` 和 \`A股\` 标签。将 \`公告,A股\` 作为标签参数填入，此时路由为 [\`/10jqka/realtimenews/公告,A股\`](https://rsshub.app/10jqka/realtimenews/公告,A股)。
+  :::
+
+  | 全部 | 重要 | A股 | 港股 | 美股 | 机会 | 异动 | 公告 |
+  | ---- | ---- | ---- | ---- | ---- | ---- | ---- | ---- |
+    `,
+    categories: ['finance'],
+
+    features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportRadar: true,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    radar: [
+        {
+            title: '全部',
+            source: ['news.10jqka.com.cn/realtimenews.html'],
+            target: '/realtimenews/全部',
+        },
+        {
+            title: '重要',
+            source: ['news.10jqka.com.cn/realtimenews.html'],
+            target: '/realtimenews/重要',
+        },
+        {
+            title: 'A股',
+            source: ['news.10jqka.com.cn/realtimenews.html'],
+            target: '/realtimenews/A股',
+        },
+        {
+            title: '港股',
+            source: ['news.10jqka.com.cn/realtimenews.html'],
+            target: '/realtimenews/港股',
+        },
+        {
+            title: '美股',
+            source: ['news.10jqka.com.cn/realtimenews.html'],
+            target: '/realtimenews/美股',
+        },
+        {
+            title: '机会',
+            source: ['news.10jqka.com.cn/realtimenews.html'],
+            target: '/realtimenews/机会',
+        },
+        {
+            title: '异动',
+            source: ['news.10jqka.com.cn/realtimenews.html'],
+            target: '/realtimenews/异动',
+        },
+        {
+            title: '公告',
+            source: ['news.10jqka.com.cn/realtimenews.html'],
+            target: '/realtimenews/公告',
+        },
+    ],
+};

package/lib/routes/12306/namespace.ts

@@ -3,4 +3,5 @@ import type { Namespace } from '@/types';
 export const namespace: Namespace = {
     name: '12306',
     url: 'kyfw.12306.cn',
+    lang: 'zh-CN',
 };

package/lib/routes/12371/namespace.ts

@@ -4,4 +4,5 @@ export const namespace: Namespace = {
     name: '共产党员网',
     url: 'www.12371.cn',
     categories: ['government'],
+    lang: 'zh-CN',
 };

package/lib/routes/12371/zxfb.ts

@@ -59,6 +59,6 @@ export const route: Route = {
     handler,
     url: 'www.12371.cn',
     description: `| 最新发布 |
-    | :------: |
-    |   zxfb   |`,
+  | :------: |
+  |   zxfb   |`,
 };

package/lib/routes/141jav/namespace.ts

@@ -6,4 +6,5 @@ export const namespace: Namespace = {
     description: `:::tip
 官方提供的订阅源不支持 BT 下载订阅，地址为 [https://141jav.com/feeds/](https://141jav.com/feeds/)
 :::`,
+    lang: 'en',
 };

package/lib/routes/141ppv/namespace.ts

@@ -6,4 +6,5 @@ export const namespace: Namespace = {
     description: `:::tip
 官方提供的订阅源不支持 BT 下载订阅，地址为 [https://141ppv.com/feeds/](https://141ppv.com/feeds/)
 :::`,
+    lang: 'en',
 };

package/lib/routes/163/music/playlist.ts

@@ -67,7 +67,8 @@ async function handler(ctx) {
                     date: new Date(thisSong.album.publishTime).toLocaleDateString(),
                     picUrl: thisSong.album.picUrl,
                 }),
-                link: `https://music.163.com/#/song?id=${item.id}`,
+                link: `https://music.163.com/song?id=${item.id}`,
+                guid: `https://music.163.com/#/song?id=${item.id}`,
                 pubDate: new Date(item.at),
                 author: singer,
             };

package/lib/routes/163/namespace.ts

@@ -6,4 +6,5 @@ export const namespace: Namespace = {
     description: `:::tip
 部分歌单及听歌排行信息为登陆后可见，自建时将环境变量\`NCM_COOKIES\`设为登陆后的 Cookie 值，即可正常获取。
 :::`,
+    lang: 'zh-CN',
 };

package/lib/routes/18comic/namespace.ts

@@ -6,4 +6,5 @@ export const namespace: Namespace = {
     description: `:::tip
 禁漫天堂有多个备用域名，本路由默认使用域名 \`https://jmcomic.me\`，若该域名无法访问，可以通过在路由最后加上 \`?domain=<域名>\` 指定路由访问的域名。如指定备用域名为 \`https://jmcomic1.me\`，则在所有禁漫天堂路由最后加上 \`?domain=jmcomic1.me\` 即可，此时路由为 [\`/18comic?domain=jmcomic1.me\`](https://rsshub.app/18comic?domain=jmcomic1.me)
 :::`,
+    lang: 'zh-CN',
 };

package/lib/routes/19lou/namespace.ts

@@ -3,4 +3,5 @@ import type { Namespace } from '@/types';
 export const namespace: Namespace = {
     name: '19 楼',
     url: '19lou.com',
+    lang: 'zh-CN',
 };

package/lib/routes/1lou/namespace.ts

@@ -5,4 +5,5 @@ export const namespace: Namespace = {
     url: '1lou.me',
     categories: ['multimedia'],
     description: '',
+    lang: 'zh-CN',
 };

package/lib/routes/1point3acres/namespace.ts

@@ -3,4 +3,5 @@ import type { Namespace } from '@/types';
 export const namespace: Namespace = {
     name: '一亩三分地',
     url: 'blog.1point3acres.com',
+    lang: 'zh-CN',
 };

package/lib/routes/1point3acres/thread.ts

@@ -3,7 +3,9 @@ import cache from '@/utils/cache';
 import { rootUrl, apiRootUrl, types, ProcessThreads } from './utils';
 
 export const route: Route = {
-    path: ['/post/:type?/:order?', '/thread/:type?/:order?'],
+    path: '/thread/:type?/:order?',
+    example: '/1point3acres/thread/hot',
+    parameters: { type: '帖子分类, 见下表，默认为 hot，即热门帖子', order: '排序方式，见下表，默认为空，即最新回复' },
     name: '帖子',
     categories: ['bbs'],
     maintainers: ['EthanWng97', 'DIYgod', 'nczitzk'],

package/lib/routes/1point3acres/utils.ts

@@ -5,7 +5,9 @@ import got from '@/utils/got';
 import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
 import path from 'node:path';
-import bbcode from 'bbcodejs';
+import type { BBobCoreTagNodeTree } from '@bbob/types';
+import bbobHTML from '@bbob/html';
+import presetHTML5 from '@bbob/preset-html5';
 
 const rootUrl = 'https://instant.1point3acres.com';
 const apiRootUrl = 'https://api.1point3acres.com';
@@ -15,6 +17,17 @@ const types = {
     hot: '热门帖子',
 };
 
+const swapLinebreak = (tree: BBobCoreTagNodeTree) =>
+    tree.walk((node) => {
+        if (typeof node === 'string' && node === '\n') {
+            return {
+                tag: 'br',
+                content: null,
+            };
+        }
+        return node;
+    });
+
 const ProcessThreads = async (tryGet, apiUrl, order) => {
     const response = await got({
         method: 'get',
@@ -24,8 +37,6 @@ const ProcessThreads = async (tryGet, apiUrl, order) => {
         },
     });
 
-    const bbcodeParser = new bbcode.Parser();
-
     const items = await Promise.all(
         response.data.threads.map((item) => {
             const result = {
@@ -48,20 +59,73 @@ const ProcessThreads = async (tryGet, apiUrl, order) => {
                         },
                     });
 
-                    const data = detailResponse.data;
+                    const thread = detailResponse.data.thread;
+
+                    const customPreset = presetHTML5.extend((tags) => ({
+                        ...tags,
+                        attach: (node, { render }) => {
+                            const id = render(node.content);
+                            const attachment = thread.attachment_list.find((a) => a.aid === Number.parseInt(id));
+
+                            if (attachment.isimage) {
+                                return {
+                                    tag: 'img',
+                                    attrs: {
+                                        src: attachment.url,
+                                    },
+                                };
+                            }
+
+                            return {
+                                tag: 'a',
+                                attrs: {
+                                    href: `https://www.1point3acres.com/bbs/plugin.php?id=attachcenter:page&aid=${id}`,
+                                    rel: 'noopener',
+                                    target: '_blank',
+                                },
+                                content: `https://www.1point3acres.com/bbs/plugin.php?id=attachcenter:page&aid=${id}`,
+                            };
+                        },
+                        url: (node) => {
+                            const link = Object.keys(node.attrs as Record<string, string>)[0];
+                            if (link.startsWith('https://link.1p3a.com/?url=')) {
+                                const url = decodeURIComponent(link.replace('https://link.1p3a.com/?url=', ''));
+                                return {
+                                    tag: 'a',
+                                    attrs: {
+                                        href: url,
+                                        rel: 'noopener',
+                                        target: '_blank',
+                                    },
+                                    content: node.content,
+                                };
+                            }
+
+                            return {
+                                tag: 'a',
+                                attrs: {
+                                    href: link,
+                                    rel: 'noopener',
+                                    target: '_blank',
+                                },
+                                content: node.content,
+                            };
+                        },
+                    }));
 
-                    result.description = bbcodeParser.toHTML(data.thread.message_bbcode);
+                    result.description = bbobHTML(thread.message_bbcode, [customPreset(), swapLinebreak]);
 
-                    for (const a of data.thread.attachment_list) {
-                        if (a.isimage === 1) {
-                            result.description = result.description.replaceAll(
-                                new RegExp(`\\[attach\\]${a.aid}\\[\\/attach\\]`, 'g'),
-                                art(path.join(__dirname, 'templates/image.art'), {
-                                    url: a.url,
-                                    height: a.height,
-                                    width: a.width,
-                                })
-                            );
+                    if (!thread.message_bbcode.includes('[attach]') && thread.attachment_list.length > 0) {
+                        for (const a of thread.attachment_list) {
+                            result.description +=
+                                a.isimage === 1
+                                    ? '<br>' +
+                                      art(path.join(__dirname, 'templates/image.art'), {
+                                          url: a.url,
+                                          height: a.height,
+                                          width: a.width,
+                                      })
+                                    : '';
                         }
                     }
                 } catch {

package/lib/routes/1x/namespace.ts

@@ -5,4 +5,5 @@ export const namespace: Namespace = {
     url: '1x.com',
     categories: ['design', 'picture'],
     description: '1x.com • In Pursuit of the Sublime. Browse 200,000 curated photos from photographers all over the world.',
+    lang: 'en',
 };

package/lib/routes/2023game/namespace.ts

@@ -3,4 +3,5 @@ import type { Namespace } from '@/types';
 export const namespace: Namespace = {
     name: '游戏星辰',
     url: 'www.2023game.com',
+    lang: 'zh-CN',
 };

package/lib/routes/2048/namespace.ts

@@ -3,4 +3,5 @@ import type { Namespace } from '@/types';
 export const namespace: Namespace = {
     name: '2048 核基地',
     url: 'hjd2048.com',
+    lang: 'zh-CN',
 };