rsshub 1.0.0-master.f6c2ebb → 1.0.0-master.f70afef

package/lib/routes/weibo/user.ts

@@ -45,9 +45,9 @@ export const route: Route = {
     name: '博主',
     maintainers: ['DIYgod', 'iplusx', 'Rongronggg9', 'Konano'],
     handler,
-    description: `:::warning
+    description: `::: warning
   部分博主仅登录可见，未提供 Cookie 的情况下不支持订阅，可以通过打开 \`https://m.weibo.cn/u/:uid\` 验证
-  :::`,
+:::`,
 };
 
 async function handler(ctx) {

package/lib/routes/weibo/utils.ts

@@ -132,8 +132,8 @@ const weiboUtils = {
         }
 
         // drop live photo
-        const livePhotoCount = status.pics ? status.pics.filter((pic) => pic.type === 'livephotos').length : 0;
-        const pics = status.pics && status.pics.filter((pic) => pic.type !== 'livephotos');
+        const livePhotoCount = status.pics ? status.pics.filter((pic) => pic.type === 'livephoto').length : 0;
+        const pics = status.pics && status.pics.filter((pic) => pic.type !== 'livephoto');
 
         // 添加微博配图
         if (pics) {
@@ -263,7 +263,7 @@ const weiboUtils = {
     },
     formatVideo: (itemDesc, status) => {
         const pageInfo = status.page_info;
-        const livePhotos = status.pics && status.pics.filter((pic) => pic.type === 'livephotos' && pic.videoSrc);
+        const livePhotos = status.pics && status.pics.filter((pic) => pic.type === 'livephoto' && pic.videoSrc);
         let video = '<br clear="both" /><div style="clear: both"></div>';
         let anyVideo = false;
         if (livePhotos) {

package/lib/routes/whu/swrh.ts

@@ -0,0 +1,115 @@
+// 修改自计算机学院route
+import { Route } from '@/types';
+import cache from '@/utils/cache';
+import got from '@/utils/got';
+// import { parseDate } from '@/utils/parse-date';
+// import timezone from '@/utils/timezone';
+import { load } from 'cheerio';
+import { fetchArticle } from '@/utils/wechat-mp';
+
+const baseUrl = 'https://swrh.whu.edu.cn';
+
+export const route: Route = {
+    path: '/swrh/:type',
+    categories: ['university'],
+    example: '/whu/swrh/2',
+    radar: [
+        {
+            source: ['swrh.whu.edu.cn/:type'],
+            target: '/swrh/:type',
+        },
+    ],
+    parameters: { type: '公告类型，详见表格' },
+    features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    name: '水利水电学院公告',
+    maintainers: ['FanofZY'],
+    handler,
+    description: `| 公告类型 | 学院新闻 | 学术科研 | 通知公告 |
+  | -------- | -------- | -------- | -------- |
+  | 参数     | 0        | 1        | 2        |`,
+};
+
+async function handler(ctx) {
+    const type = Number.parseInt(ctx.req.param('type'));
+
+    let link;
+    switch (type) {
+        case 0:
+            link = `${baseUrl}/index/xyxw.htm`; // 学院新闻
+            break;
+
+        case 1:
+            link = `${baseUrl}/index/xsky.htm`; // 学术科研
+            break;
+
+        case 2:
+            link = `${baseUrl}/xxgk/tzgg.htm`; // 通知公告
+            break;
+
+        default:
+            throw new Error(`Unknown type: ${type}`);
+    }
+
+    const response = await got(link);
+    const $ = load(response.data);
+
+    const list =
+        type === 0
+            ? $('div.my_box_nei')
+                  .toArray()
+                  .map((item) => {
+                      item = $(item);
+                      return {
+                          title: item.find('a b.am-text-truncate').text().trim(),
+                          pubDate: item.find('a i').text().trim(),
+                          link: new URL(item.find('a').attr('href'), baseUrl).href,
+                      };
+                  })
+            : $('div.list_txt.am-fr ul.am-list li')
+                  .toArray()
+                  .map((item) => {
+                      item = $(item);
+                      return {
+                          title: item.find('a span').text().trim(),
+                          pubDate: item.find('a i').text().trim(),
+                          link: new URL(item.find('a').attr('href'), baseUrl).href,
+                      };
+                  });
+
+    let items = await Promise.all(
+        list.map((item) =>
+            cache.tryGet(item.link, async () => {
+                // 首先检查是否是微信公众号
+                item.description = item.link.includes('weixin')
+                    ? await fetchArticle(item.link).then((article) => article.description)
+                    : await (async () => {
+                          try {
+                              const response = await got(item.link);
+                              const $ = load(response.data);
+
+                              return $('.v_news_content').length ? $('.v_news_content').html().trim() : $('.prompt').length ? $('.prompt').html() : item.title;
+                          } catch {
+                              return item.title;
+                          }
+                      })();
+
+                return item;
+            })
+        )
+    );
+
+    items = items.filter((item) => item !== null);
+
+    return {
+        title: $('title').first().text(),
+        link,
+        item: items,
+    };
+}

package/lib/routes/wordpress/index.ts

@@ -142,7 +142,7 @@ export const route: Route = {
     parameters: { url: 'URL, <https://wordpress.org/news> by default', filter: 'Filter, see below' },
     description: `If you subscribe to [WordPress News](https://wordpress.org/news/)，where the URL is \`https://wordpress.org/news/\`, Encode the URL using \`encodeURIComponent()\` and then use it as the parameter. Therefore, the route will be [\`/wordpress/https%3A%2F%2Fwordpress.org%2Fnews\`](https://rsshub.app/wordpress/https%3A%2F%2Fwordpress.org%2Fnews).
 
-  :::tip
+::: tip
   If you wish to subscribe to specific categories or tags, you can fill in the "filter" parameter in the route. \`/category/Podcast\` to subscribe to the Podcast category. In this case, the route would be [\`/wordpress/https%3A%2F%2Fwordpress.org%2Fnews/category/Podcast\`](https://rsshub.app/wordpress/https%3A%2F%2Fwordpress.org%2Fnews/category/Podcast).
 
   You can also subscribe to multiple categories. \`/category/Podcast,Community\` to subscribe to both the Podcast and Community categories. In this case, the route would be [\`/wordpress/https%3A%2F%2Fwordpress.org%2Fnews/category/Podcast,Community\`](https://rsshub.app/wordpress/https%3A%2F%2Fwordpress.org%2Fnews/category/Podcast,Community).
@@ -150,7 +150,7 @@ export const route: Route = {
   Categories and tags can be combined as well. \`/category/Releases/tag/tagging\` to subscribe to the Releases category and the tagging tag. In this case, the route would be [\`/wordpress/https%3A%2F%2Fwordpress.org%2Fnews/category/Releases/tag/tagging\`](https://rsshub.app/wordpress/https%3A%2F%2Fwordpress.org%2Fnews/category/Releases/tag/tagging).
   
   You can also search for keywords. \`/search/Blog\` to search for the keyword "Blog". In this case, the route would be [\`/wordpress/https%3A%2F%2Fwordpress.org%2Fnews/search/Blog\`](https://rsshub.app/wordpress/https%3A%2F%2Fwordpress.org%2Fnews/search/Blog).
-  :::`,
+:::`,
     categories: ['blog'],
 
     features: {

package/lib/routes/wufazhuce/namespace.ts

@@ -0,0 +1,7 @@
+import type { Namespace } from '@/types';
+
+export const namespace: Namespace = {
+    name: '「ONE · 一个」',
+    url: 'wufazhuce.com',
+    lang: 'zh-CN',
+};

package/lib/routes/wufazhuce/one.ts

@@ -0,0 +1,90 @@
+import { Route, Data, DataItem } from '@/types';
+import { load } from 'cheerio';
+import cache from '@/utils/cache';
+import got from '@/utils/got';
+
+const apiUrl = 'https://wufazhuce.com/';
+const NAME = '「ONE · 一个」';
+
+export const route: Route = {
+    path: '/one',
+    categories: ['new-media'],
+    example: '/wufazhuce/one',
+    features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    radar: [
+        {
+            source: ['wufazhuce.com'],
+            target: '/one',
+        },
+    ],
+    name: NAME,
+    maintainers: ['sicheng1806'],
+    handler,
+};
+
+async function handler(): Promise<Data> {
+    const resp = await got(apiUrl);
+    const $ = load(resp.body);
+    let items: DataItem[] = [
+        ...$('#carousel-one div.item')
+            .toArray()
+            .map((item) => {
+                const a = $(item).find('.fp-one-cita a').first();
+                return {
+                    title: a.text(),
+                    link: a.attr('href'),
+                    description: '',
+                    category: '摄影',
+                };
+            }),
+        ...$('.fp-one-articulo a')
+            .toArray()
+            .map((item) => {
+                const a = $(item);
+                return {
+                    title: a.text(),
+                    link: a.attr('href'),
+                    description: '',
+                    category: '文章',
+                };
+            }),
+        ...$('.fp-one-cuestion a')
+            .toArray()
+            .map((item) => {
+                const a = $(item);
+                return {
+                    title: a.text(),
+                    link: a.attr('href'),
+                    description: '',
+                    category: '问题',
+                };
+            }),
+    ];
+
+    // 添加全文
+    items = await Promise.all(
+        items.map((item: DataItem) =>
+            cache.tryGet(item.link, async () => {
+                const rsp = await got(item.link);
+                const content = load(rsp.body);
+                item.description = content('.tab-content').html() || '';
+                return item;
+            })
+        )
+    );
+
+    // 生成rss
+    return {
+        title: NAME,
+        link: apiUrl,
+        item: items,
+        description: '复杂世界里, 一个就够了. One is all.',
+    };
+}

package/lib/routes/xaut/jwc.ts

@@ -20,9 +20,9 @@ export const route: Route = {
     name: '教务处',
     maintainers: ['mocusez'],
     handler,
-    description: `:::warning
+    description: `::: warning
   有些内容需使用校园网或 VPN 访问知行网获取
-  :::
+:::
 
   | 通知公告 | 新闻动态 | 规章制度 | 竞赛结果公示 | 竞赛获奖通知 | 竞赛信息 | 公开公示 |
   | :------: | :------: | :------: | :----------: | :----------: | :------: | :------: |

package/lib/routes/xaut/rsc.ts

@@ -20,9 +20,9 @@ export const route: Route = {
     name: '人事处',
     maintainers: ['mocusez', 'light0926'],
     handler,
-    description: `:::warning
+    description: `::: warning
   有些内容指向外部链接，目前只提供这些链接，不提供具体内容，去除 jwc 和 index 的修改
-  :::
+:::
 
   | 通知公告 | 工作动态 |
   | :------: | :------: |

package/lib/routes/xbmu/academic.ts

@@ -0,0 +1,91 @@
+import { DataItem, Route } from '@/types';
+import cache from '@/utils/cache';
+import got from '@/utils/got';
+import { parseDate } from '@/utils/parse-date';
+import { load } from 'cheerio';
+
+const BASE_URL = 'https://www.xbmu.edu.cn/xwzx/xsxx.htm';
+
+const handler: Route['handler'] = async () => {
+    try {
+        // Fetch the academic page
+        const { data: listResponse } = await got(BASE_URL);
+        const $ = load(listResponse);
+
+        // Select all list items containing academic information
+        const ITEM_SELECTOR = 'body > div.container.list-container.ny_mani > div > div.news_list > ul > li';
+        const listItems = $(ITEM_SELECTOR);
+
+        // Map through each list item to extract details
+        const academicLinkList = await Promise.all(
+            listItems.toArray().map((element) => {
+                const rawDate = $(element).find('span').text().trim();
+                const [day, yearMonth] = rawDate.split('/').map((s) => s.trim());
+                const formattedDate = parseDate(`${yearMonth}-${day}`).toUTCString();
+
+                const title = $(element).find('a').attr('title') || '学术信息';
+                const relativeHref = $(element).find('a').attr('href') || '';
+                const link = `https://www.xbmu.edu.cn/${relativeHref.replaceAll('../', '')}`;
+
+                return {
+                    date: formattedDate,
+                    title,
+                    link,
+                };
+            })
+        );
+
+        return {
+            title: '西北民族大学学术信息',
+            description: '西北民族大学近日学术信息',
+            link: BASE_URL,
+            image: 'http://210.26.0.114:9090/mdxg/img/weex/default_img.jpg',
+            item: (await Promise.all(
+                academicLinkList.map((item) =>
+                    cache.tryGet(item.link, async () => {
+                        const CONTENT_SELECTOR = '#vsb_content > div';
+                        const { data: contentResponse } = await got(item.link);
+                        const contentPage = load(contentResponse);
+                        const content = contentPage(CONTENT_SELECTOR).html() || '';
+                        return {
+                            title: item.title,
+                            pubDate: item.date,
+                            link: item.link,
+                            description: content,
+                            category: ['university'],
+                            guid: item.link,
+                            id: item.link,
+                            image: 'http://210.26.0.114:9090/mdxg/img/weex/default_img.jpg',
+                            content,
+                            updated: item.date,
+                            language: 'zh-cn',
+                        };
+                    })
+                )
+            )) as DataItem[],
+            allowEmpty: true,
+            language: 'zh-cn',
+            feedLink: 'https://rsshub.app/xbmu/academic',
+            id: 'https://rsshub.app/xbmu/academic',
+        };
+    } catch (error) {
+        throw new Error(`Error fetching academic information: ${error}`);
+    }
+};
+
+export const route: Route = {
+    path: '/academic',
+    name: '学术信息',
+    maintainers: ['PrinOrange'],
+    handler,
+    categories: ['university'],
+    features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    example: '/xbmu/academic',
+};

