rsshub 1.0.0-master.f9003f9 → 1.0.0-master.f917bdc

package/lib/routes/fortunechina/index.ts

@@ -1,8 +1,11 @@
 import { Route } from '@/types';
 import cache from '@/utils/cache';
-import got from '@/utils/got';
+import ofetch from '@/utils/ofetch';
 import { load } from 'cheerio';
 import { parseDate, parseRelativeDate } from '@/utils/parse-date';
+import randUserAgent from '@/utils/rand-user-agent';
+
+const UA = randUserAgent({ browser: 'mobile safari', os: 'ios', device: 'mobile' });
 
 export const route: Route = {
     path: '/:category?',
@@ -36,15 +39,12 @@ async function handler(ctx) {
     const rootUrl = 'https://www.fortunechina.com';
     const currentUrl = `${rootUrl}${category ? `/${category}` : ''}`;
 
-    const response = await got({
-        method: 'get',
-        url: currentUrl,
-    });
+    const response = await ofetch(currentUrl);
 
-    const $ = load(response.data);
+    const $ = load(response);
 
     let items = $('.main')
-        .find('h3 a')
+        .find(category === '' ? 'a:has(h2)' : 'h2 a')
         .slice(0, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 15)
         .toArray()
         .map((item) => {
@@ -61,14 +61,15 @@ async function handler(ctx) {
     items = await Promise.all(
         items.map((item) =>
             cache.tryGet(item.link, async () => {
-                const detailResponse = await got({
-                    method: 'get',
-                    url: item.link,
+                const detailResponse = await ofetch(item.link, {
+                    headers: {
+                        'User-Agent': UA,
+                    },
                 });
 
-                const content = load(detailResponse.data);
+                const content = load(detailResponse);
 
-                const spans = content('.mod-info span').text();
+                const spans = content('.date').text();
                 let matches = spans.match(/(\d{4}-\d{2}-\d{2})/);
                 if (matches) {
                     item.pubDate = parseDate(matches[1]);
@@ -79,11 +80,20 @@ async function handler(ctx) {
                     }
                 }
 
-                item.author = content('.name').text();
+                item.author = content('.author').text();
 
                 content('.mod-info, .title, .eval-zan, .eval-pic, .sae-more, .ugo-kol, .word-text .word-box .word-cn').remove();
 
-                item.description = content('#articleContent, .eval-desc').html();
+                item.description = content(item.link.includes('content') ? '.contain .text' : '.contain .top').html();
+                if (item.link.includes('jingxuan')) {
+                    item.description += content('.eval-mod_ugo').html();
+                } else if (item.link.includes('events')) {
+                    const eventDetails = await ofetch(`https://www.bagevent.com/event/${item.link.match(/\d+/)[0]}`);
+                    const $event = load(eventDetails);
+                    item.description = $event('.page_con').html();
+                } else if (item.link.includes('zhuanlan')) {
+                    item.description += content('.mod-word').html();
+                }
 
                 return item;
             })

package/lib/routes/freebuf/index.ts

@@ -1,5 +1,5 @@
 import { Route } from '@/types';
-import got from '@/utils/got';
+import ofetch from '@/utils/ofetch';
 import { parseDate } from '@/utils/parse-date';
 
 export const route: Route = {
@@ -40,7 +40,7 @@ async function handler(ctx) {
             referer: 'https://www.freebuf.com',
             accept: 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7',
         },
-        searchParams: {
+        query: {
             name: type,
             page: 1,
             limit: 20,
@@ -50,7 +50,7 @@ async function handler(ctx) {
         },
     };
 
-    const response = await got.get(fapi, options).json();
+    const response = await ofetch(fapi, options);
 
     const items = response.data.data_list.map((item) => ({
         title: item.post_title,

package/lib/routes/ftchinese/channel.ts

@@ -4,7 +4,7 @@ import utils from './utils';
 export const route: Route = {
     path: '/:language/:channel?',
     categories: ['traditional-media'],
-    example: '/ft/simplified/hotstoryby7day',
+    example: '/ftchinese/simplified/hotstoryby7day',
     parameters: { language: '语言，简体 `simplified`，繁体 `traditional`', channel: '频道，缺省为每日更新' },
     features: {
         requireConfig: false,
@@ -25,8 +25,8 @@ export const route: Route = {
 
   支持所有频道，频道名称见 [官方频道 RSS](http://www.ftchinese.com/channel/rss.html).
 
-  -   频道为单一路径，如 \`http://www.ftchinese.com/rss/news\` 则为 \`/ft/simplified/news\`.
-  -   频道包含多重路径，如 \`http://www.ftchinese.com/rss/column/007000002\` 则替换 \`/\` 为 \`-\` \`/ft/simplified/column-007000002\`.`,
+  -   频道为单一路径，如 \`http://www.ftchinese.com/rss/news\` 则为 \`/ftchinese/simplified/news\`.
+  -   频道包含多重路径，如 \`http://www.ftchinese.com/rss/column/007000002\` 则替换 \`/\` 为 \`-\` \`/ftchinese/simplified/column-007000002\`.`,
 };
 
 async function handler(ctx) {

package/lib/routes/gdut/oa-news.ts

@@ -1,7 +1,6 @@
 import { Route } from '@/types';
 import cache from '@/utils/cache';
 import got from '@/utils/got';
-import wait from '@/utils/wait';
 import { load } from 'cheerio';
 import { CookieJar } from 'tough-cookie';
 import { parseDate } from '@/utils/parse-date';
@@ -81,7 +80,7 @@ export const route: Route = {
         },
     ],
     name: 'Unknown',
-    maintainers: ['Jim Kirisame'],
+    maintainers: ['jim-kirisame'],
     handler,
     url: 'oas.gdut.edu.cn/seeyon',
 };
@@ -115,18 +114,16 @@ async function handler(ctx) {
     }
 
     // 构造文章数组
-    const articles = [];
-    for (const item of resp.data.list) {
-        articles.push({
-            title: item.title,
-            guid: item.id,
-            link: site + '/newsData.do?method=newsView&newsId=' + item.id,
-            pubDate: timezone(parseDate(item.publishDate1), +8),
-            author: item.publishUserDepart,
-            category: item.typeName,
-        });
-    }
+    const articles = resp.data.list.map((item) => ({
+        title: item.title,
+        guid: item.id,
+        link: site + '/newsData.do?method=newsView&newsId=' + item.id,
+        pubDate: timezone(parseDate(item.publishDate1), +8),
+        author: item.publishUserDepart,
+        category: item.typeName,
+    }));
 
+    const results = [];
     // 获取实际的文章内容
     for await (const data of asyncPool(2, articles, async (data) => {
         const link = data.link;
@@ -209,18 +206,16 @@ async function handler(ctx) {
                 }
             });
 
-            // 防止太快被Ban
-            await wait(500);
             return node.html();
         });
     })) {
-        data;
+        results.push(data);
     }
 
     return {
         title: `广东工业大学新闻通知网 - ` + type.name,
         link: site,
         description: `广东工业大学新闻通知网`,
-        item: articles,
+        item: results,
     };
 }

package/lib/routes/getitfree/util.ts

@@ -234,7 +234,7 @@ const getFilterByKeyAndKeyword = async (key, keyword) => {
 const getFilterKeyForSearchParams = (key, isApi = false) => {
     const keys = isApi ? filterApiKeys : filterKeys;
 
-    return Object.hasOwn(keys, key) ? keys[key] ?? key : undefined;
+    return Object.hasOwn(keys, key) ? (keys[key] ?? key) : undefined;
 };
 
 /**

package/lib/routes/github/activity.ts

@@ -0,0 +1,55 @@
+import { Route, ViewType } from '@/types';
+import ofetch from '@/utils/ofetch';
+import { parseDate } from '@/utils/parse-date';
+import Parser from 'rss-parser';
+
+const parser = new Parser();
+
+export const route: Route = {
+    path: '/activity/:user',
+    name: 'User Activities',
+    maintainers: ['hyoban'],
+    example: '/github/activity/DIYgod',
+    categories: ['programming', 'popular'],
+    view: ViewType.Articles,
+    parameters: {
+        user: 'GitHub username',
+    },
+    description: 'Get the activities of a user on GitHub, based on the GitHub official RSS feed',
+    features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    radar: [
+        {
+            source: ['github.com/:user'],
+            target: '/activity/:user',
+        },
+    ],
+    handler: async (ctx) => {
+        const { user } = ctx.req.param();
+        const response = (await ofetch(`https://github.com/${user}.atom`)) as Blob;
+        const raw = await response.text();
+        // <media:thumbnail height="30" width="30" url="https://avatars.githubusercontent.com/u/8266075?s=30&amp;v=4"/>
+        const image = raw.match(/<media:thumbnail height="30" width="30" url="(.+?)"/)?.[1];
+        const feed = await parser.parseString(raw);
+        return {
+            title: `${user}'s GitHub activities`,
+            link: feed.link,
+            image,
+            item: feed.items.map((item) => ({
+                title: item.title ?? '',
+                link: item.link,
+                description: item.content?.replace(/href="(.+?)"/g, `href="https://github.com$1"`),
+                pubDate: item.pubDate ? parseDate(item.pubDate) : undefined,
+                author: item.author,
+                guid: item.id,
+                image,
+            })),
+        };
+    },
+};

package/lib/routes/github/issue.ts

@@ -1,4 +1,4 @@
-import { Route } from '@/types';
+import { Route, ViewType } from '@/types';
 import got from '@/utils/got';
 import { config } from '@/config';
 import MarkdownIt from 'markdown-it';
@@ -12,8 +12,31 @@ import { parseDate } from '@/utils/parse-date';
 export const route: Route = {
     path: '/issue/:user/:repo/:state?/:labels?',
     categories: ['programming', 'popular'],
-    example: '/github/issue/vuejs/core/all/wontfix',
-    parameters: { user: 'GitHub username', repo: 'GitHub repo name', state: 'the state of the issues. Can be either `open`, `closed`, or `all`. Default: `open`.', labels: 'a list of comma separated label names' },
+    view: ViewType.Notifications,
+    example: '/github/issue/DIYgod/RSSHub/open',
+    parameters: {
+        user: 'GitHub username',
+        repo: 'GitHub repo name',
+        state: {
+            description: 'the state of the issues.',
+            default: 'open',
+            options: [
+                {
+                    label: 'Open',
+                    value: 'open',
+                },
+                {
+                    label: 'Closed',
+                    value: 'closed',
+                },
+                {
+                    label: 'All',
+                    value: 'all',
+                },
+            ],
+        },
+        labels: 'a list of comma separated label names',
+    },
     radar: [
         {
             source: ['github.com/:user/:repo/issues', 'github.com/:user/:repo/issues/:id', 'github.com/:user/:repo'],

package/lib/routes/github/search.ts

@@ -1,6 +1,5 @@
-import { Route } from '@/types';
-import got from '@/utils/got';
-import { load } from 'cheerio';
+import { DataItem, Route } from '@/types';
+import ofetch from '@/utils/ofetch';
 import * as url from 'node:url';
 
 const host = 'https://github.com';
@@ -40,22 +39,25 @@ async function handler(ctx) {
 
     const suffix = 'search?o='.concat(order, '&q=', encodeURIComponent(query), '&s=', sort, '&type=Repositories');
     const link = url.resolve(host, suffix);
-    const response = await got.get(link);
-    const $ = load(response.data);
+    const response = await ofetch(link, {
+        headers: {
+            accept: 'application/json',
+        },
+    });
 
-    const out = $('.repo-list li')
-        .slice(0, 10)
-        .map(function () {
-            const a = $(this).find('.f4.text-normal > a');
-            const single = {
-                title: a.text(),
-                author: a.text().split('/')[0].trim(),
-                link: host.concat(a.attr('href')),
-                description: $(this).find('div p').text().trim(),
-            };
-            return single;
-        })
-        .get();
+    const out = response.payload.results.map((item) => {
+        const {
+            repo: { repository },
+            hl_trunc_description,
+        } = item;
+
+        return {
+            title: repository.name,
+            author: repository.owner_login,
+            link: host.concat(`/${repository.owner_login}/${repository.name}`),
+            description: hl_trunc_description,
+        } as DataItem;
+    });
 
     return {
         allowEmpty: true,

package/lib/routes/github/star.ts

@@ -1,12 +1,13 @@
-import { Route } from '@/types';
+import { Route, ViewType } from '@/types';
 import got from '@/utils/got';
 import { config } from '@/config';
 import ConfigNotFoundError from '@/errors/types/config-not-found';
 
 export const route: Route = {
     path: '/stars/:user/:repo',
-    categories: ['programming'],
-    example: '/github/stars/DIYGod/RSSHub',
+    categories: ['programming', 'popular'],
+    example: '/github/stars/DIYgod/RSSHub',
+    view: ViewType.Notifications,
     parameters: { user: 'GitHub username', repo: 'GitHub repo name' },
     features: {
         requireConfig: [

package/lib/routes/github/trending.ts

@@ -1,4 +1,4 @@
-import { Route } from '@/types';
+import { Route, ViewType } from '@/types';
 import { getCurrentPath } from '@/utils/helpers';
 const __dirname = getCurrentPath(import.meta.url);
 
@@ -11,12 +11,34 @@ import ConfigNotFoundError from '@/errors/types/config-not-found';
 
 export const route: Route = {
     path: '/trending/:since/:language/:spoken_language?',
-    categories: ['programming'],
+    categories: ['programming', 'popular'],
     example: '/github/trending/daily/javascript/en',
+    view: ViewType.Articles,
     parameters: {
-        since: "time frame, available in [Trending page](https://github.com/trending/javascript?since=monthly) 's URL, possible values are: `daily`, `weekly` or `monthly`",
-        language: "the feed language, available in [Trending page](https://github.com/trending/javascript?since=monthly) 's URL, don't filter option is `any`",
-        spoken_language: "natural language, available in [Trending page](https://github.com/trending/javascript?since=monthly) 's URL",
+        since: {
+            description: 'time range',
+            options: [
+                {
+                    value: 'daily',
+                    label: 'Today',
+                },
+                {
+                    value: 'weekly',
+                    label: 'This week',
+                },
+                {
+                    value: 'monthly',
+                    label: 'This month',
+                },
+            ],
+        },
+        language: {
+            description: "the feed language, available in [Trending page](https://github.com/trending/javascript?since=monthly) 's URL, don't filter option is `any`",
+            default: 'any',
+        },
+        spoken_language: {
+            description: "natural language, available in [Trending page](https://github.com/trending/javascript?since=monthly) 's URL",
+        },
     },
     features: {
         requireConfig: [

package/lib/routes/google/citations.ts

@@ -4,7 +4,7 @@ import { load } from 'cheerio';
 
 export const route: Route = {
     path: '/citations/:id',
-    categories: ['journal'],
+    categories: ['journal', 'popular'],
     example: '/google/citations/mlmE4JMAAAAJ',
     parameters: { id: 'N' },
     features: {
@@ -15,7 +15,7 @@ export const route: Route = {
         supportPodcast: false,
         supportScihub: false,
     },
-    name: 'Author Citations',
+    name: 'Scholar Author Citations',
     maintainers: ['KellyHwong', 'const7'],
     handler,
     description: `The parameter id in the route is the id in the URL of the user's Google Scholar reference page, for example \`https://scholar.google.com/citations?user=mlmE4JMAAAAJ\` to \`mlmE4JMAAAAJ\`.

package/lib/routes/google/research.ts

@@ -0,0 +1,45 @@
+import { Route } from '@/types';
+import ofetch from '@/utils/ofetch';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
+
+const baseUrl = 'https://research.google';
+
+export const route: Route = {
+    path: '/research',
+    categories: ['blog'],
+    example: '/google/research',
+    name: 'Research Blog',
+    maintainers: ['Levix'],
+    radar: [
+        {
+            source: ['research.google'],
+        },
+    ],
+    handler: async () => {
+        const response = await ofetch(`${baseUrl}/blog`);
+        const $ = load(response);
+        const items = $('div.js-configurable-list .blog-posts-grid__cards .glue-grid__col')
+            .toArray()
+            .map((eleItem) => {
+                const item = $(eleItem);
+                const a = item.find('a').first();
+                return {
+                    title: a.find('.headline-5').text(),
+                    link: `${baseUrl}${a.attr('href')}`,
+                    pubDate: parseDate(item.find('.glue-label.glue-spacer-1-bottom').text()),
+                    author: 'Google',
+                    category: item
+                        .find('.not-glue.caption')
+                        .toArray()
+                        .map((item) => $(item).text().replace('·', '').trim()),
+                };
+            });
+
+        return {
+            title: 'Google Research Blog',
+            link: `${baseUrl}/blog`,
+            item: items,
+        };
+    },
+};

package/lib/routes/google/scholar.ts

@@ -4,7 +4,7 @@ import { load } from 'cheerio';
 
 export const route: Route = {
     path: '/scholar/:query',
-    categories: ['journal'],
+    categories: ['journal', 'popular'],
     example: '/google/scholar/data+visualization',
     parameters: { query: 'query statement which supports「Basic」and「Advanced」modes' },
     features: {
@@ -15,7 +15,7 @@ export const route: Route = {
         supportPodcast: false,
         supportScihub: false,
     },
-    name: 'Keywords Monitoring',
+    name: 'Scholar Keywords Monitoring',
     maintainers: ['HenryQW'],
     handler,
     description: `:::warning

package/lib/routes/gov/beijing/bphc/index.ts

@@ -1,7 +1,7 @@
 import { Route } from '@/types';
 import { getSubPath } from '@/utils/common-utils';
 import cache from '@/utils/cache';
-import got from '@/utils/got';
+import ofetch from '@/utils/ofetch';
 import { parseDate } from '@/utils/parse-date';
 import timezone from '@/utils/timezone';
 
@@ -36,13 +36,13 @@ async function handler(ctx) {
     const obj = mapping[key];
     const currentUrl = `${rootUrl}${obj.list}`;
 
-    const listResp = await got(currentUrl).json();
+    const listResp = await ofetch(currentUrl);
     const list = listResp.data?.records ?? [];
     const items = await Promise.all(
         list.map((item) => {
             const detail = `${rootUrl}${obj.detail}/${item.id}`;
             return cache.tryGet(detail, async () => {
-                const detailResponse = await got(detail).json();
+                const detailResponse = await ofetch(detail);
                 const description = (detailResponse.data?.content || detailResponse.data?.introduction) ?? '';
                 const single = {
                     title: item.title || item.fullName,

package/lib/routes/gov/immiau/news.ts

@@ -38,11 +38,11 @@ export const route: Route = {
 };
 
 async function handler() {
-    const res = await got({
+    const { data: res } = await got({
         method: 'post',
         url,
         json: reqBodyByYear(new Date().getFullYear()),
-    }).json();
+    });
 
     const list = res.d.data.map((item) => ({
         title: item.Title,