rsshub 1.0.0-master.f72af1b → 1.0.0-master.f7347d9

package/lib/routes/uestc/gr.ts

@@ -1,17 +1,38 @@
-import { Route } from '@/types';
+import { Data, DataItem, Route } from '@/types';
 import cache from '@/utils/cache';
-import got from '@/utils/got';
+import ofetch from '@/utils/ofetch';
 import { load } from 'cheerio';
 import { parseDate } from '@/utils/parse-date';
+import timezone from '@/utils/timezone';
+import InvalidParameterError from '@/errors/types/invalid-parameter';
+import type { Context } from 'hono';
 
-const baseUrl = 'https://gr.uestc.edu.cn/tongzhi/';
-const baseIndexUrl = 'https://gr.uestc.edu.cn';
+const baseUrl = 'https://gr.uestc.edu.cn/';
+const detailUrl = 'https://gr.uestc.edu.cn/';
+
+const dateTimeRegex = /(\d{4}-\d{2}-\d{2} \d{2}:\d{2})/;
+
+const typeUrlMap = {
+    important: 'tongzhi/',
+    teaching: 'tongzhi/119',
+    degree: 'tongzhi/129',
+    student: 'tongzhi/122',
+    practice: 'tongzhi/123',
+};
+
+const typeNameMap = {
+    important: '重要公告',
+    teaching: '教学管理',
+    degree: '学位管理',
+    student: '学生管理',
+    practice: '就业实践',
+};
 
 export const route: Route = {
-    path: '/gr',
+    path: '/gr/:type?',
     categories: ['university'],
-    example: '/uestc/gr',
-    parameters: {},
+    example: '/uestc/gr/student',
+    parameters: { type: '默认为 `important`' },
     features: {
         requireConfig: false,
         requirePuppeteer: false,
@@ -29,46 +50,53 @@ export const route: Route = {
     maintainers: ['huyyi', 'mobyw'],
     handler,
     url: 'gr.uestc.edu.cn/',
+    description: `\
+  | 重要公告  | 教学管理 | 学位管理 | 学生管理 | 就业实践 |
+  | --------- | -------- | -------- | -------- | -------- |
+  | important | teaching | degree   | student  | practice |`,
 };
 
-async function handler() {
-    const response = await got.get(baseIndexUrl);
+async function handler(ctx: Context): Promise<Data> {
+    const type = ctx.req.param('type') || 'important';
+    if (type in typeUrlMap === false) {
+        throw new InvalidParameterError('type not supported');
+    }
+    const typeName = typeNameMap[type];
 
-    const $ = load(response.data);
+    const indexContent = await ofetch(baseUrl + typeUrlMap[type]);
 
-    const items = [];
-    $('[href^="/tongzhi/"]').each((_, item) => {
-        items.push(baseIndexUrl + item.attribs.href);
-    });
+    const $ = load(indexContent);
+    const entries = $('div.title').toArray();
+
+    const items = entries.map(async (entry) => {
+        const element = $(entry);
+        const newsTitle = element.find('a').text() ?? '';
+        const newsLink = detailUrl + element.find('a').attr('href');
 
-    const out = await Promise.all(
-        items.map(async (newsUrl) => {
-            const newsDetail = await cache.tryGet(newsUrl, async () => {
-                const result = await got.get(newsUrl);
+        const newsDetail = await cache.tryGet(newsLink, async () => {
+            const newsContent = await ofetch(newsLink);
+            const content = load(newsContent);
 
-                const $ = load(result.data);
+            const basicInfo = content('div.topic_detail_header').find('div.info').text();
+            const match = dateTimeRegex.exec(basicInfo);
 
-                const title = '[' + $('.over').text() + '] ' + $('div.title').text();
-                const author = $('.info').text().split('|')[1].trim().substring(3);
-                const date = parseDate($('.info').text().split('|')[0].trim().substring(4));
-                const description = $('.content').html();
+            return {
+                title: newsTitle,
+                link: newsLink,
+                pubDate: match ? timezone(parseDate(match[1]), +8) : null,
+                description: content('div.content').html(),
+            };
+        });
+
+        return newsDetail;
+    });
 
-                return {
-                    title,
-                    link: newsUrl,
-                    author,
-                    pubDate: date,
-                    description,
-                };
-            });
-            return newsDetail;
-        })
-    );
+    const out = await Promise.all(items);
 
     return {
-        title: '研究生院通知',
+        title: `研究生院通知（${typeName}）`,
         link: baseUrl,
-        description: '电子科技大学研究生院通知公告',
-        item: out,
+        description: `电子科技大学研究生院通知（${typeName}）`,
+        item: out as DataItem[],
     };
 }

package/lib/routes/uestc/jwc.ts

@@ -1,22 +1,33 @@
-import { Route } from '@/types';
-import got from '@/utils/got';
+import { Data, DataItem, Route } from '@/types';
+import cache from '@/utils/cache';
+import ofetch from '@/utils/ofetch';
 import { load } from 'cheerio';
 import { parseDate } from '@/utils/parse-date';
+import timezone from '@/utils/timezone';
 import InvalidParameterError from '@/errors/types/invalid-parameter';
-
-const dateRegex = /(20\d{2})\/(\d{2})\/(\d{2})/;
+import type { Context } from 'hono';
 
 const baseUrl = 'https://www.jwc.uestc.edu.cn/';
 const detailUrl = 'https://www.jwc.uestc.edu.cn/info/';
 
-const map = {
+const dateTimeRegex = /(\d{4}-\d{2}-\d{2} \d{2}:\d{2})/;
+
+const typeUrlMap = {
     important: 'hard/?page=1',
     student: 'list/256/?page=1',
     teacher: 'list/255/?page=1',
-    teach: 'list/40/?page=1',
+    teaching: 'list/40/?page=1',
     office: 'list/ff80808160bcf79c0160c010a8d20020/?page=1',
 };
 
+const typeNameMap = {
+    important: '重要公告',
+    student: '学生事务公告',
+    teacher: '教师事务公告',
+    teaching: '教学新闻',
+    office: '办公室',
+};
+
 export const route: Route = {
     path: '/jwc/:type?',
     categories: ['university'],
@@ -32,51 +43,61 @@ export const route: Route = {
     },
     radar: [
         {
-            source: ['jwc.uestc.edu.cn/'],
+            source: ['www.jwc.uestc.edu.cn/'],
             target: '/jwc',
         },
     ],
     name: '教务处',
     maintainers: ['achjqz', 'mobyw'],
     handler,
-    url: 'jwc.uestc.edu.cn/',
-    description: `| 重要公告  | 学生事务公告 | 教师事务公告 | 教学新闻 | 办公室 |
+    url: 'www.jwc.uestc.edu.cn/',
+    description: `\
+  | 重要公告  | 学生事务公告 | 教师事务公告 | 教学新闻 | 办公室 |
   | --------- | ------------ | ------------ | -------- | ------ |
-  | important | student      | teacher      | teach    | office |`,
+  | important | student      | teacher      | teaching | office |`,
 };
 
-async function handler(ctx) {
+async function handler(ctx: Context): Promise<Data> {
     const type = ctx.req.param('type') || 'important';
-    const pageUrl = map[type];
-    if (!pageUrl) {
+    if (type in typeUrlMap === false) {
         throw new InvalidParameterError('type not supported');
     }
+    const typeName = typeNameMap[type];
 
-    const response = await got.get(baseUrl + pageUrl);
+    const indexContent = await ofetch(baseUrl + typeUrlMap[type]);
 
-    const $ = load(response.data);
+    const $ = load(indexContent);
+    const entries = $('div.textAreo.clearfix').toArray();
 
-    const items = $('div.textAreo.clearfix');
+    const items = entries.map(async (entry) => {
+        const element = $(entry);
+        const newsTitle = element.find('a').attr('title') ?? '';
+        const newsLink = detailUrl + element.find('a').attr('newsid');
 
-    const out = $(items)
-        .map((_, item) => {
-            item = $(item);
-            const newsTitle = item.find('a').attr('title');
-            const newsLink = detailUrl + item.find('a').attr('newsid');
-            const newsDate = parseDate(item.find('i').text().replace(dateRegex, '$1-$2-$3'));
+        const newsDetail = await cache.tryGet(newsLink, async () => {
+            const newsContent = await ofetch(newsLink);
+            const content = load(newsContent);
+
+            const basicInfo = content('div.detail_header').find('div.item').text();
+            const match = dateTimeRegex.exec(basicInfo);
 
             return {
                 title: newsTitle,
                 link: newsLink,
-                pubDate: newsDate,
+                pubDate: match ? timezone(parseDate(match[1]), +8) : null,
+                description: content('div.NewText').html(),
             };
-        })
-        .get();
+        });
+
+        return newsDetail;
+    });
+
+    const out = await Promise.all(items);
 
     return {
-        title: '教务处通知',
+        title: `教务处通知（${typeName}）`,
         link: baseUrl,
-        description: '电子科技大学教务处通知',
-        item: out,
+        description: `电子科技大学教务处通知（${typeName}）`,
+        item: out as DataItem[],
     };
 }

package/lib/routes/wechat/ershcimi.ts

@@ -41,12 +41,14 @@ async function handler(ctx) {
                 pubDate: timezone(parseDate($item('.weui_media_extra_info').attr('title')), +8),
             };
         })
-        .get();
+        .toArray();
 
     return {
         title: `微信公众号 - ${$('span.name').text()}`,
         link: url,
         description: $('div.Profile-sideColumnItemValue').text(),
-        item: await Promise.all(items.map((item) => finishArticleItem(item).catch(() => item))),
+        item: await Promise.all(items.map((item) => finishArticleItem(item))).catch((error) => {
+            throw error;
+        }),
     };
 }

package/lib/routes/weibo/user.ts

@@ -30,12 +30,20 @@ export const route: Route = {
     },
     radar: [
         {
-            source: ['m.weibo.cn/u/:uid', 'm.weibo.cn/profile/:uid', 'weibo.com/u/:uid', 'www.weibo.com/u/:uid'],
+            source: ['m.weibo.cn/u/:uid', 'm.weibo.cn/profile/:uid'],
+            target: '/user/:uid',
+        },
+        {
+            source: ['weibo.com/u/:uid'],
+            target: '/user/:uid',
+        },
+        {
+            source: ['www.weibo.com/u/:uid'],
             target: '/user/:uid',
         },
     ],
     name: '博主',
-    maintainers: ['DIYgod', 'iplusx', 'Rongronggg9'],
+    maintainers: ['DIYgod', 'iplusx', 'Rongronggg9', 'Konano'],
     handler,
     description: `:::warning
   部分博主仅登录可见，未提供 Cookie 的情况下不支持订阅，可以通过打开 \`https://m.weibo.cn/u/:uid\` 验证

package/lib/routes/xaut/index.ts

@@ -1,6 +1,7 @@
 import { Route } from '@/types';
 import cache from '@/utils/cache';
 import got from '@/utils/got';
+import timezone from '@/utils/timezone';
 import { parseDate } from '@/utils/parse-date';
 import { load } from 'cheerio';
 
@@ -8,7 +9,7 @@ export const route: Route = {
     path: '/index/:category?',
     categories: ['university'],
     example: '/xaut/index/tzgg',
-    parameters: { category: '通知类别，默认为通知公告' },
+    parameters: { category: '通知类别，默认为学校新闻' },
     features: {
         requireConfig: false,
         requirePuppeteer: false,
@@ -20,19 +21,19 @@ export const route: Route = {
     name: '学校主页',
     maintainers: ['mocusez'],
     handler,
-    description: `| 通知公告 | 校园要闻 | 媒体播报 | 学术活动 |
-  | :------: | :------: | :------: | :------: |
-  |   tzgg   |   xyyw   |   mtbd   |   xshd   |`,
+    description: `| 学校新闻 | 砥志研思 | 立德树人 | 传道授业 | 校闻周知 |
+  | :------: | :------: | :------: | :------: | :------: |
+  |   xxxw   |   dzys   |   ldsr   |   cdsy   |   xwzz   |`,
 };
 
 async function handler(ctx) {
     let category = ctx.req.param('category');
-    const dic_html = { tzgg: 'tzgg.htm', xyyw: 'xyyw.htm', mtbd: 'mtbd1.htm', xshd: 'xshd.htm' };
-    const dic_title = { tzgg: '通知公告', xyyw: '校园要闻', mtbd: '媒体播报', xshd: '学术活动' };
+    const dic_html = { xxxw: 'xxxw.htm', dzys: 'dzys.htm', ldsr: 'ldsr.htm', cdsy: 'cdsy.htm', xwzz: 'xwzz.htm' };
+    const dic_title = { xxxw: '学校新闻', dzys: '砥志研思', ldsr: '立德树人', cdsy: '传道授业', xwzz: '校闻周知' };
 
     // 设置默认值
     if (dic_title[category] === undefined) {
-        category = 'tzgg';
+        category = 'xxxw';
     }
 
     const response = await got({
@@ -42,26 +43,18 @@ async function handler(ctx) {
     const data = response.body;
     const $ = load(data);
 
-    // 这个列表指通知公告详情列表
-    const list = $('.newslist_block ul a')
+    const list = $('div.nlist ul li')
         .map((_, item) => {
             item = $(item);
-            const temp = item.find('span').text();
-
             // link原来长这样：'../info/1196/13990.htm'
-            const link = item.attr('href').replace(/^\.\./, 'http://www.xaut.edu.cn');
-            let date = parseDate(temp.slice(-10, -1), 'YYYY-MM-DD');
-            let title = temp.slice(0, -10);
-
-            if (category === 'xshd') {
-                date = parseDate(temp.slice(-11, -1).replace('年', '-').replace('月', '-').replace('日', ''), 'YYYY-MM-DD');
-                title = temp.slice(0, -11);
-            }
+            const link = item.find('a').attr('href').replace(/^\.\./, 'http://www.xaut.edu.cn');
+            const pubDate = timezone(parseDate(item.find('div.time').text().trim()), +8);
+            const title = item.find('h5').text();
 
             return {
                 title,
                 link,
-                pubDate: date,
+                pubDate,
             };
         })
         .get();

package/lib/routes/xaut/namespace.ts

@@ -2,5 +2,5 @@ import type { Namespace } from '@/types';
 
 export const namespace: Namespace = {
     name: '西安理工大学',
-    url: 'index.xaut.edu.cn',
+    url: 'www.xaut.edu.cn',
 };

package/lib/routes/xbookcn/blog.ts

@@ -0,0 +1,66 @@
+import { Route } from '@/types';
+import ofetch from '@/utils/ofetch';
+import { load } from 'cheerio';
+import cache from '@/utils/cache';
+
+export const route: Route = {
+    path: '/:label?', // 路由路径
+    categories: ['reading'], // 分类
+    example: '/xbookcn/精选作品', // 示例路径
+    parameters: { label: '按名称分类，详见https://blog.xbookcn.net/p/all.html' }, // 参数
+    features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    name: '短篇', // 源名称
+    maintainers: ['Lyunvy'], // 维护者
+    handler: async (ctx) => {
+        const { label = '精选作品' } = ctx.req.param(); // 从请求参数中获取 label
+        const url = `https://blog.xbookcn.net/search/label/${label}`; // 使用反引号构建 URL
+        const response = await ofetch(url); // 请求源链接
+        const $ = load(response); // 加载 HTML
+
+        const articles = $('.blog-posts.hfeed .date-outer').find('.post'); // 查找文章
+
+        const list = articles.toArray().map((elem) => {
+            const a = $(elem).find('.post-title a'); // 获取标题链接
+            return {
+                title: a.text().trim(), // 标题
+                link: a.attr('href'), // 链接
+                category: [], // 分类
+            };
+        });
+
+        const items = await Promise.all(
+            list.map(
+                async (item) =>
+                    // 使用缓存以避免重复请求
+                    await cache.tryGet(item.link, async () => {
+                        const response = await ofetch(item.link); // 请求文章链接
+                        const $ = load(response); // 加载文章页面
+
+                        // 获取文章的完整描述
+                        item.description = $('.post-body.entry-content').html() || '无内容'; // 抓取指定内容
+
+                        // 获取分类信息
+                        const categories = $('.post-labels a')
+                            .toArray()
+                            .map((el) => $(el).text().trim());
+                        item.category = categories; // 添加多个分类信息
+
+                        return item; // 返回带有描述和分类的文章对象
+                    })
+            )
+        );
+
+        return {
+            title: 'xbookcn', // 源标题
+            link: url, // 源链接
+            item: items, // 源文章
+        };
+    },
+};

package/lib/routes/xbookcn/namespace.ts

@@ -0,0 +1,6 @@
+import type { Namespace } from '@/types';
+
+export const namespace: Namespace = {
+    name: '中文成人文學網',
+    url: 'www.xbookcn.net',
+};

package/lib/routes/xiaoyuzhou/podcast.ts

@@ -8,7 +8,7 @@ export const route: Route = {
     categories: ['multimedia', 'popular'],
     view: ViewType.Audios,
     example: '/xiaoyuzhou/podcast/6021f949a789fca4eff4492c',
-    parameters: { id: '播客id，可以在小宇宙播客的 URL 中找到' },
+    parameters: { id: '播客 id 或单集 id，可以在小宇宙播客的 URL 中找到' },
     features: {
         requireConfig: false,
         requirePuppeteer: false,
@@ -19,25 +19,53 @@ export const route: Route = {
     },
     radar: [
         {
-            source: ['xiaoyuzhoufm.com/podcast/:id'],
+            source: ['xiaoyuzhoufm.com/podcast/:id', 'xiaoyuzhoufm.com/episode/:id'],
         },
     ],
     name: '播客',
-    maintainers: ['hondajojo', 'jtsang4'],
+    maintainers: ['hondajojo', 'jtsang4', 'pseudoyu'],
     handler,
     url: 'xiaoyuzhoufm.com/',
 };
 
 async function handler(ctx) {
-    const link = `https://www.xiaoyuzhoufm.com/podcast/${ctx.req.param('id')}`;
-    const response = await got({
+    const id = ctx.req.param('id');
+    let link = `https://www.xiaoyuzhoufm.com/podcast/${id}`;
+    let response = await got({
         method: 'get',
         url: link,
     });
 
-    const $ = load(response.data);
+    let $ = load(response.data);
+    let page_data = JSON.parse($('#__NEXT_DATA__')[0].children[0].data);
 
-    const page_data = JSON.parse($('#__NEXT_DATA__')[0].children[0].data);
+    if (!page_data.props.pageProps.podcast?.episodes) {
+        // If episodes are not found, it might be an episode page
+        // Try to get the podcast id from the episode page
+        link = `https://www.xiaoyuzhoufm.com/episode/${id}`;
+        response = await got({
+            method: 'get',
+            url: link,
+        });
+
+        $ = load(response.data);
+        const podcastLink = $('.jsx-605929003.podcast-title .jsx-605929003.name').attr('href');
+        if (podcastLink) {
+            const podcastId = podcastLink.split('/').pop();
+            link = `https://www.xiaoyuzhoufm.com/podcast/${podcastId}`;
+            response = await got({
+                method: 'get',
+                url: link,
+            });
+
+            $ = load(response.data);
+            page_data = JSON.parse($('#__NEXT_DATA__')[0].children[0].data);
+        }
+    }
+
+    if (!page_data.props.pageProps.podcast?.episodes) {
+        throw new Error('Failed to fetch podcast episodes');
+    }
 
     const episodes = page_data.props.pageProps.podcast.episodes.map((item) => ({
         title: item.title,

package/lib/routes/xueqiu/cookies.ts

@@ -14,14 +14,16 @@ export const parseToken = () =>
             if (matches) {
                 acw_sc__v2 = getAcwScV2ByArg1(matches[1]);
             }
-
+            const acw_sc__v2_cookie = `acw_sc__v2=${acw_sc__v2}`;
             const res = await ofetch.raw('https://xueqiu.com', {
                 headers: {
-                    Cookie: `acw_sc__v2=${acw_sc__v2}`,
+                    Cookie: acw_sc__v2_cookie,
                 },
             });
             const cookieArray = res.headers.getSetCookie();
-            return cookieArray.find((c) => c.startsWith('xq_a_token='));
+            const xq_a_token_cookie = cookieArray.find((c) => c.startsWith('xq_a_token='));
+
+            return `${acw_sc__v2_cookie}; ${xq_a_token_cookie}`;
         },
         config.cache.routeExpire,
         false

package/lib/routes/xueqiu/stock-info.ts

@@ -82,17 +82,11 @@ async function handler(ctx) {
         title: `${id} ${stock_name} - ${source}`,
         link: `https://xueqiu.com/S/${id}`,
         description: `${stock_name} - ${source}`,
-        item: data.map((item) => {
-            let link = `https://xueqiu.com${item.target}`;
-            if (item.quote_cards) {
-                link = item.quote_cards[0].target_url;
-            }
-            return {
-                title: item.title || sanitizeHtml(item.description, { allowedTags: [], allowedAttributes: {} }),
-                description: item.description,
-                pubDate: parseDate(item.created_at),
-                link,
-            };
-        }),
+        item: data.map((item) => ({
+            title: item.title || sanitizeHtml(item.description, { allowedTags: [], allowedAttributes: {} }),
+            description: item.description,
+            pubDate: parseDate(item.created_at),
+            link: `https://xueqiu.com${item.target}`,
+        })),
     };
 }

package/lib/routes/yande/namespace.ts

@@ -1,7 +1,7 @@
 import type { Namespace } from '@/types';
 
 export const namespace: Namespace = {
-    name: 'yande',
+    name: 'yande.re',
     url: 'yande.re',
     description: `yande post`,
 };

package/lib/routes/yande/post.ts

@@ -4,20 +4,20 @@ import queryString from 'query-string';
 
 export const route: Route = {
     path: '/post/popular_recent/:period?',
-    categories: ['anime'],
+    categories: ['picture'],
     example: '/yande/post/popular_recent/1d',
     parameters: {
         period: '展示时间',
     },
     radar: [
         {
-            source: ['yande.re/post/'],
+            source: ['yande.re/post'],
         },
     ],
-    name: 'posts',
-    maintainers: ['fashioncj', 'NekoAria'],
-    description: `| 最近 24 小时    | 最近一周     | 最近一月    | 最近一年     | 
-  | ------- | -------- | ------- | -------- | 
+    name: 'Popular Recent Posts',
+    maintainers: ['magic-akari', 'SettingDust', 'fashioncj', 'NekoAria'],
+    description: `| 最近 24 小时    | 最近一周     | 最近一月    | 最近一年     |
+  | ------- | -------- | ------- | -------- |
   | 1d | 1w | 1m | 1y |`,
     handler,
 };