rsshub 1.0.0-master.f9a482d → 1.0.0-master.fa27a51

package/lib/v2/ouc/jwc.js

@@ -0,0 +1,39 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const link = 'https://jwc.ouc.edu.cn/6517/list.htm';
+    const response = await got(link);
+    const $ = cheerio.load(response.data);
+    const list = $('.wp_article_list li')
+        .toArray()
+        .map((e) => {
+            e = $(e);
+            const a = e.find('a');
+            return {
+                title: a.attr('title'),
+                link: a.attr('href'),
+                pubDate: parseDate(e.find('span.Article_PublishDate').text(), 'YYYY-MM-DD'),
+            };
+        });
+
+    const out = await Promise.all(
+        list.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const response = await got('https://jwc.ouc.edu.cn' + item.link);
+                const $ = cheerio.load(response.data);
+                item.author = '中国海洋大学教务处';
+                item.description = $('.wp_articlecontent').html();
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: '中国海洋大学教务处',
+        link,
+        description: '中国海洋大学教务处最新通知',
+        item: out,
+    };
+};

package/lib/v2/ouc/jwgl.js

@@ -0,0 +1,42 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const link = 'http://jwgl.ouc.edu.cn/public/listSchoolNotices.action?currentPage=1&recordsPerPage=15&qtitle=';
+    const response = await got(link);
+    const $ = cheerio.load(response.data);
+    const list = $('div.datalist table tbody tr')
+        .toArray()
+        .map((e) => {
+            e = $(e);
+            const noticeId = e
+                .find('a')
+                .attr('onclick')
+                .match(/viewNotice\('(.+?)'\)/)[1];
+            const tds = e.find('td');
+            return {
+                title: tds.eq(2).text(),
+                link: 'http://jwgl.ouc.edu.cn/public/viewSchoolNoticeDetail.action?schoolNoticeId=' + noticeId,
+                pubDate: parseDate(tds.eq(3).text(), 'YYYY-MM-DD HH:mm'),
+            };
+        });
+
+    const out = await Promise.all(
+        list.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const response = await got(item.link);
+                const $ = cheerio.load(response.data);
+                item.description = $('div.notice').html();
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: '中国海洋大学选课信息教务通知',
+        link,
+        description: '中国海洋大学选课信息教务通知',
+        item: out,
+    };
+};

package/lib/v2/ouc/maintainer.js

@@ -1,5 +1,7 @@
 module.exports = {
     '/it/postgraduate': ['shengmaosu'],
     '/it/:type?': ['GeoffreyChen777'],
+    '/jwc': ['3401797899'],
+    '/jwgl': ['3401797899'],
     '/yjs': ['shengmaosu'],
 };

package/lib/v2/ouc/radar.js

@@ -4,23 +4,39 @@ module.exports = {
         it: [
             {
                 title: '信息科学与工程学院',
-                docs: 'https://docs.rsshub.app/university.html#zhong-guo-hai-yang-da-xue',
+                docs: 'https://docs.rsshub.app/routes/university#zhong-guo-hai-yang-da-xue',
                 source: ['/'],
-                target: '/ocu/it',
+                target: '/ouc/it',
             },
             {
                 title: '信息科学与工程学院研究生招生通知公告',
-                docs: 'https://docs.rsshub.app/university.html#zhong-guo-hai-yang-da-xue',
+                docs: 'https://docs.rsshub.app/routes/university#zhong-guo-hai-yang-da-xue',
                 source: ['/_s381/16619/list.psp', '/16619/list.htm', '/'],
-                target: '/ocu/it/postgraduate',
+                target: '/ouc/it/postgraduate',
+            },
+        ],
+        jwc: [
+            {
+                title: '教务处',
+                docs: 'https://docs.rsshub.app/routes/university#zhong-guo-hai-yang-da-xue',
+                source: ['/', '/6517/list.htm'],
+                target: '/ouc/jwc',
+            },
+        ],
+        jwgl: [
+            {
+                title: '选课信息教务通知',
+                docs: 'https://docs.rsshub.app/routes/university#zhong-guo-hai-yang-da-xue',
+                source: ['/cas/login.action', '/public/SchoolNotice.jsp'],
+                target: '/ouc/jwgl',
             },
         ],
         yz: [
             {
                 title: '研究生院',
-                docs: 'https://docs.rsshub.app/university.html#zhong-guo-hai-yang-da-xue',
+                docs: 'https://docs.rsshub.app/routes/university#zhong-guo-hai-yang-da-xue',
                 source: ['/5926/list.htm'],
-                target: '/ocu/yjs',
+                target: '/ouc/yjs',
             },
         ],
     },

