rsshub 1.0.0-master.fdf137b → 1.0.0-master.fe775f5

package/lib/v2/foresightnews/index.js

@@ -0,0 +1,88 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+
+const categories = {
+    '': {
+        id: 'feed',
+        title: '首页',
+    },
+    article: {
+        id: 'feed',
+        title: '文章',
+    },
+    news: {
+        id: 'news',
+        title: '快讯',
+    },
+    column: {
+        id: 'articles',
+        title: '专栏',
+    },
+};
+
+module.exports = async (ctx) => {
+    const category = ctx.params.category ?? '';
+    const id = ctx.params.id ?? '1';
+
+    const rootUrl = 'https://foresightnews.pro';
+    const currentUrl = `${rootUrl}/v1/${categories[category].id}?page=1&size=${ctx.query.limit ?? 30}${category === 'column' ? `&column_id=${id}` : ''}`;
+
+    const response = await got({
+        method: 'get',
+        url: currentUrl,
+    });
+
+    let items = response.data.data.list.map((item) =>
+        item.source_type
+            ? {
+                  type: item.source_type,
+                  title: item[item.source_type].title,
+                  author: item[item.source_type]?.author?.username ?? undefined,
+                  link: `${rootUrl}/${item.source_type}/detail/${item.source_id}`,
+                  category: item[item.source_type].tags ? item[item.source_type].tags.map((tag) => tag.name) : undefined,
+                  description: item[item.source_type]?.content ?? '',
+                  pubDate: parseDate(item[item.source_type].publishDate),
+              }
+            : {
+                  type: category,
+                  title: item.title,
+                  author: item?.author?.username ?? undefined,
+                  link: `${rootUrl}/${category === 'article' ? 'article' : 'news'}/detail/${item.id}`,
+                  category: item.tags ? item.tags.map((tag) => tag.name) : undefined,
+                  description: item.content ?? '',
+                  pubDate: parseDate(item.publishDate),
+              }
+    );
+
+    if (category === 'article') {
+        items = items.filter((item) => item.type === 'article');
+    }
+
+    items = await Promise.all(
+        items.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                if (item.type !== 'news') {
+                    const detailResponse = await got({
+                        method: 'get',
+                        url: item.link,
+                    });
+
+                    const content = cheerio.load(detailResponse.data);
+
+                    item.description = content('.detail-body').html();
+                }
+
+                delete item.type;
+
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: `${categories[category].title} - Foresight News`,
+        link: currentUrl,
+        item: items,
+    };
+};

package/lib/v2/foresightnews/maintainer.js

@@ -0,0 +1,6 @@
+module.exports = {
+    '/': ['nczitzk'],
+    '/article': ['nczitzk'],
+    '/column/:id': ['nczitzk'],
+    '/news': ['nczitzk'],
+};

package/lib/v2/foresightnews/radar.js

@@ -0,0 +1,31 @@
+module.exports = {
+    'foresightnews.pro': {
+        _name: 'Foresight News',
+        '.': [
+            {
+                title: '首页',
+                docs: 'https://docs.rsshub.app/new-media.html#foresight-news-shou-ye',
+                source: ['/article', '/'],
+                target: '/foresightnews',
+            },
+            {
+                title: '文章',
+                docs: 'https://docs.rsshub.app/new-media.html#foresight-news-wen-zhang',
+                source: ['/article', '/'],
+                target: '/foresightnews/article',
+            },
+            {
+                title: '快讯',
+                docs: 'https://docs.rsshub.app/new-media.html#foresight-news-kuai-xun',
+                source: ['/news', '/'],
+                target: '/foresightnews/news',
+            },
+            {
+                title: '专栏',
+                docs: 'https://docs.rsshub.app/new-media.html#foresight-news-zhuan-lan',
+                source: ['/column/detail/:id', '/'],
+                target: '/foresightnews/column/:id',
+            },
+        ],
+    },
+};

package/lib/v2/foresightnews/router.js

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

package/lib/v2/gcores/category.js

