rsshub 1.0.0-master.f7add90 → 1.0.0-master.f7bfacc

package/lib/v2/weibo/keyword.js

@@ -37,19 +37,10 @@ module.exports = async (ctx) => {
             if (item.mblog.retweeted_status && item.mblog.retweeted_status.created_at) {
                 item.mblog.retweeted_status.created_at = timezone(item.mblog.retweeted_status.created_at, +8);
             }
-            const formatExtended = weiboUtils.formatExtended(ctx, item.mblog, {
+            return weiboUtils.formatExtended(ctx, item.mblog, undefined, {
                 showAuthorInTitle: fallback(undefined, queryToBoolean(routeParams.showAuthorInTitle), true),
                 showAuthorInDesc: fallback(undefined, queryToBoolean(routeParams.showAuthorInDesc), true),
             });
-            const title = formatExtended.title;
-            const description = formatExtended.description;
-            return {
-                title,
-                description,
-                pubDate: item.mblog.created_at,
-                author: item.mblog.user.screen_name,
-                link: `https://weibo.com/${item.mblog.user.id}/${item.mblog.bid}`,
-            };
         }),
     });
 };

package/lib/v2/weibo/maintainer.js

@@ -1,8 +1,9 @@
 module.exports = {
-    '/keyword/:keyword/:routeParams?': ['DIYgod'],
+    '/group/:gid/:gname?/:routeParams?': ['monologconnor', 'Rongronggg9'],
+    '/keyword/:keyword/:routeParams?': ['DIYgod', 'Rongronggg9'],
     '/oasis/user/:userid': ['kt286'],
     '/search/hot': ['xyqfer'],
-    '/super_index/:id/:type?/:routeParams?': ['zengxs'],
-    '/timeline/:uid/:feature?/:routeParams?': ['zytomorrow', 'DIYgod ', 'Rongronggg9'],
+    '/super_index/:id/:type?/:routeParams?': ['zengxs', 'Rongronggg9'],
+    '/timeline/:uid/:feature?/:routeParams?': ['zytomorrow', 'DIYgod', 'Rongronggg9'],
     '/user/:uid/:routeParams?': ['DIYgod', 'iplusx', 'Rongronggg9'],
 };

package/lib/v2/weibo/router.js

@@ -1,4 +1,5 @@
 module.exports = (router) => {
+    router.get('/group/:gid/:gname?/:routeParams?', require('./group'));
     router.get('/keyword/:keyword/:routeParams?', require('./keyword'));
     router.get('/oasis/user/:userid', require('./oasis/user'));
     router.get('/search/hot', require('./search/hot'));

package/lib/v2/weibo/super_index.js

@@ -1,6 +1,5 @@
 const got = require('@/utils/got');
 const weiboUtils = require('./utils');
-const timezone = require('@/utils/timezone');
 const queryString = require('query-string');
 const config = require('@/config').value;
 
@@ -40,15 +39,7 @@ module.exports = async (ctx) => {
             if (mblogCard.card_type === '9' && 'mblog' in mblogCard) {
                 const mblog = mblogCard.mblog;
                 const formatExtended = weiboUtils.formatExtended(ctx, mblog);
-                const title = formatExtended.title;
-                const desc = formatExtended.description;
-                resultItems.push({
-                    title,
-                    description: desc,
-                    author: mblog.user.screen_name,
-                    link: `https://weibo.com/${mblog.user.id}/${mblog.bid}`,
-                    pubDate: timezone(mblog.created_at, +8),
-                });
+                resultItems.push(formatExtended);
             }
         }
     }

package/lib/v2/weibo/timeline.js

@@ -83,11 +83,11 @@ module.exports = async (ctx) => {
                     }
                 }
 
-                const link = `https://weibo.com/${uid}/${item.id}`;
+                const guid = `https://weibo.com/${uid}/${item.id}`;
+                // not using formatExtended.guid in order not to introduce breaking change
 
