rsshub 1.0.0-master.fe4f650 → 1.0.0-master.fe560d2

package/lib/v2/18comic/utils.js

@@ -24,7 +24,7 @@ module.exports = {
 
                 return {
                     title: item.text().trim(),
-                    link: `${rootUrl}${item.prev().prev().attr('href')}`,
+                    link: `${rootUrl}${item.prev().find('a').attr('href')}`,
                 };
             });
 
@@ -52,7 +52,7 @@ module.exports = {
                         .join(', ');
                     item.description = `<p>${content('#intro-block .p-t-5').text()}</p><img src="${content('.img_zoom_img img')
                         .toArray()
-                        .map((image) => content(image).attr('src'))
+                        .map((image) => content(image).attr('data-original'))
                         .join('"><img src="')}">`;
 
                     return item;

package/lib/v2/36kr/index.js

@@ -27,16 +27,19 @@ module.exports = async (ctx) => {
 
     const data = JSON.parse(response.data.match(/"itemList":(\[.*?\])/)[1]);
 
-    let items = data.slice(0, ctx.query.limit ? parseInt(ctx.query.limit) : 30).map((item) => {
-        item = item.templateMaterial ?? item;
-        return {
-            title: item.widgetTitle.replace(/<\/?em>/g, ''),
-            author: item.author,
-            pubDate: parseDate(item.publishTime),
-            link: `${rootUrl}/${path === '/newsflashes' ? 'newsflashes' : 'p'}/${item.itemId}`,
-            description: item.widgetContent ?? item.content,
-        };
-    });
+    let items = data
+        .slice(0, ctx.query.limit ? parseInt(ctx.query.limit) : 30)
+        .filter((item) => item.itemType !== 0)
+        .map((item) => {
+            item = item.templateMaterial ?? item;
+            return {
+                title: item.widgetTitle.replace(/<\/?em>/g, ''),
+                author: item.author,
+                pubDate: parseDate(item.publishTime),
+                link: `${rootUrl}/${path === '/newsflashes' ? 'newsflashes' : 'p'}/${item.itemId}`,
+                description: item.widgetContent ?? item.content,
+            };
+        });
 
     if (!/^\/(search|newsflashes)/.test(path)) {
         items = await Promise.all(
@@ -47,20 +50,22 @@ module.exports = async (ctx) => {
                         url: item.link,
                     });
 
-                    const key = CryptoJS.enc.Utf8.parse('efabccee-b754-4c');
-                    const cipherText = detailResponse.data.match(/{"state":"(.*)","isEncrypt":true}/)[1];
-
-                    const content = JSON.parse(
-                        CryptoJS.AES.decrypt(cipherText, key, {
-                            mode: CryptoJS.mode.ECB,
-                            padding: CryptoJS.pad.Pkcs7,
-                        })
-                            .toString(CryptoJS.enc.Utf8)
-                            .toString()
-                    ).articleDetail.articleDetailData.data;
-
-                    item.description = content.widgetContent;
-
+                    const cipherTextList = detailResponse.data.match(/{"state":"(.*)","isEncrypt":true}/) ?? [];
+                    if (cipherTextList.length !== 0) {
+                        const key = CryptoJS.enc.Utf8.parse('efabccee-b754-4c');
+                        const content = JSON.parse(
+                            CryptoJS.AES.decrypt(cipherTextList[1], key, {
+                                mode: CryptoJS.mode.ECB,
+                                padding: CryptoJS.pad.Pkcs7,
+                            })
+                                .toString(CryptoJS.enc.Utf8)
+                                .toString()
+                        ).articleDetail.articleDetailData.data;
+                        item.description = content.widgetContent;
+                    } else {
+                        const $ = cheerio.load(detailResponse.body);
+                        item.description = $('div.articleDetailContent').html();
+                    }
                     return item;
                 })
             )

package/lib/v2/agora0/maintainer.js

@@ -1,3 +1,4 @@
 module.exports = {
+    '/pen0': ['TonyRL'],
     '/:category?': ['nczitzk'],
 };

package/lib/v2/agora0/pen0.js

