rsshub 1.0.0-master.f8b1c8d → 1.0.0-master.f961961

package/lib/v2/cngal/radar.js

@@ -0,0 +1,19 @@
+module.exports = {
+    'cngal.org': {
+        _name: 'CnGal',
+        www: [
+            {
+                title: '每周速报',
+                docs: 'https://docs.rsshub.app/anime.html#cngal-mei-zhou-su-bao',
+                source: ['/', '/weeklynews'],
+                target: '/cngal/weekly',
+            },
+            {
+                title: '制作者/游戏新闻',
+                docs: 'https://docs.rsshub.app/anime.html#cngal-zhi-zuo-zhe-you-xi-xin-wen',
+                source: ['/entries/index/:id'],
+                target: '/cngal/entry/:id',
+            },
+        ],
+    },
+};

package/lib/v2/cngal/router.js

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

package/lib/v2/cngal/templates/entry-description.art

@@ -0,0 +1,4 @@
+<p>{{ briefIntroduction }}</p>
+{{ if image }}
+    <img src="{{ image }}"/>
+{{ /if }}

package/lib/v2/cngal/templates/weekly-description.art

@@ -0,0 +1,4 @@
+<p>{{@ briefIntroduction.trim().replace(/\n/g, '<br>') }}</p>
+{{ if mainImage }}
+    <img src="{{ mainImage }}"/>
+{{ /if }}

package/lib/v2/cngal/weekly.js

@@ -0,0 +1,20 @@
+const got = require('@/utils/got');
+const { art } = require('@/utils/render');
+const path = require('path');
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const response = await got('https://www.cngal.org/api/news/GetWeeklyNewsOverview');
+
+    ctx.state.data = {
+        title: 'CnGal - 每周速报',
+        link: 'https://www.cngal.org/weeklynews',
+        item: response.data.map((item) => ({
+            title: item.name,
+            description: art(path.join(__dirname, 'templates/weekly-description.art'), item),
+            pubDate: parseDate(item.lastEditTime),
+            link: `https://www.cngal.org/articles/index/${item.id}`,
+        })),
+    };
+    ctx.state.json = response.data;
+};

package/lib/v2/cnki/author.js

@@ -0,0 +1,45 @@
+const utils = require('./utils');
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+
+const rootUrl = 'https://chn.oversea.cnki.net/kcms/detail/frame/knetlist.aspx?infotype=4&codetype=1&vl=&';
+const authorPageRootUrl = 'https://kns.cnki.net/kcms/detail/knetsearch.aspx?sfield=au&';
+
+module.exports = async (ctx) => {
+    const { code } = ctx.params;
+
+    const authorPageUrl = `${authorPageRootUrl}code=${code}`;
+
+    const res = await got(authorPageUrl);
+    const $ = cheerio.load(res.data);
+    const authorName = $('#showname').text();
+    const companyName = $('body > div.wrapper > div.main > div.container.full-screen > div > div:nth-child(3) > h3:nth-child(2) > span > a').text();
+
+    const url = `${rootUrl}code=${code}`;
+
+    const list = await got
+        .get(url, {
+            headers: {
+                Referer: authorPageUrl,
+            },
+        })
+        .then((res) => {
+            const $ = cheerio.load(res.data);
+            const list = $('.bignum')
+                .children()
+                .map((_, e) => ({
+                    title: $(e).find('a').first().text().trim(),
+                    link: 'https://chn.oversea.cnki.net' + $(e).find('a').first().attr('href'),
+                }))
+                .get();
+            return list;
+        });
+
+    const items = await Promise.all(list.map((item) => ctx.cache.tryGet(item.link, () => utils.ProcessItem(item))));
+
+    ctx.state.data = {
+        title: `知网 ${authorName} ${companyName}`,
+        link: authorPageUrl,
+        item: items,
+    };
+};

package/lib/v2/cnki/journals.js

@@ -1,8 +1,7 @@
 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 { ProcessItem } = require('./utils');
 
 const rootUrl = 'https://chn.oversea.cnki.net';
 
@@ -44,27 +43,7 @@ module.exports = async (ctx) => {
         return item;
     });
 
-    const items = await Promise.all(
-        list.map((item) =>
-            ctx.cache.tryGet(item.link, async () => {
-                const detailResponse = await got.get(item.link);
-                const $ = cheerio.load(detailResponse.data);
-                item.description = art(path.join(__dirname, 'templates/desc.art'), {
-                    author: $('h3.author > span')
-                        .map((_, item) => $(item).text())
-                        .get()
-                        .join(' '),
-                    company: $('a.author')
-                        .map((_, item) => $(item).text())
-                        .get()
-                        .join(' '),
-                    content: $('div.row > span.abstract-text').parent().text(),
-                });
-
-                return item;
-            })
-        )
-    );
+    const items = await Promise.all(list.map((item) => ctx.cache.tryGet(item.link, () => ProcessItem(item))));
 
     ctx.state.data = {
         title: String(title),

package/lib/v2/cnki/maintainer.js

@@ -1,4 +1,5 @@
 module.exports = {
     '/journals/:name': ['Fatpandac'],
     '/journals/debut/:name': ['Fatpandac'],
+    '/author/:code': ['harveyqiu'],
 };

package/lib/v2/cnki/radar.js

@@ -15,5 +15,13 @@ module.exports = {
                 target: '/cnki/journals/debut/:name',
             },
         ],
+        kns: [
+            {
+                title: '作者期刊文献',
+                docs: 'https://docs.rsshub.app/journal.html#zhong-guo-zhi-wang-zuo-zhe-qi-kan-wen-xian',
+                source: ['/kcms/detail/knetsearch.aspx', '/'],
+                target: (_, url) => `/cnki/author/${new URL(url).searchParams.get('code')}`,
+            },
+        ],
     },
 };

package/lib/v2/cnki/router.js

@@ -1,4 +1,5 @@
 module.exports = function (router) {
     router.get('/journals/:name', require('./journals'));
     router.get('/journals/debut/:name', require('./debut'));
+    router.get('/author/:code', require('./author'));
 };

package/lib/v2/cnki/utils.js

@@ -0,0 +1,26 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { art } = require('@/utils/render');
+const path = require('path');
+
+const ProcessItem = async (item) => {
+    const detailResponse = await got(item.link);
+    const $ = cheerio.load(detailResponse.data);
+    item.description = art(path.join(__dirname, 'templates/desc.art'), {
+        author: $('h3.author > span')
+            .map((_, item) => $(item).text())
+            .get()
+            .join(' '),
+        company: $('a.author')
+            .map((_, item) => $(item).text())
+            .get()
+            .join(' '),
+        content: $('div.row > span.abstract-text').parent().text(),
+    });
+
+    return item;
+};
+
+module.exports = {
+    ProcessItem,
+};

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 }}