rsshub 1.0.0-master.fb2a407 → 1.0.0-master.fc5a2f6

package/lib/v2/itch/radar.js

@@ -0,0 +1,28 @@
+module.exports = {
+    'itch.io': {
+        _name: 'itch.io',
+        '.': [
+            {
+                title: 'Browse',
+                docs: 'https://docs.rsshub.app/game.html#itch-io-browse',
+                source: ['/'],
+                target: (params, url) => `/itch${new URL(url).toString().split('itch.io').pop()}`,
+            },
+            {
+                title: 'Developer Logs',
+                docs: 'https://docs.rsshub.app/game.html#itch-io-developer-logs',
+                source: ['/'],
+                target: (params, url) => {
+                    const matches = new URL(url).toString().match(/\/\/(.*?)\.itch\.io\/(.*?)\/devlog/);
+                    return `/itch/devlog/${matches[1]}/${matches[2]}`;
+                },
+            },
+            {
+                title: 'Posts',
+                docs: 'https://docs.rsshub.app/game.html#itch-io-posts',
+                source: ['/t/:topic/:id'],
+                target: '/itch/posts/:topic/:id',
+            },
+        ],
+    },
+};

package/lib/v2/itch/router.js

@@ -0,0 +1,5 @@
+module.exports = function (router) {
+    router.get('/devlog/:user/:id', require('./devlog'));
+    router.get('/posts/:topic/:id', require('./posts'));
+    router.get(/([\w\d/-]+)?/, require('./index'));
+};

package/lib/v2/itch/templates/description.art

@@ -0,0 +1,4 @@
+{{ each images image }}
+<img src="{{ image }}">
+{{ /each }}
+{{@ description }}

package/lib/v2/jasa/templates/description.art

@@ -1,5 +1,7 @@
 <p>
     <span><big>{{ item.title }}</big></span><br />
+</p>
+<p>
     <span><small><i>{{ item.authors }}</i></small></span><br />
     <span><small><i>https://doi.org/{{ item.doi }}</i></small></span><br />
     <img src={{ item.img }}/>

package/lib/v2/javdb/utils.js

@@ -14,16 +14,16 @@ module.exports = {
 
         const $ = cheerio.load(response.data);
 
-        $('.tags, .tag-can-play').remove();
+        $('.tags, .tag-can-play, .over18-modal').remove();
 
-        let items = $('.grid-item a')
+        let items = $('div.item')
             .slice(0, ctx.query.limit ? parseInt(ctx.query.limit) : 20)
             .toArray()
             .map((item) => {
                 item = $(item);
                 return {
-                    title: item.text(),
-                    link: `${rootUrl}${item.attr('href')}`,
+                    title: item.find('.video-title').text(),
+                    link: `${rootUrl}${item.find('.box').attr('href')}`,
                     pubDate: parseDate(item.find('.meta').text()),
                 };
             });

package/lib/v2/jd/maintainer.js

@@ -0,0 +1,3 @@
+module.exports = {
+    '/price/:id': ['nczitzk'],
+};

package/lib/v2/jd/price.js

@@ -0,0 +1,42 @@
+const got = require('@/utils/got');
+const { art } = require('@/utils/render');
+const path = require('path');
+
+module.exports = async (ctx) => {
+    const id = ctx.params.id;
+
+    const rootUrl = 'https://item.jd.com';
+    const currentUrl = `${rootUrl}/${id}.html`;
+    const apiUrl = `http://p.3.cn/prices/mgets?skuIds=J_${id}`;
+
+    const apiResponse = await got({
+        method: 'get',
+        url: apiUrl,
+    });
+
+    const data = apiResponse.data[0];
+
+    const response = await got({
+        method: 'get',
+        url: currentUrl,
+    });
+
+    const title = response.data.match(/name: '(.*?)'/)[1];
+
+    ctx.state.data = {
+        title: `京东商品价格 - ${title}`,
+        link: currentUrl,
+        item: [
+            {
+                guid: data.p,
+                title: data.p,
+                link: currentUrl,
+                description: art(path.join(__dirname, 'templates/description.art'), {
+                    p: data.p,
+                    op: data.op,
+                    m: data.m,
+                }),
+            },
+        ],
+    };
+};

package/lib/v2/jd/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'jd.com': {
+        _name: '京东',
+        item: [
+            {
+                title: '商品价格',
+                docs: 'https://docs.rsshub.app/shopping.html#jing-dong-shang-pin-jia-ge',
+                source: ['/'],
+                target: (params, url) => `/jd/price/${new URL(url).hash.match(/\/(\d+)\.html/)[1]}`,
+            },
+        ],
+    },
+};

