rsshub 1.0.0-master.fc5a2f6 → 1.0.0-master.fc648b5

package/lib/v2/trending/radar.js

@@ -0,0 +1,35 @@
+module.exports = {
+    'toutiao.com': {
+        _name: '今日头条',
+        so: [
+            {
+                title: '热搜关键词聚合追踪',
+                docs: 'https://docs.rsshub.app/social-media.html#re-sou-ju-he',
+                source: ['/search'],
+                target: (params, url) => `/trending/${new URL(url).searchParams.get('keyword')}`,
+            },
+        ],
+    },
+    'weibo.com': {
+        _name: '微博',
+        s: [
+            {
+                title: '热搜关键词聚合追踪',
+                docs: 'https://docs.rsshub.app/social-media.html#re-sou-ju-he',
+                source: '/weibo/:keyword',
+                target: (params) => `/trending/${params.keyword}}`,
+            },
+        ],
+    },
+    'zhihu.com': {
+        _name: '知乎',
+        www: [
+            {
+                title: '热搜关键词聚合追踪',
+                docs: 'https://docs.rsshub.app/social-media.html#re-sou-ju-he',
+                source: ['/search'],
+                target: (params, url) => `/trending/${new URL(url).searchParams.get('q')}`,
+            },
+        ],
+    },
+};

package/lib/v2/trending/router.js

@@ -0,0 +1,3 @@
+module.exports = (router) => {
+    router.get('/:keywords/:numberOfDays?', require('./allTrending'));
+};

package/lib/v2/trending/templates/content.art

@@ -0,0 +1,24 @@
+<article>
+  <h2>热榜内容</h2>
+  {{each data channel}}
+  {{if channel.data.length !== 0}}
+  <h3>{{channel.name}}</h3>
+    <ul>
+      {{each channel.data item}}
+      <li>
+        <a href="{{item.url}}" rel="noopener noreferrer" target="_blank">{{item.title}}</a>
+      </li>
+      {{/each}}
+    </ul>
+  {{/if}}
+  {{/each}}
+  <h2>搜索关键词</h2>
+  {{each queries q}}
+  <h3>{{q.key}}</h3>
+  <p>
+    {{each q.links l}}
+      {{@l}}&nbsp&nbsp
+    {{/each}}
+  </p>
+  {{/each}}
+</article>

package/lib/v2/u3c3/index.js

@@ -0,0 +1,59 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+
+module.exports = async (ctx) => {
+    const type = ctx.params.type;
+    // should be:
+    // undefined
+    // U3C3
+    // Videos
+    // Photo
+    // Book
+    // Game
+    // Software
+    // Other
+    const rootURL = 'https://www.u3c3.com';
+    let currentURL;
+    let title;
+    if (typeof type === 'undefined') {
+        currentURL = rootURL;
+        title = 'home - u3c3';
+    } else if (type === 'search') {
+        const keyword = typeof ctx.params.keyword === 'undefined' ? '' : ctx.params.keyword;
+        currentURL = `${rootURL}/?search=${keyword}`;
+        title = `search ${keyword} - u3c3`;
+    } else {
+        currentURL = `${rootURL}/?type=${type}&p=1`;
+        title = `${type} - u3c3`;
+    }
+
+    const response = await got(currentURL);
+    const $ = cheerio.load(response.data);
+
+    const items = $('body > div.container > div.table-responsive > table > tbody > tr')
+        .toArray()
+        .map((item) => {
+            item = $(item);
+            const title = item.find('td:nth-of-type(2) > a ').attr('title');
+            const guid = rootURL + item.find('td:nth-of-type(2) > a').attr('href');
+            const link = guid;
+            const pubDate = item.find('td:nth-of-type(5)').text();
+            const enclosure_url = item.find('td:nth-of-type(3) > a:nth-of-type(2)').attr('href');
+            return {
+                title,
+                guid,
+                link,
+                pubDate,
+
+                enclosure_url,
+                enclosure_type: 'application/x-bittorrent',
+            };
+        });
+
+    ctx.state.data = {
+        title,
+        description: title,
+        link: currentURL,
+        item: items,
+    };
+};

