rsshub 1.0.0-master.f961961 → 1.0.0-master.f992838

package/lib/v2/caixin/templates/article.art

@@ -0,0 +1,38 @@
+{{ if item.audio }}
+    <audio src="{{ item.audio }}" controls></audio><br>
+{{ /if }}
+{{ if $('.article .subhead').length }}
+    <blockquote><p>{{@ $('.article .subhead').html() }}</p></blockquote>
+    <br>
+{{ /if }}
+
+{{ if $('.article .media').length }}
+    {{@ $('.article .media').html() }}
+    <br>
+{{ /if }}
+
+{{ if $('.article .content_video').length }}
+    <% const video = $('script').text().match(/initPlayer\('(.*?)','(.*?)'\)/); %>
+    <% const videoUrl = video[1]; %>
+    <% const poster = video[2]; %>
+    <video controls preload="none" poster="{{ poster }}" src="{{ videoUrl }}"></video>
+    <br>
+{{ /if }}
+
+{{ if $('div#Main_Content_Val.text').length }}
+    {{@ $('div#Main_Content_Val.text').html() }}
+{{ else }}
+    {{ if item.summary }}
+        <blockquote><p>{{ item.summary }}</p></blockquote>
+        <br>
+    {{ /if }}
+    {{ if item.pics?.includes('#') }}
+        {{ each item.pics.split('#') pic }}
+            <img src="{{ pic }}">
+            <br>
+        {{ /each }}
+    {{ else }}
+        <img src="{{ item.pics }}">
+        <br>
+    {{ /if }}
+{{ /if }}

package/lib/v2/caixin/utils.js

@@ -0,0 +1,52 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { art } = require('@/utils/render');
+const path = require('path');
+
+const parseArticle = (item, tryGet) => {
+    if (new URL(item.link).hostname.match(/\.blog\.caixin\.com$/)) {
+        return parseBlogArticle(item, tryGet);
+    } else {
+        return tryGet(item.link, async () => {
+            const { data: response } = await got(item.link);
+
+            const $ = cheerio.load(response);
+
+            item.description = art(path.join(__dirname, 'templates/article.art'), {
+                item,
+                $,
+            });
+
+            if (item.audio) {
+                item.itunes_item_image = item.audio_image_url;
+                item.enclosure_url = item.audio;
+                item.enclosure_type = 'audio/mpeg';
+            }
+
+            return item;
+        });
+    }
+};
+
+const parseBlogArticle = (item, tryGet) =>
+    tryGet(item.link, async () => {
+        const response = await got(item.link);
+        const $ = cheerio.load(response.data);
+        const article = $('#the_content').removeAttr('style');
+        article.find('img').removeAttr('style');
+        article
+            .find('p')
+            // Non-breaking space U+00A0, ` ` in html
+            // element.children[0].data === $(element, article).text()
+            .filter((_, element) => element.children[0].data === String.fromCharCode(160))
+            .remove();
+
+        item.description = article.html();
+
+        return item;
+    });
+
+module.exports = {
+    parseArticle,
+    parseBlogArticle,
+};

package/lib/v2/chsi/kydt.js

@@ -0,0 +1,51 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const timezone = require('@/utils/timezone');
+const { parseDate } = require('@/utils/parse-date');
+
+const host = 'https://yz.chsi.com.cn';
+
+module.exports = async (ctx) => {
+    const response = await got(`${host}/kyzx/kydt`);
+
+    const $ = cheerio.load(response.data);
+    const list = $('ul.news-list').children();
+
+    const items = await Promise.all(
+        list.map((i, item) => {
+            item = $(item);
+            const itemTitle = item.find('a').text();
+            const itemDate = item.find('.span-time').text();
+            const path = item.find('a').attr('href');
+            let itemUrl = '';
+            if (!path.startsWith('https://') && !path.startsWith('http://')) {
+                itemUrl = host + path;
+            } else {
+                itemUrl = path;
+            }
+            return ctx.cache.tryGet(itemUrl, async () => {
+                let description = '';
+                if (!path.startsWith('https://') && !path.startsWith('http://')) {
+                    const result = await got(itemUrl);
+                    const $ = cheerio.load(result.data);
+                    description = $('#article_dnull').html().trim();
+                } else {
+                    description = itemTitle;
+                }
+                return {
+                    title: itemTitle,
+                    link: itemUrl,
+                    pubDate: timezone(parseDate(itemDate), 8),
+                    description,
+                };
+            });
+        })
+    );
+
+    ctx.state.data = {
+        title: `中国研究生招生信息网 - 考研动态`,
+        link: `${host}/kyzx/kydt/`,
+        description: '中国研究生招生信息网 - 考研动态',
+        item: items,
+    };
+};

package/lib/v2/chsi/maintainer.js

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

