rsshub 1.0.0-master.fe50f9c → 1.0.0-master.fe560d2

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/codeforces/templates/contest.art

@@ -1,11 +1,6 @@
-<text>比赛：{{ title }}</text>
-<br>
-<text>开始时间：{{ startTime }}</text>
-<br>
-<text>持续时间：{{ durationTime }} 分钟</text>
-<br>
-<text>相对时间：{{ relativeTime }} 分钟</text>
-<br>
-<text>比赛类型：{{ type }}</text>
-<br>
+<p>比赛：{{ title }}</p>
+<p>开始时间：{{ startTime }}</p>
+<p>持续时间：{{ durationTime }} 分钟</p>
+<p>相对时间：{{ relativeTime }} 分钟</p>
+<p>比赛类型：{{ type }}</p>
 

package/lib/{routes → v2}/comicskingdom/index.js

@@ -1,27 +1,25 @@
 const got = require('@/utils/got');
 const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+const { art } = require('@/utils/render');
+const path = require('path');
 
 module.exports = async (ctx) => {
-    const baseURL = 'https://www.comicskingdom.com';
+    const baseURL = 'https://comicskingdom.com';
     const name = ctx.params.name;
     const url = `${baseURL}/${name}/archive`;
-    const response = await got({
-        method: 'get',
-        url,
-    });
+    const { data } = await got(url);
 
-    const data = response.data;
     const $ = cheerio.load(data);
 
     // Determine Comic and Author from main page
     const comic = $('title').text().replace('Comics Kingdom - ', '').trim();
-    const author = $('div.author p').text();
+    const author = $('.feature-title h2').text();
 
     // Find the links for all non-archived items
-    const links = $('div.archive-tile[data-is-blocked=false]')
-        .map((i, el) => $(el).find('a[data-prem="Comic Tile"]').first().attr('href'))
-        .get()
-        .map((url) => `${baseURL}${url}`);
+    const links = $('div.tile')
+        .toArray()
+        .map((el) => $(el).find('a').first().attr('href'));
 
     if (links.length === 0) {
         throw `Comic Not Found - ${name}`;
@@ -29,17 +27,16 @@ module.exports = async (ctx) => {
     const items = await Promise.all(
         links.map((link) =>
             ctx.cache.tryGet(link, async () => {
-                const detailResponse = await got({
-                    method: 'get',
-                    url: link,
-                });
+                const detailResponse = await got(link);
                 const content = cheerio.load(detailResponse.data);
 
-                const title = content('title').text();
+                const title = content('meta[property="og:description"]').attr('content');
                 const image = content('meta[property="og:image"]').attr('content');
-                const description = `<img src="${image}" />`;
+                const description = art(path.join(__dirname, 'templates/desc.art'), {
+                    image,
+                });
                 // Pull the date out of the URL
-                const pubDate = new Date(link.split('/').slice(-3).join('/')).toUTCString();
+                const pubDate = parseDate(link.substring(link.lastIndexOf('/') + 1), 'YYYY-MM-DD');
 
                 return {
                     title,
@@ -54,8 +51,10 @@ module.exports = async (ctx) => {
     );
 
     ctx.state.data = {
-        title: `${comic} - Comics Kingdom`,
+        title: comic,
         link: url,
+        image: $('.feature-logo').attr('src'),
         item: items,
+        language: 'en-US',
     };
 };

package/lib/v2/comicskingdom/maintainer.js

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

package/lib/v2/comicskingdom/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'comicskingdom.com': {
+        _name: 'Comics Kingdom',
+        '.': [
+            {
+                title: 'Archive',
+                docs: 'https://docs.rsshub.app/anime.html#comics-kingdom',
+                source: ['/:name/*', '/:name'],
+                target: '/comicskingdom/:name',
+            },
+        ],
+    },
+};

package/lib/v2/comicskingdom/router.js

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

package/lib/v2/comicskingdom/templates/desc.art

@@ -0,0 +1 @@
+<img src="{{ image }}">

package/lib/{routes → v2}/coolapk/dyh.js

@@ -4,16 +4,12 @@ const utils = require('./utils');
 module.exports = async (ctx) => {
     const dyhId = ctx.params.dyhId;
     const full_url = utils.base_url + `/v6/dyhArticle/list?dyhId=${dyhId}&type=all&page=1`;
-    const r = await got({
-        method: 'get',
-        url: utils.base_url + `/v6/dyh/detail?dyhId=${dyhId}`,
+    const r = await got(`${utils.base_url}/v6/dyh/detail?dyhId=${dyhId}`, {
         headers: utils.getHeaders(),
     });
     let targetTitle = r.data.data.title;
     const feedDescription = r.data.data.description;
-    const response = await got({
-        method: 'get',
-        url: full_url,
+    const response = await got(full_url, {
         headers: utils.getHeaders(),
     });
     const data = response.data.data;

package/lib/{routes → v2}/coolapk/hot.js

@@ -69,9 +69,7 @@ module.exports = async (ctx) => {
     const type = ctx.params.type || 'jrrm';
     const period = ctx.params.period || 'daily';
     const { link, title } = getLinkAndTitle(type, period);
-    const r = await got({
-        method: 'get',
-        url: link,
+    const r = await got(link, {
         headers: utils.getHeaders(),
     });
     const data = r.data.data;

package/lib/{routes → v2}/coolapk/huati.js

@@ -4,9 +4,7 @@ const utils = require('./utils');
 module.exports = async (ctx) => {
     const tag = ctx.params.tag;
     const full_url = utils.base_url + `/v6/page/dataList?url=%23%2Ffeed%2FmultiTagFeedList%3FlistType%3Ddateline_desc%26tag=${tag}&title=%E6%9C%80%E6%96%B0%E5%8F%91%E5%B8%83&subTitle=&page=1`;
-    const response = await got({
-        method: 'get',
-        url: full_url,
+    const response = await got(full_url, {
         headers: utils.getHeaders(),
     });
     const data = response.data.data;

package/lib/v2/coolapk/maintainer.js

@@ -0,0 +1,9 @@
+module.exports = {
+    '/dyh/:dyhId': ['xizeyoupan'],
+    '/huati/:tag': ['xizeyoupan'],
+    '/hot/:type?/:period?': ['xizeyoupan'],
+    '/toutiao/:type?': ['xizeyoupan'],
+    '/tuwen/:type?': ['xizeyoupan'],
+    '/tuwen-xinxian': ['xizeyoupan'],
+    '/user/:uid/dynamic': ['xizeyoupan'],
+};

package/lib/v2/coolapk/radar.js

@@ -0,0 +1,31 @@
+module.exports = {
+    'coolapk.com': {
+        _name: '酷安',
+        '.': [
+            {
+                title: '图文',
+                docs: 'https://docs.rsshub.app/social-media.html#ku-an',
+            },
+            {
+                title: '头条',
+                docs: 'https://docs.rsshub.app/social-media.html#ku-an',
+            },
+            {
+                title: '看看号',
+                docs: 'https://docs.rsshub.app/social-media.html#ku-an',
+            },
+            {
+                title: '话题',
+                docs: 'https://docs.rsshub.app/social-media.html#ku-an',
+            },
+            {
+                title: '用户',
+                docs: 'https://docs.rsshub.app/social-media.html#ku-an',
+            },
+            {
+                title: '热榜',
+                docs: 'https://docs.rsshub.app/social-media.html#ku-an',
+            },
+        ],
+    },
+};

package/lib/v2/coolapk/router.js

@@ -0,0 +1,9 @@
+module.exports = (router) => {
+    router.get('/dyh/:dyhId', require('./dyh'));
+    router.get('/huati/:tag', require('./huati'));
+    router.get('/hot/:type?/:period?', require('./hot'));
+    router.get('/toutiao/:type?', require('./toutiao'));
+    router.get('/tuwen/:type?', require('./tuwen'));
+    router.get('/tuwen-xinxian', require('./tuwen'));
+    router.get('/user/:uid/dynamic', require('./userDynamic'));
+};

package/lib/{routes → v2}/coolapk/toutiao.js

@@ -13,9 +13,7 @@ module.exports = async (ctx) => {
             title: '最新动态',
         },
     };
-    const response = await got({
-        method: 'get',
-        url: urls[type].url,
+    const response = await got(urls[type].url, {
         headers: utils.getHeaders(),
     });
     const data = response.data.data;

package/lib/{routes → v2}/coolapk/tuwen.js

@@ -12,12 +12,10 @@ module.exports = async (ctx) => {
         feedTitle = `酷安 - 新鲜图文`;
     } else if (ctx.originalUrl.startsWith(`/coolapk/tuwen`)) {
         // 精选
-        full_url = utils.base_url + '/v6/page/dataList?url=%23%2Ffeed%2FdigestList%3Ftype%3D12%26is_html_article%3D1%26recommend%3D3&title=%E5%9B%BE%E6%96%87&page=1';
+        full_url = utils.base_url + '/v6/page/dataList?url=%23%2Ffeed%2FdigestList%3Ftype%3D12%26is_html_article%3D1%26recommend%3D3%252C4&title=%E5%9B%BE%E6%96%87&page=1';
         feedTitle = `酷安图文 - 编辑精选`;
     }
-    const response = await got({
-        method: 'get',
-        url: full_url,
+    const response = await got(full_url, {
         headers: utils.getHeaders(),
     });
     const data = response.data.data;

package/lib/{routes → v2}/coolapk/userDynamic.js

@@ -5,9 +5,7 @@ module.exports = async (ctx) => {
     const uid = ctx.params.uid;
     const full_url = utils.base_url + `/v6/user/feedList?uid=${uid}&page=1&showAnonymous=0&isIncludeTop=1&showDoing=1`;
     let username;
-    const response = await got({
-        method: 'get',
-        url: full_url,
+    const response = await got(full_url, {
         headers: utils.getHeaders(),
     });
     const data = response.data.data;

package/lib/{routes → v2}/coolapk/utils.js

@@ -1,6 +1,7 @@
 const md5 = require('@/utils/md5');
 const cheerio = require('cheerio');
 const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
 
 const dynamicTpye = { 0: '基本动态', 8: '酷图', 9: '评论', 10: '提问', 11: '回答', 12: '图文', 15: '二手', 17: '观点', 20: '交易动态' };
 
@@ -49,13 +50,13 @@ const parseTuwenFromRaw = (raw) =>
                 <img src="${i.url}">
                 <p class="image-caption" style="text-align: center;">${i.description}</p></div>`;
         } else {
-            // console.log(i)
+            // console.log(i);
             return `Unkown type`;
         }
     });
 
 const parseDynamic = async (item, ctx) => {
-    const pubDate = new Date(item.lastupdate * 1000).toUTCString();
+    const pubDate = parseDate(item.lastupdate, 'X');
     if (item.entityType === 'sponsorCard') {
         return;
     } else if (item.shareUrl === undefined) {
@@ -66,6 +67,7 @@ const parseDynamic = async (item, ctx) => {
     const type = parseInt(item.type);
     switch (type) {
         case 0:
+        case 5:
         case 8:
         case 9:
         case 10:
@@ -77,12 +79,10 @@ const parseDynamic = async (item, ctx) => {
             if (item.issummary) {
                 // 需要爬内容
                 description = await ctx.cache.tryGet(itemUrl, async () => {
-                    const result = await got({
-                        method: 'get',
-                        url: itemUrl,
+                    const result = await got(itemUrl, {
                         headers: getHeaders(),
                     });
-                    const message = `<p>` + result.data.data.message.split('\n').join('<br>') + `</p>`;
+                    const message = `<p>` + result.data.data?.message.split('\n').join('<br>') + `</p>`;
                     const picArr = item.picArr.filter((i) => i).map((i) => `<img src="${i}">`); // 若无图片，item.picArr=[""]
                     return message + picArr.join('');
                 });
@@ -112,9 +112,7 @@ const parseDynamic = async (item, ctx) => {
         case 12: {
             title = item.title;
             description = await ctx.cache.tryGet(itemUrl, async () => {
-                const result = await got({
-                    method: 'get',
-                    url: itemUrl,
+                const result = await got(itemUrl, {
                     headers: getHeaders(),
                 });
 

package/lib/v2/creative-comic/book.js

@@ -0,0 +1,60 @@
+const { parseDate } = require('@/utils/parse-date');
+const { art } = require('@/utils/render');
+const path = require('path');
+const { getUuid, getBook, getChapter, getChapters, getImgEncrypted, getImgKey, decrypt, getRealKey, siteHost } = require('./utils');
+
+module.exports = async (ctx) => {
+    const { id, coverOnly = 'true', quality = '1' } = ctx.params;
+    const uuid = await getUuid(ctx.cache.tryGet);
+    let { data: book } = await getBook(id, uuid);
+    let { data: chapters } = await getChapters(id, uuid);
+    book = book.data;
+    chapters = chapters.data;
+
+    const items = await Promise.all(
+        chapters.chapters.map(async (c) => {
+            let pages;
+            if (coverOnly !== 'true' && coverOnly !== '1') {
+                let { data: chapter } = await getChapter(c.id, uuid);
+                chapter = chapter.data;
+
+                if (chapter.chapter.free_day === null || chapter.chapter.free_day === 0) {
+                    pages = await Promise.all(
+                        chapter.chapter.proportion.map(async (p) => {
+                            let { data: imgKey } = await getImgKey(p.id, uuid);
+                            imgKey = imgKey.data.key;
+
+                            const realKey = getRealKey(imgKey);
+                            const encrypted = await getImgEncrypted(p.id, quality);
+
+                            return ctx.cache.tryGet(`${siteHost}/fs/chapter_content/encrypt/${p.id}/${quality}`, () => decrypt(encrypted, realKey));
+                        })
+                    );
+                }
+            }
+
+            return {
+                title: c.vol_name,
+                description: art(path.join(__dirname, 'templates/chapter.art'), {
+                    chapter: c,
+                    pages,
+                    cover: c.image1,
+                }),
+                pubDate: parseDate(c.online_at),
+                updated: parseDate(c.updated_at),
+                link: `https://www.creative-comic.tw/reader_comic/${c.id}`,
+                author: book.author.map((author) => author.name).join(', '),
+                category: book.tags.map((tag) => tag.name),
+            };
+        })
+    );
+
+    ctx.state.data = {
+        title: `${book.name} | CCC創作集`,
+        description: `${book.brief} ${book.description}`,
+        link: book.share_link,
+        image: book.image1,
+        item: items,
+        language: 'zh-hant',
+    };
+};

package/lib/v2/creative-comic/maintainer.js

@@ -0,0 +1,3 @@
+module.exports = {
+    '/book/:id/:coverOnly?/:quality?': ['TonyRL'],
+};

package/lib/v2/creative-comic/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'creative-comic.tw': {
+        _name: 'CCC 創作集',
+        '.': [
+            {
+                title: '漫畫',
+                docs: 'https://docs.rsshub.app/anime.html#ccc-chuang-zuo-ji',
+                source: ['/book/:id/*'],
+                target: '/creative-comic/:id',
+            },
+        ],
+    },
+};

package/lib/v2/creative-comic/router.js

@@ -0,0 +1,3 @@
+module.exports = (router) => {
+    router.get('/book/:id/:coverOnly?/:quality?', require('./book'));
+};

package/lib/v2/creative-comic/templates/chapter.art

@@ -0,0 +1,11 @@
+{{ if chapter }}
+    <p>{{ chapter.name }}</p>
+{{ /if }}
+{{ if pages }}
+    {{ each pages page }}
+        <br><img src="{{ page }}">
+    {{ /each }}
+{{ /if }}
+{{ if cover }}
+    <img src="{{ cover }}">
+{{ /if }}

package/lib/v2/creative-comic/utils.js

@@ -0,0 +1,96 @@
+const got = require('@/utils/got');
+const CryptoJS = require('crypto-js');
+
+const apiHost = 'https://api.creative-comic.tw';
+const siteHost = 'https://www.creative-comic.tw';
+const device = 'web_desktop';
+const DEFAULT_TOKEN = 'freeforccc2020reading';
+
+const getBook = (bookId, uuid) =>
+    got(`${apiHost}/book/${bookId}/info`, {
+        headers: {
+            device,
+            uuid,
+        },
+    });
+
+const getChapter = (id, uuid) =>
+    got(`${apiHost}/book/chapter/${id}`, {
+        headers: {
+            device,
+            uuid,
+        },
+    });
+
+const getChapters = (bookId, uuid) =>
+    got(`${apiHost}/book/${bookId}/chapter`, {
+        headers: {
+            device,
+            uuid,
+        },
+    });
+
+const getImgEncrypted = async (pageId, quality) => {
+    const { data: res } = await got(`${siteHost}/fs/chapter_content/encrypt/${pageId}/${quality}`, {
+        headers: {
+            device,
+        },
+        responseType: 'buffer',
+    });
+    return Buffer.from(res).toString('base64');
+};
+
+const getImgKey = (pageId, uuid) =>
+    got(`${apiHost}/book/chapter/image/${pageId}`, {
+        headers: {
+            device,
+            uuid,
+        },
+    });
+
+const getUuid = (tryGet) =>
+    tryGet('creative-comic:uuid', async () => {
+        const { data } = await got(`${apiHost}/guest`, {
+            headers: {
+                device,
+            },
+        });
+        return data.data;
+    });
+
+const decrypt = (encrypted, secrets) =>
+    CryptoJS.AES.decrypt(encrypted, CryptoJS.enc.Hex.parse(secrets.key), {
+        iv: CryptoJS.enc.Hex.parse(secrets.iv),
+        mode: CryptoJS.mode.CBC,
+        padding: CryptoJS.pad.Pkcs7,
+    }).toString(CryptoJS.enc.Utf8);
+
+const token2Key = (token) => {
+    const t = CryptoJS.SHA512(token).toString();
+    return {
+        key: t.substring(0, 64),
+        iv: t.substring(30, 62), // t.substr(30, 32)
+    };
+};
+
+const getRealKey = (imgKey, token = DEFAULT_TOKEN) => {
+    const secrets = token2Key(token);
+    const key = decrypt(imgKey, secrets);
+    const realKey = key.split(':');
+    return {
+        key: realKey[0],
+        iv: realKey[1],
+    };
+};
+
+module.exports = {
+    getBook,
+    getChapter,
+    getChapters,
+    getImgEncrypted,
+    getImgKey,
+    getUuid,
+    decrypt,
+    token2Key,
+    getRealKey,
+};

package/lib/v2/curius/links.js

@@ -0,0 +1,43 @@
+const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
+const { art } = require('@/utils/render');
+const path = require('path');
+
+module.exports = async (ctx) => {
+    const username = ctx.params.name;
+
+    const name_response = await got(`https://curius.app/api/users/${username}`, {
+        headers: {
+            Referer: `https://curius.app/${username}`,
+        },
+    });
+
+    const data = name_response.data;
+
+    const uid = data.user.id;
+    const name = `${data.user.firstName} ${data.user.lastName}`;
+
+    const response = await got(`https://curius.app/api/users/${uid}/links?page=0`, {
+        headers: {
+            Referer: `https://curius.app/${username}`,
+        },
+    });
+
+    const items = response.data.userSaved.map((item) => ({
+        title: item.title,
+        description: art(path.join(__dirname, 'templates/description.art'), {
+            item,
+        }),
+        link: item.link,
+        pubDate: parseDate(item.createdDate),
+        guid: `curius:${username}:${item.id}`,
+    }));
+
+    ctx.state.data = {
+        title: `${name} - Curius`,
+        link: `https://curius.app/${username}`,
+        description: `${name} - Curius`,
+        allowEmpty: true,
+        item: items,
+    };
+};

package/lib/v2/curius/maintainer.js

@@ -0,0 +1,3 @@
+module.exports = {
+    '/links/:name': ['Ovler-Young'],
+};

package/lib/v2/curius/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'curius.app': {
+        _name: 'Curius',
+        '.': [
+            {
+                title: '用户',
+                docs: 'https://docs.rsshub.app/social-media.html#curius',
+                source: '/:name',
+                target: '/curius/links/:name',
+            },
+        ],
+    },
+};

package/lib/v2/curius/router.js

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

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

@@ -0,0 +1,16 @@
+{{ if item.metadata.full_text }}
+    原文：{{@ item.metadata.full_text.replace(/\n/gm, '<br>') }}<br><br>
+{{ /if }}
+{{ if item.comments.length }}
+    评论：{{ item.comments[0].text.substring(0, 100) }}<br><br>
+{{ /if }}
+{{ if item.highlights.length }}
+    评论：
+    {{ each item.highlights highlight }}
+        {{ if highlight.comment }}
+            {{ highlight.highlight }}<br>评论：{{ highlight.comment.text }}<br>
+        {{ else }}
+            <br>标注：{{ highlight.highlight }}<br>
+        {{ /if }}
+    {{ /each }}
+{{ /if }}

package/lib/v2/cw/master.js

@@ -1,9 +1,12 @@
 const cheerio = require('cheerio');
-const { baseUrl, cookieJar, got, parseList, parseItems } = require('./utils');
+const { baseUrl, cookieJar, got, parseList, parseItems, getCookie } = require('./utils');
 
 module.exports = async (ctx) => {
     const { channel } = ctx.params;
     const pageUrl = `${baseUrl}/masterChannel.action`;
+    if (!cookieJar) {
+        await getCookie();
+    }
     const { data: response } = await got(pageUrl, {
         headers: {
             Referer: baseUrl,