rsshub 1.0.0-master.f78ad03 → 1.0.0-master.f792555

package/lib/v2/nuaa/yjsy/yjsy.js

@@ -1,55 +1,74 @@
 const got = require('@/utils/got');
 const cheerio = require('cheerio');
-const host = 'http://www.graduate.nuaa.edu.cn/';
 const { parseDate } = require('@/utils/parse-date');
+const getCookie = require('../utils/pypasswaf');
+const host = 'http://www.graduate.nuaa.edu.cn/';
 
-const map = {
-    latest: '2146/list.htm',
-    yyxw: 'yyxw/list.htm',
-    sjwj: 'sjwj/list.htm',
-    glwj: '2017/list.htm',
-    xxfw: '2147/list.htm',
-};
-
-const load = (link, ctx) =>
-    ctx.cache.tryGet(link, async () => {
-        const response = await got(host + link);
-        const $ = cheerio.load(response.data);
-        const images = $('img');
-        for (let k = 0; k < images.length; k++) {
-            $(images[k]).replaceWith(`<img src="${new URL($(images[k]).attr('src'), host).href}" />`);
-        }
-        const description = $('.wp_articlecontent').html();
-        return { description };
-    });
+const map = new Map([
+    ['tzgg', { title: '通知公告 | 南京航空航天大学研究生院', suffix: '2145/list.htm' }],
+    ['xwdt', { title: '新闻动态 | 南京航空航天大学研究生院', suffix: '13276/list.htm' }],
+    ['xsxx', { title: '学术信息 | 南京航空航天大学研究生院', suffix: '13277/list.htm' }],
+    ['ssfc', { title: '师生风采 | 南京航空航天大学研究生院', suffix: '13278/list.htm' }],
+]);
 
 module.exports = async (ctx) => {
-    const type = ctx.params.type ?? 'latest';
-    const response = await got({
-        method: 'get',
-        url: host + map[type],
-    });
+    const type = ctx.params.type;
+    const suffix = map.get(type).suffix;
+    const getDescription = Boolean(ctx.params.getDescription) || false;
+    const link = new URL(suffix, host).href;
+    const cookie = await getCookie(host);
+    const gotConfig = {
+        headers: {
+            cookie,
+        },
+    };
+    const response = await got(link, gotConfig);
     const $ = cheerio.load(response.data);
-    const list = $('#news_list ul.news_ul > li').slice(0, 10).get();
-    const process = await Promise.all(
-        list.map(async (item) => {
-            const a = $(item).find('a');
-            const t = $(item).find('span');
-            const itemUrl = a.attr('href');
-            const single = {
-                title: a.text(),
-                link: new URL(itemUrl, host).href,
-                pubDate: parseDate(t.text(), 'YYYY-MM-DD'),
+
+    const list = $('#wp_news_w6 ul li')
+        .slice(0, 10)
+        .map(function () {
+            const info = {
+                title: $(this).find('a').text(),
+                link: $(this).find('a').attr('href'),
+                date: $(this).find('span').text(),
+            };
+            return info;
+        })
+        .get();
+
+    const out = await Promise.all(
+        list.map(async (info) => {
+            const title = info.title || 'tzgg';
+            const date = info.date;
+            const itemUrl = new URL(info.link, host).href;
+            let description = title + '<br><a href="' + itemUrl + '" target="_blank">查看原文</a>';
+
+            if (getDescription) {
+                description = await ctx.cache.tryGet(itemUrl, async () => {
+                    const arr = itemUrl.split('.');
+                    const pageType = arr[arr.length - 1];
+                    if (pageType === 'htm' || pageType === 'html') {
+                        const response = await got(itemUrl, gotConfig);
+                        const $ = cheerio.load(response.data);
+                        return $('.wp_articlecontent').html() + '<br><hr /><a href="' + itemUrl + '" target="_blank">查看原文</a>';
+                    }
+                });
+            }
+
+            return {
+                title,
+                link: itemUrl,
+                description,
+                pubDate: parseDate(date),
             };
-            const other = await load(itemUrl, ctx);
-            return { ...single, ...other };
         })
     );
 
     ctx.state.data = {
-        title: '南航研究生院',
-        link: host,
-        description: '南航研究生院RSS',
-        item: process,
+        title: map.get(type).title,
+        link,
+        description: '南京航空航天大学研究生院RSS',
+        item: out,
     };
 };

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/oreno3d/main.js

@@ -34,24 +34,27 @@ function get_user_url(rootUrl, ctx, sort) {
     }
     return userUrl;
 }
-const selector = 'a.box';
 module.exports = async (ctx) => {
-    // 下载
-    const sort = ctx.params.sort ?? 'latest';
-    const userUrl = get_user_url(rootUrl, ctx, sort);
-    const response = await got(userUrl);
-    const $ = cheerio.load(response.data);
-    // 第一页，获取搜索主标题
-    const title = $('div.g-main-list').find('h1.main-h').text(); // 搜索标题;//第二页跳转链接
-
-    const list = $(selector);
-    const items = await Promise.all(
-        list
-            .map((_, item) => {
-                // 第一页，获取搜各视频地址
-                const link = $(item).attr('href');
-                return ctx.cache.tryGet(link, async () => {
-                    // 第二页数据分析
+    // 获取视频链接列表及标题
+    function getLinksTitle(response) {
+        const selector = 'a.box';
+        const $ = cheerio.load(response.data);
+        const title = $('div.g-main-list').find('h1.main-h').text();
+        const list = $(selector);
+        return { title, list };
+    }
+    // 数据爬取和分析
+    async function getData(response) {
+        const $ = cheerio.load(response.data);
+        // 第一页，获取搜索主标题
+        const title = getLinksTitle(response).title;
+        const list = getLinksTitle(response).list;
+        const items = await Promise.all(
+            list
+                .map(async (_, item) => {
+                    // 第一页，获取搜各视频地址
+                    const link = $(item).attr('href');
+                    // 第二页数据分析+缓存
                     const sec_data = await get_sec_page_data(link);
                     // 传递
                     const raw_pic_link = sec_data.raw_pic_link;
@@ -63,32 +66,92 @@ module.exports = async (ctx) => {
                     const desc = sec_data.desc;
                     const iwara_link = sec_data.iwara_link;
                     const oreno3d_link = sec_data.oreno3d_link;
-                    // 打包
-                    return {
-                        title: `${video_name} - ${authors}`,
-                        author: authors,
-                        link: oreno3d_link,
-                        category: tags.split(' '),
-                        description: art(path.join(__dirname, 'templates/description.art'), {
-                            raw_pic_link,
-                            video_name,
-                            authors,
-                            origins,
-                            characters,
-                            tags,
-                            desc,
-                            iwara_link,
-                            oreno3d_link,
-                        }),
-                    };
-                });
-            })
-            .get()
+                    // 打包,缓存HTML
+                    const description = art(path.join(__dirname, 'templates/description.art'), {
+                        raw_pic_link,
+                        video_name,
+                        authors,
+                        origins,
+                        characters,
+                        tags,
+                        desc,
+                        iwara_link,
+                        oreno3d_link,
+                    });
+                    const title = `${video_name} - ${authors}`;
+                    const realData = await ctx.cache.tryGet(oreno3d_link, () => {
+                        const result = {
+                            title,
+                            author: authors,
+                            link: oreno3d_link,
+                            category: tags.split(' '),
+                            description,
+                        };
+                        return result;
+                    });
+                    return realData;
+                })
+                .get()
+        );
+        return { items, title };
+    }
+    // 参数定义
+    const sort = ctx.params.sort;
+    let pagelimit = ctx.params.pagelimit ?? 1;
+    // 根链接
+    const userUrl = get_user_url(rootUrl, ctx, sort);
+    // 确认最大页数并比较修改(同时也是获取第一页的内容)
+    const response = await got(userUrl);
+    const $ = cheerio.load(response.data);
+    const maxPageSelector = 'div.container > main > div.g-main-list > ul.pagination > li:last-child > a';
+    // 页码判断
+    if ($(maxPageSelector)) {
+        const pageLink = new URLSearchParams($(maxPageSelector).attr('href'));
+        const actualNum = pageLink.get('page'); // 获取最大页数
+        if (parseInt(pagelimit) >= parseInt(actualNum)) {
+            pagelimit = actualNum;
+        }
+    } else {
+        pagelimit = 1;
+    }
+    // 构造网页数据的对应数组
+    const responseList = [];
+    // 将第一页的数据加入数组
+    responseList.push(response);
+    // 创建不含第一页链接的数组
+    const Links = [];
+    for (let i = 1; i < pagelimit; i++) {
+        Links.push(`${userUrl}&page=${i + 1}`);
+    }
+    // 由数组索引添加response
+    await Promise.all(
+        Links.map(async (link) => {
+            const response = await got(link);
+            responseList.push(response);
+        })
     );
-
+    // 由数组索引获取初步分析数据
+    const tempData = [];
+    await Promise.all(
+        responseList.map(async (response) => {
+            const result = await getData(response);
+            tempData.push(result);
+        })
+    );
+    // 拼接多页面item
+    let realItem = [];
+    for (const data of tempData) {
+        realItem = realItem.concat(data.items);
+    }
+    // 构造最终data
+    const data = {
+        title: tempData[0].title,
+        item: realItem,
+    };
+    // 生成RSS源码
     ctx.state.data = {
-        title: `${title} - ${sortRename[sort]}`,
+        title: `${data.title} - ${sortRename[sort]}(Page 1-${pagelimit})`,
         link: userUrl,
-        item: items,
+        item: data.item,
     };
 };

package/lib/v2/oreno3d/maintainer.js

@@ -1,7 +1,7 @@
 module.exports = {
-    '/authors/:authorid/:sort?': ['xueli_sherryli'],
-    '/characters/:characterid/:sort?': ['xueli_sherryli'],
-    '/origins/:originid/:sort?': ['xueli_sherryli'],
-    '/search/:keyword/:sort?': ['xueli_sherryli'],
-    '/tags/:tagid/:sort?': ['xueli_sherryli'],
+    '/authors/:authorid/:sort/:pagelimit?': ['xueli_sherryli'],
+    '/characters/:characterid/:sort/:pagelimit?': ['xueli_sherryli'],
+    '/origins/:originid/:sort/:pagelimit?': ['xueli_sherryli'],
+    '/search/:keyword/:sort/:pagelimit?': ['xueli_sherryli'],
+    '/tags/:tagid/:sort/:pagelimit?': ['xueli_sherryli'],
 };

package/lib/v2/oreno3d/router.js

@@ -1,7 +1,7 @@
 module.exports = function (router) {
-    router.get('/authors/:authorid/:sort?', require('./main'));
-    router.get('/characters/:characterid/:sort?', require('./main'));
-    router.get('/origins/:originid/:sort?', require('./main'));
-    router.get('/search/:keyword/:sort?', require('./main'));
-    router.get('/tags/:tagid/:sort?', require('./main'));
+    router.get('/authors/:authorid/:sort/:pagelimit?', require('./main'));
+    router.get('/characters/:characterid/:sort/:pagelimit?', require('./main'));
+    router.get('/origins/:originid/:sort/:pagelimit?', require('./main'));
+    router.get('/search/:keyword/:sort/:pagelimit?', require('./main'));
+    router.get('/tags/:tagid/:sort/:pagelimit?', require('./main'));
 };

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'));
+};

package/lib/v2/paradigm/writing.js

@@ -0,0 +1,44 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+
+const baseUrl = 'https://www.paradigm.xyz';
+
+module.exports = async (ctx) => {
+    const url = `${baseUrl}/writing`;
+
+    const response = await got(url);
+    const $ = cheerio.load(response.data);
+
+    const nextData = JSON.parse($('#__NEXT_DATA__').text());
+    const buildId = nextData.buildId;
+    const list = nextData.props.pageProps.posts.map((item) => ({
+        title: item.title,
+        link: `${baseUrl}${item.slug}`,
+        api: `${baseUrl}/_next/data/${buildId}${item.slug}.json`,
+        author: item.authors.map((author) => author.name).join(', '),
+        pubDate: parseDate(item.originalDate),
+        category: item.tags,
+    }));
+
+    const items = await Promise.all(
+        list.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const response = await got(item.api);
+                const $ = cheerio.load(response.data.pageProps.content, null, false);
+
+                // Remove the TOC
+                $('.toc').remove();
+                item.description = $.html();
+
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: 'Paradigm - Writing',
+        link: url,
+        item: items,
+    };
+};

package/lib/v2/picuki/maintainer.js

@@ -1,3 +1,3 @@
 module.exports = {
-    '/profile/:id/:functionalFlag?': ['hoilc', 'Rongronggg9'],
+    '/profile/:id/:functionalFlag?': ['hoilc', 'Rongronggg9', 'devinmugen'],
 };