package/lib/v2/chsi/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'chsi.com.cn': {
+        _name: '中国研究生招生信息网',
+        yz: [
+            {
+                title: '考研动态',
+                docs: 'https://docs.rsshub.app/study.html#zhong-guo-yan-jiu-sheng-zhao-sheng-xin-xi-wang',
+                source: ['/kyzx/kydt'],
+                target: '/chsi/kydt',
+            },
+        ],
+    },
+};

package/lib/v2/chsi/router.js

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

package/lib/v2/clickme/index.js

@@ -0,0 +1,56 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const site = ctx.params.site === 'r18' ? 'r18' : '';
+    const grouping = ctx.params.grouping === 'tag' ? 'tag' : 'category';
+    const name = ctx.params.name;
+
+    const url = `https://${site ? 'r18.' : ''}clickme.net/${grouping.substring(0, 1)}/${encodeURIComponent(name)}`;
+
+    const { data: response } = await got.post('https://api.clickme.net/article/list', {
+        headers: {
+            Referer: url,
+        },
+        searchParams: {
+            key: 'clickme',
+        },
+        form: {
+            articleType: site ? 'r18' : 'article',
+            subtype: grouping,
+            subtypeSlug: name,
+            device: '',
+            limit: 18,
+            page: 1,
+        },
+    });
+
+    const category_name = name === 'new' ? '最新' : response.data.items[0].categoryName[0].name;
+    const displayed_name = grouping === 'tag' ? name : category_name;
+
+    const list = response.data.items.map((item) => ({
+        title: item.title,
+        link: item.url.replace('http://', 'https://'),
+        author: item.userNick,
+        pubDate: parseDate(item.date, 'X'),
+        category: [...item.categoryName.map((item) => item.name), ...item.tags],
+    }));
+
+    const out = await Promise.all(
+        list.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const { data } = await got.get(item.link);
+                const $ = cheerio.load(data);
+                item.description = $('.article-detail-content').html();
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: `ClickMe ${site ? 'R18 ' : ''}- ${displayed_name}`,
+        link: url,
+        item: out,
+    };
+};

package/lib/v2/clickme/maintainer.js

@@ -0,0 +1,3 @@
+module.exports = {
+    '/:site/:grouping/:name': ['hoilc'],
+};

package/lib/v2/clickme/radar.js

@@ -0,0 +1,21 @@
+module.exports = {
+    'clickme.net': {
+        _name: 'ClickMe',
+        '.': [
+            {
+                title: '文章',
+                docs: 'https://docs.rsshub.app/other.html#clickme',
+                source: ['/:grouping/:name'],
+                target: (params) => `/clickme/default/${params.grouping === 't' ? 'tag' : 'category'}/${params.name}`,
+            },
+        ],
+        r18: [
+            {
+                title: '文章',
+                docs: 'https://docs.rsshub.app/other.html#clickme',
+                source: ['/:grouping/:name'],
+                target: (params) => `/clickme/r18/${params.grouping === 't' ? 'tag' : 'category'}/${params.name}`,
+            },
+        ],
+    },
+};

package/lib/v2/clickme/router.js

@@ -0,0 +1,3 @@
+module.exports = (router) => {
+    router.get('/:site/:grouping/:name', require('./index'));
+};

package/lib/v2/cnbc/rss.js