package/lib/v2/jd/router.js

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

package/lib/v2/jd/templates/description.art

@@ -0,0 +1,3 @@
+<p>目前价格：<b>{{ p }}</b></p>
+<p>指导价：<b>{{ op }}</b></p>
+<p>最高价：<b>{{ m }}</b></p>

package/lib/v2/jike/maintainer.js

@@ -0,0 +1,5 @@
+module.exports = {
+    '/topic/text/:id': ['HenryQW'],
+    '/topic/:id': ['DIYgod', 'prnake'],
+    '/user/:id': ['DIYgod', 'prnake'],
+};

package/lib/v2/jike/radar.js

@@ -0,0 +1,34 @@
+module.exports = {
+    'okjike.com': {
+        _name: '即刻',
+        m: [
+            {
+                title: '用户动态',
+                docs: 'https://docs.rsshub.app/social-media.html#ji-ke',
+                source: '/users/:uid',
+                target: '/jike/user/:uid',
+            },
+            {
+                title: '用户动态',
+                docs: 'https://docs.rsshub.app/social-media.html#ji-ke',
+                source: '/reposts/:repostId',
+                target: (params, url, document) => {
+                    const uid = document.querySelector('.avatar').getAttribute('href').replace('/users/', '');
+                    return uid ? `/jike/user/${uid}` : '';
+                },
+            },
+            {
+                title: '圈子',
+                docs: 'https://docs.rsshub.app/social-media.html#ji-ke',
+                source: '/topics/:id',
+                target: '/jike/topic/:id',
+            },
+            {
+                title: '圈子 - 纯文字',
+                docs: 'https://docs.rsshub.app/social-media.html#ji-ke',
+                source: '/topics/:id',
+                target: '/jike/topic/text/:id',
+            },
+        ],
+    },
+};

package/lib/v2/jike/router.js

@@ -0,0 +1,5 @@
+module.exports = (router) => {
+    router.get('/topic/text/:id', require('./topicText'));
+    router.get('/topic/:id', require('./topic'));
+    router.get('/user/:id', require('./user'));
+};

package/lib/v2/jike/topic.js

@@ -0,0 +1,42 @@
+const got = require('@/utils/got');
+const { topicDataHanding } = require('./utils');
+const cheerio = require('cheerio');
+const dayjs = require('dayjs');
+const { constructTopicEntry } = require('@/v2/jike/utils');
+
+module.exports = async (ctx) => {
+    const id = ctx.params.id;
+    const topicUrl = `https://m.okjike.com/topics/${id}`;
+
+    const data = await constructTopicEntry(ctx, topicUrl);
+
+    if (data) {
+        ctx.state.data.item = topicDataHanding(data);
+        if (id === '553870e8e4b0cafb0a1bef68' || id === '55963702e4b0d84d2c30ce6f') {
+            ctx.state.data.item = await Promise.all(
+                ctx.state.data.item.map(async (one) => {
+                    const item = { ...one };
+                    const regResult = /https:\/\/www\.okjike\.com\/medium\/[a-zA-Z0-9]*/.exec(item.description);
+                    if (regResult) {
+                        const newsUrl = regResult[0];
+                        item.description = await ctx.cache.tryGet(newsUrl, async () => {
+                            const { data } = await got(newsUrl);
+                            const $ = cheerio.load(data);
+                            const upper = $('ul.main > li.item');
+                            const links = upper.find('a').map((_, ele) => $(ele).attr('href'));
+                            const texts = upper.find('span.text').map((_, ele) => $(ele).text());
+                            let description = '';
+                            for (let i = 0; i < links.length; i++) {
+                                description += `${i + 1}、<a href="${links[i]}">${texts[i]}</a><br>`;
+                            }
+                            description = description.replace(/<br>$/, '');
+                            return description;
+                        });
+                    }
+                    item.title = `${data.topic.content} ${dayjs(one.pubDate).format('MM月DD日')}`;
+                    return item;
+                })
+            );
+        }
+    }
+};