@@ -0,0 +1,126 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+
+module.exports = async (ctx) => {
+    const category = ctx.params.category;
+    const url = `https://www.gcores.com/${category}`;
+    const res = await got({
+        method: 'get',
+        url,
+    });
+    const data = res.data;
+    const $ = cheerio.load(data);
+    const feedTitle = $('title').text();
+
+    const list = $('.original.am_card.original-normal')
+        .map(function () {
+            const item = {
+                url: $(this).find('a.am_card_content.original_content').attr('href'),
+                title: $(this).find('h3.am_card_title').text(),
+                category: $(this).find('span.original_category>a').text(),
+            };
+            return item;
+        })
+        .get();
+
+    const out = await Promise.all(
+        list.map((item) => {
+            const articleUrl = `https://www.gcores.com${item.url}`;
+
+            return ctx.cache.tryGet(articleUrl, async () => {
+                const itemRes = await got({
+                    method: 'get',
+                    url: articleUrl,
+                });
+
+                const itemPage = itemRes.data;
+                const $ = cheerio.load(itemPage);
+
+                let articleData = await got(`https://www.gcores.com/gapi/v1${item.url}?include=media`);
+
+                articleData = articleData.data.data;
+                let cover;
+                if (articleData.attributes.cover) {
+                    cover = `<img src="https://image.gcores.com/${articleData.attributes.cover}" />`;
+                } else if (articleData.attributes.thumb) {
+                    cover = `<img src="https://image.gcores.com/${articleData.attributes.thumb}" />`;
+                } else {
+                    cover = '';
+                }
+
+                // replace figure with img
+                const articleContent = JSON.parse(articleData.attributes.content);
+                const entityRangeMap = {};
+                for (const block of articleContent.blocks || []) {
+                    if (block.entityRanges.length) {
+                        entityRangeMap[block.key] = block.entityRanges;
+                    }
+                }
+
+                $('figure').each((i, elem) => {
+                    const keyAttr = elem.attribs['data-offset-key'];
+                    const keyMatch = /^(\w+)-(\d+)-(\d)$/.exec(keyAttr);
+                    let actualContent = '';
+                    if (keyMatch) {
+                        const [, key, index] = keyMatch;
+                        if (entityRangeMap[key] && entityRangeMap[key][index]) {
+                            const entityKey = entityRangeMap[key] && entityRangeMap[key][index].key;
+                            const entity = articleContent.entityMap[entityKey];
+                            actualContent = convertEntityToContent(entity);
+                        }
+                    }
+
+                    if (actualContent) {
+                        $(elem).replaceWith(actualContent);
+                    }
+                });
+
+                // remove editor toolbar img
+                $('.md-editor-toolbar').replaceWith('');
+                // remove hidden tip block
+                $('.story_hidden').replaceWith('');
+
+                const content = $('.story.story-show').html();
+                return {
+                    title: item.title,
+                    description: cover + content,
+                    category: item.category,
+                    link: articleUrl,
+                    guid: articleUrl,
+                };
+            });
+        })
+    );
+    ctx.state.data = {
+        title: feedTitle,
+        link: url,
+        item: out,
+    };
+};
+
+function convertEntityToContent(entity) {
+    const { type, data } = entity;
+    switch (type) {
+        case 'IMAGE':
+            return `
+<figure>
+<img src="https://image.gcores.com/${data.path}" alt="${data.caption || ''}">
+${data.caption ? `<figcaption>${data.caption}</figcaption>` : ''}
+</figure>`;
+
+        case 'GALLERY':
+            return data.images
+                .map(
+                    (image, i, arr) => `
+<figure>
+<img src="https://image.gcores.com/${image.path}" alt="${image.caption || ''}">
+<figcaption>${data.caption || ''} (${i + 1}/${arr.length}) ${image.caption || ''}</figcaption>
+</figure>
+            `
+                )
+                .join('');
+
+        default:
+            return '';
+    }
+}

package/lib/v2/gcores/maintainer.js

