rsshub 1.0.0-master.fe4f650 → 1.0.0-master.fe560d2

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

@@ -1,6 +1,13 @@
 const got = require('@/utils/got');
 const cheerio = require('cheerio');
 const { JSDOM } = require('jsdom');
+const { parseDate } = require('@/utils/parse-date');
+const { art } = require('@/utils/render');
+const path = require('path');
+const dayjs = require('dayjs');
+const localizedFormat = require('dayjs/plugin/localizedFormat');
+require('dayjs/locale/zh-cn');
+dayjs.extend(localizedFormat);
 
 function nuxtReader(data) {
     let nuxt = {};
@@ -21,10 +28,7 @@ function generateImageLink(link) {
 }
 
 async function load(link) {
-    const response = await got({
-        method: 'get',
-        url: link,
-    });
+    const response = await got(link);
 
     const data = response.data;
 
@@ -37,20 +41,17 @@ async function load(link) {
 }
 
 async function loadNews(link) {
-    const response = await got({
-        method: 'get',
-        url: link,
-    });
+    const response = await got(link);
 
     const data = response.data;
 
     const $ = cheerio.load(data);
     let description = $('.detail-body-container').html();
-    const date = $('.topics-articleHead__date').html();
-    description = description.replace(new RegExp('src="/topics/', 'g'), ' src="https://www.nintendo.com.hk/topics/');
+    const date = $('.topics-articleHead__date').text();
+    description = description.replace(/src="\/topics\//g, 'src="https://www.nintendo.com.hk/topics/');
     return {
         content: description,
-        date: new Date(date).toUTCString(),
+        pubDate: parseDate(date, 'YYYY.M.D'),
     };
 }
 
@@ -58,7 +59,7 @@ const ProcessItem = (list, caches) =>
     Promise.all(
         list.map(async (item) => {
             const other = await caches.tryGet(item.link, () => load(item.link));
-            return Promise.resolve(Object.assign({}, item, other));
+            return { ...item, ...other };
         })
     );
 
@@ -66,7 +67,7 @@ const ProcessNews = (list, caches) =>
     Promise.all(
         list.map(async (item) => {
             const other = await caches.tryGet(item.url, () => loadNews('https://www.nintendo.com.hk' + item.url));
-            return Promise.resolve(Object.assign({}, item, other));
+            return { ...item, ...other };
         })
     );
 
@@ -129,50 +130,33 @@ const ProcessNews = (list, caches) =>
 const ProcessItemChina = (list, cache) =>
     Promise.all(
         list.map(async (item) => {
-            const n = await cache.tryGet(item.link, async () =>
-                nuxtReader(
-                    (
-                        await got({
-                            url: item.link,
-                            method: 'get',
-                        })
-                    ).data
-                )
-            );
+            if (!item.link.startsWith('https://www.nintendoswitch.com.cn/software/')) {
+                return item;
+            }
+            const n = await cache.tryGet(item.link, async () => nuxtReader((await got(item.link)).data));
             const software = n.data;
-            return Promise.resolve(
-                Object.assign({}, item, {
-                    category: [...item.category, ...software.supportLanguages, ...software.genre, ...software.playMode],
-                    description: `
-            ${item.description}
-            价格: ${software.price} ${software.currency} <br/>
-            大小：${software.sizeNum} ${software.sizeUnit} <br/>
-
-            ${software.descriptionContent}
-            `,
-                })
-            );
+            return {
+                ...item,
+                category: [...software.supportLanguages, ...software.genre, ...software.playMode],
+                description: art(path.join(__dirname, 'templates/eshop_cn.art'), {
+                    item,
+                    software,
+                    releaseDatetime: dayjs(software.releaseDatetime).locale('zh-cn').format('lll'),
+                }),
+            };
         })
     );
 
 const ProcessNewsChina = (list, cache) =>
     Promise.all(
         list.map(async (item) => {
-            const n = await cache.tryGet(item.link, async () =>
-                nuxtReader(
-                    (
-                        await got({
-                            url: item.link,
-                            method: 'get',
-                        })
-                    ).data
-                )
-            );
-            return Promise.resolve(
-                Object.assign({}, item, {
-                    description: item.description + n.newsData.content,
-                })
-            );
+            const n = await cache.tryGet(item.link, async () => nuxtReader((await got(item.link)).data));
+            return {
+                ...item,
+                description: item.description + n.newsData.content,
+                category: n.newsData.category,
+                pubDate: parseDate(n.newsData.releaseTime, 'x'),
+            };
         })
     );
 

package/lib/v2/njxzc/home.js

@@ -36,15 +36,19 @@ module.exports = async (ctx) => {
             // 使用缓存
             ctx.cache.tryGet(item.link, async () => {
                 const response = await got(item.link);
-                const $ = cheerio.load(response.data);
-                item.title = $('.arti_title').text();
-                item.description = $('.wp_articlecontent')
-                    .html()
-                    .replace(/src="\//g, `src="${new URL('.', host).href}`)
-                    .replace(/href="\//g, `href="${new URL('.', host).href}`)
-                    .trim();
-                item.pubDate = timezone(parseDate($('.arti_update').text().replace('发布时间：', '')), +8);
-
+                if (response.redirectUrls.length > 0) {
+                    item.link = response.redirectUrls[0];
+                    item.description = '该通知无法直接预览，请点击原文链接↑查看';
+                } else {
+                    const $ = cheerio.load(response.data);
+                    item.title = $('.arti_title').text();
+                    item.description = $('.wp_articlecontent')
+                        .html()
+                        .replace(/src="\//g, `src="${new URL('.', host).href}`)
+                        .replace(/href="\//g, `href="${new URL('.', host).href}`)
+                        .trim();
+                    item.pubDate = timezone(parseDate($('.arti_update').text().replace('发布时间：', '')), +8);
+                }
                 return item;
             })
         )

package/lib/v2/nmtv/column.js

@@ -0,0 +1,53 @@
+const got = require('@/utils/got');
+const timezone = require('@/utils/timezone');
+const { parseDate } = require('@/utils/parse-date');
+const { art } = require('@/utils/render');
+const path = require('path');
+
+module.exports = async (ctx) => {
+    const id = ctx.params.id ?? '877';
+    const limit = ctx.query.limit ? parseInt(ctx.query.limit) : 100;
+
+    const hostUrl = 'https://vod.m2oplus.nmtv.cn';
+    const apiRootUrl = 'https://mapi.m2oplus.nmtv.cn';
+    const apiUrl = `${apiRootUrl}/api/v1/contents.php?offset=0&count=${limit}&column_id=${id}`;
+
+    const response = await got({
+        method: 'get',
+        url: apiUrl,
+    });
+
+    const data = response.data;
+
+    const items = data.map((item) => {
+        const enclosure_url = `${hostUrl}/${item.target_path}${item.target_filename}`;
+        const enclosure_type = `${item.type}/${enclosure_url.match(/\.(\w+)$/)[1]}`;
+
+        return {
+            title: item.title,
+            link: item.content_url,
+            author: item.column_name,
+            pubDate: timezone(parseDate(item.publish_time), +8),
+            description: art(path.join(__dirname, 'templates/description.art'), {
+                type: item.type,
+                image: item.index_pic,
+                file: enclosure_url,
+            }),
+            enclosure_url,
+            enclosure_type,
+            itunes_duration: item.video.duration,
+            itunes_item_image: item.index_pic,
+        };
+    });
+
+    const author = data[0].column_name;
+    const imageUrl = data[0].column_info.indexpic;
+
+    ctx.state.data = {
+        title: `内蒙古广播电视台 - ${author}`,
+        link: items[0].link.split(/\/\d{4}-\d{2}-\d{2}\//)[0],
+        item: items,
+        image: `${imageUrl.host}${imageUrl.filepath}${imageUrl.filename}`,
+        itunes_author: author,
+    };
+};

package/lib/v2/nmtv/maintainer.js

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

package/lib/v2/nmtv/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'nmtv.cn': {
+        _name: '内蒙古广播电视台',
+        '.': [
+            {
+                title: '点播',
+                docs: 'https://docs.rsshub.app/traditional-media.html#nei-meng-gu-guang-bo-dian-shi-tai-dian-bo',
+                source: ['/'],
+                target: (params, url) => `/nmtv/column/${new URL(url).toString.split(/\/folder/).pop()}`,
+            },
+        ],
+    },
+};

package/lib/v2/nmtv/router.js

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

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

@@ -0,0 +1,9 @@
+{{ if type === 'audio' }}
+<audio controls="controls">
+<source src="{{ file }}" type="audio/mp3">
+</audio>
+{{ else if type === 'video' }}
+<video controls poster="{{ image }}">
+<source src="{{ file }}" type="video/mp4">
+</video>
+{{ /if }}

package/lib/v2/nua/lib.js

@@ -0,0 +1,39 @@
+const util = require('./utils');
+const baseUrl = 'https://lib.nua.edu.cn';
+
+module.exports = async (ctx) => {
+    const type = ctx.params.type;
+    let webPageName;
+
+    switch (type) {
+        case 'xwdt':
+            webPageName = '.wp_column.column-1.selected';
+            break;
+        case 'djdt':
+            webPageName = '.wp_column.column-2.selected';
+            break;
+        case 'zydt':
+            webPageName = '.wp_column.column-3.selected';
+            break;
+        case 'fwdt':
+            webPageName = '.wp_column.column-4.selected';
+            break;
+        default:
+            throw Error(`暂不支持对${type}的订阅`);
+    }
+
+    const newsUrl = `${baseUrl}/${type}/list.htm`;
+    const listName = 'div.news_con';
+    const artiContent = '.wp_articlecontent';
+    const listDate = '.news_date';
+
+    const items = await util.ProcessList(newsUrl, baseUrl, listName, listDate, webPageName);
+    const results = await util.ProcessFeed(items[0], artiContent, ctx);
+
+    ctx.state.data = {
+        title: 'NUA-图书馆-' + items[1],
+        link: `${baseUrl}/${type}/list.htm`,
+        description: '南京艺术学院 图书馆 ' + items[1],
+        item: results,
+    };
+};

package/lib/v2/nua/maintainer.js

@@ -2,5 +2,6 @@ module.exports = {
     '/dc/:type': ['evnydd0sf'],
     '/gra/:type': ['evnydd0sf'],
     '/index/:type': ['evnydd0sf'],
+    '/lib/:type': ['evnydd0sf'],
     '/sxw/:type': ['evnydd0sf'],
 };

package/lib/v2/nua/radar.js

@@ -33,5 +33,13 @@ module.exports = {
                 target: '/nua/gra/:type',
             },
         ],
+        lib: [
+            {
+                title: '图书馆',
+                docs: 'https://docs.rsshub.app/university.html#nan-jing-yi-shu-xue-yuan',
+                source: ['/:type/list.htm'],
+                target: '/nua/lib/:type',
+            },
+        ],
     },
 };

package/lib/v2/nua/router.js

@@ -2,5 +2,6 @@ module.exports = function (router) {
     router.get('/dc/:type', require('./dc'));
     router.get('/gra/:type', require('./gra'));
     router.get('/index/:type', require('./index'));
+    router.get('/lib/:type', require('./lib'));
     router.get('/sxw/:type', require('./sxw'));
 };

package/lib/v2/nua/utils.js

@@ -23,26 +23,21 @@ function arti_link(text, href) {
 }
 
 async function ProcessList(newsUrl, baseUrl, listName, listDate, webPageName) {
-    const result = await got(newsUrl, {
-        https: {
-            rejectUnauthorized: false,
-        },
-    });
+    const result = await got(newsUrl, { https: { rejectUnauthorized: false } });
     const $ = cheerio.load(result.data);
 
-    const pageName = $(webPageName).text();
+    const pageName = $(webPageName).text().trim();
 
     const items = $(listName)
         .toArray()
         .map((item) => {
-            item = $(item);
             const href = $(item).find('a').attr('href');
             const type = pageType(href);
 
             return {
                 link: type === 'in-nua' ? baseUrl + href : href,
-                title: item.find('a').attr('title'),
-                pubDate: timezone(parseDate(item.find(listDate).first().text(), 'YYYY-MM-DD'), +8),
+                title: $(item).find('a').attr('title'),
+                pubDate: timezone(parseDate($(item).find(listDate).first().text(), 'YYYY-MM-DD'), +8),
                 type,
             };
         });
@@ -55,14 +50,14 @@ const ProcessFeed = async (items, artiContent, ctx) =>
         items.map((item) =>
             ctx.cache.tryGet(item.link, async () => {
                 switch (item.type) {
-                    case 'in-nua' || 'nua':
-                        // eslint-disable-next-line no-case-declarations
+                    case 'in-nua':
+                    case 'nua': {
                         const result = await got(item.link, { https: { rejectUnauthorized: false } });
-                        // eslint-disable-next-line no-case-declarations
                         const $ = cheerio.load(result.data);
                         item.author = $('.arti_publisher').text() + '  ' + $('.arti_views').text();
                         item.description = $(artiContent).html();
                         return item;
+                    }
                     case 'wechat-mp':
                         return fetchArticle(ctx, item.link);
                     case 'unknown':

package/lib/v2/nuaa/utils/pypasswaf.js

@@ -1,3 +1,5 @@
+const puppeteerUtils = require('@/utils/puppeteer-utils');
+
 /**
  * async function 获取cookie
  * @desc 返回一个可用的cookie，使用 `got` 发起请求的时候，传入到`options.headers.cookie`即可
@@ -14,8 +16,7 @@ module.exports = async function getCookie(host) {
         waitUntil: 'networkidle0',
     });
 
-    let cookie = await page.cookies();
-    cookie = cookie.map(({ name, value }) => `${name}=${value}`).join('; ');
+    const cookie = await puppeteerUtils.getCookies(page);
     await browser.close();
     return cookie;
 };

package/lib/v2/nyaa/main.js

@@ -11,34 +11,27 @@ module.exports = async (ctx) => {
         },
     });
 
-    let currentURL;
-    let currentLink;
+    const { query, username } = ctx.params;
 
+    let rootURL;
     if (ctx.routerPath.split('/')[1] === 'sukebei') {
-        const rootURL = 'https://sukebei.nyaa.si';
-        const { username = 'ohys' } = ctx.params;
-        const { query = '' } = ctx.params;
-        if (ctx.routerPath.split('/')[2] === 'user') {
-            currentURL = `${rootURL}/?page=rss&u=${username}`;
-            currentLink = `${rootURL}/user/${username}`;
-        } else {
-            currentURL = `${rootURL}/?page=rss&c=0_0&f=0&q=${encodeURI(query)}`;
-            currentLink = `${rootURL}/?f=0&c=0_0&q=${query}`;
-        }
+        rootURL = 'https://sukebei.nyaa.si';
     } else {
-        const rootURL = 'https://nyaa.si';
-        const { username = 'Tarakara168' } = ctx.params;
-        const { query = '' } = ctx.params;
-        if (ctx.routerPath.split('/')[1] === 'user') {
-            currentURL = `${rootURL}/?page=rss&u=${username}`;
-            currentLink = `${rootURL}/user/${username}`;
-        } else {
-            currentURL = `${rootURL}/?page=rss&c=0_0&f=0&q=${encodeURI(query)}`;
-            currentLink = `${rootURL}/?f=0&c=0_0&q=${query}`;
-        }
+        rootURL = 'https://nyaa.si';
     }
 
-    const feed = await parser.parseURL(currentURL);
+    let currentRSSURL = `${rootURL}/?page=rss`;
+    let currentLink = `${rootURL}/`;
+    if (username !== undefined) {
+        currentRSSURL = `${currentRSSURL}&u=${encodeURI(username)}`;
+        currentLink = `${currentLink}user/${encodeURI(username)}`;
+    }
+    if (query !== undefined) {
+        currentRSSURL = `${currentRSSURL}&q=${encodeURI(query)}`;
+        currentLink = `${currentLink}?q=${encodeURI(query)}`;
+    }
+
+    const feed = await parser.parseURL(currentRSSURL);
 
     feed.items.map((item) => {
         item.link = item.guid;

package/lib/v2/nyaa/maintainer.js

@@ -1,6 +1,9 @@
 module.exports = {
-    '/search/:query?': ['Lava-Swimmer', 'noname1897'],
-    '/sukebei/search/:query?': ['Lava-Swimmer', 'noname1897'],
-    '/user/:username?': ['Lava-Swimmer', 'noname1897'],
-    '/sukebei/user/:username?': ['Lava-Swimmer', 'noname1897'],
+    '/search/:query?': ['Lava-Swimmer', 'noname1776'],
+    '/user/:username?': ['Lava-Swimmer', 'noname1776'],
+    '/user/:username/search/:query?': ['Lava-Swimmer', 'noname1776'],
+
+    '/sukebei/search/:query?': ['Lava-Swimmer', 'noname1776'],
+    '/sukebei/user/:username?': ['Lava-Swimmer', 'noname1776'],
+    '/sukebei/user/:username/search/:query?': ['Lava-Swimmer', 'noname1776'],
 };

package/lib/v2/nyaa/radar.js

@@ -3,47 +3,45 @@ module.exports = {
         _name: 'nyaa',
         '.': [
             {
-                title: '搜索结果',
-                docs: 'https://docs.rsshub.app/multimedia.html#nyaa-sou-suo-jie-guo',
-                source: '/',
+                title: 'nyaa 的搜索结果、指定用户、指定用户的搜索结果',
+                docs: 'https://docs.rsshub.app/multimedia.html#nyaa',
+                source: ['/', '/user/:username'],
                 target: (params, url) => {
                     url = new URL(url);
-                    if (url.hostname.split('.')[0] === 'nyaa') {
-                        const searchParams = url.searchParams;
-                        const query = searchParams.has('q') ? searchParams.get('q') : '';
-                        return `/nyaa/search/${query}`;
+                    const username = params.username;
+                    const query = url.searchParams.get('q');
+
+                    let currentURL = '/nyaa';
+                    if (username !== undefined) {
+                        currentURL = `${currentURL}/user/${username}`;
                     }
-                },
-            },
-            {
-                title: '用户',
-                docs: 'https://docs.rsshub.app/multimedia.html#nyaa-yong-hu',
-                source: '/user/:username',
-                target: (params, url) => {
-                    url = new URL(url);
-                    if (url.hostname.split('.')[0] === 'nyaa') {
-                        return `/nyaa/user/${params.username}`;
+                    if (query !== null) {
+                        currentURL = `${currentURL}/search/${query}`;
                     }
+                    return currentURL;
                 },
             },
         ],
         sukebei: [
             {
-                title: 'sukebei 搜索结果',
-                docs: 'https://docs.rsshub.app/multimedia.html#nyaa-sukebei-sou-suo-jie-guo',
-                source: '/',
+                title: 'sukebei 的搜索结果、指定用户、指定用户的搜索结果',
+                docs: 'https://docs.rsshub.app/multimedia.html#nyaa',
+                source: ['/', '/user/:username'],
                 target: (params, url) => {
-                    const searchParams = new URL(url).searchParams;
-                    const query = searchParams.has('q') ? searchParams.get('q') : '';
-                    return `/nyaa/sukebei/search/${query}`;
+                    url = new URL(url);
+                    const username = params.username;
+                    const query = url.searchParams.get('q');
+
+                    let currentURL = '/nyaa/sukebei';
+                    if (username !== undefined) {
+                        currentURL = `${currentURL}/user/${username}`;
+                    }
+                    if (query !== null) {
+                        currentURL = `${currentURL}/search/${query}`;
+                    }
+                    return currentURL;
                 },
             },
-            {
-                title: 'sukebei 用户',
-                docs: 'https://docs.rsshub.app/multimedia.html#nyaa-sukebei-yong-hu',
-                source: '/user/:username',
-                target: (params) => `/nyaa/sukebei/user/${params.username}`,
-            },
         ],
     },
 };

package/lib/v2/nyaa/router.js

@@ -1,7 +1,9 @@
 module.exports = (router) => {
     router.get('/search/:query?', require('./main'));
-    router.get('/sukebei/search/:query?', require('./main'));
-
     router.get('/user/:username?', require('./main'));
+    router.get('/user/:username/search/:query?', require('./main'));
+
+    router.get('/sukebei/search/:query?', require('./main'));
     router.get('/sukebei/user/:username?', require('./main'));
+    router.get('/sukebei/user/:username/search/:query?', require('./main'));
 };

package/lib/v2/odaily/post.js

@@ -20,15 +20,11 @@ module.exports = async (ctx) => {
 
     const currentUrl = `${rootUrl}/api/pp/api/app-front/feed-stream?feed_id=${id}&b_id=&per_page=${ctx.query.limit ?? 25}`;
 
-    const response = await got({
-        method: 'get',
-        url: currentUrl,
-    });
+    const response = await got(currentUrl);
 
     let items = response.data.data.items
         .map((item) => ({
             title: item.title,
-            author: item.user.name,
             type: item.entity_type,
             description: `<p>${item.summary}</p>`,
             link: `${rootUrl}/${item.entity_type}/${item.entity_id}`,
@@ -37,26 +33,25 @@ module.exports = async (ctx) => {
         .filter((item) => item.type !== 'newsflash');
 
     items = await Promise.all(
-        items.map(
-            async (item) =>
-                await ctx.cache.tryGet(item.link, async () => {
-                    const detailResponse = await got({
-                        method: 'get',
-                        url: item.link,
-                    });
+        items.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const detailResponse = await got(item.link);
 
-                    const content = cheerio.load(detailResponse.data.match(item.type === 'post' ? /"content":"(.*)","extraction_tags":/ : /"description":"(.*?)","cover":/)[1]);
+                const ssr = JSON.parse(`{${detailResponse.data.match(/window\.__INITIAL_STATE__ = {(.*)}/)[1]}}`);
 
-                    content('img').each(function () {
-                        content(this).attr('src', content(this).attr('src').replace(/\\"/g, ''));
-                    });
+                const content = cheerio.load(ssr.post.detail.content, null, false);
+                content('img').each((_, img) => {
+                    img.attribs.src = img.attribs.src.split('?x-oss-process')[0];
+                    img.attribs.src = img.attribs.src.split('!heading')[0];
+                });
 
-                    item.description = content.html();
+                item.description = content.html();
+                item.author = ssr.post.user.name;
 
-                    delete item.type;
+                delete item.type;
 
-                    return item;
-                })
+                return item;
+            })
         )
     );
 

package/lib/v2/odaily/utils.js

@@ -1,3 +1,3 @@
 module.exports = {
-    rootUrl: 'https://www.0daily.com',
+    rootUrl: 'https://www.odaily.news',
 };

package/lib/v2/paradigm/maintainer.js

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

package/lib/v2/paradigm/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'paradigm.xyz': {
+        _name: 'Paradigm',
+        '.': [
+            {
+                title: 'Writing',
+                docs: 'https://docs.rsshub.app/finance.html#paradigm',
+                source: ['/writing'],
+                target: '/paradigm/writing',
+            },
+        ],
+    },
+};

package/lib/v2/paradigm/router.js

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