package/lib/v2/jike/topicText.js

@@ -0,0 +1,21 @@
+const dayjs = require('dayjs');
+const { constructTopicEntry } = require('./utils');
+
+module.exports = async (ctx) => {
+    const id = ctx.params.id;
+    const topicUrl = `https://m.okjike.com/topics/${id}`;
+
+    const data = await constructTopicEntry(ctx, topicUrl);
+
+    if (data) {
+        ctx.state.data.item = data.posts.map((item) => {
+            const date = dayjs(item.createdAt);
+            return {
+                title: `${data.topic.content} ${date.format('MM月DD日')}`,
+                description: item.content.replace(/\n/g, '<br>'),
+                pubDate: date.toDate(),
+                link: `https://m.okjike.com/originalPosts/${item.id}`,
+            };
+        });
+    }
+};

package/lib/{routes → v2}/jike/user.js

@@ -1,5 +1,6 @@
 const got = require('@/utils/got');
 const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
 
 module.exports = async (ctx) => {
     const id = ctx.params.id;
@@ -45,7 +46,7 @@ module.exports = async (ctx) => {
             let imgTemplate = '';
             item.pictures &&
                 item.pictures.forEach((item) => {
-                    imgTemplate += `<img referrerpolicy="no-referrer" src="${item.picUrl}"><br>`;
+                    imgTemplate += `<img src="${item.picUrl}"><br>`;
                 });
 
             let content = item.content || (item.linkInfo && item.linkInfo.title) || (item.question && item.question.title) || item.title || '';
@@ -53,8 +54,7 @@ module.exports = async (ctx) => {
 
             let shortenTitle = '一条动态';
             if (content) {
-                shortenTitle = content.length > 75 ? `${content.substr(0, 75)}...` : content;
-                shortenTitle = shortenTitle.replace(/(<br>)+/g, ' ');
+                shortenTitle = content.replace(/(<br>)+/g, ' ');
                 content = `${content}<br><br>`;
             }
 
@@ -64,7 +64,7 @@ module.exports = async (ctx) => {
                 let repostImgTemplate = '';
                 item.target.pictures &&
                     item.target.pictures.forEach((item) => {
-                        repostImgTemplate += `<br><img referrerpolicy="no-referrer" src="${item.thumbnailUrl}">`;
+                        repostImgTemplate += `<br><img src="${item.thumbnailUrl}">`;
                     });
 
                 const repostContent = `转发 ${screenNameTemplate}: ${item.target.content}${repostImgTemplate}`.replace(/\r\n|\n|\r/g, '<br>');
@@ -88,7 +88,7 @@ module.exports = async (ctx) => {
                 answerImgKeys.forEach((key) => {
                     const entity = item.richtextContent.entityMap[key];
                     if (entity.type.toUpperCase() === 'IMAGE') {
-                        answerImgTemplate += `<br><img referrerpolicy="no-referrer" src="${entity.data.pictureUrl.middlePicUrl}">`;
+                        answerImgTemplate += `<br><img src="${entity.data.pictureUrl.middlePicUrl}">`;
                     }
                 });
             }
@@ -98,13 +98,13 @@ module.exports = async (ctx) => {
             content = `在主题 <a href="https://web.okjike.com/topic/${item.topic.id}/official" target="_blank">${item.topic.content}</a> 提出了一个问题：<br><br>${content}`;
         } else if (item.type === 'PERSONAL_UPDATE') {
             shortenTitle = item.topic.content;
-            content = `<img referrerpolicy="no-referrer" src="${item.topic.squarePicture.picUrl}"> 主题简介：<br>${item.topic.briefIntro.replace(/(?:\r\n|\r|\n)/g, '<br>')}`;
+            content = `<img src="${item.topic.squarePicture.picUrl}"> 主题简介：<br>${item.topic.briefIntro.replace(/(?:\r\n|\r|\n)/g, '<br>')}`;
         }*/
 
             const single = {
                 title: `${typeMap[item.type]}了: ${shortenTitle}`,
                 description: `${content}${linkTemplate}${imgTemplate}`.replace(/(<br>|\s)+$/, ''),
-                pubDate: new Date(item.createdAt).toUTCString(),
+                pubDate: parseDate(item.createdAt),
                 link: linkMap[item.type],
             };
 
@@ -130,11 +130,11 @@ module.exports = async (ctx) => {
                     .find('li.item')
                     // eslint-disable-next-line array-callback-return
                     .map((i, j) => {
-                        single.description += `<a href="${$$(j).find('a').attr('href')}">${$$(j).find('a').text()}</a><br/>`;
+                        single.description += `<a href="${$$(j).find('a').attr('href')}">${$$(j).find('a').text()}</a><br>`;
                     });
             }
 
-            return Promise.resolve(single);
+            return single;
         })
     );
 

package/lib/{routes/jike/common.js → v2/jike/utils.js}

@@ -1,14 +1,11 @@
-const url = require('url');
+const { parseDate } = require('@/utils/parse-date');
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const config = require('@/config').value;
+
+const videoAPI = 'https://api.ruguoapp.com/1.0/mediaMeta/play?type=ORIGINAL_POST';
 
 module.exports = {
-    emptyResponseCheck: (ctx, data) => {
-        if (data.length === 0) {
-            ctx.state.data = {
-                title: '主题 ID 不存在，或该主题暂无内容',
-            };
-            return true;
-        }
-    },
     topicDataHanding: (data) =>
         data.posts.map((item) => {
             let audioName, videoName, linkName;
@@ -36,13 +33,21 @@ module.exports = {
 
             // rss内容
             let description = '';
+            // 作者昵称
+            let author = '';
+
+            // 添加内容作者信息
+            if (item.user) {
+                author = item.user.screenName;
+                description += `<span>用户昵称：${author} <br> Username：${item.user.username}</span><br>`;
+            }
 
             if (item.linkInfo) {
                 const linkUrl = item.linkInfo.originalLinkUrl || item.linkInfo.linkUrl;
 
                 // 对于即刻抓取的微信公众号文章 特殊处理
                 // 此时 Rss原文链接 变为 微信公众号链接
-                if (url.parse(linkUrl).host === 'mp.weixin.qq.com') {
+                if (new URL(linkUrl).host === 'mp.weixin.qq.com') {
                     link = linkUrl;
                 }
 
@@ -55,7 +60,7 @@ module.exports = {
                     const audioAuthor = audioObject.author;
                     audioName = `${audioTitle} - ${audioAuthor}`;
                     description += `
-                    <img referrerpolicy="no-referrer" src="${audioImage}"/>
+                    <img src="${audioImage}">
                     <a href="${audioLink}">${audioName}</a>
                 `;
                 }
@@ -68,7 +73,7 @@ module.exports = {
                     const videoDuration = Math.floor(videoObject.duration / 60000);
                     videoName = item.linkInfo.title;
                     description += `
-                    <img referrerpolicy="no-referrer" src="${videoImage}"/>
+                    <img src="${videoImage}">
                     <a href="${videoLink}">${videoName || '观看视频'} - 约${videoDuration}分钟</a>
                 `;
                 }
@@ -80,7 +85,7 @@ module.exports = {
                     const linkTitle = linkName || '访问原文';
                     // 部分链接有缩略图
                     const linkImage = item.linkInfo.pictureUrl;
-                    const imageTag = `<img referrerpolicy="no-referrer" src="${linkImage}"/>`;
+                    const imageTag = `<img src="${linkImage}">`;
                     description += `
                     ${linkImage ? imageTag : ''}
                     <a href="${linkUrl}">${linkTitle}</a>
@@ -89,35 +94,41 @@ module.exports = {
             }
 
             // 4. 文字内容
-            description += `<br/>${content}`;
+            description += description ? `<br>${content}` : content;
 
             // 5. 图片
             if (item.pictures) {
                 item.pictures.forEach((pic) => {
                     if (pic.format === 'gif') {
-                        description += `<img referrerpolicy="no-referrer" src="${pic.picUrl.split('?imageMogr2/')[0]}"></picture>`;
+                        description += `<img src="${pic.picUrl.split('?imageMogr2/')[0]}">`;
                     } else {
                         // jpeg, bmp, png, gif, webp
                         // https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types
-                        let type = 'jpeg';
-                        switch (pic.format) {
-                            case 'bmp':
-                                type = 'bmp';
-                                break;
-                            case 'png':
-                                type = 'png';
-                                break;
-                            default:
-                                break;
-                        }
+                        // let type = 'jpeg';
+                        // switch (pic.format) {
+                        //     case 'bmp':
+                        //         type = 'bmp';
+                        //         break;
+                        //     case 'png':
+                        //         type = 'png';
+                        //         break;
+                        //     default:
+                        //         break;
+                        // }
                         const imgUrl = pic.picUrl.match(/\.[a-z0-9]+?\?imageMogr2/) ? pic.picUrl.split('?imageMogr2/')[0] : pic.picUrl.replace(/thumbnail\/.+/, '');
-                        description += `<br/><picture><source srcset="${
-                            pic.picUrl.split('/thumbnail/')[0]
-                        }/strip/format/webp" type="image/webp"><source srcset="${imgUrl}" type="image/${type}"><img referrerpolicy="no-referrer" src="${imgUrl}"></picture>`;
+                        description += `<br><img src="${imgUrl}">`;
+                        // description += `<br><picture><source srcset="${
+                        //     pic.picUrl.split('/thumbnail/')[0]
+                        // }/strip/format/webp" type="image/webp"><source srcset="${imgUrl}" type="image/${type}"><img src="${imgUrl}"></picture>`;
                     }
                 });
             }
 
+            // 6. 视频
+            if (item.video) {
+                description += `<br><video src="${item.video.url}" controls></video>`;
+            }
+
             // rss标题
             // 优先将音频和视频名作为标题
             // 其次将正文内容作为标题
@@ -127,9 +138,58 @@ module.exports = {
 
             return {
                 title,
-                description: description.replace(new RegExp('\n', 'g'), '<br/>'),
-                pubDate: new Date(item.createdAt).toUTCString(),
+                description: description.trim().replace(/\n/g, '<br>'),
+                pubDate: parseDate(item.createdAt),
+                author,
                 link,
             };
         }),
+    constructTopicEntry: async (ctx, url) => {
+        const data = await ctx.cache.tryGet(
+            url,
+            async () => {
+                const resp = await got(url);
+                const html = resp.data;
+                const $ = cheerio.load(html);
+                const raw = $('[type = "application/json"]').html();
+                const data = JSON.parse(raw).props.pageProps;
+                data.posts = await Promise.all(
+                    data.posts.map(async (item) => {
+                        if (!item.video) {
+                            return item;
+                        }
+
+                        const videoUrl = `${videoAPI}&id=${item.id}`;
+                        const videoRes = await got(videoUrl);
+                        item.video = videoRes.data;
+
+                        return item;
+                    })
+                );
+
+                return data;
+            },
+            false,
+            config.cache.routeExpire
+        );
+
+        if (data.length === 0) {
+            ctx.state.data = {
+                title: '主题 ID 不存在，或该主题暂无内容',
+            };
+            return null;
+        }
+
+        const topic = data.topic;
+
+        ctx.state.data = {
+            title: `${topic.content} - 即刻圈子`,
+            link: url,
+            description: topic.briefIntro,
+            image: topic.squarePicture.picUrl || topic.squarePicture.middlePicUrl || topic.squarePicture.thumbnailUrl,
+            // item: topicDataHanding(data),
+        };
+
+        return data;
+    },
 };

package/lib/{routes → v2}/juejin/books.js

@@ -1,4 +1,5 @@
 const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
 
 module.exports = async (ctx) => {
     const response = await got({
@@ -17,7 +18,7 @@ module.exports = async (ctx) => {
             ${base_info.summary}<br>
             <strong>价格:</strong> ${base_info.price / 100}元
         `,
-        pubDate: new Date(base_info.ctime * 1000).toUTCString(),
+        pubDate: parseDate(base_info.ctime * 1000),
         guid: base_info.booklet_id,
     }));
 

package/lib/{routes → v2}/juejin/category.js

@@ -26,7 +26,7 @@ module.exports = async (ctx) => {
 
     let originalData = [];
     if (response.data.data) {
-        originalData = response.data.data.slice(0, 5);
+        originalData = response.data.data;
     }
     const resultItems = await util.ProcessFeed(originalData, ctx.cache);
 

package/lib/v2/juejin/maintainer.js

@@ -0,0 +1,13 @@
+module.exports = {
+    '/books': ['xyqfer'],
+    '/category/:category': ['DIYgod'],
+    '/collection/:collectionId': ['isQ'],
+    '/collections/:userId': ['isQ'],
+    '/column/:id': ['xiangzy1'],
+    '/news/:id': ['CancerGary'],
+    '/pins/:type?': ['xyqfer', 'laampui'],
+    '/posts/:id': ['Maecenas'],
+    '/shares/:userId': ['qiwihui'],
+    '/tag/:tag': ['isheng5'],
+    '/trending/:category/:type': ['moaix'],
+};

package/lib/v2/juejin/news.js

@@ -0,0 +1,25 @@
+const got = require('@/utils/got');
+const util = require('./utils');
+
+module.exports = async (ctx) => {
+    const { id } = ctx.params;
+
+    const response = await got({
+        method: 'post',
+        url: 'https://api.juejin.cn/content_api/v1/news/list_user',
+        json: {
+            user_id: id,
+            sort_type: 2,
+        },
+    });
+    const { data } = response.data;
+    const username = data[0] && data[0].author_user_info && data[0].author_user_info.user_name;
+    const resultItems = await util.ProcessFeed(data, ctx.cache);
+
+    ctx.state.data = {
+        title: `掘金资讯-${username}`,
+        link: `https://juejin.cn/user/${id}/news`,
+        description: `掘金资讯-${username}`,
+        item: resultItems,
+    };
+};

package/lib/{routes → v2}/juejin/pins.js

@@ -1,7 +1,8 @@
 const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
 
 module.exports = async (ctx) => {
-    const type = ctx.params.type || 'recommend';
+    const type = ctx.params.type ?? 'recommend';
     const title = {
         recommend: '推荐',
         hot: '热门',
@@ -35,7 +36,7 @@ module.exports = async (ctx) => {
         const title = content;
         const guid = item.msg_id;
         const link = `https://juejin.cn/pin/${guid}`;
-        const pubDate = new Date(parseInt(item.msg_Info.ctime) * 1000).toUTCString();
+        const pubDate = parseDate(item.msg_Info.ctime * 1000);
         const author = item.author_user_info.user_name;
         const imgs = item.msg_Info.pic_list.reduce((imgs, item) => {
             imgs += `