-                const formatExtended = weiboUtils.formatExtended(ctx, item);
+                const formatExtended = weiboUtils.formatExtended(ctx, item, uid);
                 let description = formatExtended.description;
-                const title = formatExtended.title;
                 const pubDate = isDataOK ? parseDate(data.created_at) : parseDate(item.created_at);
 
                 // 视频的处理
@@ -116,9 +116,9 @@ module.exports = async (ctx) => {
                 }
 
                 return {
-                    title,
+                    ...formatExtended,
+                    guid,
                     description,
-                    link,
                     pubDate,
                     author: item.user.screen_name,
                 };

package/lib/v2/weibo/user.js

@@ -94,11 +94,8 @@ module.exports = async (ctx) => {
                     }
                 }
 
-                const link = `https://weibo.com/${uid}/${item.mblog.bid}`;
-                const formatExtended = weiboUtils.formatExtended(ctx, item.mblog);
+                const formatExtended = weiboUtils.formatExtended(ctx, item.mblog, uid);
                 let description = formatExtended.description;
-                const title = formatExtended.title;
-                const pubDate = item.mblog.created_at;
 
                 // 视频的处理
                 if (displayVideo === '1') {
@@ -126,11 +123,8 @@ module.exports = async (ctx) => {
                 }
 
                 return {
-                    title,
+                    ...formatExtended,
                     description,
-                    link,
-                    pubDate,
-                    author: item.mblog.user.screen_name,
                     isPinned: item.profile_type_id?.startsWith('proweibotop'),
                 };
             })

package/lib/v2/weibo/utils.js