@@ -8,7 +8,7 @@ module.exports = async (ctx) => {
 
     const items = await Promise.all(
         feed.items
-            .filter((i) => !i.link.startsWith('https://www.cnbc.com/select/'))
+            .filter((i) => i.link && !i.link.startsWith('https://www.cnbc.com/select/'))
             .map((item) =>
                 ctx.cache.tryGet(item.link, async () => {
                     const { data: response } = await got(item.link);

package/lib/v2/cnbeta/radar.js

@@ -1,22 +1,22 @@
 module.exports = {
-    'cnbeta.com': {
-        _name: 'cnBeta',
+    'cnbeta.com.tw': {
+        _name: 'cnBeta.COM',
         '.': [
             {
-                title: '最新',
-                docs: 'https://docs.rsshub.app/new-media.html#cnbeta-zuixin',
+                title: '头条资讯',
+                docs: 'https://docs.rsshub.app/new-media.html#cnbeta-com-tou-tiao-zi-xun',
                 source: ['/'],
                 target: '/cnbeta',
             },
             {
                 title: '分类',
-                docs: 'https://docs.rsshub.app/new-media.html#cnbeta-fenlei',
+                docs: 'https://docs.rsshub.app/new-media.html#cnbeta-com-fen-lei',
                 source: ['/category/:id', '/'],
                 target: '/cnbeta/category/:id',
             },
             {
                 title: '主题',
-                docs: 'https://docs.rsshub.app/new-media.html#cnbeta-zhuti',
+                docs: 'https://docs.rsshub.app/new-media.html#cnbeta-com-zhu-ti',
                 source: ['/topics/:id', '/'],
                 target: '/cnbeta/topics/:id',
             },

package/lib/v2/cnbeta/router.js

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

package/lib/v2/cnbeta/type.js

@@ -6,32 +6,26 @@ const { parseDate } = require('@/utils/parse-date');
 const { rootUrl, ProcessItems } = require('./utils');
 
 module.exports = async (ctx) => {
-    const type = ctx.params.type;
-    const id = ctx.params.id;
+    const { type, id } = ctx.params;
 
-    const currentUrl = `${rootUrl}/${type}/${id}.htm`;
+    const currentUrl = type ? `${rootUrl}/${type}/${id}.htm` : rootUrl;
 
-    let response = await got({
-        method: 'get',
-        url: currentUrl,
-    });
+    let response = await got(currentUrl);
 
     const $ = cheerio.load(response.data);
 
     const token = encodeURI($('meta[name="csrf-token"]').attr('content'));
     const apiUrl = `${rootUrl}/home/more?&type=${$('div[data-type]').attr('data-type')}&page=1&_csrf=${token}&_=${new Date().getTime()}`;
 
-    response = await got({
-        method: 'get',
-        url: apiUrl,
-    });
+    response = await got(apiUrl);
 
     const items = response.data.result.list.map((item) => ({
         title: item.title,
         description: item.hometext,
         author: item.source.split('@http')[0],
         pubDate: timezone(parseDate(item.inputtime), +8),
-        link: item.url_show.indexOf('//') === 0 ? `https:${item.url_show}` : item.url_show,
+        link: item.url_show.startsWith('//') ? `https:${item.url_show}` : item.url_show.replace('http:', 'https:'),
+        category: item.label.name,
     }));
 
     ctx.state.data = {

package/lib/v2/cnbeta/utils.js

@@ -1,18 +1,15 @@
 const got = require('@/utils/got');
 const cheerio = require('cheerio');
 
-const rootUrl = 'https://www.cnbeta.com';
+const rootUrl = 'https://www.cnbeta.com.tw';
 
 module.exports = {
     rootUrl,
-    ProcessItems: async (items, limit, tryGet) =>
-        await Promise.all(
-            items.slice(0, limit ? parseInt(limit) : 50).map((item) =>
+    ProcessItems: (items, limit, tryGet) =>
+        Promise.all(
+            items.slice(0, limit ? parseInt(limit) : 60).map((item) =>
                 tryGet(item.link, async () => {
-                    const detailResponse = await got({
-                        method: 'get',
-                        url: item.link,
-                    });
+                    const detailResponse = await got(item.link);
 
                     const content = cheerio.load(detailResponse.data);
 

package/lib/v2/cnblogs/common.js

@@ -0,0 +1,30 @@
+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 link = `https://www.cnblogs.com${ctx.path}`;
+    const response = await got(link);
+    const data = response.data;
+
+    const $ = cheerio.load(data);
+    const list = $('#post_list article')
+        .toArray()
+        .map((item) => {
+            item = $(item);
+            return {
+                title: item.find('.post-item-title').text(),
+                link: item.find('.post-item-title').attr('href'),
+                pubDate: timezone(parseDate(item.find('.post-item-foot .post-meta-item span').text() || item.find('.editorpick-item-meta').text(), ['YYYY-MM-DD HH:mm', 'YYYY-MM-DD']), +8),
+                description: item.find('.post-item-summary').text(),
+                author: item.find('.post-item-author span').text(),
+            };
+        });
+
+    ctx.state.data = {
+        title: $('title').text(),
+        link,
+        item: list,
+    };
+};

package/lib/v2/cnblogs/maintainer.js

@@ -0,0 +1,7 @@
+module.exports = {
+    '/aggsite/topdiggs': ['hujingnb'],
+    '/aggsite/topviews': ['hujingnb'],
+    '/aggsite/headline': ['hujingnb'],
+    '/cate/:type': ['hujingnb'],
+    '/pick': ['hujingnb'],
+};

package/lib/v2/cnblogs/radar.js

@@ -0,0 +1,37 @@
+module.exports = {
+    'cnblogs.com': {
+        _name: '博客园',
+        www: [
+            {
+                title: '10天推荐排行榜',
+                docs: 'https://docs.rsshub.app/blog.html#博客园',
+                source: ['/aggsite/topdiggs'],
+                target: '/cnblogs/aggsite/topdiggs',
+            },
+            {
+                title: '48小时阅读排行',
+                docs: 'https://docs.rsshub.app/blog.html#博客园',
+                source: ['/aggsite/topviews'],
+                target: '/cnblogs/aggsite/topviews',
+            },
+            {
+                title: '编辑推荐',
+                docs: 'https://docs.rsshub.app/blog.html#博客园',
+                source: ['/aggsite/headline'],
+                target: '/cnblogs/aggsite/headline',
+            },
+            {
+                title: '分类',
+                docs: 'https://docs.rsshub.app/blog.html#博客园',
+                source: ['/cate/:type'],
+                target: '/cnblogs/cate/:type',
+            },
+            {
+                title: '精华区',
+                docs: 'https://docs.rsshub.app/blog.html#博客园',
+                source: ['/pick'],
+                target: '/cnblogs/pick',
+            },
+        ],
+    },
+};

package/lib/v2/cnblogs/router.js

@@ -0,0 +1,7 @@
+module.exports = (router) => {
+    router.get('/aggsite/topdiggs', require('./common'));
+    router.get('/aggsite/topviews', require('./common'));
+    router.get('/aggsite/headline', require('./common'));
+    router.get('/cate/:type', require('./common'));
+    router.get('/pick', require('./common'));
+};

package/lib/v2/cnjxol/index.js

@@ -12,6 +12,9 @@ const categories = {
 module.exports = async (ctx) => {
     const category = ctx.params.category ?? 'jxrb';
     const id = ctx.params.id;
+    if (!Object.keys(categories).includes(category)) {
+        throw Error('Invalid category');
+    }
 
     const rootUrl = `https://${category}.cnjxol.com`;
     const currentUrl = `${rootUrl}/${category}Paper/pc/layout`;

package/lib/v2/codeforces/maintainer.js

@@ -1,3 +1,4 @@
 module.exports = {
     '/contests': ['Fatpandac'],
+    '/recent-actions': ['ftiasch'],
 };

package/lib/v2/codeforces/radar.js

@@ -1,6 +1,14 @@
 module.exports = {
     'codeforces.com': {
         _name: 'Codeforces',
+        '.': [
+            {
+                title: 'Recent Actions',
+                docs: 'https://docs.rsshub.app/programming.html#codeforces-recent-actions',
+                source: ['/recent-actions'],
+                target: '/codeforces/recent-actions',
+            },
+        ],
         www: [
             {
                 title: '最新比赛',

package/lib/v2/codeforces/recent_actions.js

@@ -0,0 +1,47 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+
+module.exports = async (ctx) => {
+    const minRating = ctx.params.minrating || 1;
+
+    const rsp = await got.get('https://codeforces.com/api/recentActions?maxCount=100').json();
+
+    const actions = rsp.result.map((action) => {
+        const pubDate = new Date(action.timeSeconds * 1000);
+
+        const blog = action.blogEntry;
+        const blogId = blog.id;
+        const blogTitle = cheerio.load(blog.title).text();
+
+        if (action.comment) {
+            const c = action.comment;
+            return {
+                title: `@${c.commentatorHandle} commented on "${blogTitle}"`,
+                description: cheerio.load(c.text).text(),
+                pubDate,
+                link: `https://codeforces.com/blog/entry/${blogId}?#comment-${c.id}`,
+                rating: c.rating,
+            };
+        }
+        return {
+            title: `@${blog.authorHandle} posted "${blogTitle}"`,
+            description: blogTitle,
+            pubDate,
+            link: `https://codeforces.com/blog/entry/${blogId}`,
+            rating: blog.rating,
+        };
+    });
+
+    ctx.state.data = {
+        title: 'Codeforces - Recent actions',
+        link: 'https://codeforces.com/recent-actions',
+        item: actions
+            .filter((a) => a.rating >= minRating)
+            .map((a) => ({
+                title: a.title,
+                description: a.description,
+                pubDate: a.pubDate,
+                link: a.link,
+            })),
+    };
+};

package/lib/v2/codeforces/router.js

@@ -1,3 +1,4 @@
 module.exports = function (router) {
     router.get('/contests', require('./contests'));
+    router.get('/recent-actions/:minrating?', require('./recent_actions'));
 };

package/lib/v2/coolapk/utils.js

@@ -6,8 +6,8 @@ const { parseDate } = require('@/utils/parse-date');
 const dynamicTpye = { 0: '基本动态', 8: '酷图', 9: '评论', 10: '提问', 11: '回答', 12: '图文', 15: '二手', 17: '观点', 20: '交易动态' };
 
 const getRandomDEVICE_ID = () => {
-    let id = [8, 4, 4, 4, 12];
-    id = id.map((i) => Math.random().toString(36).substr(2, i));
+    let id = [10, 6, 6, 6, 14];
+    id = id.map((i) => Math.random().toString(36).substring(2, i));
     return id.join('-');
 };
 
@@ -68,6 +68,7 @@ const parseDynamic = async (item, ctx) => {
     switch (type) {
         case 0:
         case 5:
+        case 7: // external share
         case 8:
         case 9:
         case 10: