rsshub 1.0.0-master.fb6d4f3 → 1.0.0-master.fb7e42c

package/lib/routes/nankai/graduate-notice.ts

@@ -0,0 +1,162 @@
+import { Route } from '@/types';
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
+import cache from '@/utils/cache';
+import timezone from '@/utils/timezone';
+
+export const route: Route = {
+    path: '/graduate/:type?',
+    categories: ['university'],
+    example: '/nankai/graduate/zxdt',
+    parameters: { type: '栏目编号（若为空则默认为"zxdt"）' },
+    features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    radar: [
+        {
+            source: ['graduate.nankai.edu.cn', 'graduate.nankai.edu.cn/:type/list.htm'],
+            target: '/graduate/:type?',
+        },
+    ],
+    name: '研究生院',
+    maintainers: ['ladeng07'],
+    description: `| 最新动态 | 综合信息 | 招生工作 | 培养管理 | 国际交流 | 学科建设 | 学位管理 |
+| -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| zxdt     | 82       | 83       | 84       | 85       | 86       | 87       |`,
+    url: 'graduate.nankai.edu.cn',
+    handler: async (ctx) => {
+        // 从 URL 参数中获取通知分类
+        const { type = 'zxdt' } = ctx.req.param();
+        const baseUrl = 'https://graduate.nankai.edu.cn';
+        const { data: response } = await got(`${baseUrl}/${type}/list.htm`);
+        const $ = load(response);
+
+        // 获取分类名称映射
+        const categoryMap: Record<string, string> = {
+            zxdt: '最新动态',
+            '82': '综合信息',
+            '83': '招生工作',
+            '84': '培养管理',
+            '85': '国际交流',
+            '86': '学科建设',
+            '87': '学位管理',
+        };
+
+        const categoryName = categoryMap[type] || '最新动态';
+
+        // 解析新闻列表
+        const list = $('.newslist li')
+            .not('#wp_paging_w6 li')
+            .toArray()
+            .map((li) => {
+                const $li = $(li);
+                const $titleDiv = $li.find('.title');
+                const $link = $titleDiv.find('a');
+                const $timeDiv = $li.find('.time');
+
+                const title = $link.attr('title');
+                let link = $link.attr('href') || '';
+
+                // 处理相对链接
+                link = link && !link.startsWith('http') ? `${baseUrl}${link}` : link;
+
+                // 提取日期
+                const dateStr = $timeDiv.text().trim();
+                const pubDate = timezone(parseDate(dateStr, 'YYYY-MM-DD'), +8);
+
+                return {
+                    title,
+                    link,
+                    pubDate,
+                    author: '研究生院',
+                    description: '', // 初始化description属性
+                };
+            })
+            .filter((item) => item && item.link && item.title); // 过滤掉空项目和没有链接的项目
+
+        // 获取每篇文章的详细内容
+        const items = await Promise.all(
+            list.map((item) =>
+                cache.tryGet(item.link, async () => {
+                    try {
+                        const { data: response } = await got(item.link);
+                        const $ = load(response);
+
+                        // 尝试多种内容选择器
+                        const $description = $('.wp_articlecontent');
+
+                        // 处理相对链接，转换为绝对链接
+                        if ($description.length > 0) {
+                            // 处理链接
+                            $description.find('a').each((i, el) => {
+                                const $el = $(el);
+                                const href = $el.attr('href');
+                                if (href && !href.startsWith('http')) {
+                                    if (href.startsWith('/')) {
+                                        $el.attr('href', `${baseUrl}${href}`);
+                                    } else {
+                                        $el.attr('href', `${baseUrl}/${href}`);
+                                    }
+                                }
+                            });
+
+                            // 处理图片
+                            $description.find('img').each((i, el) => {
+                                const $el = $(el);
+                                let src = $el.attr('src');
+
+                                if (src && !src.startsWith('http')) {
+                                    src = src.startsWith('/') ? `${baseUrl}${src}` : `${baseUrl}/${src}`;
+                                    $el.attr('src', src);
+                                }
+                            });
+
+                            // 处理PDF播放器div，提取PDF链接
+                            $description.find('.wp_pdf_player').each((i, el) => {
+                                const $el = $(el);
+                                const pdfSrc = $el.attr('pdfsrc');
+                                const sudyfileAttr = ($el.attr('sudyfile-attr') || '{}').replaceAll("'", '"');
+
+                                try {
+                                    const sudyfileAttrJson = JSON.parse(sudyfileAttr);
+                                    const fileName = sudyfileAttrJson.title || '未命名文件.pdf';
+                                    if (pdfSrc) {
+                                        let pdfUrl = pdfSrc;
+                                        if (!pdfUrl.startsWith('http')) {
+                                            pdfUrl = `${baseUrl}${pdfUrl}`;
+                                        }
+                                        // 替换PDF播放器为下载链接
+                                        $el.replaceWith(`<p><a href="${pdfUrl}" target="_blank">📄 ${fileName}</a></p>`);
+                                    }
+                                } catch {
+                                    // 如果解析失败，保留原始内容
+                                }
+                            });
+                        }
+
+                        item.description = $description.html() || item.title;
+                    } catch {
+                        // 如果获取详细内容失败，返回基本信息
+                        item.description = item.title + ' (获取详细内容失败)';
+                    }
+                    return item;
+                })
+            )
+        );
+
+        return {
+            // 源标题
+            title: `南开大学研究生院-${categoryName}`,
+            // 源链接
+            link: `${baseUrl}/${type}/list.htm`,
+            // 源文章
+            item: items,
+        };
+    },
+};