@@ -0,0 +1,4 @@
+module.exports = {
+    '/category/:category': ['MoguCloud', 'StevenRCE0'],
+    '/tag/:tag/:category?': ['StevenRCE0'],
+};

package/lib/v2/gcores/radar.js

@@ -0,0 +1,19 @@
+module.exports = {
+    'gcores.com': {
+        _name: '机核网',
+        '.': [
+            {
+                title: '分类',
+                docs: 'https://docs.rsshub.app/new-media.html#ji-he-wang-fen-lei',
+                source: ['/:category'],
+                target: '/gcores/category/:category',
+            },
+            {
+                title: '标签',
+                docs: 'https://docs.rsshub.app/new-media.html#ji-he-wang-biao-qian',
+                source: ['/categories/:tag', '/'],
+                target: '/gcores/tag/:tag',
+            },
+        ],
+    },
+};

package/lib/v2/gcores/router.js

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

package/lib/v2/gcores/tag.js

@@ -0,0 +1,126 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+
+module.exports = async (ctx) => {
+    const tag = ctx.params.tag;
+    const category = ctx.params.category;
+    const url = `https://www.gcores.com/categories/${tag + (category ? `?tab=${category}` : '')}`;
+    const res = await got({
+        method: 'get',
+        url,
+    });
+    const data = res.data;
+    const $ = cheerio.load(data);
+    const feedTitle = $('title').text();
+
+    const list = $('.original.am_card.original-normal')
+        .map(function () {
+            const item = {
+                url: $(this).find('a.am_card_content.original_content').attr('href'),
+                title: $(this).find('h3.am_card_title').text(),
+                category: $(this).find('span.original_category>a').text(),
+            };
+            return item;
+        })
+        .get();
+
+    const out = await Promise.all(
+        list.map((item) => {
+            const articleUrl = `https://www.gcores.com${item.url}`;
+
+            return ctx.cache.tryGet(articleUrl, async () => {
+                const itemRes = await got({
+                    method: 'get',
+                    url: articleUrl,
+                });
+
+                const itemPage = itemRes.data;
+                const $ = cheerio.load(itemPage);
+
+                let articleData = await got(`https://www.gcores.com/gapi/v1${item.url}?include=media`);
+
+                articleData = articleData.data.data;
+                let cover;
+                if (articleData.attributes.cover) {
+                    cover = `<img src="https://image.gcores.com/${articleData.attributes.cover}" />`;
+                } else if (articleData.attributes.thumb) {
+                    cover = `<img src="https://image.gcores.com/${articleData.attributes.thumb}" />`;
+                } else {
+                    cover = '';
+                }
+
+                // replace figure with img
+                const articleContent = JSON.parse(articleData.attributes.content);
+                const entityRangeMap = {};
+                for (const block of articleContent.blocks || []) {
+                    if (block.entityRanges.length) {
+                        entityRangeMap[block.key] = block.entityRanges;
+                    }
+                }
+
+                $('figure').each((i, elem) => {
+                    const keyAttr = elem.attribs['data-offset-key'];
+                    const keyMatch = /^(\w+)-(\d+)-(\d)$/.exec(keyAttr);
+                    let actualContent = '';
+                    if (keyMatch) {
+                        const [, key, index] = keyMatch;
+                        if (entityRangeMap[key] && entityRangeMap[key][index]) {
+                            const entityKey = entityRangeMap[key] && entityRangeMap[key][index].key;
+                            const entity = articleContent.entityMap[entityKey];
+                            actualContent = convertEntityToContent(entity);
+                        }
+                    }
+
+                    if (actualContent) {
+                        $(elem).replaceWith(actualContent);
+                    }
+                });
+
+                // remove editor toolbar img
+                $('.md-editor-toolbar').replaceWith('');
+                // remove hidden tip block
+                $('.story_hidden').replaceWith('');
+
+                const content = $('.story.story-show').html();
+                return {
+                    title: item.title,
+                    description: cover + content,
+                    link: articleUrl,
+                    guid: articleUrl,
+                };
+            });
+        })
+    );
+    ctx.state.data = {
+        title: feedTitle,
+        link: url,
+        item: out,
+    };
+};
+
+function convertEntityToContent(entity) {
+    const { type, data } = entity;
+    switch (type) {
+        case 'IMAGE':
+            return `
+<figure>
+<img src="https://image.gcores.com/${data.path}" alt="${data.caption || ''}">
+${data.caption ? `<figcaption>${data.caption}</figcaption>` : ''}
+</figure>`;
+
+        case 'GALLERY':
+            return data.images
+                .map(
+                    (image, i, arr) => `
+<figure>
+<img src="https://image.gcores.com/${image.path}" alt="${image.caption || ''}">
+<figcaption>${data.caption || ''} (${i + 1}/${arr.length}) ${image.caption || ''}</figcaption>
+</figure>
+            `
+                )
+                .join('');
+
+        default:
+            return '';
+    }
+}