package/lib/v2/ouc/router.js

@@ -1,5 +1,7 @@
 module.exports = (router) => {
     router.get('/it/postgraduate', require('./it-postgraduate'));
     router.get('/it/:type?', require('./it'));
+    router.get('/jwc', require('./jwc'));
+    router.get('/jwgl', require('./jwgl'));
     router.get('/yjs', require('./yjs'));
 };

package/lib/v2/oup/radar.js

@@ -4,7 +4,7 @@ module.exports = {
         academic: [
             {
                 title: '期刊',
-                docs: 'https://docs.rsshub.app/journal.html#oxford-university-press',
+                docs: 'https://docs.rsshub.app/routes/journal#oxford-university-press',
                 source: ['/', '/:name/issue'],
                 target: '/oup/journals/:name',
             },

package/lib/v2/outagereport/radar.js

@@ -4,7 +4,7 @@ module.exports = {
         '.': [
             {
                 title: 'Report',
-                docs: 'https://docs.rsshub.app/forecast.html#outage-report',
+                docs: 'https://docs.rsshub.app/routes/forecast#outage-report',
                 source: ['/'],
                 target: (params, url) => `/outagereport/${new URL(url).toString().split('/').pop()}`,
             },

package/lib/v2/panewslab/radar.js

@@ -4,25 +4,25 @@ module.exports = {
         '.': [
             {
                 title: '深度',
-                docs: 'https://docs.rsshub.app/new-media.html#panews-shen-du',
+                docs: 'https://docs.rsshub.app/routes/new-media#panews-shen-du',
                 source: '/',
                 target: '/panewslab/:category?',
             },
             {
                 title: '快讯',
-                docs: 'https://docs.rsshub.app/new-media.html#panews-kuai-xun',
+                docs: 'https://docs.rsshub.app/routes/new-media#panews-kuai-xun',
                 source: '/',
                 target: '/panewslab/news',
             },
             {
                 title: '专栏',
-                docs: 'https://docs.rsshub.app/new-media.html#panews-zhuan-lan',
+                docs: 'https://docs.rsshub.app/routes/new-media#panews-zhuan-lan',
                 source: '/',
                 target: '/panewslab/author/:id',
             },
             {
                 title: '专题',
-                docs: 'https://docs.rsshub.app/new-media.html#panews-zhuan-ti',
+                docs: 'https://docs.rsshub.app/routes/new-media#panews-zhuan-ti',
                 source: '/',
                 target: '/panewslab/topic/:id',
             },

package/lib/v2/paradigm/radar.js

@@ -4,7 +4,7 @@ module.exports = {
         '.': [
             {
                 title: 'Writing',
-                docs: 'https://docs.rsshub.app/finance.html#paradigm',
+                docs: 'https://docs.rsshub.app/routes/finance#paradigm',
                 source: ['/writing'],
                 target: '/paradigm/writing',
             },

package/lib/v2/patagonia/radar.js

@@ -4,7 +4,7 @@ module.exports = {
         '.': [
             {
                 title: 'New Arrivals',
-                docs: 'https://docs.rsshub.app/shopping.html#patagonia',
+                docs: 'https://docs.rsshub.app/routes/shopping#patagonia',
                 source: ['/shop/*new-arrivals'],
                 target: (_, url) => {
                     const param = new URL(url).pathname.split('/').pop().replace('-new-arrivals', '');

package/lib/v2/penguin-random-house/radar.js

@@ -4,13 +4,13 @@ module.exports = {
         '.': [
             {
                 title: 'Penguin Random House Book Lists',
-                docs: 'https://docs.rsshub.app/reading.html#penguin-random-house',
+                docs: 'https://docs.rsshub.app/routes/reading#penguin-random-house',
                 source: ['/the-read-down'],
                 target: '/penguin-random-house/the-read-down',
             },
             {
                 title: 'Penguin Random House Articles',
-                docs: 'https://docs.rsshub.app/reading.html#penguin-random-house',
+                docs: 'https://docs.rsshub.app/routes/reading#penguin-random-house',
                 source: ['/articles'],
                 target: '/penguin-random-house/articles',
             },

package/lib/v2/people/radar.js

@@ -4,7 +4,7 @@ module.exports = {
         '.': [
             {
                 title: '通用',
-                docs: 'https://docs.rsshub.app/traditional-media.html#ren-min-wang-tong-yong',
+                docs: 'https://docs.rsshub.app/routes/traditional-media#ren-min-wang-tong-yong',
                 source: '/',
                 target: '/people/:site?/:category?',
             },
@@ -12,7 +12,7 @@ module.exports = {
         liuyan: [
             {
                 title: '领导留言板',
-                docs: 'https://docs.rsshub.app/traditional-media.html#ren-min-wang-ling-dao-liu-yan-ban',
+                docs: 'https://docs.rsshub.app/routes/traditional-media#ren-min-wang-ling-dao-liu-yan-ban',
                 source: '/',
                 target: '/people/liuyan/:id/:state?',
             },

package/lib/v2/peopo/radar.js

@@ -4,7 +4,7 @@ module.exports = {
         '.': [
             {
                 title: '新聞分類',
-                docs: 'https://docs.rsshub.app/new-media.html#peopo-gong-min-xin-wen',
+                docs: 'https://docs.rsshub.app/routes/new-media#peopo-gong-min-xin-wen',
                 source: '/topic/:topicId',
                 target: '/peopo/topic/:topicId',
             },

package/lib/v2/phoronix/radar.js

@@ -4,7 +4,7 @@ module.exports = {
         '.': [
             {
                 title: '新闻与评测',
-                docs: 'https://docs.rsshub.app/new-media.html#phoronix',
+                docs: 'https://docs.rsshub.app/routes/new-media#phoronix',
                 source: ['/*'],
                 target: '/phoronix/news',
             },

package/lib/v2/pianyuan/radar.js

@@ -4,7 +4,7 @@ module.exports = {
         '.': [
             {
                 title: '电影和剧集',
-                docs: 'https://docs.rsshub.app/multimedia.html#pian-yuan',
+                docs: 'https://docs.rsshub.app/routes/multimedia#pian-yuan',
                 source: '/',
                 target: '/pianyuan/index',
             },

package/lib/v2/picnob/radar.js

@@ -4,7 +4,7 @@ module.exports = {
         '.': [
             {
                 title: 'User profile',
-                docs: 'https://docs.rsshub.app/en/social-media.html#picnob',
+                docs: 'https://docs.rsshub.app/routes/en/social-media#picnob',
                 source: ['/profile/:id/*'],
                 target: '/picnob/user/:id',
             },

package/lib/v2/picuki/profile.js

@@ -1,4 +1,3 @@
-const got = require('@/utils/got');
 const cheerio = require('cheerio');
 const chrono = require('chrono-node');
 const { art } = require('@/utils/render');
@@ -6,6 +5,19 @@ const path = require('path');
 const config = require('@/config').value;
 const { puppeteerGet } = require('./utils');
 
+function deVideo(media) {
+    const $ = cheerio.load(media);
+    let media_deVideo = '';
+    $('img,video').each((_, medium) => {
+        const tag = medium.name;
+        medium = $(medium);
+        const poster = medium.attr('poster');
+        // 如果有 poster 属性，表明它是视频，将它替换为它的 poster；如果不是，就原样返回
+        media_deVideo += poster ? `<img src='${poster}' alt='video poster'>` : tag === 'img' ? medium.toString() : '';
+    });
+    return media_deVideo;
+}
+
 module.exports = async (ctx) => {
     // use Puppeteer due to the obstacle by cloudflare challenge
     const browser = await require('@/utils/puppeteer')();
@@ -17,9 +29,9 @@ module.exports = async (ctx) => {
     const profileUrl = `https://www.picuki.com/profile/${id}`;
 
     const data = await ctx.cache.tryGet(
-        profileUrl,
+        `picuki-${id}-profile-${includeStories}`,
         async () => {
-            const _r = await puppeteerGet(profileUrl, browser);
+            const _r = await puppeteerGet(profileUrl, browser, includeStories);
             return _r;
         },
         config.cache.routeExpire,
@@ -33,124 +45,39 @@ module.exports = async (ctx) => {
 
     const list = $('ul.box-photos [data-s="media"]').get();
 
-    async function getMedia(url) {
-        const getPost = async () => {
-            const response = await puppeteerGet(url, browser);
-            return response;
-        };
-        let data = await ctx.cache.tryGet(url, getPost);
-        if (Object.prototype.toString.call(data) === '[object Object]') {
-            // oops, it's a json, maybe it's an old cache from the old version of this route!
-            data = await getPost();
-            // re-cache it
-            await ctx.cache.set(url, data);
-        }
-        const $ = cheerio.load(data);
-        // Instagram 允许最多 10 条图片/视频任意混合于一条 post，picuki 在所有情况下都会将它（们）置于 .single-photo 内
-        let html = '';
-        $('.single-photo img').each((_, item) => {
-            html += $(item).toString();
-        });
-        $('.single-photo video').each((_, item) => {
-            item = $(item);
-            let videoSrc = item.attr('src');
-            if (videoSrc === undefined) {
-                videoSrc = item.children().attr('src');
-            }
-            const videoPoster = item.attr('poster');
-            html += art(path.join(__dirname, 'templates/video.art'), {
-                videoSrc,
-                videoPoster,
-            });
-        });
-        return html;
-    }
-
-    function deVideo(media) {
-        const $ = cheerio.load(media);
-        let media_deVideo = '';
-        $('img,video').each((_, medium) => {
-            const tag = medium.name;
-            medium = $(medium);
-            const poster = medium.attr('poster');
-            // 如果有 poster 属性，表明它是视频，将它替换为它的 poster；如果不是，就原样返回
-            media_deVideo += poster ? `<img src='${poster}' alt='video poster'>` : tag === 'img' ? medium.toString() : '';
-        });
-        return media_deVideo;
-    }
+    let items = [];
 
-    let items = await Promise.all(
-        list.map(async (post) => {
-            post = $(post);
-
-            const postLink = post.find('.photo > a').attr('href');
-            const postTime = post.find('.time');
-            const pubDate = postTime ? chrono.parseDate(postTime.text()) : new Date();
-            const media_displayVideo = await getMedia(postLink);
-            const postText = post
-                .find('.photo-description')
-                .text()
-                .trim()
-                .replace(/[^\S\n]+/g, ' ')
-                .replace(/((?<=\n|^)[^\S\n])|([^\S\n](?=\n|$))/g, '');
-            const title = postText.replace(/\n/g, ' ') || 'Untitled';
-            const description = art(path.join(__dirname, 'templates/post.art'), {
-                media: displayVideo ? media_displayVideo : deVideo(media_displayVideo),
-                desc: postText,
-                locationLink: post.find('.photo-location .icon-globe-alt a'),
-            });
-
-            return {
-                title,
-                author: `@${id}`,
-                description,
-                link: postLink,
-                pubDate,
-            };
-        })
-    );
-
-    const getStories = async (queryId) => {
-        const apiUrl = `https://www.picuki.com/app/controllers/ajax.php`;
-        const key = `${apiUrl}?query=${queryId}&type=story`;
-        const data = await ctx.cache.tryGet(key, async () => {
-            const response = await got.post(apiUrl, {
-                form: {
-                    query: queryId,
-                    type: 'story',
-                },
-                headers: {
-                    Referer: profileUrl,
-                    Origin: 'https://www.picuki.com',
-                    'X-Requested-With': 'XMLHttpRequest',
-                },
-            });
-            return response.data;
-        });
-        if (data && data.stories_container) {
-            const $ = cheerio.load(data.stories_container);
-            const storyItems = $('.item')
+    if (includeStories) {
+        const stories_wrapper = $('.stories_wrapper');
+        if (stories_wrapper.length) {
+            const storyItems = $(stories_wrapper)
+                .find('.item')
                 .get()
                 .map((item) => {
                     const $item = $(item);
-                    const postTime = $item.find('.stories_count');
-                    const pubDate = postTime.length ? chrono.parseDate(postTime.text()) : new Date();
+                    let title = $item.find('.stories_count');
+                    title = title.length ? title.text() : '';
+                    const pubDate = title ? chrono.parseDate(title) : new Date();
                     const postBox = $item.find('.launchLightbox');
                     const poster = postBox.attr('data-video-poster');
                     const href = postBox.attr('href');
                     const type = postBox.attr('data-post-type'); // video / image
+                    const origin = postBox.attr('data-origin');
                     const storiesBackground = $item.find('.stories_background');
                     const storiesBackgroundUrl = storiesBackground && storiesBackground.css('background-image').match(/url\('?(.*)'?\)/);
                     const storiesBackgroundUrlSrc = storiesBackgroundUrl && storiesBackgroundUrl[1];
                     let description;
                     if (type === 'video') {
-                        description = `<video controls src="${href}" poster="${poster || storiesBackgroundUrlSrc || ''}">`;
+                        description = art(path.join(__dirname, 'templates/video.art'), {
+                            videoSrcs: [href, origin].filter(Boolean),
+                            videoPoster: poster || storiesBackgroundUrlSrc || '',
+                        });
                     } else if (type === 'image') {
                         description = `<img src="${href || poster || storiesBackgroundUrlSrc || ''}" alt="Instagram Story">`;
                     }
 
                     return {
-                        title: 'Instagram Story',
+                        title: 'Instagram Story' + (pubDate ? '' : `: ${title}`),
                         author: `@${id}`,
                         description,
                         link: href,
@@ -158,26 +85,79 @@ module.exports = async (ctx) => {
                     };
                 });
             if (storyItems.length) {
-                items = items.concat(storyItems);
+                items = storyItems;
             }
         }
-    };
+    }
 
-    if (includeStories) {
-        let profileQueryId;
-        $('script:not([src])').each((_, script) => {
-            const queryMatch = $(script)
-                .html()
-                .match(/let query ?= ?['"](\d+)['"]/);
-            if (queryMatch) {
-                profileQueryId = queryMatch[1];
+    async function getMedia(url) {
+        const getPost = () => puppeteerGet(url, browser);
+        let data = await ctx.cache.tryGet(url, getPost);
+        if (Object.prototype.toString.call(data) === '[object Object]') {
+            // oops, it's a json, maybe it's an old cache from the old version of this route!
+            data = await getPost();
+            // re-cache it
+            await ctx.cache.set(url, data);
+        }
+        const $ = cheerio.load(data);
+        // Instagram 允许最多 10 条图片/视频任意混合于一条 post，picuki 在所有情况下都会将它（们）置于 .single-photo 内
+        let html = '';
+        $('.single-photo img').each((_, item) => {
+            html += $(item).toString();
+        });
+        $('.single-photo video').each((_, item) => {
+            item = $(item);
+            let videoSrc = item.attr('src');
+            if (videoSrc === undefined) {
+                videoSrc = item.children().attr('src');
+            }
+            const videoPoster = item.attr('poster');
+            let origin = item.parent().attr('onclick');
+            if (origin) {
+                origin = origin.match(/window\.open\('([^']*)'/);
+                origin = origin && origin[1];
             }
+            html += art(path.join(__dirname, 'templates/video.art'), {
+                videoSrcs: [videoSrc, origin].filter(Boolean),
+                videoPoster,
+            });
         });
-        if (profileQueryId) {
-            await getStories(profileQueryId);
-        }
+        return html;
     }
 
+    items = items.concat(
+        await Promise.all(
+            list.map(async (post) => {
+                post = $(post);
+
+                const postLink = post.find('.photo > a').attr('href');
+                const postTime = post.find('.time');
+                const pubDate = postTime ? chrono.parseDate(postTime.text()) : new Date();
+                const media_displayVideo = await getMedia(postLink);
+                const postText = post
+                    .find('.photo-description')
+                    .text()
+                    .trim()
+                    .replace(/[^\S\n]+/g, ' ')
+                    .replace(/((?<=\n|^)[^\S\n])|([^\S\n](?=\n|$))/g, '');
+                const title = postText.replace(/\n/g, ' ') || 'Untitled';
+                const description = art(path.join(__dirname, 'templates/post.art'), {
+                    media: displayVideo ? media_displayVideo : deVideo(media_displayVideo),
+                    desc: postText,
+                    locationLink: post.find('.photo-location .icon-globe-alt a'),
+                });
+
+                return {
+                    title,
+                    author: `@${id}`,
+                    description,
+                    link: postLink,
+                    pubDate,
+                };
+            })
+        )
+    );
+
     await browser.close();
 
     ctx.state.data = {

package/lib/v2/picuki/radar.js

@@ -4,7 +4,7 @@ module.exports = {
         www: [
             {
                 title: '用户',
-                docs: 'https://docs.rsshub.app/social-media.html#picuki-yong-hu',
+                docs: 'https://docs.rsshub.app/routes/social-media#picuki-yong-hu',
                 source: '/profile/:id',
                 target: '/picuki/profile/:id',
             },

package/lib/v2/picuki/templates/video.art

@@ -1,3 +1,5 @@
 <video poster="{{ videoPoster }}" controls>
-    <source src="{{ videoSrc }}" type="video/mp4">
+  <% for (let src of videoSrcs) { %>
+    <source src="{{ src }}" type="video/mp4">
+  <% } %>
 </video>

package/lib/v2/picuki/utils.js

@@ -1,15 +1,20 @@
-const puppeteerGet = async (url, browser) => {
+const puppeteerGet = async (url, browser, includeStories = false) => {
     const page = await browser.newPage();
+    const expectResourceTypes = includeStories ? ['document', 'script', 'xhr'] : ['document'];
     // await page.setExtraHTTPHeaders({ referer: host });
     await page.setRequestInterception(true);
     page.on('request', (request) => {
-        request.resourceType() === 'document' ? request.continue() : request.abort();
+        expectResourceTypes.includes(request.resourceType()) ? request.continue() : request.abort();
     });
     await page.goto(url, {
         waitUntil: 'domcontentloaded',
     });
 
     await page.waitForSelector('.wrapper');
+    if (includeStories) {
+        await page.$eval('.show_stories_button', (btn) => btn.click());
+        await page.waitForSelector('.stories_container .content');
+    }
 
     const html = await page.evaluate(() => document.documentElement.innerHTML);
     await page.close();

package/lib/v2/pikabu/radar.js

@@ -4,19 +4,19 @@ module.exports = {
         '.': [
             {
                 title: 'Community',
-                docs: 'https://docs.rsshub.app/en/bbs.html#pikabu',
+                docs: 'https://docs.rsshub.app/routes/en/bbs#pikabu',
                 source: ['/community/:name'],
                 target: '/pikabu/community/:name',
             },
             {
                 title: 'Tag',
-                docs: 'https://docs.rsshub.app/en/bbs.html#pikabu',
+                docs: 'https://docs.rsshub.app/routes/en/bbs#pikabu',
                 source: ['/tag/:name'],
                 target: '/pikabu/tag/:name',
             },
             {
                 title: 'User',
-                docs: 'https://docs.rsshub.app/en/bbs.html#pikabu',
+                docs: 'https://docs.rsshub.app/routes/en/bbs#pikabu',
                 source: ['/:name'],
                 target: '/pikabu/user/:name',
             },