package/lib/v2/u3c3/maintainer.js

@@ -0,0 +1,3 @@
+module.exports = {
+    '/:type?/:keyword?': ['noname1897'],
+};

package/lib/v2/u3c3/radar.js

@@ -0,0 +1,29 @@
+module.exports = {
+    'u3c3.com': {
+        _name: 'u3c3',
+        '.': [
+            {
+                title: '分类',
+                docs: 'https://docs.rsshub.app/multimedia.html#u3c3-fen-lei',
+                source: '/',
+                target: (params, url) => {
+                    const searchParams = new URL(url).searchParams;
+                    const type = searchParams.has('type') ? searchParams.get('type') : '';
+                    return `/u3c3/${type}`;
+                },
+            },
+            {
+                title: '关键词搜索',
+                docs: 'https://docs.rsshub.app/multimedia.html#u3c3-guan-jian-ci-sou-suo',
+                source: '/',
+                target: (params, url) => {
+                    const searchParams = new URL(url).searchParams;
+                    if (searchParams.has('search')) {
+                        const keyword = searchParams.get('search');
+                        return `/u3c3/search/${keyword}`;
+                    }
+                },
+            },
+        ],
+    },
+};

package/lib/v2/u3c3/router.js

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

package/lib/v2/uraaka-joshi/uraaka-joshi-user.js