package/lib/v2/github/comments.js

@@ -1,64 +1,122 @@
 const got = require('@/utils/got');
-const cheerio = require('cheerio');
 const { parseDate } = require('@/utils/parse-date');
-const { art } = require('@/utils/render');
-const path = require('path');
-
+const md = require('markdown-it')({
+    html: true,
+});
+const apiUrl = 'https://api.github.com';
+const config = require('@/config').value;
 const typeDict = {
-    issues: {
-        typeRootUrl: '/issues',
+    issue: {
+        title: 'Issue',
     },
     pull: {
-        typeRootUrl: '/pulls',
+        title: 'Pull request',
     },
 };
 
 module.exports = async (ctx) => {
     const user = ctx.params.user;
     const repo = ctx.params.repo;
-    const type = ctx.params.type ?? 'issues';
-    const number = ctx.params.number ?? '1';
-
-    const rootUrl = 'https://github.com';
+    const number = isNaN(parseInt(ctx.params.number)) ? 1 : parseInt(ctx.params.number);
+    const limit = ctx.query.limit ? parseInt(ctx.params.limit) : 100;
+    const headers =
+        config.github && config.github.access_token
+            ? {
+                  Accept: 'application/vnd.github.v3+json',
+                  Authorization: `token ${config.github.access_token}`,
+              }
+            : {
+                  Accept: 'application/vnd.github.v3+json',
+              };
 
     const response = await got({
-        method: 'get',
-        url: `${rootUrl}/${user}/${repo}/${type}/${number}`,
-        header: {
-            Referer: `${rootUrl}/${user}/${repo}${typeDict[type].typeRootUrl}`,
+        url: `${apiUrl}/repos/${user}/${repo}/issues/${number}`,
+        headers,
+    });
+    const issue = response.data;
+    const type = issue.pull_request ? 'pull' : 'issue';
+
+    const timelineResponse = await got({
+        url: issue.timeline_url,
+        headers,
+        searchParams: {
+            per_page: limit,
         },
     });
+    const timeline = timelineResponse.data;
 
-    const $ = cheerio.load(response.data);
+    let items = [
+        {
+            title: `${issue.user.login} created ${user}/${repo}: ${typeDict[type].title} #${issue.number}`,
+            description: md.render(issue.body),
+            author: issue.user.login,
+            pubDate: parseDate(issue.created_at),
+            link: `${issue.html_url}#issue-${issue.id}`,
+        },
+    ];
 
-    const list = $('div.timeline-comment-group.js-minimizable-comment-group.js-targetable-element.TimelineItem-body.my-0')
-        .map((_, item) => {
-            item = $(item);
-            return {
-                title: `${item.find('strong.css-truncate').text().trim()} commented`,
-                description: art(path.join(__dirname, 'templates/comments-description.art'), {
-                    desc: item.find('div.edit-comment-hide').html(),
-                }),
-                author: item.find('strong.css-truncate').text().trim(),
-                pubDate: parseDate(item.find('relative-time.no-wrap').attr('datetime')),
-                link: `${rootUrl}/${user}/${repo}/${type}/${number}` + item.find('a.Link--secondary.js-timestamp').attr('href'),
-            };
-        })
-        .get();
+    timeline.forEach((item) => {
+        switch (item.event) {
+            case 'closed':
+                items.push({
+                    title: `${item.actor.login} ${item.event} ${user}/${repo}: ${typeDict[type].title} #${issue.number}`,
+                    author: item.actor.login,
+                    pubDate: parseDate(item.created_at),
+                    link: item.url,
+                });
+                break;
+            case 'commented':
+                items.push({
+                    title: `${item.actor.login} ${item.event} on ${user}/${repo}: ${typeDict[type].title} #${issue.number}`,
+                    description: md.render(item.body),
+                    author: item.actor.login,
+                    pubDate: parseDate(item.created_at),
+                    link: item.html_url,
+                });
+                break;
+            case 'cross-referenced':
+                items.push({
+                    title: `${item.actor.login} ${item.event} on ${user}/${repo}: ${typeDict[type].title} #${issue.number}`,
+                    description: `${item.actor.login} mentioned this issue in <a href='${item.source.issue.html_url}'><b>${item.source.issue.title}</b> #${item.source.issue.number}</a>`,
+                    author: item.actor.login,
+                    pubDate: parseDate(item.created_at),
+                    guid: `${item.actor.login} ${item.event} on ${user}/${repo}: ${typeDict[type].title} #${issue.number} on ${item.created_at}`,
+                });
+                break;
+            case 'renamed':
+                items.push({
+                    title: `${item.actor.login} ${item.event} on ${user}/${repo}: ${typeDict[type].title} #${issue.number}`,
+                    description: `${item.actor.login} changed the title <del>${item.rename.from}</del> ${item.rename.to}`,
+                    author: item.actor.login,
+                    pubDate: parseDate(item.created_at),
+                    link: item.url,
+                });
+                break;
+            case 'reviewed':
+                items.push({
+                    title: `${item.user.login} ${item.event} on ${user}/${repo}: ${typeDict[type].title} #${issue.number}`,
+                    description: item.body ? md.render(item.body) : item.state.replace('_', ' '),
+                    author: item.user.login,
+                    pubDate: parseDate(item.submitted_at),
+                    link: item.html_url,
+                });
+                break;
+            default:
+                break;
+        }
+    });
 
-    const items = await Promise.all(list && list.map((item) => ctx.cache.tryGet(item.link, () => item)));
+    items = await Promise.all(items.map((item) => ctx.cache.tryGet(item.link, () => item)));
 
     ctx.state.data = {
-        title: $('span.author.flex-self-stretch').text().trim() + '/' + $('strong.mr-2.flex-self-stretch').text().trim() + `: ${type} #${number}`,
-        description: $('span.author.flex-self-stretch').text().trim() + '/' + $('strong.mr-2.flex-self-stretch').text().trim() + ': ' + $('h1.gh-header-title.mb-2.lh-condensed.f1.mr-0.flex-auto.break-word').text().trim(),
-        link: `${rootUrl}/${user}/${repo}/${type}/${number}`,
+        title: `${user}/${repo}: ${typeDict[type].title} #${number} - ${issue.title}`,
+        link: issue.html_url,
         item: items,
     };
 
     ctx.state.json = {
-        title: $('span.author.flex-self-stretch').text().trim() + '/' + $('strong.mr-2.flex-self-stretch').text().trim() + `: ${type} #${number}`,
-        description: $('span.author.flex-self-stretch').text().trim() + '/' + $('strong.mr-2.flex-self-stretch').text().trim() + ': ' + $('h1.gh-header-title.mb-2.lh-condensed.f1.mr-0.flex-auto.break-word').text().trim(),
-        link: `${rootUrl}/${user}/${repo}/${type}/${number}`,
+        title: `${user}/${repo}: ${typeDict[type].title} #${number} - ${issue.title}`,
+        link: issue.html_url,
         item: items,
     };
 };

package/lib/v2/github/follower.js

@@ -3,7 +3,7 @@ const config = require('@/config').value;
 
 module.exports = async (ctx) => {
     if (!config.github || !config.github.access_token) {
-        throw 'GitHub follower RSS is disabled due to the lack of <a href="https://docs.rsshub.app/install/#%E9%83%A8%E5%88%86-rss-%E6%A8%A1%E5%9D%97%E9%85%8D%E7%BD%AE">relevant config</a>';
+        throw 'GitHub follower RSS is disabled due to the lack of <a href="https://docs.rsshub.app/install/#pei-zhi-bu-fen-rss-mo-kuai-pei-zhi">relevant config</a>';
     }
     const user = ctx.params.user;
 

package/lib/v2/github/maintainer.js

@@ -4,7 +4,7 @@ module.exports = {
     '/contributors/:user/:repo/:order?/:anon?': ['zoenglinghou'],
     '/file/:user/:repo/:branch/:filepath+': ['zengxs'],
     '/issue/:user/:repo/:state?/:labels?': ['HenryQW', 'AndreyMZ'],
-    '/pull/:user/:repo': ['hashman'],
+    '/pull/:user/:repo/:state?': ['hashman', 'TonyRL'],
     '/repos/:user': ['DIYgod'],
     '/search/:query/:sort?/:order?': ['LogicJake'],
     '/starred_repos/:user': ['LanceZhu'],

package/lib/v2/github/pulls.js

@@ -5,13 +5,14 @@ const md = require('markdown-it')({
     linkify: true,
 });
 const queryString = require('query-string');
+const { parseDate } = require('@/utils/parse-date');
 
 module.exports = async (ctx) => {
     const user = ctx.params.user;
     const repo = ctx.params.repo;
+    const state = ctx.params.state ?? 'open';
 
     const host = `https://github.com/${user}/${repo}/pulls`;
-    const link = `https://github.com/${user}/${repo}/pull`;
     const url = `https://api.github.com/repos/${user}/${repo}/pulls`;
 
     const headers = {};
@@ -22,7 +23,10 @@ module.exports = async (ctx) => {
         method: 'get',
         url,
         searchParams: queryString.stringify({
+            state,
             sort: 'created',
+            direction: 'desc',
+            per_page: ctx.query.limit ? (parseInt(ctx.query.limit) <= 100 ? parseInt(ctx.query.limit) : 100) : 100,
         }),
         headers,
     });
@@ -36,8 +40,8 @@ module.exports = async (ctx) => {
             title: item.title,
             author: item.user.login,
             description: item.body ? md.render(item.body) : 'No description',
-            pubDate: new Date(item.created_at).toUTCString(),
-            link: `${link}/${item.number}`,
+            pubDate: parseDate(item.created_at),
+            link: item.html_url,
         })),
     };
 };

