rsshub 1.0.0-master.f9e891b → 1.0.0-master.fa1dcc5

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

@@ -66,7 +66,7 @@ async function handler(ctx) {
     const $ = load(response.data);
 
     if (getSubPath(ctx) === '/') {
-        ctx.redirect(`/141ppv${$('.overview').first().attr('href')}`);
+        ctx.set('redirect', `/141ppv${$('.overview').first().attr('href')}`);
         return;
     }
 

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',
 };

package/lib/routes/2cycd/namespace.ts

@@ -3,4 +3,5 @@ import type { Namespace } from '@/types';
 export const namespace: Namespace = {
     name: '二次元虫洞',
     url: '2cycd.com',
+    lang: 'zh-CN',
 };

package/lib/routes/36kr/hot-list.ts

@@ -26,7 +26,7 @@ const categories = {
 
 export const route: Route = {
     path: '/hot-list/:category?',
-    categories: ['new-media'],
+    categories: ['new-media', 'popular'],
     example: '/36kr/hot-list',
     parameters: { category: '分类，默认为24小时热榜' },
     features: {

package/lib/routes/36kr/index.ts

@@ -18,7 +18,7 @@ const shortcuts = {
 
 export const route: Route = {
     path: '/:category/:subCategory?/:keyword?',
-    categories: ['new-media'],
+    categories: ['new-media', 'popular'],
     example: '/36kr/newsflashes',
     parameters: {
         category: '分类，必填项',
@@ -27,9 +27,9 @@ export const route: Route = {
     },
     name: '资讯, 快讯, 用户文章, 主题文章, 专题文章, 搜索文章, 搜索快讯',
     maintainers: ['nczitzk', 'fashioncj'],
-    description: `| 最新资讯频道    | 快讯     | 推荐资讯｜生活｜房产｜职场｜搜索文章｜搜索快讯｜
-    | ------- | -------- ｜ -------- ｜ -------- ｜ -------- ｜ --------｜ -------- ｜ -------- ｜
-    | news | newsflashes ｜ recommend ｜ life ｜ estate ｜ workplace ｜ search/articles/关键词 ｜ search/articles/关键词 ｜`,
+    description: `| 最新资讯频道 | 快讯 | 推荐资讯 | 生活 | 房产 | 职场 | 搜索文章 | 搜索快讯 |
+  | ------- | -------- | -------- | -------- | -------- | --------| -------- | -------- |
+  | news | newsflashes | recommend | life | estate | workplace | search/articles/关键词 | search/articles/关键词 |`,
     handler,
 };
 

package/lib/routes/36kr/namespace.ts

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

package/lib/routes/3dmgame/namespace.ts

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

package/lib/routes/3kns/namespace.ts

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

package/lib/routes/423down/namespace.ts

@@ -5,4 +5,5 @@ export const namespace: Namespace = {
     url: '423down.com',
     categories: ['program-update'],
     description: '',
+    lang: 'zh-CN',
 };

package/lib/routes/4gamers/namespace.ts

@@ -3,4 +3,5 @@ import type { Namespace } from '@/types';
 export const namespace: Namespace = {
     name: '4Gamers',
     url: 'www.4gamers.com.tw',
+    lang: 'zh-TW',
 };

package/lib/routes/4ksj/namespace.ts

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

package/lib/routes/500px/namespace.ts

@@ -3,4 +3,5 @@ import type { Namespace } from '@/types';
 export const namespace: Namespace = {
     name: '500px 摄影社区',
     url: '500px.com.cn',
+    lang: 'zh-CN',
 };

package/lib/routes/50forum/namespace.ts

@@ -3,4 +3,5 @@ import type { Namespace } from '@/types';
 export const namespace: Namespace = {
     name: '经济 50 人论坛',
     url: '50forum.org.cn',
+    lang: 'zh-CN',
 };

package/lib/routes/51cto/namespace.ts

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

package/lib/routes/51read/article.ts

@@ -42,8 +42,8 @@ async function handler(ctx) {
 
     const pageLength = $chapter('.ml-page select')
         .find('option')
-        .map((_, option) => option.attribs.value)
-        .toArray().length;
+        .toArray()
+        .map((option) => option.attribs.value).length;
 
     const item = await createItem(chapter, pageLength);
 
@@ -63,8 +63,8 @@ const createItem = async (baseUrl: string, page: number) => {
     const $latest = load(await ofetch(url));
     const item = await Promise.all(
         $latest('.kb-jp li>a')
-            .map((_, chapter) => buildItem(chapter.attribs.href))
             .toArray()
+            .map((chapter) => buildItem(chapter.attribs.href))
             .toReversed()
     );
     return item;

package/lib/routes/51read/namespace.ts

@@ -3,4 +3,5 @@ import type { Namespace } from '@/types';
 export const namespace: Namespace = {
     name: '51Read',
     url: 'm.51read.org',
+    lang: 'zh-CN',
 };

package/lib/routes/52hrtt/namespace.ts

@@ -3,4 +3,5 @@ import type { Namespace } from '@/types';
 export const namespace: Namespace = {
     name: '52hrtt 华人头条',
     url: '52hrtt.com',
+    lang: 'zh-CN',
 };

package/lib/routes/56kog/namespace.ts

@@ -3,4 +3,5 @@ import type { Namespace } from '@/types';
 export const namespace: Namespace = {
     name: '明月中文网',
     url: '56kog.com',
+    lang: 'zh-CN',
 };

package/lib/routes/591/namespace.ts

@@ -3,4 +3,5 @@ import type { Namespace } from '@/types';
 export const namespace: Namespace = {
     name: '591 Rental house',
     url: 'rent.591.com.tw',
+    lang: 'zh-TW',
 };

package/lib/routes/5eplay/index.ts

@@ -1,11 +1,8 @@
 import { Route } from '@/types';
 import cache from '@/utils/cache';
 import { load } from 'cheerio';
-import zlib from 'zlib';
 import got from '@/utils/got';
 import { parseDate } from '@/utils/parse-date';
-import { config } from '@/config';
-import { getAcwScV2ByArg1 } from './utils';
 
 export const route: Route = {
     path: '/article',
@@ -34,70 +31,23 @@ export const route: Route = {
 async function handler() {
     const rootUrl = 'https://csgo.5eplay.com/';
     const apiUrl = `${rootUrl}api/article?page=1&type_id=0&time=0&order_by=0`;
-    const articleUrl = `${rootUrl}article`;
 
     const { data: response } = await got({
         method: 'get',
         url: apiUrl,
     });
 
-    // get acw_sc__v2
-    const acw_sc__v2 = await cache.tryGet(
-        articleUrl,
-        async () => {
-            // Zlib Z_BUF_ERROR: unexpected end of file, should close decompress
-            const detailResponse = await got(
-                {
-                    method: 'get',
-                    url: articleUrl,
-                },
-                {
-                    decompress: false,
-                }
-            );
-
-            const unzipData = zlib.createUnzip({
-                chunkSize: 20 * 1024,
-            });
-            unzipData.write(detailResponse.body);
-
-            let acw_sc__v2 = '';
-            for await (const data of unzipData) {
-                const strData = data.toString();
-                const matches = strData.match(/var arg1='(.*?)';/);
-                if (matches) {
-                    acw_sc__v2 = getAcwScV2ByArg1(matches[1]);
-                    break;
-                }
-            }
-            return acw_sc__v2;
-        },
-        Math.min(config.cache.routeExpire, 25 * 60),
-        false
-    );
-
     const items = await Promise.all(
         response.data.list.map((item) =>
             cache.tryGet(item.jump_link, async () => {
-                if (!acw_sc__v2) {
-                    return {
-                        title: item.title,
-                        description: item.title + (item.images?.[0] ? `<img src="${item.images[0]}" />` : ''),
-                        pubDate: parseDate(item.dateline * 1000),
-                        link: item.jump_link,
-                    };
-                }
                 const { data: detailResponse } = await got({
                     method: 'get',
                     url: item.jump_link,
-                    headers: {
-                        cookie: `acw_sc__v2=${acw_sc__v2}`,
-                    },
                 });
                 const $ = load(detailResponse);
 
                 const content = $('.article-text');
-                const res = [];
+                const res: string[] = [];
 
                 content.find('> p, > blockquote').each((i, e) => {
                     res.push($(e).text());

package/lib/routes/5eplay/namespace.ts

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

package/lib/routes/69shu/article.ts

@@ -6,7 +6,7 @@ import type { Route, DataItem } from '@/types';
 export const route: Route = {
     path: '/article/:id',
     name: '章节',
-    url: 'www.69shuba.pro',
+    url: 'www.69shuba.cx',
     maintainers: ['eternasuno'],
     example: '/69shu/article/47117',
     parameters: { id: '小说 id, 可在对应小说页 URL 中找到' },
@@ -21,19 +21,19 @@ export const route: Route = {
     },
     radar: [
         {
-            source: ['www.69shuba.pro/book/:id.htm'],
+            source: ['www.69shuba.cx/book/:id.htm'],
             target: '/article/:id',
         },
     ],
     handler: async (ctx) => {
         const { id } = ctx.req.param();
-        const link = `https://www.69shuba.pro/book/${id}.htm`;
+        const link = `https://www.69shuba.cx/book/${id}.htm`;
         const $ = load(await get(link));
 
         const item = await Promise.all(
             $('.qustime li>a')
-                .map((_, chapter) => createItem(chapter.attribs.href))
                 .toArray()
+                .map((chapter) => createItem(chapter.attribs.href))
         );
 
         return {

package/lib/routes/69shu/namespace.ts

@@ -2,5 +2,6 @@ import type { Namespace } from '@/types';
 
 export const namespace: Namespace = {
     name: '69书吧',
-    url: '69shuba.pro',
+    url: '69shuba.cx',
+    lang: 'zh-CN',
 };

package/lib/routes/6park/namespace.ts

@@ -3,4 +3,5 @@ import type { Namespace } from '@/types';
 export const namespace: Namespace = {
     name: '留园网',
     url: 'club.6parkbbs.com',
+    lang: 'zh-CN',
 };

package/lib/routes/6v123/namespace.ts

@@ -3,4 +3,5 @@ import type { Namespace } from '@/types';
 export const namespace: Namespace = {
     name: '6v 电影',
     url: 'hao6v.cc',
+    lang: 'zh-CN',
 };

package/lib/routes/6v123/utils.ts

@@ -19,11 +19,11 @@ export async function loadDetailPage(link) {
             .replaceAll(/，免费下载，迅雷下载|，6v电影/g, ''),
         description: $('meta[name="description"]').attr('content'),
         enclosure_urls: $('table td')
-            .map((i, e) => ({
+            .toArray()
+            .map((e) => ({
                 title: $(e).text().replace('磁力：', ''),
                 magnet: $(e).find('a').attr('href'),
             }))
-            .toArray()
             .filter((item) => item.magnet?.includes('magnet')),
     };
 }