@@ -11,8 +11,14 @@ module.exports = async (ctx) => {
         async () => {
             const browser = await require('@/utils/puppeteer')();
             const page = await browser.newPage();
+            await page.setRequestInterception(true);
+            page.on('request', (request) => {
+                request.resourceType() === 'document' || request.resourceType() === 'script' || request.resourceType() === 'fetch' ? request.continue() : request.abort();
+            });
 
-            await page.goto(link);
+            await page.goto(link, {
+                waitUntil: 'domcontentloaded',
+            });
             await page.waitForSelector('#pickup03 .grid-cell');
             await page.waitForSelector('#pickup04 .grid-cell');
             await page.waitForSelector('#main-block .grid-cell');

package/lib/v2/uraaka-joshi/uraaka-joshi.js

@@ -8,7 +8,14 @@ module.exports = async (ctx) => {
     const browser = await require('@/utils/puppeteer')();
 
     const page = await browser.newPage();
-    await page.goto(link);
+    await page.setRequestInterception(true);
+    page.on('request', (request) => {
+        request.resourceType() === 'document' || request.resourceType() === 'script' || request.resourceType() === 'fetch' ? request.continue() : request.abort();
+    });
+
+    await page.goto(link, {
+        waitUntil: 'domcontentloaded',
+    });
 
     await page.waitForSelector('#pickup03 .grid-cell');
     await page.waitForSelector('#pickup04 .grid-cell');

package/lib/v2/vlive/index.js

@@ -0,0 +1,71 @@
+const got = require('@/utils/got');
+const { JSDOM } = require('jsdom');
+const { parseDate } = require('@/utils/parse-date');
+const { art } = require('@/utils/render');
+const path = require('path');
+
+const baseUrl = 'https://www.vlive.tv';
+
+module.exports = async (ctx) => {
+    const { channel, board } = ctx.params;
+    const link = `${baseUrl}/channel/${channel}/board/${board}`;
+
+    const response = await got(link);
+    const dom = new JSDOM(response.data, {
+        runScripts: 'dangerously',
+    });
+    const preloadedState = dom.window.__PRELOADED_STATE__;
+    const channelData = preloadedState.channel.channel;
+    const userCountry = preloadedState.common.userCountry;
+    const userLanguage = preloadedState.common.userLanguage;
+
+    const apiResponse = await got(`${baseUrl}/globalv-web/vam-web/post/v1.0/board-${board}/posts`, {
+        searchParams: {
+            appId: '8c6cc7b45d2568fb668be6e05b6e5a3b',
+            fields: 'attachments,author,availableActions,board{boardId,title,boardType,payRequired,includedCountries,excludedCountries},channel{channelName,channelCode},totalCommentCount,contentType,createdAt,emotionCount,excludedCountries,includedCountries,isCommentEnabled,isHiddenFromStar,lastModifierMember,notice,officialVideo,plainBody,postId,postVersion,reservation,starReactions,targetMember,thumbnail,title,url,writtenIn,sharedPosts,originPost,blindType',
+            sortType: 'LATEST',
+            limit: ctx.query.limit ? Number(ctx.query.limit) : 20,
+            gcc: userCountry,
+            locale: userLanguage,
+        },
+        headers: {
+            referer: link,
+        },
+    });
+
+    const items = apiResponse.data.data.map((item) => {
+        let description;
+        switch (item.contentType) {
+            case 'POST':
+                description = art(path.join(__dirname, 'templates/post.art'), {
+                    post: item.plainBody?.replace(/\r\n/g, '<br><br>').replace(/\n/g, '<br>'),
+                    images: item.attachments.photo,
+                });
+                break;
+            case 'VIDEO':
+                description = art(path.join(__dirname, 'templates/video.art'), {
+                    link: item.url,
+                    image: item.officialVideo.thumb,
+                });
+                break;
+            default:
+                throw `Unknown content type: ${item.contentType}`;
+        }
+
+        return {
+            title: item.title,
+            description,
+            link: item.url,
+            author: item.author.nickname,
+            pubDate: parseDate(item.createdAt),
+        };
+    });
+
+    ctx.state.data = {
+        title: `${channelData.channelName} Channel`,
+        description: channelData.channelDescription,
+        link,
+        image: channelData.channelProfileImage,
+        item: items,
+    };
+};

package/lib/v2/vlive/maintainer.js

@@ -0,0 +1,3 @@
+module.exports = {
+    '/channel/:channel/board/:board': ['TonyRL'],
+};

package/lib/v2/vlive/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'vlive.tv': {
+        _name: 'V LIVE',
+        '.': [
+            {
+                title: 'Board',
+                docs: 'https://docs.rsshub.app/en/live.html#v-live',
+                source: '/channel/:board/board/:board',
+                target: '/vlive/channel/:board/board/:board',
+            },
+        ],
+    },
+};

package/lib/v2/vlive/router.js

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

package/lib/v2/vlive/templates/post.art

@@ -0,0 +1,8 @@
+{{ if post }}
+{{@ post }}
+{{ /if }}
+{{ if images }}
+{{ each images image }}
+<img src="{{ image.url }}">
+{{ /each }}
+{{ /if }}

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

@@ -0,0 +1,3 @@
+{{ if image }}
+<a href="{{ link }}"><img src="{{ image }}"></a>
+{{ /if }}

package/lib/v2/xiaohongshu/util.js

@@ -7,14 +7,14 @@ const getContent = (url, cache) =>
             const browser = await require('@/utils/puppeteer')();
             try {
                 const page = await browser.newPage();
+                await page.setRequestInterception(true);
+                page.on('request', (request) => {
+                    request.resourceType() === 'document' || request.resourceType() === 'script' || request.resourceType() === 'xhr' ? request.continue() : request.abort();
+                });
                 await page.goto(url);
                 await page.waitForSelector('.pc-container');
-                let content = await page.content();
-
-                content = content.replace('"RedAppLayout":undefined,', ''); // fix json parse
-                const regex = /_SSR_STATE__\S*=([\s\S]+)<\/script>/gm;
-                const match = regex.exec(content);
-                return JSON.parse(match[1]).Main;
+                const initialSsrState = await page.evaluate(() => window.__INITIAL_SSR_STATE__);
+                return initialSsrState.Main;
             } finally {
                 browser.close();
             }

package/lib/v2/xjtu/2yuan/news.js

@@ -0,0 +1,61 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const timezone = require('@/utils/timezone');
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const id = ctx.params.id ?? '110';
+
+    const rootUrl = 'http://2yuan.xjtu.edu.cn';
+    const currentUrl = `${rootUrl}/Html/News/Columns/${id}/Index.html`;
+
+    const response = await got({
+        method: 'get',
+        url: currentUrl,
+    });
+
+    const $ = cheerio.load(response.data);
+
+    let items = $('.column_list h2')
+        .toArray()
+        .map((item) => {
+            item = $(item);
+            return {
+                title: item.find('a').attr('title'),
+                link: `${rootUrl}${item.find('a').attr('href')}`,
+                pubDate: timezone(parseDate(item.find('.dy_date').text()), +8),
+            };
+        });
+
+    items = await Promise.all(
+        items.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const detailResponse = await got({
+                    method: 'get',
+                    url: item.link,
+                });
+
+                const content = cheerio.load(detailResponse.data);
+
+                item.description = content('#zoom').html();
+                item.pubDate = timezone(
+                    parseDate(
+                        content('.sub_tit3 strong')
+                            .first()
+                            .text()
+                            .replace(/发布时间：/, '')
+                    ),
+                    +8
+                );
+
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: $('title').text(),
+        link: currentUrl,
+        item: items,
+    };
+};

package/lib/v2/xjtu/dean.js

@@ -0,0 +1,83 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+const timezone = require('@/utils/timezone');
+
+const parseContent = (htmlString) => {
+    const $ = cheerio.load(htmlString);
+
+    const info = $('.detail_main_content > h1')
+        .contents()
+        .filter(function () {
+            return this.nodeType === 3;
+        })
+        .map(function () {
+            return $(this).text().trim();
+        })
+        .get();
+
+    const content = $('[id^="vsb_content"]');
+    $('form > div > ul a').each(function () {
+        $(this).appendTo(content);
+        $('<br>').appendTo(content);
+    });
+
+    return {
+        author: info[0] || '教务处',
+        description: content.html(),
+    };
+};
+
+module.exports = async (ctx) => {
+    const subpath = ctx.params.subpath;
+
+    const url = `http://dean.xjtu.edu.cn/${subpath.replace(/\.htm/g, '')}.htm`;
+    const base = url.split('/').slice(0, -1).join('/');
+
+    const list_response = await got(url);
+    const $ = cheerio.load(list_response.data);
+
+    const subname = $('em.ma-nav a')
+        .slice(1)
+        .map(function () {
+            return $(this).text();
+        })
+        .get()
+        .join(' - ');
+
+    const list = $('.list_main_content > .list-li')
+        .toArray()
+        .map((item) => {
+            item = $(item);
+            const title = item.find('a').attr('title');
+            const link = new URL(item.find('a').attr('href'), base).href;
+            return {
+                title,
+                link,
+                pubDate: timezone(parseDate(item.find('.list_time').text(), 'YYYY-MM-DD'), +8),
+            };
+        });
+
+    const out = await Promise.all(
+        list.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                try {
+                    const response = await got(item.link);
+                    const result = parseContent(response.data);
+
+                    item.description = result.description;
+                    item.author = result.author;
+                } catch (err) {
+                    return item;
+                }
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: `西安交大教务处 - ${subname}`,
+        link: url,
+        item: out.filter((item) => item !== ''),
+    };
+};

package/lib/{routes/universities → v2}/xjtu/ee.js

@@ -4,24 +4,23 @@ const { parseDate } = require('@/utils/parse-date');
 const timezone = require('@/utils/timezone');
 
 module.exports = async (ctx) => {
-    const id = ctx.params.id || '1124';
+    const id = ctx.params.id ?? '1124';
     const rootUrl = `http://ee.xjtu.edu.cn/list.jsp?urltype=tree.TreeTempUrl&wbtreeid=${id}`;
     const baseUrl = 'http://ee.xjtu.edu.cn';
 
-    const list_response = await got.get(rootUrl);
+    const list_response = await got(rootUrl);
     const $ = cheerio.load(list_response.data);
 
     const feed_title = $('span.windowstyle67278', "div[class='list_right fr']").text().trim();
 
     const list = $("div[class='list_right fr'] ul li")
-        .slice(0, 10)
         .map((_, item) => {
             item = $(item);
             const a = item.find('a');
             const date = parseDate(item.find('span').text());
             return {
                 title: a.text(),
-                link: new URL(a.attr('href'), baseUrl),
+                link: new URL(a.attr('href'), baseUrl).href,
                 pubDate: timezone(date, +8),
             };
         })
@@ -33,8 +32,9 @@ module.exports = async (ctx) => {
         item: await Promise.all(
             list.map((item) =>
                 ctx.cache.tryGet(item.link, async () => {
-                    const res = await got.get(item.link);
+                    const res = await got(item.link);
                     const content = cheerio.load(res.data);
+                    item.title = content('tr td[class^=titlestyle]').text();
                     item.description = content('td.contentstyle67362', 'form').html();
                     return item;
                 })

package/lib/{routes/universities → v2}/xjtu/gs/tzgg.js

@@ -1,6 +1,6 @@
-const url = require('url');
 const got = require('@/utils/got');
 const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
 
 module.exports = async (ctx) => {
     const rootUrl = 'http://gs.xjtu.edu.cn/tzgg.htm';
@@ -15,9 +15,9 @@ module.exports = async (ctx) => {
             item = $(item);
             const a = item.find('a');
             return {
-                title: a.text(),
-                link: url.resolve('http://gs.xjtu.edu.cn/', a.attr('href')),
-                pubDate: new Date(item.find('span.time').text()).toUTCString(),
+                title: a.attr('title'),
+                link: new URL(a.attr('href'), 'http://gs.xjtu.edu.cn/').href,
+                pubDate: parseDate(item.find('span.time').text()),
             };
         })
         .get();
@@ -28,9 +28,9 @@ module.exports = async (ctx) => {
         item: await Promise.all(
             list.map((item) =>
                 ctx.cache.tryGet(item.link, async () => {
-                    const res = await got({ method: 'get', url: item.link });
+                    const res = await got(item.link);
                     const content = cheerio.load(res.data);
-                    item.description = content('#vsb_content').html();
+                    item.description = content('#vsb_content').html() + (content('form ul').length > 0 ? content('form ul').html() : '');
                     return item;
                 })
             )

package/lib/v2/xjtu/international.js

@@ -0,0 +1,51 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const subpath = ctx.params.subpath;
+    const base = 'http://international.xjtu.edu.cn';
+
+    const url = `${base}/${subpath.split('.')[0]}.htm`;
+    const resp = await got(url);
+
+    const $ = cheerio.load(resp.data);
+    const name = $('div.pageTitle').text();
+    const list = $('.news-list-a > .c')
+        .toArray()
+        .map((item) => {
+            item = $(item);
+            const title = item.find('a').attr('title');
+            const pubDate = parseDate(item.find('p.list-time').text());
+            const link = new URL(item.find('a').attr('href'), base).href;
+            return {
+                title,
+                pubDate,
+                link,
+            };
+        });
+
+    const item = await Promise.all(
+        list.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                if (new URL(item.link).pathname.startsWith === '/content.jsp') {
+                    return item;
+                }
+                const resp = await got(item.link);
+
+                const $Des = cheerio.load(resp.data);
+                const description = $Des('div.ctnCont').html();
+
+                item.description = description;
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: `西安交通大学国际处 - ${name}`,
+        link: url,
+        description: `西安交通大学国际处 - ${name}`,
+        item,
+    };
+};