@@ -14,7 +14,9 @@ const weiboUtils = {
             .replace(/<[^<]*>/g, '')
             .replace(/\n/g, ' ')
             .trim(),
-    formatExtended: (ctx, status, params = {}, picsPrefixes = []) => {
+    formatExtended: (ctx, status, uid = undefined, params = {}, picsPrefixes = []) => {
+        // `uid = undefined` to explicitly mark it as optional, avoiding IDEs prompting warnings
+
         // undefined and strings like "1" is also safely parsed, so no if branch is needed
         const routeParams = querystring.parse(ctx.params.routeParams);
 
@@ -35,6 +37,7 @@ const weiboUtils = {
             sizeOfAuthorAvatar: fallback(params.sizeOfAuthorAvatar, queryToInteger(routeParams.sizeOfAuthorAvatar), 48),
             showEmojiInDescription: fallback(params.showEmojiInDescription, queryToInteger(routeParams.showEmojiInDescription), true),
             showLinkIconInDescription: fallback(params.showLinkIconInDescription, queryToInteger(routeParams.showLinkIconInDescription), true),
+            preferMobileLink: fallback(params.preferMobileLink, queryToBoolean(routeParams.preferMobileLink), false),
         };
 
         params = mergedParams;
@@ -56,6 +59,7 @@ const weiboUtils = {
             sizeOfAuthorAvatar,
             showEmojiInDescription,
             showLinkIconInDescription,
+            preferMobileLink,
         } = params;
 
         let retweeted = '';
@@ -191,7 +195,7 @@ const weiboUtils = {
             retweetedParams.showAuthorInDesc = true;
             retweetedParams.showAuthorAvatarInDesc = false;
             retweetedParams.showAtBeforeAuthor = true;
-            retweeted += weiboUtils.formatExtended(ctx, status.retweeted_status, retweetedParams, picsPrefixes).description;
+            retweeted += weiboUtils.formatExtended(ctx, status.retweeted_status, undefined, retweetedParams, picsPrefixes).description;
 
             html += retweeted;
 
@@ -231,7 +235,15 @@ const weiboUtils = {
             title += ' [视频]';
         }
 
-        return { description: html, title };
+        uid = uid || status.user?.id;
+        const bid = status.bid || status.id;
+        const guid = uid ? `https://weibo.com/${uid}/${bid}` : `https://m.weibo.cn/status/${bid}`;
+        const link = preferMobileLink ? `https://m.weibo.cn/status/${bid}` : guid;
+
+        const author = status.user?.screen_name;
+        const pubDate = status.created_at;
+
+        return { description: html, title, link, guid, author, pubDate };
     },
     getShowData: async (uid, bid) => {
         const link = `https://m.weibo.cn/statuses/show?id=${bid}`;

package/lib/v2/winstall/maintainer.js

@@ -0,0 +1,3 @@
+module.exports = {
+    '/:appId': ['TonyRL'],
+};

package/lib/v2/winstall/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'winstall.app': {
+        _name: 'winstall',
+        '.': [
+            {
+                title: '应用更新',
+                docs: 'https://docs.rsshub.app/program-update.html#winstall',
+                source: ['/apps/:appId'],
+                target: '/winstall/:appId',
+            },
+        ],
+    },
+};

package/lib/v2/winstall/router.js

@@ -0,0 +1,3 @@
+module.exports = (router) => {
+    router.get('/:appId', require('./update'));
+};

package/lib/v2/winstall/templates/desc.art

@@ -0,0 +1,5 @@
+{{ if installers }}
+    {{ each installers installer }}
+        <a href="{{ installer }}">{{ installer }}</a><br>
+    {{ /each }}
+{{ /if }}

package/lib/v2/winstall/update.js

@@ -0,0 +1,43 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const config = require('@/config').value;
+const { art } = require('@/utils/render');
+const { join } = require('path');
+
+module.exports = async (ctx) => {
+    const baseUrl = 'https://winstall.app';
+    const { appId } = ctx.params;
+
+    const buildId = await ctx.cache.tryGet(
+        'winget:buildId',
+        async () => {
+            const { data } = await got(baseUrl);
+            const $ = cheerio.load(data);
+
+            return JSON.parse($('#__NEXT_DATA__').text()).buildId;
+        },
+        config.cache.routeExpire,
+        false
+    );
+
+    const { data: response } = await got(`${baseUrl}/_next/data/${buildId}/apps/${appId}.json`);
+    const { app } = response.pageProps;
+    const items = app.versions.map((item) => ({
+        title: `${app.name} ${item.version}`,
+        description: art(join(__dirname, 'templates/desc.art'), {
+            installers: item.installers,
+        }),
+        author: app.publisher,
+        category: app.tags,
+        guid: `winstall:${appId}:${item.version}`,
+    }));
+
+    ctx.state.data = {
+        title: `${app.name} - winstall`,
+        description: app.desc,
+        link: `${baseUrl}/apps/${appId}`,
+        image: `https://api.winstall.app/icons/next/${appId}.webp`,
+        language: 'en',
+        item: items,
+    };
+};

package/lib/v2/wnacg/index.js

@@ -23,7 +23,7 @@ const categories = {
     21: '韓漫 生肉',
 };
 
-const baseUrl = 'https://wnacg.org';
+const baseUrl = 'https://www.wnacg.com';
 
 module.exports = async (ctx) => {
     const { cid, tag } = ctx.params;

package/lib/v2/wnacg/templates/manga.art

@@ -1,9 +1,9 @@
 {{ if description }}
-{{@ description }}
+    {{@ description }}
 {{ /if }}
 <br>
 {{ if imgList }}
-{{ each imgList img }}
-<img src="https:{{ img.url }}" alt="{{ img.caption }}">
-{{ /each }}
+    {{ each imgList img }}
+        <img src="https:{{ img.url }}" alt="{{ img.caption }}">
+    {{ /each }}
 {{ /if }}

package/lib/v2/wtu/index.js

@@ -0,0 +1,37 @@
+const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
+const timezone = require('@/utils/timezone');
+
+module.exports = async (ctx) => {
+    const apiUrl = 'https://ehall.wtu.edu.cn/wtu/api/queryBulletinListByConditional.do?pageNum=1&pageSize=20&columnId=';
+    const listUrl = 'https://ehall.wtu.edu.cn/new/list.html?type=';
+    const psgUrl = 'https://ehall.wtu.edu.cn/new/detail-word.html?';
+    const map = new Map([
+        [1, { title: '通知公告', type: '2', id: '1994a3b58bef4ee887e1efc19881decd' }],
+        [2, { title: '教务信息', type: '6', id: '36d47fcd3e774f289adfef1d93138a9d' }],
+        [3, { title: '科研动态', type: '7', id: '48e8abfb983b4e4486b69feacad1dc1b' }],
+    ]);
+
+    const typeInt = parseInt(ctx.params.type);
+    const value = map.get(typeInt);
+    const title = value.title;
+    const columnId = value.id;
+    const type = value.type;
+    const res = await got({
+        method: 'get',
+        url: `${apiUrl}${columnId}`,
+    });
+    const resJson = res.data.bulletinList;
+
+    ctx.state.data = {
+        title: `${title} - 武汉纺织大学信息门户`,
+        link: `${listUrl}${type}`,
+        description: `${title} - 武汉纺织大学信息门户`,
+        item: resJson.map((item) => ({
+            title: item.TITLE,
+            pubDate: timezone(parseDate(item.CREATE_TIME), 8),
+            link: item.GOTO_URL ?? `${psgUrl}type=${type}?bulletinId=${item.WID}`,
+            author: item.PUBLISH_USER_DEPT_NAME,
+        })),
+    };
+};

package/lib/v2/wtu/job.js

@@ -0,0 +1,80 @@
+const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
+const zlib = require('zlib');
+const cheerio = require('cheerio');
+
+const baseUrl = 'https://wtu.91wllm.com/';
+
+const typeMap = new Map([
+    ['xxtz', { title: '信息通知', url: `${baseUrl}news/index/tag/xxtz` }],
+    ['tzgg', { title: '通知公告', url: `${baseUrl}news/index/tag/tzgg` }],
+    ['xwkd', { title: '新闻快递', url: `${baseUrl}news/index/tag/xwkd` }],
+]);
+
+/**
+ * 解压缩数据
+ * @param {String} str
+ * @returns {String}
+ */
+function decodeData(str) {
+    // 匹配正则
+    const regex = /Base64.decode\(unzip\("(.+?)"\)\.substr\((\d+)\)\)\.substr\((\d+)\)/;
+    const match = str.match(regex);
+    if (!match) {
+        return '';
+    }
+    // 获取数据
+    const compressedContent = match[1];
+    const substr1Num = Number.parseInt(match[2]);
+    const substr2Num = Number.parseInt(match[3]);
+    // 解压缩
+    const unzipContent = zlib.inflateSync(Buffer.from(compressedContent, 'base64')).toString('utf8');
+    const content = Buffer.from(unzipContent.substring(substr1Num), 'base64');
+    return content.toString('utf8').substring(substr2Num);
+}
+
+module.exports = async (ctx) => {
+    // 获取参数 type
+    const type = ctx.params.type;
+    const mapItem = typeMap.get(type);
+    const msgTitle = `${mapItem.title} - 武汉纺织大学就业信息`;
+    const link = mapItem.url;
+
+    // 请求网页
+    const resp = await got.get(link);
+    // 解压缩列表数据
+    const listStr = decodeData(resp.data);
+    // 解析列表数据
+    const $ = cheerio.load(listStr);
+    const list = $('.newsList')
+        .toArray()
+        .map((item) => {
+            item = $(item);
+            const $date = item.find("li[class='span2 y']").text();
+            const $linkLi = item.find('li>a');
+            const $url = new URL($linkLi.attr('href'), baseUrl).href;
+            return {
+                title: $linkLi.text(),
+                pubDate: parseDate($date, 'YYYY-MM-DD'),
+                link: $url,
+            };
+        });
+    // 获取全文信息
+    const items = await Promise.all(
+        list.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const { data: response } = await got.get(item.link);
+                const content = decodeData(response);
+                item.description = content;
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: msgTitle,
+        link,
+        description: msgTitle,
+        item: items,
+    };
+};

package/lib/v2/wtu/maintainer.js

@@ -0,0 +1,4 @@
+module.exports = {
+    '/:type': ['loyio'],
+    '/job/:type': ['ticks-tan'],
+};

package/lib/v2/wtu/radar.js

@@ -0,0 +1,22 @@
+module.exports = {
+    '91wllm.com': {
+        _name: '湖北高校就业网络联盟',
+        wtu: [
+            {
+                title: '武汉纺织大学就业信息',
+                docs: 'https://docs.rsshub.app/university.html#wu-han-fang-zhi-da-xue',
+                source: '/news/index/tag/:type',
+                target: '/wtu/job/:type',
+            },
+        ],
+    },
+    'wtu.edu.cn': {
+        _name: '武汉纺织大学',
+        wtu: [
+            {
+                title: '信息门户公告',
+                docs: 'https://docs.rsshub.app/university.html#wu-han-fang-zhi-da-xue',
+            },
+        ],
+    },
+};

package/lib/v2/wtu/router.js

@@ -0,0 +1,4 @@
+module.exports = (router) => {
+    router.get('/:type', require('./index'));
+    router.get('/job/:type', require('./job'));
+};

package/lib/v2/xiaohongshu/maintainer.js

@@ -1,5 +1,5 @@
 module.exports = {
     '/board/:board_id': ['lotosbin'],
     '/user/:user_id/collect': ['lotosbin'],
-    '/user/:user_id/notes': ['lotosbin'],
+    '/user/:user_id/notes/:fulltext?': ['lotosbin', 'howerhe'],
 };

package/lib/v2/xiaohongshu/notes.js

@@ -0,0 +1,16 @@
+const { getNotes, formatText, formatNote } = require('./util');
+
+module.exports = async (ctx) => {
+    const userId = ctx.params.user_id;
+    const url = `https://www.xiaohongshu.com/user/profile/${userId}`;
+
+    const { user, notes } = await getNotes(url, ctx.cache);
+
+    ctx.state.data = {
+        title: `${user.nickname} - 笔记 • 小红书 / RED`,
+        description: formatText(user.desc),
+        image: user.imageb || user.images,
+        link: url,
+        item: notes.map((item) => formatNote(url, item)),
+    };
+};

package/lib/v2/xiaohongshu/router.js

@@ -1,4 +1,5 @@
 module.exports = (router) => {
     router.get('/board/:board_id', require('./board'));
+    router.get('/user/:user_id/notes/fulltext', require('./notes'));
     router.get('/user/:user_id/:category', require('./user'));
 };

package/lib/v2/xiaohongshu/util.js

@@ -1,5 +1,6 @@
 const config = require('@/config').value;
 const logger = require('@/utils/logger');
+const { parseDate } = require('@/utils/parse-date');
 
 const getUser = (url, cache) =>
     cache.tryGet(
@@ -68,7 +69,128 @@ const getBoard = (url, cache) =>
         false
     );
 
+const getNotes = (url, cache) =>
+    cache.tryGet(
+        url + '/notes', // To avoid mixing with the cache for `user.js`
+        async () => {
+            let user = '';
+            let notes = [];
+
+            const setPageFilter = async (page) => {
+                await page.setRequestInterception(true);
+                page.on('request', (req) => {
+                    req.resourceType() === 'document' || req.resourceType() === 'script' || req.resourceType() === 'xhr' || req.resourceType() === 'other' ? req.continue() : req.abort();
+                });
+            };
+
+            const browser = await require('@/utils/puppeteer')({ stealth: true });
+            try {
+                const page = await browser.newPage();
+                await setPageFilter(page);
+
+                logger.debug(`Requesting ${url}`);
+                await page.goto(url);
+
+                let otherInfo = {};
+                let userPosted = {};
+                try {
+                    [otherInfo, userPosted] = await Promise.all(
+                        ['/api/sns/web/v1/user/otherinfo', '/api/sns/web/v1/user_posted'].map((p) =>
+                            page
+                                .waitForResponse((res) => {
+                                    const req = res.request();
+                                    return req.url().includes(p) && req.method() === 'GET';
+                                })
+                                .then((r) => r.json())
+                        )
+                    );
+                } catch (e) {
+                    throw Error(`Could not get user information and note list\n${e}`);
+                }
+
+                await page.close();
+
+                // Get full text for each note
+                const notesPromise = userPosted.data.notes.map((n) => {
+                    const noteUrl = url + '/' + n.note_id;
+
+                    return cache.tryGet(noteUrl, async () => {
+                        const notePage = await browser.newPage();
+                        await setPageFilter(notePage);
+
+                        logger.debug(`Requesting ${noteUrl}`);
+                        await notePage.goto(noteUrl);
+
+                        let feed = {};
+                        try {
+                            feed = await notePage.evaluate(() => window.__INITIAL_STATE__);
+
+                            // Sometimes the page is not server-side rendered
+                            if (typeof feed?.note?.note === 'undefined' || JSON.stringify(feed?.note?.note) === '{}') {
+                                const res = await notePage.waitForResponse((res) => {
+                                    const req = res.request();
+                                    return req.url().includes('/api/sns/web/v1/feed') && req.method() === 'POST';
+                                });
+
+                                const json = await res.json();
+                                const note_card = json.data.items[0].note_card;
+                                feed.note.note = {
+                                    title: note_card.title,
+                                    noteId: note_card.id,
+                                    desc: note_card.desc,
+                                    tagList: note_card.tag_list,
+                                    imageList: note_card.image_list,
+                                    user: note_card.user,
+                                    time: note_card.time,
+                                    lastUpdateTime: note_card.last_update_time,
+                                };
+                            }
+                        } catch (e) {
+                            throw Error(`Could not get note ${n.note_id}\n${e}`);
+                        }
+
+                        await notePage.close();
+
+                        if (typeof feed?.note?.note !== 'undefined' && JSON.stringify(feed?.note?.note) !== '{}') {
+                            return feed.note.note;
+                        } else {
+                            throw Error(`Could not get note ${n.note_id}`);
+                        }
+                    });
+                });
+
+                user = otherInfo.data.basic_info;
+                notes = await Promise.all(notesPromise);
+            } finally {
+                await browser.close();
+            }
+
+            return { user, notes };
+        },
+        config.cache.routeExpire,
+        false
+    );
+
+const formatText = (text) => text.replace(/(\r\n|\r|\n)/g, '<br>').replace(/\t/g, '&emsp;');
+
+// tag_list.id has nothing to do with its url
+const formatTagList = (tagList) => tagList.reduce((acc, item) => acc + `#${item.name} `, ``);
+
+const formatImageList = (imageList) => imageList.reduce((acc, item) => acc + `<img src="${item.url}"><br>`, ``);
+
+const formatNote = (url, note) => ({
+    title: note.title,
+    link: url + '/' + note.noteId,
+    description: formatText(note.desc) + '<br><br>' + formatTagList(note.tagList) + '<br><br>' + formatImageList(note.imageList),
+    author: note.user.nickname,
+    pubDate: parseDate(note.time, 'x'),
+    updated: parseDate(note.lastUpdateTime, 'x'),
+});
+
 module.exports = {
     getUser,
     getBoard,
+    getNotes,
+    formatText,
+    formatNote,
 };

package/lib/v2/yomiuri/maintainer.js

@@ -1,3 +1,3 @@
 module.exports = {
-    '/yomiuri/:category?': ['Arracc'],
+    '/:category?': ['Arracc'],
 };