rsshub 1.0.0-master.fed0404 → 1.0.0-master.ff1cc11

package/lib/routes/javdb/utils.js

@@ -1,62 +1,72 @@
 const got = require('@/utils/got');
 const cheerio = require('cheerio');
 
-const rootUrl = 'https://javdb.com';
+let rootUrl = 'https://javdb.com';
 
 module.exports = {
-    rootUrl: rootUrl,
     ProcessItems: async (ctx, currentUrl, title) => {
-        const response = await got({
-            method: 'get',
-            url: currentUrl,
-        });
+        let data;
 
-        const $ = cheerio.load(response.data);
+        try {
+            const response = await got({
+                method: 'get',
+                url: `${rootUrl}${currentUrl}`,
+            });
+            data = response.data;
+        } catch (err) {
+            rootUrl = rootUrl.replace('javdb', 'javdb7');
+            const response = await got({
+                method: 'get',
+                url: `${rootUrl}${currentUrl}`,
+            });
+            data = response.data;
+        }
+
+        const $ = cheerio.load(data);
 
         $('.tags').remove();
 
         const list = $('.grid-item a')
-            .slice(0, 5)
+            .slice(0, 15)
             .map((_, item) => {
                 item = $(item);
                 return {
                     title: item.text(),
                     link: `${rootUrl}${item.attr('href')}`,
-                    pubDate: new Date(item.find('.meta').text()).toUTCString(),
+                    pubDate: Date.parse(item.find('.meta').text()),
                 };
             })
             .get();
 
         const items = await Promise.all(
-            list.map(
-                async (item) =>
-                    await ctx.cache.tryGet(item.link, async () => {
-                        const detailResponse = await got({
-                            method: 'get',
-                            url: item.link,
-                        });
-                        const content = cheerio.load(detailResponse.data);
+            list.map((item) =>
+                ctx.cache.tryGet(item.link, async () => {
+                    const detailResponse = await got({
+                        method: 'get',
+                        url: item.link,
+                    });
+                    const content = cheerio.load(detailResponse.data);
 
-                        item.enclosure_url = content('#magnets-content button[data-clipboard-text]').eq(0).attr('data-clipboard-text');
-                        item.enclosure_type = 'application/x-bittorrent';
+                    item.enclosure_url = content('#magnets-content button[data-clipboard-text]').eq(0).attr('data-clipboard-text');
+                    item.enclosure_type = 'application/x-bittorrent';
 
-                        content('icon, .review-buttons, .copy-to-clipboard').remove();
-                        content('#modal-review-watched, #modal-save-list').remove();
-                        content('.video-cover').eq(1).remove();
+                    content('icon, .review-buttons, .copy-to-clipboard').remove();
+                    content('#modal-review-watched, #modal-save-list').remove();
+                    content('.video-cover').eq(1).remove();
 
-                        content('img.video-cover').attr('src', content(this).parent().attr('href'));
+                    content('img.video-cover').attr('src', content(this).parent().attr('href'));
 
-                        content('.preview-images img').each(function () {
-                            content(this).removeAttr('data-src');
-                            content(this).attr('src', content(this).parent().attr('href'));
-                        });
+                    content('.preview-images img').each(function () {
+                        content(this).removeAttr('data-src');
+                        content(this).attr('src', content(this).parent().attr('href'));
+                    });
 
-                        content('#preview-video').css('display', 'block');
+                    content('#preview-video').css('display', 'block');
 
-                        item.description = content('.movie-info-panel .columns').html() + content('#magnets-content').html() + content('.preview-images').html();
+                    item.description = content('.movie-info-panel .columns').html() + content('#magnets-content').html() + content('.preview-images').html();
 
-                        return item;
-                    })
+                    return item;
+                })
             )
         );
 
@@ -65,7 +75,7 @@ module.exports = {
 
         return {
             title: subject === '' ? title : `${subject} - ${title}`,
-            link: currentUrl,
+            link: `${rootUrl}${currentUrl}`,
             item: items,
         };
     },

package/lib/routes/javlibrary/bestreviews.js

@@ -5,7 +5,7 @@ module.exports = async (ctx) => {
     const items = await getVideoComments(link);
     ctx.state.data = {
         title: 'Javlibrary - 最佳评论',
-        link: link,
+        link,
         item: items,
     };
 };

package/lib/routes/javlibrary/users.js

@@ -10,7 +10,7 @@ module.exports = async (ctx) => {
         const items = await getVideoComments(link);
         ctx.state.data = {
             title: `Javlibrary - ${uid} 发表的文章`,
-            link: link,
+            link,
             item: items,
         };
     } else {

package/lib/routes/javlibrary/utils.js

@@ -1,6 +1,6 @@
 const url = require('url');
 const cheerio = require('cheerio');
-const got = require('hooman');
+const got = require('@/utils/got');
 const dateUtil = require('@/utils/date');
 
 // 通过传入不同的ctx.state.data.link 返回javlibrary 不同link的rss
@@ -34,7 +34,7 @@ exports.template = async function template(ctx) {
 
     ctx.state.data = {
         title: `Javlibrary - ${$('.boxtitle').text()}`,
-        link: link,
+        link,
         item: items,
     };
 };

package/lib/routes/jdlingyu/index.js

@@ -12,7 +12,7 @@ module.exports = async (ctx) => {
     const url = baseUrl + type;
     const response = await got({
         method: 'get',
-        url: url,
+        url,
     });
     const $ = cheerio.load(response.data);
 
@@ -29,9 +29,9 @@ module.exports = async (ctx) => {
                 });
                 return Promise.resolve({
                     title: a.text(),
-                    description: description,
+                    description,
                     author: $(div).find('.post-header .users').text(),
-                    link: link,
+                    link,
                     pubDate: new Date($(div).find('.post-header time').attr('datetime')).toUTCString(),
                 });
             })

package/lib/routes/jianshu/utils.js

@@ -32,10 +32,10 @@ async function load(link) {
     return { description, pubDate };
 }
 
-const ProcessFeed = async (list, caches) => {
+const ProcessFeed = (list, caches) => {
     const host = 'https://www.jianshu.com';
 
-    return await Promise.all(
+    return Promise.all(
         list.map(async (item) => {
             const $ = cheerio.load(item);
 
@@ -53,7 +53,7 @@ const ProcessFeed = async (list, caches) => {
 
             // 使用tryGet方法从缓存获取内容。
             // 当缓存中无法获取到链接内容的时候，则使用load方法加载文章内容。
-            const other = await caches.tryGet(itemUrl, async () => await load(itemUrl));
+            const other = await caches.tryGet(itemUrl, () => load(itemUrl));
 
             // 合并解析后的结果集作为该篇文章最终的输出结果
             return Promise.resolve(Object.assign({}, single, other));

package/lib/routes/jiazhen108/index.js

@@ -0,0 +1,47 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+
+module.exports = async (ctx) => {
+    const rootUrl = 'http://www.jiazhen108.com/news/';
+    const response = await got({
+        method: 'get',
+        url: rootUrl,
+    });
+
+    const $ = cheerio.load(response.data);
+
+    const list = $('div.met-news-list ul li')
+        .slice(0, 10)
+        .map((_, item) => {
+            item = $(item);
+            const a = item.find('a');
+            return {
+                title: a.text(),
+                link: a.attr('href'),
+            };
+        })
+        .get();
+
+    const items = await Promise.all(
+        list.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const detailResponse = await got({
+                    method: 'get',
+                    url: item.link,
+                });
+                const content = cheerio.load(detailResponse.data);
+
+                item.description = content('section.met-editor').html();
+                item.pubDate = new Date(content('div.info span').eq(0).text() + ' GMT+8').toUTCString();
+
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: `「108将」实战分享`,
+        link: rootUrl,
+        item: items,
+    };
+};

package/lib/routes/jiemian/list.js

@@ -18,7 +18,7 @@ module.exports = async (ctx) => {
     let out = await Promise.all(
         list.map(async (item) => {
             const $ = cheerio.load(item);
-            const title = $('.item-main a').text();
+            const title = $('.item-main a').text().replace('target="_blank">', '');
             const itemUrl = $('.item-main a').attr('href');
             const cache = await ctx.cache.get(itemUrl);
             if (cache) {

package/lib/routes/jike/common.js

@@ -129,7 +129,7 @@ module.exports = {
                 title,
                 description: description.replace(new RegExp('\n', 'g'), '<br/>'),
                 pubDate: new Date(item.createdAt).toUTCString(),
-                link: link,
+                link,
             };
         }),
 };

package/lib/routes/jike/user.js

@@ -103,7 +103,7 @@ module.exports = async (ctx) => {
                 title: `${typeMap[item.type]}了: ${shortenTitle}`,
                 description: `${content}${linkTemplate}${imgTemplate}`,
                 pubDate: new Date(item.createdAt).toUTCString(),
-                link: `${linkMap[item.type]}`,
+                link: linkMap[item.type],
             };
 
             if (id === 'wenhao1996' && item.topic.id === '553870e8e4b0cafb0a1bef68') {

package/lib/routes/jingdong/zhongchou.js

@@ -35,7 +35,7 @@ module.exports = async (ctx) => {
     const statusCode = statusCodes[status];
 
     const params = {
-        sort: sort,
+        sort,
     };
     if (typeCode !== '') {
         params.categoryId = typeCode;
@@ -63,7 +63,7 @@ module.exports = async (ctx) => {
 
             const info = {
                 link: url.resolve(host, $(this).find('a.link-pic').attr('href')),
-                description: description,
+                description,
                 title: $(this).find('div.i-tits.no-color-choose > a > h4').text() || $(this).find('div.i-tits > a > h4').text(),
             };
             return info;
@@ -71,7 +71,7 @@ module.exports = async (ctx) => {
         .get();
 
     ctx.state.data = {
-        title: title,
+        title,
         link: host,
         item: out,
     };

package/lib/routes/jinritoutiao/keyword.js

@@ -11,19 +11,17 @@ module.exports = async (ctx) => {
         },
     });
     let data = response.data.data;
-    data = data.filter(function (item) {
-        return !item.cell_type;
-    });
+    data = data.filter((item) => !item.cell_type);
 
     ctx.state.data = {
         title: `今日头条: ${keyword}`,
         link: `https://www.toutiao.com/search/?keyword=${keyword}`,
-        description: `${keyword}`,
+        description: keyword,
         item: data.map((item) => ({
             title: `${item.media_name}: ${item.title}`,
-            description: `${item.abstract}`,
-            pubDate: `${new Date(parseInt(item.create_time) * 1000)}`,
-            link: `${item.article_url}`,
+            description: item.abstract,
+            pubDate: new Date(parseInt(item.create_time) * 1000),
+            link: item.article_url,
         })),
     };
 };

package/lib/routes/jinshi/index.js

@@ -0,0 +1,35 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+
+module.exports = async (ctx) => {
+    const response = await got.get('https://www.jin10.com/');
+    const $ = cheerio.load(response.data);
+    let date;
+
+    const item = $('#jin_flash_list .jin-flash-item-container')
+        .filter((index, ele) => !!$('.right-content div:first-of-type', ele).text() && !$('.is-vip', ele).length)
+        .map((index, ele) => {
+            const year = new Date().getFullYear();
+            const time = $('.item-time', ele).text();
+            const title = $('.right-content div:first-of-type', ele).text();
+            const link = $('.right-content .flash-item-share_right a', ele).attr('href');
+
+            date = $('.jin-flash-date-line span', ele).text().trim() ? $('.jin-flash-date-line span', ele).text().trim() : date;
+
+            const datetime = year + '-' + date.replace('月', '-').replace('日', ` ${time}`);
+
+            return {
+                title,
+                link,
+                description: datetime,
+                pubDate: new Date(datetime),
+            };
+        })
+        .get();
+
+    ctx.state.data = {
+        title: '金十数据',
+        link: 'https://www.jin10.com/',
+        item,
+    };
+};

package/lib/routes/jpmorganchase/research.js

@@ -5,7 +5,7 @@ const dateParser = require('@/utils/dateParser');
 const base = 'https://institute.jpmorganchase.com';
 const url = `${base}/institute/research`;
 
-const parseDetails = async (link, ctx) => {
+const parseDetails = (link, ctx) => {
     const fullLink = `${base}${link}`;
     return ctx.cache.tryGet(fullLink, async () => {
         const response = await got({
@@ -38,7 +38,7 @@ module.exports = async (ctx) => {
     const $ = cheerio.load(response.data);
 
     const items = $('.item a')
-        .map(async (i, item) => {
+        .map((i, item) => {
             const link = item.attribs.href;
             return parseDetails(link, ctx);
         })

package/lib/routes/juejin/books.js

@@ -3,14 +3,14 @@ const got = require('@/utils/got');
 module.exports = async (ctx) => {
     const response = await got({
         method: 'post',
-        url: 'https://apinew.juejin.im/booklet_api/v1/booklet/listbycategory',
+        url: 'https://api.juejin.cn/booklet_api/v1/booklet/listbycategory',
         json: { category_id: '0', cursor: '0', limit: 20 },
     });
 
     const { data } = response.data;
     const items = data.map(({ base_info }) => ({
         title: base_info.title,
-        link: `https://juejin.im/book/${base_info.booklet_id}`,
+        link: `https://juejin.cn/book/${base_info.booklet_id}`,
         description: `
             <img src="${base_info.cover_img}"><br>
             <strong>${base_info.title}</strong><br><br>
@@ -23,7 +23,7 @@ module.exports = async (ctx) => {
 
     ctx.state.data = {
         title: '掘金小册',
-        link: 'https://juejin.im/books',
+        link: 'https://juejin.cn/books',
         item: items,
     };
 };

package/lib/routes/juejin/category.js

@@ -6,7 +6,7 @@ module.exports = async (ctx) => {
 
     const idResponse = await got({
         method: 'get',
-        url: 'https://apinew.juejin.im/tag_api/v1/query_category_briefs?show_type=0',
+        url: 'https://api.juejin.cn/tag_api/v1/query_category_briefs?show_type=0',
     });
 
     const cat = idResponse.data.data.find((item) => item.category_url === category);
@@ -14,7 +14,7 @@ module.exports = async (ctx) => {
 
     const response = await got({
         method: 'post',
-        url: 'https://apinew.juejin.im/recommend_api/v1/article/recommend_cate_feed',
+        url: 'https://api.juejin.cn/recommend_api/v1/article/recommend_cate_feed',
         json: {
             id_type: 2,
             sort_type: 300,
@@ -31,9 +31,9 @@ module.exports = async (ctx) => {
     const resultItems = await util.ProcessFeed(originalData, ctx.cache);
 
     ctx.state.data = {
-        title: `掘金${cat.category_name}`,
-        link: `https://juejin.im/${category}`,
-        description: `掘金${cat.category_name}`,
+        title: `掘金 ${cat.category_name}`,
+        link: `https://juejin.cn/${category}`,
+        description: `掘金 ${cat.category_name}`,
         item: resultItems,
     };
 };

package/lib/routes/juejin/collection.js

@@ -6,7 +6,7 @@ module.exports = async (ctx) => {
 
     const collectPage = await got({
         method: 'get',
-        url: `https://apinew.juejin.im/interact_api/v1/collectionSet/get?tag_id=${collectionId}&cursor=0`,
+        url: `https://api.juejin.cn/interact_api/v1/collectionSet/get?tag_id=${collectionId}&cursor=0`,
     });
 
     let items = [];
@@ -18,8 +18,9 @@ module.exports = async (ctx) => {
 
     ctx.state.data = {
         title: '掘金 - 单个收藏夹',
-        link: `https://juejin.im/collection/${collectionId}`,
+        link: `https://juejin.cn/collection/${collectionId}`,
         description: '掘金，用户单个收藏夹',
         item: result,
+        allowEmpty: true,
     };
 };

package/lib/routes/juejin/column.js

@@ -0,0 +1,31 @@
+const got = require('@/utils/got');
+const util = require('./utils');
+
+module.exports = async (ctx) => {
+    const { id } = ctx.params;
+    const detail = await got({
+        method: 'get',
+        url: `https://api.juejin.cn/content_api/v1/column/detail?column_id=${id}`,
+    });
+    const response = await got({
+        method: 'post',
+        url: 'https://api.juejin.cn/content_api/v1/column/articles_cursor',
+        json: {
+            column_id: id,
+            limit: 20,
+            cursor: '0',
+            sort: 0,
+        },
+    });
+    const { data } = response.data;
+    const detailData = detail.data.data;
+    const columnName = detailData && detailData.column_version && detailData.column_version.title;
+    const resultItems = await util.ProcessFeed(data, ctx.cache);
+
+    ctx.state.data = {
+        title: `掘金专栏-${columnName}`,
+        link: `https://juejin.cn/column/${id}`,
+        description: `掘金专栏-${columnName}`,
+        item: resultItems,
+    };
+};

package/lib/routes/juejin/favorites.js

@@ -5,7 +5,7 @@ module.exports = async (ctx) => {
     const { userId } = ctx.params;
     const response = await got({
         method: 'get',
-        url: `https://apinew.juejin.im/interact_api/v1/collectionSet/list?user_id=${userId}&cursor=0&limit=20`,
+        url: `https://api.juejin.cn/interact_api/v1/collectionSet/list?user_id=${userId}&cursor=0&limit=20`,
     });
 
     // 获取用户所有收藏夹id
@@ -15,10 +15,10 @@ module.exports = async (ctx) => {
     async function getPostId(item) {
         const collectPage = await got({
             method: 'get',
-            url: `https://apinew.juejin.im/interact_api/v1/collectionSet/get?tag_id=${item}&cursor=0`,
+            url: `https://api.juejin.cn/interact_api/v1/collectionSet/get?tag_id=${item}&cursor=0`,
         });
 
-        return (collectPage.data.data && collectPage.data.data.article_list.slice(0, 10)) || [];
+        return (Array.isArray(collectPage.data.data.article_list) && collectPage.data.data.article_list.slice(0, 10)) || [];
     }
 
     const temp = await Promise.all(collectionId.map(getPostId));
@@ -34,5 +34,6 @@ module.exports = async (ctx) => {
         link: `https://juejin.im/user/${userId}/collections`,
         description: '掘金，指定用户整个收藏集',
         item: result,
+        allowEmpty: true,
     };
 };

package/lib/routes/juejin/pins.js

@@ -1,17 +1,40 @@
 const got = require('@/utils/got');
 
 module.exports = async (ctx) => {
+    const type = ctx.params.type || 'recommend';
+    const title = {
+        recommend: '推荐',
+        hot: '热门',
+        '6824710203301167112': '上班摸鱼',
+        '6819970850532360206': '内推招聘',
+        '6824710202487472141': '一图胜千言',
+        '6824710202562969614': '今天学到了',
+        '6824710202378436621': '每天一道算法题',
+        '6824710202000932877': '开发工具推荐',
+        '6824710203112423437': '树洞一下',
+    };
+
+    let url = '';
+    let json = null;
+    if (/^\d+$/.test(type)) {
+        url = `https://api.juejin.cn/recommend_api/v1/short_msg/topic`;
+        json = { id_type: 4, sort_type: 500, cursor: '0', limit: 20, topic_id: type };
+    } else {
+        url = `https://api.juejin.cn/recommend_api/v1/short_msg/${type}`;
+        json = { id_type: 4, sort_type: 200, cursor: '0', limit: 20 };
+    }
+
     const response = await got({
         method: 'post',
-        url: 'https://apinew.juejin.im/recommend_api/v1/short_msg/recommend',
-        json: { id_type: 4, sort_type: 300, cursor: '0', limit: 20 },
+        url,
+        json,
     });
 
     const items = response.data.data.map((item) => {
         const content = item.msg_Info.content;
         const title = content;
         const guid = item.msg_id;
-        const link = `https://juejin.im/pin/${guid}`;
+        const link = `https://juejin.cn/pin/${guid}`;
         const pubDate = new Date(parseInt(item.msg_Info.ctime) * 1000).toUTCString();
         const author = item.author_user_info.user_name;
         const imgs = item.msg_Info.pic_list.reduce((imgs, item) => {
@@ -36,8 +59,8 @@ module.exports = async (ctx) => {
     });
 
     ctx.state.data = {
-        title: '沸点 - 推荐',
-        link: 'https://juejin.im/pins/recommended',
+        title: `沸点 - ${title[type]}`,
+        link: 'https://juejin.cn/pins/recommended',
         item: items,
     };
 };

package/lib/routes/juejin/posts.js

@@ -6,7 +6,7 @@ module.exports = async (ctx) => {
 
     const response = await got({
         method: 'post',
-        url: 'https://apinew.juejin.im/content_api/v1/article/query_list',
+        url: 'https://api.juejin.cn/content_api/v1/article/query_list',
         json: {
             user_id: id,
             sort_type: 2,
@@ -18,7 +18,7 @@ module.exports = async (ctx) => {
 
     ctx.state.data = {
         title: `掘金专栏-${username}`,
-        link: `https://juejin.im/user/${id}/posts`,
+        link: `https://juejin.cn/user/${id}/posts`,
         description: `掘金专栏-${username}`,
         item: resultItems,
     };

package/lib/routes/juejin/tag.js

@@ -6,7 +6,7 @@ module.exports = async (ctx) => {
 
     const idResponse = await got({
         method: 'post',
-        url: 'https://apinew.juejin.im/tag_api/v1/query_tag_detail',
+        url: 'https://api.juejin.cn/tag_api/v1/query_tag_detail',
         json: {
             key_word: tag,
         },
@@ -16,7 +16,7 @@ module.exports = async (ctx) => {
 
     const response = await got({
         method: 'post',
-        url: 'https://apinew.juejin.im/recommend_api/v1/article/recommend_tag_feed',
+        url: 'https://api.juejin.cn/recommend_api/v1/article/recommend_tag_feed',
         json: {
             id_type: 2,
             cursor: '0',
@@ -32,9 +32,9 @@ module.exports = async (ctx) => {
     const resultItems = await util.ProcessFeed(originalData, ctx.cache);
 
     ctx.state.data = {
-        title: `掘金${tag}`,
-        link: `https://juejin.im/tag/${encodeURIComponent(tag)}`,
-        description: `掘金${tag}`,
+        title: `掘金 ${tag}`,
+        link: `https://juejin.cn/tag/${encodeURIComponent(tag)}`,
+        description: `掘金 ${tag}`,
         item: resultItems,
     };
 };