package/lib/routes/natgeo/natgeo.ts

@@ -16,14 +16,14 @@ async function loadContent(link) {
         .replaceAll(/ /gi, ' ')
         .trim();
 
-    $('.splide__arrows, .slide-control').remove();
+    $('.splide__arrows, .slide-control, [class^="ad-"], style').remove();
 
     let description = ($('article').eq(0).html() ?? '') + ($('article').eq(1).html() ?? '');
     if (/photo|gallery/.test(link)) {
         description = $('#content-album').html() + description;
     }
     return {
-        title: $('title').text(),
+        title: $('h1.content-title').text().trim(),
         pubDate: parseDate(dtStr),
         description,
         category: $('.content-tag a')
@@ -66,6 +66,7 @@ async function handler(ctx) {
 
     const urlList = $('.article-link-content h4')
         .toArray()
+        .filter((i) => $(i).closest('.article-link-right').length === 0) // 移除右側熱門精選
         .map((i) => ({
             link: $(i).find('a[href]').first().attr('href'),
         }))

package/lib/routes/naturalism/namespace.ts

@@ -0,0 +1,7 @@
+import type { Namespace } from '@/types';
+
+export const namespace: Namespace = {
+    name: 'Naturalism.org',
+    url: 'naturalism.org',
+    lang: 'en',
+};

package/lib/routes/naturalism/new.ts

@@ -0,0 +1,59 @@
+import { Route } from '@/types';
+
+import cache from '@/utils/cache';
+import ofetch from '@/utils/ofetch';
+import { load } from 'cheerio';
+
+export const route: Route = {
+    path: '/',
+    categories: ['other'],
+    example: '/naturalism',
+    radar: [
+        {
+            source: ['naturalism.org'],
+        },
+    ],
+    name: "What's New",
+    maintainers: ['TonyRL'],
+    handler,
+    url: 'naturalism.org',
+};
+
+async function handler() {
+    const baseUrl = 'https://naturalism.org';
+    const response = await ofetch(baseUrl);
+    const $ = load(response);
+
+    const list = $('.view-what-s-new .field-content a')
+        .toArray()
+        .map((element) => {
+            const a = $(element);
+            return {
+                title: a.text(),
+                link: new URL(a.attr('href'), baseUrl).href,
+            };
+        });
+
+    const items = await Promise.all(
+        list.map((item) =>
+            cache.tryGet(item.link, async () => {
+                const response = await ofetch(item.link);
+                const $ = load(response);
+
+                const content = $('#content');
+                content.find('h1').remove();
+
+                item.description = $('#content').html();
+
+                return item;
+            })
+        )
+    );
+
+    return {
+        title: $('head title').text(),
+        link: baseUrl,
+        image: `${baseUrl}/sites/naturalism.org/files/swirl-logo.png`,
+        item: items,
+    };
+}

package/lib/routes/netflav/index.ts

@@ -18,6 +18,9 @@ export const route: Route = {
     maintainers: ['TonyRL'],
     handler,
     url: 'netflav.com/',
+    features: {
+        nsfw: true,
+    },
 };
 
 async function handler() {

package/lib/routes/nhentai/search.ts

@@ -12,6 +12,7 @@ export const route: Route = {
     features: {
         antiCrawler: true,
         supportBT: true,
+        nsfw: true,
     },
     radar: [
         {

package/lib/routes/nhk/news-web-easy.ts

@@ -49,7 +49,7 @@ async function handler(ctx) {
         }))
     );
 
-    items = items.sort((a, b) => b.pubDate - a.pubDate).slice(0, ctx.req.query('limit') ? Number(ctx.req.query('limit')) : 30);
+    items = items.toSorted((a, b) => b.pubDate - a.pubDate).slice(0, ctx.req.query('limit') ? Number(ctx.req.query('limit')) : 30);
 
     items = await Promise.all(
         items.map((item) =>

package/lib/routes/nicovideo/mylist.ts

@@ -0,0 +1,39 @@
+import { DataItem, Route } from '@/types';
+
+import { getMylist, renderVideo } from './utils';
+import { parseDate } from '@/utils/parse-date';
+
+export const route: Route = {
+    name: 'Mylist',
+    path: '/mylist/:id',
+    parameters: { id: 'Mylist ID' },
+    example: '/nicovideo/mylist/2973737',
+    maintainers: ['esperecyan'],
+    radar: [
+        {
+            source: ['www.nicovideo.jp/user/:user/mylist/:id'],
+            target: '/mylist/:id',
+        },
+    ],
+    handler: async (ctx) => {
+        const { id } = ctx.req.param();
+
+        const mylist = await getMylist(id);
+
+        return {
+            title: `マイリスト ${mylist.name}‐ニコニコ動画`,
+            link: `https://www.nicovideo.jp/user/${mylist.owner.id}/mylist/${mylist.id}`,
+            language: 'ja',
+            item: mylist.items.map(
+                (item): DataItem => ({
+                    title: item.video.title,
+                    link: `https://www.nicovideo.jp/watch/${item.video.id}`,
+                    pubDate: parseDate(item.addedAt),
+                    author: [{ name: item.video.owner.name, avatar: item.video.owner.iconUrl, url: `https://www.nicovideo.jp/user/${item.video.owner.id}` }],
+                    description: renderVideo(item.video, false),
+                    image: item.video.thumbnail.nHdUrl ?? item.video.thumbnail.largeUrl ?? item.video.thumbnail.middleUrl ?? undefined,
+                })
+            ),
+        };
+    },
+};

package/lib/routes/nicovideo/types.ts

@@ -52,3 +52,30 @@ export interface VideoItem {
     series: null;
     essential: Essential;
 }
+
+export type Mylist = {
+    id: number;
+    name: string;
+    description: string;
+    decoratedDescriptionHtml: string;
+    defaultSortKey: string;
+    defaultSortOrder: string;
+    items: MylistItem[];
+    totalItemCount: number;
+    hasNext: boolean;
+    isPublic: boolean;
+    owner: Owner;
+    hasInvisibleItems: boolean;
+    followerCount: number;
+    isFollowing: boolean;
+};
+
+type MylistItem = {
+    itemId: number;
+    watchId: string;
+    description: string;
+    decoratedDescriptionHtml: string;
+    addedAt: string;
+    status: string;
+    video: Essential;
+};

package/lib/routes/nicovideo/utils.ts

@@ -1,4 +1,4 @@
-import { Essential, UserInfo, VideoItem } from './types';
+import { Essential, Mylist, UserInfo, VideoItem } from './types';
 
 import ofetch from '@/utils/ofetch';
 import cache from '@/utils/cache';
@@ -31,4 +31,30 @@ export const getUserVideosById = (id: string) =>
         false
     ) as Promise<VideoItem[]>;
 
+export const getMylist = (id: string): Promise<Mylist> =>
+    cache.tryGet<Mylist>(
+        `nicovideo:mylist:${id}`,
+        async () => {
+            const { data } = await ofetch(`https://nvapi.nicovideo.jp/v2/mylists/${id}`, {
+                headers: {
+                    'X-Frontend-Id': '6',
+                },
+                query: {
+                    sortKey: 'addedAt',
+                    sortOrder: 'desc',
+                    /**
+                     * @remarks
+                     * Up to 500 items can be registered in a single mylist.
+                     * @see https://qa.nicovideo.jp/faq/show/648?site_domain=default
+                     */
+                    pageSize: 500,
+                    page: 1,
+                },
+            });
+            return data.mylist;
+        },
+        config.cache.routeExpire,
+        false
+    );
+
 export const renderVideo = (video: Essential, embed: boolean) => art(path.join(__dirname, 'templates/video.art'), { video, embed });

package/lib/routes/nikkei/cn/index.ts

@@ -136,10 +136,7 @@ async function handler(ctx) {
 
                 item.author = content('meta[name="author"]').attr('content');
                 item.title = item.title ?? content('meta[name="twitter:title"]').attr('content');
-                item.description = content('#contentDiv')
-                    .html()
-                    ?.replace(/ /g, '')
-                    .replaceAll('<p></p>', '');
+                item.description = content('#contentDiv').html()?.replaceAll('&nbsp;', '').replaceAll('<p></p>', '');
 
                 return item;
             })

package/lib/routes/nio/nioradio.ts

@@ -7,7 +7,7 @@ export const route: Route = {
     path: '/nioradio/:albumid',
     categories: ['multimedia'],
     description: `
-:::tip
+::: tip
 **如何获取电台 ID？**
 打开蔚来 APP 后，点击“此地”→“NIO Radio”，找到自己想要转换为播客的专辑，分享后在生成的链接中找到\`container_id=\`后方的数字即可。
 常见电台 ID：

package/lib/routes/njxzc/utils/index.ts

@@ -5,7 +5,7 @@ import timezone from '@/utils/timezone';
 import ofetch from '@/utils/ofetch'; // 使用默认导出的方式导入ofetch
 
 async function getNoticeList(ctx, url, host, titleSelector, dateSelector, contentSelector, listSelector) {
-    const response = await ofetch(url).catch(() => null);
+    const response = await ofetch(url);
     if (!response) {
         return [];
     }
@@ -25,7 +25,7 @@ async function getNoticeList(ctx, url, host, titleSelector, dateSelector, conten
     const out = await Promise.all(
         list.map((item) =>
             cache.tryGet(item.link, async () => {
-                const response = await ofetch(item.link).catch(() => null);
+                const response = await ofetch(item.link);
                 if (!response || (response.status >= 300 && response.status < 400)) {
                     return {
                         ...item,

package/lib/routes/notion/namespace.ts

@@ -3,11 +3,11 @@ import type { Namespace } from '@/types';
 export const namespace: Namespace = {
     name: 'Notion',
     url: 'notion.so',
-    description: `:::warning
+    description: `::: warning
 Need to set up Notion integration, please refer to [Route-specific Configurations](https://docs.rsshub.app/deploy/config#route-specific-configurations) for details.
 :::
 
-:::tip Recommendation
+::: tip Recommendation
 It is recommended to use with clipping tools such as Notion Web Clipper.
 :::`,
     lang: 'en',

package/lib/routes/now/news.ts

@@ -100,7 +100,7 @@ async function handler(ctx) {
                           link: `https://news.now.com/home/${category}/player?newsId=${item.newsId}`,
                           pubDate: parseDate(item.publishDate, 'x'),
                           category: [...item.sportTypes.map((t) => t.sportTypeNameChi), ...item.players.map((p) => p.playerFullNameChi), ...item.teams.map((t) => t.teamCodeChi)],
-                          image: item.newsPhotos?.filter((p) => p.sizeType === '3')?.[0]?.imageUrl,
+                          image: item.newsPhotos?.find((p) => p.sizeType === '3')?.imageUrl,
                           newsId: item.newsId,
                       };
                   })

package/lib/routes/nytimes/index.ts

@@ -136,7 +136,7 @@ async function handler(ctx) {
             // Match 感谢|謝.*?cn.letters@nytimes.com。
             const ending = /感(&#x8C22|&#x8B1D);.*?cn\.letters@nytimes\.com。/g;
 
-            single.description = result.description?.replace(ending, '');
+            single.description = result.description?.replaceAll(ending, '');
 
             if (hasEnVersion) {
                 single.title = result.title;

package/lib/routes/olevod/vod.ts

@@ -16,6 +16,9 @@ export const route: Route = {
     name: '视频',
     maintainers: ['fang63625'],
     handler,
+    features: {
+        nsfw: true,
+    },
 };
 
 async function handler(ctx) {

package/lib/routes/olevod/vodlist.ts

@@ -15,6 +15,9 @@ export const route: Route = {
     name: '最新视频',
     maintainers: ['fang63625'],
     handler,
+    features: {
+        nsfw: true,
+    },
 };
 
 async function handler() {

package/lib/routes/oreno3d/main.ts

@@ -49,6 +49,7 @@ export const route: Route = {
         supportBT: false,
         supportPodcast: false,
         supportScihub: false,
+        nsfw: true,
     },
     name: 'Author Search',
     maintainers: ['xueli_sherryli'],

package/lib/routes/oschina/column.ts

@@ -183,9 +183,8 @@ export const route: Route = {
     parameters: {
         id: '专栏 id，可在对应专栏页 URL 中找到',
     },
-    description: `:::tip
+    description: `::: tip
 若订阅 [开源安全专栏](https://www.oschina.net/news/column?columnId=14)，网址为 \`https://www.oschina.net/news/column?columnId=14\`，请截取 \`https://www.oschina.net/news/column?columnId=\` 到末尾的部分 \`14\` 作为 \`id\` 参数填入，此时目标路由为 [\`/oschina/column/14\`](https://rsshub.app/oschina/column/14)。
-
 :::
 
 <details>

package/lib/routes/oschina/event.ts

@@ -198,7 +198,7 @@ export const route: Route = {
     parameters: {
         category: '分类，默认为 `latest`，即最新活动，可在对应分类页 URL 中找到',
     },
-    description: `:::tip
+    description: `::: tip
 若订阅 [强力推荐](https://www.oschina.net/event?tab=recommend)，网址为 \`https://www.oschina.net/event?tab=recommend\`，请截取 \`https://www.oschina.net/event?tab=\` 到末尾的部分 \`recommend\` 作为 \`category\` 参数填入，此时目标路由为 [\`/oschina/event/recommend\`](https://rsshub.app/oschina/event/recommend)。
 :::
 

package/lib/routes/osu/beatmaps/latest-ranked.ts

@@ -34,7 +34,7 @@ This actual parameters should be passed as \`routeParams\` in URL Query String f
 
     /osu/latest-ranked/modeInTitle=true&includeMode=osu
 
-:::tip
+::: tip
 You could make use of \`difficultyLimit\` paramters to create a "high difficulty/low difficulty only" only feed.
 
 For example, if you only wants to play low star rating beatmap like 1 or 2 star, you could subscribe to:
@@ -49,8 +49,7 @@ with star rating higher than a certain threshold.
     /osu/latest-ranked/difficultyLimit=L6
 
 Now all beatmapsets that don't provided at least one beatmap with star rating higher than \`6.00\` will be filtered.
-:::
-`;
+:::`;
 
 export const route: Route = {
     path: '/latest-ranked/:routeParams?',

package/lib/routes/papers/category.ts

@@ -123,7 +123,7 @@ export const route: Route = {
             description: 'Category ID, can be found in URL',
         },
     },
-    description: `:::tip
+    description: `::: tip
 To subscribe to [Artificial Intelligence (cs.AI)](https://papers.cool/arxiv/cs.AI) (<https://papers.cool/arxiv/cs.AI>), extract \`arxiv/cs.AI\` from the URL as the \`category\` parameter. The resulting route will be [\`/papers/category/arxiv/cs.AI\`](https://rsshub.app/papers/category/arxiv/cs.AI).
 :::
 
@@ -1212,9 +1212,8 @@ To subscribe to [Artificial Intelligence (cs.AI)](https://papers.cool/arxiv/cs.A
                 description: '分类 id，可在对应分类页 URL 中找到',
             },
         },
-        description: `:::tip
+        description: `::: tip
 订阅 [人工智能 (cs.AI)](https://papers.cool/arxiv/cs.AI)（<https://papers.cool/arxiv/cs.AI>），请从 URL 中提取 \`arxiv/cs.AI\` 作为 \`category\` 参数，得到的路由将是 [\`/papers/category/arxiv/cs.AI\`](https://rsshub.app/papers/category/arxiv/cs.AI)。
-:::
-`,
+:::`,
     },
 };

package/lib/routes/patreon/feed.ts

@@ -22,6 +22,7 @@ export const route: Route = {
                 description: 'The value of the session_id cookie after logging in to Patreon, required to access paid posts',
             },
         ],
+        nsfw: true,
     },
     radar: [
         {

package/lib/routes/picuki/profile.ts

@@ -6,8 +6,7 @@ import ofetch from '@/utils/ofetch';
 import { art } from '@/utils/render';
 import path from 'node:path';
 import { config } from '@/config';
-import { puppeteerGet } from './utils';
-import puppeteer from '@/utils/puppeteer';
+import { getPuppeteerPage } from '@/utils/puppeteer';
 import NotFoundError from '@/errors/types/not-found';
 
 export const route: Route = {
@@ -87,9 +86,18 @@ async function handler(ctx) {
             });
         } catch (error) {
             if (error.status === 403) {
-                const browser = await puppeteer();
-                response = await puppeteerGet(profileUrl, browser);
-                await browser.close();
+                const { page, destory } = await getPuppeteerPage(profileUrl, {
+                    onBeforeLoad: async (page) => {
+                        const expectResourceTypes = new Set(['document', 'script', 'xhr', 'fetch']);
+                        await page.setRequestInterception(true);
+                        page.on('request', (request) => {
+                            expectResourceTypes.has(request.resourceType()) ? request.continue() : request.abort();
+                        });
+                    },
+                });
+                await page.waitForSelector('.content');
+                response = await page.content();
+                await destory();
             } else {
                 throw new NotFoundError(error.message);
             }

package/lib/routes/pixiv/bookmarks.ts

@@ -20,6 +20,7 @@ export const route: Route = {
         supportBT: false,
         supportPodcast: false,
         supportScihub: false,
+        nsfw: true,
     },
     radar: [
         {

package/lib/routes/pixiv/illustfollow.ts

@@ -24,6 +24,7 @@ export const route: Route = {
         supportBT: false,
         supportPodcast: false,
         supportScihub: false,
+        nsfw: true,
     },
     radar: [
         {

package/lib/routes/pixiv/novel-api/user-novels/sfw.ts

@@ -15,7 +15,7 @@ export async function getSFWUserNovels(id: string, fullContent: boolean = false,
     });
 
     const novels = Object.keys(allData.body.novels)
-        .sort((a, b) => Number(b) - Number(a))
+        .toSorted((a, b) => Number(b) - Number(a))
         .slice(0, Number.parseInt(String(limit), 10));
 
     if (novels.length === 0) {