@@ -0,0 +1,43 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const baseUrl = 'https://agorahub.github.io';
+    const response = await got(`${baseUrl}/pen0/`);
+    const $ = cheerio.load(response.data);
+
+    const list = $('div article')
+        .toArray()
+        .slice(0, -1) // last one is a dummy
+        .map((item) => {
+            item = $(item);
+            const meta = item.find('h5').first().text();
+            return {
+                title: item.find('h3').text(),
+                link: item.find('h3 a').attr('href'),
+                author: meta.split('|')[0].trim(),
+                pubDate: parseDate(meta.split('|')[1].trim()),
+            };
+        });
+
+    const items = await Promise.all(
+        list.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const response = await got(item.link);
+                const $ = cheerio.load(response.data);
+                $('h1').remove();
+                item.description = $('article').html();
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: $('head title').text(),
+        description: $('head meta[name="description"]').attr('content'),
+        link: response.url,
+        image: $('link[rel="apple-touch-icon"]').attr('href'),
+        item: items,
+    };
+};

package/lib/v2/agora0/radar.js

@@ -1,10 +1,21 @@
 module.exports = {
+    'github.io': {
+        _name: 'GitHub',
+        agorahub: [
+            {
+                title: '共和報',
+                docs: 'https://docs.rsshub.app/new-media.html#ag0ra',
+                source: ['/pen0'],
+                target: '/agora0/pen0',
+            },
+        ],
+    },
     'gitlab.io': {
         _name: 'GitLab',
         agora0: [
             {
                 title: '零博客',
-                docs: 'https://docs.rsshub.app/blog.html#ling-bo-ke-fen-lei',
+                docs: 'https://docs.rsshub.app/new-media.html#ag0ra',
                 source: ['/blog/:category', '/'],
                 target: '/agora0/:category',
             },

package/lib/v2/agora0/router.js

@@ -1,3 +1,4 @@
 module.exports = function (router) {
+    router.get('/pen0', require('./pen0'));
     router.get('/:category?', require('./index'));
 };

package/lib/v2/aiea/index.js

@@ -0,0 +1,39 @@
+const buildData = require('@/utils/common-config');
+
+module.exports = async (ctx) => {
+    const link = 'http://www.aiea.org/0504';
+    const period = ctx.params.period ?? '';
+
+    let nth_child = 'n';
+    switch (period) {
+        case 'upcoming':
+            nth_child = '1';
+            break;
+
+        case 'past':
+            nth_child = '2';
+            break;
+
+        case 'both':
+            nth_child = 'n';
+            break;
+
+        default:
+            break;
+    }
+
+    ctx.state.data = await buildData({
+        link,
+        url: link,
+        title: `%title%`,
+        params: {
+            title: 'AIEA Seminars',
+        },
+        item: {
+            item: `.seminar-contents .seminar-partWrap:nth-child(${nth_child}) > .seminar-list`,
+            title: `$('.seminar-list-title > span').text()`,
+            link: `$('a[href^="/0504"]').attr('href')`,
+            description: `$('.seminar-list .txt > .title').text()`,
+        },
+    });
+};

package/lib/v2/aiea/maintainer.js

@@ -0,0 +1,3 @@
+module.exports = {
+    '/seminars/:period': ['zxx-457'],
+};

package/lib/v2/aiea/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'aiea.org': {
+        _name: 'Asian Innovation and Entrepreneurship Association',
+        www: [
+            {
+                title: 'Seminar Series',
+                docs: 'https://docs.rsshub.app/study.html#AIEA-Seminar-Series',
+                source: ['/0504', '/'],
+                target: '/aiea/seminars/upcoming',
+            },
+        ],
+    },
+};

package/lib/v2/aiea/router.js

@@ -0,0 +1,3 @@
+module.exports = function (router) {
+    return router.get('/seminars/:period', require('.'));
+};

package/lib/v2/baidu/radar.js

@@ -6,7 +6,7 @@ module.exports = {
                 title: '首页指数',
                 docs: 'https://docs.rsshub.app/finance.html#bai-du-gu-shi-tong',
                 source: ['/'],
-                target: '/gushitong/index',
+                target: '/baidu/gushitong/index',
             },
         ],
         tieba: [
@@ -17,7 +17,7 @@ module.exports = {
                 target: (params, url) => {
                     const type = new URL(url).searchParams.get('tab');
                     if (!type || type === 'main') {
-                        return `/tieba/forum/${new URL(url).searchParams.get('kw')}`;
+                        return `/baidu/tieba/forum/${new URL(url).searchParams.get('kw')}`;
                     }
                 },
             },
@@ -28,7 +28,7 @@ module.exports = {
                 target: (params, url) => {
                     const type = new URL(url).searchParams.get('tab');
                     if (type === 'good') {
-                        return `/tieba/forum/good/${new URL(url).searchParams.get('kw')}`;
+                        return `/baidu/tieba/forum/good/${new URL(url).searchParams.get('kw')}`;
                     }
                 },
             },
@@ -36,13 +36,13 @@ module.exports = {
                 title: '帖子动态',
                 docs: 'https://docs.rsshub.app/bbs.html#bai-du-tie-ba',
                 source: '/p/:id',
-                target: '/tieba/post/:id',
+                target: '/baidu/tieba/post/:id',
             },
             {
                 title: '只看楼主',
                 docs: 'https://docs.rsshub.app/bbs.html#bai-du-tie-ba',
                 source: '/p/:id',
-                target: '/tieba/post/lz/:id',
+                target: '/baidu/tieba/post/lz/:id',
             },
             {
                 title: '用户帖子',
@@ -51,7 +51,7 @@ module.exports = {
                 target: (params, url) => {
                     const uid = new URL(url).searchParams.get('un');
                     if (uid) {
-                        return `/tieba/user/${uid}`;
+                        return `/baidu/tieba/user/${uid}`;
                     }
                 },
             },

package/lib/v2/bangumi/online/online.js

@@ -1,21 +1,23 @@
 const got = require('@/utils/got');
 const { art } = require('@/utils/render');
+const { parseDate } = require('@/utils/parse-date');
 const path = require('path');
 
 module.exports = async (ctx) => {
-    const url = 'https://bangumi.online/api/serve/home';
+    const url = 'https://api.bangumi.online/serve/home';
 
     const response = await got.post(url);
 
     const list = response.data.data.list;
 
     const items = list.map((item) => ({
-        title: `${item.title_zh} - 第 ${item.volume} 集`,
+        title: `${item.title.zh ? item.title.zh : item.title.ja} - 第 ${item.volume} 集`,
         description: art(path.join(__dirname, '../templates/online/image.art'), {
             src: `https:${item.cover}`,
             alt: `${item.title_zh} - 第 ${item.volume} 集`,
         }),
         link: `https://bangumi.online/watch/${item.vid}`,
+        pubDate: parseDate(item.create_time),
     }));
 
     ctx.state.data = {

package/lib/v2/bangumi/tv/group/reply.js

@@ -21,6 +21,18 @@ module.exports = async (ctx) => {
                 date: $el.children().first().find('small').children().remove().end().text().slice(3),
             };
         });
+    const latestSubReplies = $('.sub_reply_bg')
+        .toArray()
+        .map((el) => {
+            const $el = $(el);
+            return {
+                id: $el.attr('id'),
+                author: $el.find('.userName .l').text(),
+                content: $el.find('.cmt_sub_content').html(),
+                date: $el.children().first().find('small').children().remove().end().text().slice(3),
+            };
+        });
+    const finalLatestReplies = latestReplies.concat(latestSubReplies).sort((a, b) => (a.id < b.id ? 1 : -1));
 
     const postTopic = {
         title,
@@ -34,7 +46,7 @@ module.exports = async (ctx) => {
         title: `${title}的最新回复`,
         link,
         item: [
-            ...latestReplies.map((c) => ({
+            ...finalLatestReplies.map((c) => ({
                 title: `${c.author} 回复了小组话题《${title}》`,
                 description: c.content,
                 pubDate: timezone(parseDate(c.date), +8),

package/lib/v2/bangumi/tv/group/topic.js

@@ -10,17 +10,30 @@ module.exports = async (ctx) => {
     const $ = cheerio.load(html);
     const title = 'Bangumi - ' + $('.SecondaryNavTitle').text();
 
+    const items = await Promise.all(
+        $('.topic_list .topic')
+            .toArray()
+            .map(async (elem) => {
+                const link = new URL($('.subject a', elem).attr('href'), base_url).href;
+                const fullText = await ctx.cache.tryGet(link, async () => {
+                    const { data: html } = await got(link);
+                    const $ = cheerio.load(html);
+                    return $('.postTopic .topic_content').html();
+                });
+                const summary = 'Reply: ' + $('.posts', elem).text();
+                return {
+                    link,
+                    title: $('.subject a', elem).attr('title'),
+                    pubDate: parseDate($('.lastpost .time', elem).text()),
+                    description: fullText ? summary + '<br><br>' + fullText : summary,
+                    author: $('.author a', elem).text(),
+                };
+            })
+    );
+
     ctx.state.data = {
         title,
         link,
-        item: $('.topic_list .topic')
-            .toArray()
-            .map((elem) => ({
-                link: new URL($('.subject a', elem).attr('href'), base_url).href,
-                title: $('.subject a', elem).attr('title'),
-                pubDate: parseDate($('.lastpost .time', elem).text()),
-                description: 'Reply: ' + $('.posts', elem).text(),
-                author: $('.author a', elem).text(),
-            })),
+        item: items,
     };
 };

package/lib/v2/bilibili/cache.js

@@ -4,10 +4,43 @@ module.exports = {
     getCookie: (ctx) => {
         const key = 'bili-cookie';
         return ctx.cache.tryGet(key, async () => {
-            const response = await got(`https://www.bilibili.com/`);
+            const response = await got('https://www.bilibili.com/');
             return response.headers['set-cookie'];
         });
     },
+    getVerifyString: (ctx) => {
+        const key = 'bili-verify-string';
+        return ctx.cache.tryGet(key, async () => {
+            const cookie = await module.exports.getCookie(ctx);
+            const { data: navResponse } = await got('https://api.bilibili.com/x/web-interface/nav', {
+                headers: {
+                    Referer: 'https://www.bilibili.com/',
+                    Cookie: cookie,
+                },
+            });
+            const imgUrl = navResponse.data.wbi_img.img_url;
+            const subUrl = navResponse.data.wbi_img.sub_url;
+            const r = imgUrl.substring(imgUrl.lastIndexOf('/') + 1, imgUrl.length).split('.')[0] + subUrl.substring(subUrl.lastIndexOf('/') + 1, subUrl.length).split('.')[0];
+            const { body: spaceResponse } = await got('https://space.bilibili.com/1', {
+                headers: {
+                    Referer: 'https://www.bilibili.com/',
+                    Cookie: cookie,
+                },
+            });
+            const jsUrl = 'https:' + spaceResponse.match(/[^"]*9.space[^"]*/);
+            const { body: jsResponse } = await got(jsUrl, {
+                headers: {
+                    Referer: 'https://space.bilibili.com/1',
+                },
+            });
+            const array = JSON.parse(jsResponse.match(/\[(?:\d+,){63}\d+\]/));
+            const o = [];
+            array.forEach((t) => {
+                r.charAt(t) && o.push(r.charAt(t));
+            });
+            return o.join('').slice(0, 32);
+        });
+    },
     getUsernameFromUID: (ctx, uid) => {
         const key = 'bili-username-from-uid-' + uid;
         return ctx.cache.tryGet(key, async () => {

package/lib/v2/bilibili/userCollection.js

@@ -11,10 +11,9 @@ module.exports = async (ctx) => {
     const uid = parseInt(ctx.params.uid);
     const sid = parseInt(ctx.params.sid);
     const disableEmbed = ctx.params.disableEmbed;
-
     const link = `https://space.bilibili.com/${uid}/channel/collectiondetail?sid=${sid}`;
     const [userName, face] = await cache.getUsernameAndFaceFromUID(ctx, uid);
-    const host = `https://api.bilibili.com/x/polymer/space/seasons_archives_list?mid=${uid}&season_id=${sid}&sort_reverse=false&page_num=1&page_size=10`;
+    const host = `https://api.bilibili.com/x/polymer/space/seasons_archives_list?mid=${uid}&season_id=${sid}&sort_reverse=true&page_num=1&page_size=10`;
 
     const response = await got(host, {
         headers: {

package/lib/v2/bilibili/utils.js

@@ -1,9 +1,19 @@
+const crypto = require('crypto');
+
 const iframe = (aid, page, bvid) =>
     `<iframe src="https://player.bilibili.com/player.html?${bvid ? `bvid=${bvid}` : `aid=${aid}`}${
         page ? `&page=${page}` : ''
     }&high_quality=1" width="650" height="477" scrolling="no" border="0" frameborder="no" framespacing="0" allowfullscreen="true"></iframe>`;
 
+const addVerifyInfo = (params, verifyString) => {
+    const md5 = crypto.createHash('md5');
+    const wts = Math.round(Date.now() / 1000);
+    const w_rid = md5.update(`${params}&wts=${wts}${verifyString}`).digest('hex');
+    return `${params}&w_rid=${w_rid}&wts=${wts}`;
+};
+
 module.exports = {
     iframe,
+    addVerifyInfo,
     bvidTime: 1589990400,
 };

package/lib/v2/bilibili/video-all.js

@@ -7,6 +7,7 @@ module.exports = async (ctx) => {
     const uid = ctx.params.uid;
     const disableEmbed = ctx.params.disableEmbed;
     const cookie = await cache.getCookie(ctx);
+    const verifyString = cache.getVerifyString(ctx);
     const [name, face] = await cache.getUsernameAndFaceFromUID(ctx, uid);
 
     await got(`https://space.bilibili.com/${uid}/video?tid=0&page=1&keyword=&order=pubdate`, {
@@ -15,7 +16,8 @@ module.exports = async (ctx) => {
             Cookie: cookie,
         },
     });
-    const response = await got(`https://api.bilibili.com/x/space/arc/search?mid=${uid}&ps=30&tid=0&pn=1&keyword=&order=pubdate&jsonp=jsonp`, {
+    const params = utils.addVerifyInfo(`mid=${uid}&ps=30&tid=0&pn=1&keyword=&order=pubdate&order_avoided=true`, verifyString);
+    const response = await got(`https://api.bilibili.com/x/space/wbi/arc/search?${params}`, {
         headers: {
             Referer: `https://space.bilibili.com/${uid}/video?tid=0&page=1&keyword=&order=pubdate`,
             Cookie: cookie,
@@ -32,7 +34,8 @@ module.exports = async (ctx) => {
                 Cookie: cookie,
             },
         });
-        return await got(`https://api.bilibili.com/x/space/arc/search?mid=${uid}&ps=30&tid=0&pn=${pageId}&keyword=&order=pubdate&jsonp=jsonp`, {
+        const params = utils.addVerifyInfo(`mid=${uid}&ps=30&tid=0&pn=${pageId}&keyword=&order=pubdate&order_avoided=true`, verifyString);
+        return await got(`https://api.bilibili.com/x/space/wbi/arc/search?${params}`, {
             headers: {
                 Referer: `https://space.bilibili.com/${uid}/video?tid=0&page=${pageId}&keyword=&order=pubdate`,
                 Cookie: cookie,

package/lib/v2/bilibili/video.js

@@ -6,6 +6,7 @@ module.exports = async (ctx) => {
     const uid = ctx.params.uid;
     const disableEmbed = ctx.params.disableEmbed;
     const cookie = await cache.getCookie(ctx);
+    const verifyString = await cache.getVerifyString(ctx);
     const [name, face] = await cache.getUsernameAndFaceFromUID(ctx, uid);
 
     await got(`https://space.bilibili.com/${uid}/video?tid=0&page=1&keyword=&order=pubdate`, {
@@ -14,7 +15,8 @@ module.exports = async (ctx) => {
             Cookie: cookie,
         },
     });
-    const response = await got(`https://api.bilibili.com/x/space/arc/search?mid=${uid}&ps=30&tid=0&pn=1&keyword=&order=pubdate&jsonp=jsonp`, {
+    const params = utils.addVerifyInfo(`mid=${uid}&ps=30&tid=0&pn=1&keyword=&order=pubdate&order_avoided=true`, verifyString);
+    const response = await got(`https://api.bilibili.com/x/space/wbi/arc/search?${params}`, {
         headers: {
             Referer: `https://space.bilibili.com/${uid}/video?tid=0&page=1&keyword=&order=pubdate`,
             Cookie: cookie,

package/lib/v2/bytes/bytes.js

@@ -0,0 +1,25 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const currentURL = 'https://bytes.dev/archives';
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const resp = await got(currentURL);
+    const $ = cheerio.load(resp.data);
+    const text = $('script#__NEXT_DATA__').text();
+    const json = JSON.parse(text);
+    const posts = [json.props.pageProps.featuredPost].concat(json.props.pageProps.posts);
+    const items = posts.map((item) => ({
+        title: `Issue ${item.slug}`,
+        pubDate: parseDate(item.date),
+        description: item.title,
+        link: `/archives/${item.slug}`,
+    }));
+
+    ctx.state.data = {
+        title: 'bytes.dev',
+        description: 'Your weekly dose of JS',
+        link: currentURL,
+        item: items,
+    };
+};

package/lib/v2/bytes/maintainer.js

@@ -0,0 +1,4 @@
+module.exports = {
+    '': ['meixger'],
+    '/': ['meixger'],
+};

package/lib/v2/bytes/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'bytes.dev': {
+        _name: 'ui.dev',
+        '.': [
+            {
+                title: 'BYTES - Your weekly dose of JS',
+                docs: 'https://docs.rsshub.app/en/programming.html#ui-dev-bytes',
+                source: ['/archives', '/'],
+                target: '/bytes',
+            },
+        ],
+    },
+};

package/lib/v2/bytes/router.js

@@ -0,0 +1,3 @@
+module.exports = function (router) {
+    router.get('/', require('./bytes'));
+};

package/lib/v2/caijing/maintainer.js

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

package/lib/v2/caijing/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'caijing.com.cn': {
+        _name: '财经网',
+        roll: [
+            {
+                title: '滚动新闻',
+                docs: 'https://docs.rsshub.app/finance.html#cai-jing-wang',
+                source: ['/index1.html', '/'],
+                target: '/caijing/roll',
+            },
+        ],
+    },
+};

package/lib/v2/caijing/roll.js

@@ -0,0 +1,46 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+const timezone = require('@/utils/timezone');
+
+module.exports = async (ctx) => {
+    const baseUrl = 'https://roll.caijing.com.cn';
+    const response = await got(`${baseUrl}/ajax_lists.php`, {
+        searchParams: {
+            modelid: 0,
+            time: Math.random(),
+        },
+    });
+
+    const list = response.data.map((item) => ({
+        title: item.title,
+        link: item.url.replace('http://', 'https://'),
+        pubDate: timezone(parseDate(item.published, 'MM-DD HH:mm'), +8),
+        category: item.cat,
+    }));
+
+    const items = await Promise.all(
+        list.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const response = await got(item.link);
+                const $ = cheerio.load(response.data);
+                item.author = $('.editor').text().trim() || $('#editor_baidu').text().trim().replace(/[()]/g, '');
+                item.description = $('.article-content').html();
+                item.category = [
+                    item.category,
+                    ...$('.news_keywords span')
+                        .toArray()
+                        .map((e) => $(e).text()),
+                ];
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: '滚动新闻-财经网',
+        image: 'https://www.caijing.com.cn/favicon.ico',
+        link: response.url,
+        item: items,
+    };
+};

package/lib/v2/caijing/router.js

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

package/lib/v2/cdzjryb/maintainer.js

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