package/lib/routes/xbmu/announcement.ts

@@ -0,0 +1,91 @@
+import { DataItem, Route } from '@/types';
+import cache from '@/utils/cache';
+import got from '@/utils/got';
+import { parseDate } from '@/utils/parse-date';
+import { load } from 'cheerio';
+
+const BASE_URL = 'https://www.xbmu.edu.cn/xwzx/tzgg.htm';
+
+const handler: Route['handler'] = async () => {
+    try {
+        // Fetch the announcements page
+        const { data: listResponse } = await got(BASE_URL);
+        const $ = load(listResponse);
+
+        // Select all list items containing announcement information
+        const ITEM_SELECTOR = 'body > div.container.list-container.ny_mani > div > div.news_list > ul > li';
+        const listItems = $(ITEM_SELECTOR);
+
+        // Map through each list item to extract details
+        const announcementLinkList = await Promise.all(
+            listItems.toArray().map((element) => {
+                const rawDate = $(element).find('span').text().trim();
+                const [day, yearMonth] = rawDate.split('/').map((s) => s.trim());
+                const formattedDate = parseDate(`${yearMonth}-${day}`).toUTCString();
+
+                const title = $(element).find('a').attr('title') || '通知公告';
+                const relativeHref = $(element).find('a').attr('href') || '';
+                const link = `https://www.xbmu.edu.cn/${relativeHref.replaceAll('../', '')}`;
+
+                return {
+                    date: formattedDate,
+                    title,
+                    link,
+                };
+            })
+        );
+
+        return {
+            title: '西北民族大学通知公告',
+            description: '西北民族大学近日通知公告',
+            link: BASE_URL,
+            image: 'http://210.26.0.114:9090/mdxg/img/weex/default_img.jpg',
+            item: (await Promise.all(
+                announcementLinkList.map((item) =>
+                    cache.tryGet(item.link, async () => {
+                        const CONTENT_SELECTOR = '#vsb_content > div';
+                        const { data: contentResponse } = await got(item.link);
+                        const contentPage = load(contentResponse);
+                        const content = contentPage(CONTENT_SELECTOR).html() || '';
+                        return {
+                            title: item.title,
+                            pubDate: item.date,
+                            link: item.link,
+                            description: content,
+                            category: ['university'],
+                            guid: item.link,
+                            id: item.link,
+                            image: 'http://210.26.0.114:9090/mdxg/img/weex/default_img.jpg',
+                            content,
+                            updated: item.date,
+                            language: 'zh-cn',
+                        };
+                    })
+                )
+            )) as DataItem[],
+            allowEmpty: true,
+            language: 'zh-cn',
+            feedLink: 'https://rsshub.app/xbmu/announcement',
+            id: 'https://rsshub.app/xbmu/announcement',
+        };
+    } catch (error) {
+        throw new Error(`Error fetching announcements: ${error}`);
+    }
+};
+
+export const route: Route = {
+    path: '/announcement',
+    name: '通知公告',
+    maintainers: ['PrinOrange'],
+    handler,
+    categories: ['university'],
+    features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    example: '/xbmu/announcement',
+};

package/lib/routes/xbmu/namespace.ts

@@ -0,0 +1,6 @@
+import type { Namespace } from '@/types';
+
+export const namespace: Namespace = {
+    name: '西北民族大学',
+    url: 'www.xbmu.edu.cn',
+};

package/lib/routes/xiaohongshu/user.ts

@@ -1,19 +1,34 @@
 import { Route, ViewType } from '@/types';
 import cache from '@/utils/cache';
-import { getUser } from './util';
+import querystring from 'querystring';
+import { getUser, renderNotesFulltext, getUserWithCookie } from './util';
 import InvalidParameterError from '@/errors/types/invalid-parameter';
-
+import { config } from '@/config';
+import { fallback, queryToBoolean } from '@/utils/readable-social';
 export const route: Route = {
-    path: '/user/:user_id/:category',
-    name: '用户笔记',
+    path: '/user/:user_id/:category/:routeParams?',
+    name: '用户笔记/收藏',
     categories: ['social-media', 'popular'],
     view: ViewType.Articles,
-    maintainers: ['lotosbin'],
+    maintainers: ['lotosbin', 'howerhe', 'rien7', 'dddaniel1', 'pseudoyu'],
     handler,
+    radar: [
+        {
+            source: ['xiaohongshu.com/user/profile/:user_id'],
+            target: '/user/:user_id/notes',
+        },
+    ],
     example: '/xiaohongshu/user/593032945e87e77791e03696/notes',
     features: {
         antiCrawler: true,
         requirePuppeteer: true,
+        requireConfig: [
+            {
+                name: 'XIAOHONGSHU_COOKIE',
+                optional: true,
+                description: '小红书 cookie 值，可在网络里面看到。',
+            },
+        ],
     },
     parameters: {
         user_id: 'user id, length 24 characters',
@@ -29,6 +44,11 @@ export const route: Route = {
                     label: 'collect',
                 },
             ],
+            default: 'notes',
+        },
+        routeParams: {
+            description: 'displayLivePhoto,`/user/:user_id/notes/displayLivePhoto=0`,不限时LivePhoto显示为图片,`/user/:user_id/notes/displayLivePhoto=1`,取值不为0时LivePhoto显示为视频',
+            default: '0',
         },
     },
 };
@@ -36,8 +56,33 @@ export const route: Route = {
 async function handler(ctx) {
     const userId = ctx.req.param('user_id');
     const category = ctx.req.param('category');
+    const routeParams = querystring.parse(ctx.req.param('routeParams'));
+    const displayLivePhoto = !!fallback(undefined, queryToBoolean(routeParams.displayLivePhoto), false);
     const url = `https://www.xiaohongshu.com/user/profile/${userId}`;
+    const cookie = config.xiaohongshu.cookie;
+
+    if (cookie && category === 'notes') {
+        try {
+            const urlNotePrefix = 'https://www.xiaohongshu.com/explore';
+            const user = await getUserWithCookie(url, cookie);
+            const notes = await renderNotesFulltext(user.notes, urlNotePrefix, displayLivePhoto);
+            return {
+                title: `${user.userPageData.basicInfo.nickname} - 笔记 • 小红书 / RED`,
+                description: user.userPageData.basicInfo.desc,
+                image: user.userPageData.basicInfo.imageb || user.userPageData.basicInfo.images,
+                link: url,
+                item: notes,
+            };
+        } catch {
+            // Fallback to normal logic if cookie method fails
+            return await getUserFeeds(url, category);
+        }
+    } else {
+        return await getUserFeeds(url, category);
+    }
+}
 
+async function getUserFeeds(url: string, category: string) {
     const {
         userPageData: { basicInfo, interactions, tags },
         notes,
@@ -52,7 +97,7 @@ async function handler(ctx) {
         notes.flatMap((n) =>
             n.map(({ id, noteCard }) => ({
                 title: noteCard.displayTitle,
-                link: `${url}/${noteCard.noteId || id}`,
+                link: new URL(noteCard.noteId || id, url).toString(),
                 guid: noteCard.noteId || id || noteCard.displayTitle,
                 description: `<img src ="${noteCard.cover.infoList.pop().url}"><br>${noteCard.displayTitle}`,
                 author: noteCard.user.nickname,