package/lib/v2/github/radar.js

@@ -6,7 +6,7 @@ module.exports = {
                 title: 'Issues / Pull Requests 评论',
                 docs: 'https://docs.rsshub.app/programming.html#github',
                 source: ['/:user/:repo/:type/:number'],
-                target: '/github/comments/:user/:repo/:type/:number',
+                target: '/github/comments/:user/:repo/:number',
             },
             {
                 title: '用户仓库',

package/lib/v2/github/router.js

@@ -1,10 +1,11 @@
 module.exports = function (router) {
     router.get('/branches/:user/:repo', require('./branches'));
-    router.get('/comments/:user/:repo/:type/:number', require('./comments'));
+    router.get('/comments/:user/:repo/:type/:number', require('./comments')); // deprecated
+    router.get('/comments/:user/:repo/:number', require('./comments'));
     router.get('/contributors/:user/:repo/:order?/:anon?', require('./contributors'));
     router.get('/file/:user/:repo/:branch/:filepath+', require('./file'));
     router.get('/issue/:user/:repo/:state?/:labels?', require('./issue'));
-    router.get('/pull/:user/:repo', require('./pulls'));
+    router.get('/pull/:user/:repo/:state?', require('./pulls'));
     router.get('/repos/:user', require('./repos'));
     router.get('/search/:query/:sort?/:order?', require('./search'));
     router.get('/starred_repos/:user', require('./starred_repos'));