rsshub 1.0.0-master.fdbb6fa → 1.0.0-master.fdc59d2

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

@@ -0,0 +1,12 @@
+{{ if logo }}
+<img src="{{ logo }}">
+{{ /if }}
+<table>
+{{ each items item index }}
+{{ if item }}
+<tr>
+  <td><b>{{ index }}</b></td>
+  <td>{{ item }}</td>
+</tr>
+{{ /if }}
+{{ /each }}

package/lib/v2/yoasobi-music/info.js

@@ -0,0 +1,68 @@
+const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
+const { parseJSONP } = require('./jsonpHelper');
+const { art } = require('@/utils/render');
+const path = require('path');
+
+module.exports = async (ctx) => {
+    const category = ctx.params.category;
+
+    const ARTIST = 'YOASOBI',
+        SONYJPURL = 'https://www.sonymusic.co.jp',
+        BASEURL = 'https://www.sonymusic.co.jp/json/v2/artist',
+        POSTFIX = category === 'news' ? 'start/0/count/-1' : 'start/0/count/-1/callback/hotCallback';
+
+    const officialUrl = `https://www.yoasobi-music.jp/${category}`;
+    const api = `${BASEURL}/${ARTIST}/${category === 'news' ? 'information' : 'hottopic'}/${POSTFIX}`;
+    const title = `LATEST ${category.toUpperCase()}`;
+
+    const response = await got({
+        method: 'get',
+        url: api,
+    });
+
+    const data = parseJSONP(response.data).items.map((item) => {
+        const isBio = category === 'biography';
+        const randomEmoji = (() => {
+            const emojis = ['㊗️', '🎉', '🎊', '🎈', '🎁', '🎂', '🎀', '🎗', '🎆', '🎇', '🎐', '🎑', '🎃'];
+            return emojis[Math.floor(Math.random() * emojis.length)];
+        })();
+
+        return {
+            id: isBio ? null : item.id,
+            guid: isBio ? `bio:${item.url}` : `news:${item.title}${item.date}`,
+            title: isBio ? `${randomEmoji} ${item.url}` : item.title,
+            category: item.category ?? 'Achievement',
+            date: isBio ? item.url : item.date,
+            description: isBio ? item.kiji : item.article,
+            image: !isBio ? null : item.image_url === '' ? null : `${SONYJPURL}${item.image_url}`,
+        };
+    });
+
+    ctx.state.data = {
+        // the source title
+        title,
+        // the source url
+        link: officialUrl,
+        // the source description
+        description: `Yoasobi's latest ${category}`,
+        // iterate through all leaf objects
+        item: data.map((i) => ({
+            // the article title
+            title: i.title,
+            // the article content
+            description: art(path.join(__dirname, 'templates/info.art'), {
+                image: i.image,
+                category: i.category,
+                description: i.description.replace(/\n/g, '<br>'),
+            }),
+            // the article publish time
+            pubDate: parseDate(i.date),
+            // guid
+            guid: i.guid,
+            // the article link
+            link: i.id ? `${officialUrl}/${i.id}` : officialUrl,
+            category: i.category,
+        })),
+    };
+};

package/lib/v2/yoasobi-music/jsonpHelper.js

@@ -0,0 +1,19 @@
+function parseJSONP(jsonpData) {
+    try {
+        const startPos = jsonpData.indexOf('({');
+        const endPos = jsonpData.lastIndexOf('})');
+        let jsonString = jsonpData.substring(startPos + 1, endPos + 1);
+
+        // remove escaped single quotes since they are not valid json
+        jsonString = jsonString.replace(/\\'/g, "'");
+
+        return JSON.parse(jsonString);
+    } catch (e) {
+        const error = new Error(`Failed to convert jsonp to json. ${e.message}`);
+        throw error;
+    }
+}
+
+module.exports = {
+    parseJSONP,
+};

package/lib/v2/yoasobi-music/live.js

@@ -0,0 +1,52 @@
+const got = require('@/utils/got');
+const { parseJSONP } = require('./jsonpHelper');
+const { art } = require('@/utils/render');
+const path = require('path');
+
+module.exports = async (ctx) => {
+    const ARTIST = 'YOASOBI',
+        SONYJPURL = 'https://www.sonymusic.co.jp',
+        BASEURL = 'https://www.sonymusic.co.jp/json/v2/artist',
+        POSTFIX = 'start/0/count/-1';
+
+    const api = `${BASEURL}/${ARTIST}/live/${POSTFIX}`;
+    const officialUrl = 'https://www.yoasobi-music.jp/live';
+    const title = 'LATEST LIVE';
+
+    const response = await got({
+        method: 'get',
+        url: api,
+    });
+
+    const data = parseJSONP(response.data).items.map((item) => ({
+        title: item.tourName,
+        imageLink: item.tourImage !== '' ? `${SONYJPURL}${item.tourImage}` : null,
+        link: `${officialUrl}/${item.link.split('/').pop()}`,
+        description: item.tourInfo,
+        // @param {Array} liveItem - An array contains all the sessions
+        sessions: item.liveItem,
+    }));
+
+    ctx.state.data = {
+        // the source title
+        title,
+        // the source url
+        link: officialUrl,
+        // the source description
+        description: "YOASOBI's Latest Live",
+        // iterate through all leaf objects
+        item: data.map((item) => ({
+            // the article title
+            title: item.title,
+            // the article content
+            description: art(path.join(__dirname, 'templates/live.art'), {
+                image: item.imageLink,
+                description: item.description,
+                sessions: item.sessions,
+            }),
+            // no pubDate
+            // the article link
+            link: item.link,
+        })),
+    };
+};

package/lib/v2/yoasobi-music/maintainer.js

@@ -0,0 +1,5 @@
+module.exports = {
+    '/info/:category': ['Kiotlin'],
+    '/live': ['Kiotlin'],
+    '/media': ['Kiotlin'],
+};

package/lib/v2/yoasobi-music/media.js

@@ -0,0 +1,59 @@
+const got = require('@/utils/got');
+const { parseJSONP } = require('./jsonpHelper');
+const { art } = require('@/utils/render');
+const path = require('path');
+
+module.exports = async (ctx) => {
+    const ARTIST = 'YOASOBI',
+        BASEURL = 'https://www.sonymusic.co.jp/json/v2/artist',
+        POSTFIX = 'start/0/count/-1';
+
+    const api = `${BASEURL}/${ARTIST}/media/${POSTFIX}`;
+    const officialUrl = 'https://www.yoasobi-music.jp/media';
+    const title = 'LATEST MEDIA';
+
+    const response = await got({
+        method: 'get',
+        url: api,
+    });
+
+    const data = Object.values(parseJSONP(response.data).items)
+        .reduce((p, c) => p.concat(c))
+        .sort((a, b) => new Date(b.date) - new Date(a.date))
+        .map((item) => ({
+            date: item.date,
+            weekDay: item.youbi,
+            startTime: item.startTime || null,
+            endTime: item.endTime || null,
+            tvStation: item.media || null,
+            title: item.program || item.media,
+            description: item.note,
+        }));
+
+    ctx.state.data = {
+        // the source title
+        title,
+        // the source url
+        link: officialUrl,
+        // the source description
+        description: "YOASOBI's Latest Media",
+        // iterate through all leaf objects
+        item: data.map((i) => ({
+            // the article title
+            title: i.title,
+            // the article content
+            description: art(path.join(__dirname, 'templates/media.art'), {
+                date: i.date,
+                weekDay: i.weekDay,
+                postFix: i.startTime && i.endTime && i.tvStation ? `${i.startTime} ~ ${i.endTime} ${i.tvStation}` : null,
+                description: i.description,
+            }),
+            // no pubDate
+            pubDate: i.date,
+            // specify guid because the link is not unique
+            guid: i.title + i.date,
+            // the article link
+            link: officialUrl,
+        })),
+    };
+};

package/lib/v2/yoasobi-music/radar.js

@@ -0,0 +1,31 @@
+module.exports = {
+    'yoasobi-music.jp': {
+        _name: 'Yoasobi Official',
+        www: [
+            {
+                title: 'News',
+                docs: 'https://docs.rsshub.app/en/live.html#yoasobi',
+                source: ['/', '/:category'],
+                target: '/yoasobi-music/info/:category',
+            },
+            {
+                title: 'Biography',
+                docs: 'https://docs.rsshub.app/en/live.html#yoasobi',
+                source: ['/', '/:category'],
+                target: '/yoasobi-music/info/:category',
+            },
+            {
+                title: 'Live',
+                docs: 'https://docs.rsshub.app/en/live.html#yoasobi',
+                source: ['/', '/live'],
+                target: '/yoasobi-music/live',
+            },
+            {
+                title: 'Media',
+                docs: 'https://docs.rsshub.app/en/live.html#yoasobi',
+                source: ['/', '/media'],
+                target: '/yoasobi-music/media',
+            },
+        ],
+    },
+};

package/lib/v2/yoasobi-music/router.js

@@ -0,0 +1,5 @@
+module.exports = function (router) {
+    router.get('/info/:category?', require('./info')); // news, biography
+    router.get('/live', require('./live'));
+    router.get('/media', require('./media'));
+};

package/lib/v2/yoasobi-music/templates/info.art

@@ -0,0 +1,7 @@
+{{ if image }}
+    <img src="{{ image}}" />
+{{ /if }}
+{{ if category }}
+    <p>Category: {{category}}</p>
+{{ /if }}
+{{@ description }}

package/lib/v2/yoasobi-music/templates/live.art

@@ -0,0 +1,12 @@
+{{ if image }}
+    <img src={{image}} />
+{{ /if }}
+{{@ description }}
+{{ each sessions se }}
+    <div style="margin: 0.5em 0; padding: 0.5em 1em; border: 0.1em solid palevioletred;">
+        <p>{{se.date}} [{{se.youbi}}]</p>
+        <p style="color: palevioletred;">{{se.tourName}}</p>
+        <p>会場: {{se.area}} <a href={{se.mapURL}} target="_blank">{{se.place}}</a></p>
+        <p>開場/開演: {{se.open}}/{{se.start}}</p>
+    </div>
+{{ /each }}

package/lib/v2/yoasobi-music/templates/media.art

@@ -0,0 +1,2 @@
+<p>{{date}} [{{weekDay}}] {{ if postFix }}{{postFix}}{{ /if }}</p>
+{{@ description }}

package/lib/v2/yxdown/maintainer.js

@@ -0,0 +1,4 @@
+module.exports = {
+    '/news/:category?': ['nczitzk'],
+    '/recommend': ['nczitzk'],
+};

package/lib/{routes → v2}/yxdown/news.js

@@ -2,18 +2,20 @@ const got = require('@/utils/got');
 const cheerio = require('cheerio');
 const timezone = require('@/utils/timezone');
 const { parseDate } = require('@/utils/parse-date');
+const { rootUrl, getCookie } = require('./utils');
 
 module.exports = async (ctx) => {
     const category = ctx.params.category ? `${ctx.params.category}/` : '';
 
-    const rootUrl = 'http://www.yxdown.com';
     const currentUrl = `${rootUrl}/news/${category}`;
 
-    const response = await got({
-        method: 'get',
-        url: currentUrl,
-    });
+    const cookie = await getCookie();
 
+    const response = await got(currentUrl, {
+        headers: {
+            cookie,
+        },
+    });
     const $ = cheerio.load(response.data);
 
     const list = $('.div_zixun h2 a')
@@ -30,9 +32,10 @@ module.exports = async (ctx) => {
     const items = await Promise.all(
         list.map((item) =>
             ctx.cache.tryGet(item.link, async () => {
-                const detailResponse = await got({
-                    method: 'get',
-                    url: item.link,
+                const detailResponse = await got(item.link, {
+                    headers: {
+                        cookie,
+                    },
                 });
                 const content = cheerio.load(detailResponse.data);
 

package/lib/v2/yxdown/radar.js

@@ -0,0 +1,19 @@
+module.exports = {
+    'yxdown.com': {
+        _name: '游讯网',
+        '.': [
+            {
+                title: '资讯',
+                docs: 'https://docs.rsshub.app/game.html#you-xun-wang',
+                source: ['/news/:category', '/news'],
+                target: (params) => `/yxdown/news${params.category ? `/${params.category}` : ''}`,
+            },
+            {
+                title: '精彩推荐',
+                docs: 'https://docs.rsshub.app/game.html#you-xun-wang',
+                source: ['/'],
+                target: '/yxdown/recommend',
+            },
+        ],
+    },
+};

package/lib/{routes → v2}/yxdown/recommend.js

@@ -2,13 +2,15 @@ const got = require('@/utils/got');
 const cheerio = require('cheerio');
 const timezone = require('@/utils/timezone');
 const { parseDate } = require('@/utils/parse-date');
+const { rootUrl, getCookie } = require('./utils');
 
 module.exports = async (ctx) => {
-    const rootUrl = 'http://www.yxdown.com';
-    const currentUrl = `${rootUrl}/news`;
-    const response = await got({
-        method: 'get',
-        url: currentUrl,
+    const currentUrl = `${rootUrl}/news/`;
+    const cookie = await getCookie();
+    const response = await got(currentUrl, {
+        headers: {
+            cookie,
+        },
     });
 
     const $ = cheerio.load(response.data);
@@ -27,9 +29,10 @@ module.exports = async (ctx) => {
     const items = await Promise.all(
         list.map((item) =>
             ctx.cache.tryGet(item.link, async () => {
-                const detailResponse = await got({
-                    method: 'get',
-                    url: item.link,
+                const detailResponse = await got(item.link, {
+                    headers: {
+                        cookie,
+                    },
                 });
                 const content = cheerio.load(detailResponse.data);
 

package/lib/v2/yxdown/router.js

@@ -0,0 +1,4 @@
+module.exports = (router) => {
+    router.get('/news/:category?', require('./news'));
+    router.get('/recommend', require('./recommend'));
+};

package/lib/v2/yxdown/utils.js

@@ -0,0 +1,17 @@
+const got = require('@/utils/got');
+
+const rootUrl = 'http://www.yxdown.com';
+
+const getCookie = async () => {
+    const cookieResponse = await got(rootUrl);
+
+    const cookieRegx = /(?<=.cookie=").*(?=; path)/g;
+    const cookieStr = cookieResponse.data.match(cookieRegx)[0];
+
+    return cookieStr;
+};
+
+module.exports = {
+    rootUrl,
+    getCookie,
+};

package/lib/v2/zaobao/maintainer.js

@@ -2,5 +2,5 @@ module.exports = {
     '/interactive-graphics': ['shunf4'],
     '/realtime/:section?': ['shunf4'],
     '/znews/:section?': ['shunf4'],
-    '/:type/:section': ['shunf4'],
+    '/:type?/:section?': ['shunf4'],
 };

package/lib/v2/zaobao/util.js

@@ -132,23 +132,23 @@ const parseList = async (ctx, sectionUrl) => {
                     });
                 }
                 if ($1('.inline-figure-gallery').length) {
-                    // Unused?
+                    // for SG version
                     imageDataArray.push({
                         type: 'normalHTML',
                         html: $1('.inline-figure-gallery')
                             .html()
-                            .replace(/\/\/.*\.com\/s3fs-public/, '//static.zaobao.com/s3fs-public')
-                            .replace(/s3\/files/, 's3fs-public'),
+                            .replace(/\/\/.*\.com\/s3fs-public/g, '//static.zaobao.com/s3fs-public')
+                            .replace(/s3\/files/g, 's3fs-public'),
                     });
                 }
                 if ($1('#carousel-article').length) {
-                    // for HK version
+                    // for HK version, HK version of multi images use same selector as single image, so g is needed for all pages
                     imageDataArray.push({
                         type: 'normalHTML',
                         html: $1('#carousel-article .carousel-inner')
                             .html()
-                            .replace(/\/\/.*\.com\/s3fs-public/, '//static.zaobao.com/s3fs-public')
-                            .replace(/s3\/files/, 's3fs-public'),
+                            .replace(/\/\/.*\.com\/s3fs-public/g, '//static.zaobao.com/s3fs-public')
+                            .replace(/s3\/files/g, 's3fs-public'),
                     });
                 }
 

package/lib/{routes → v2}/zcool/discover.js

@@ -1,5 +1,8 @@
 const got = require('@/utils/got');
 const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+const { art } = require('@/utils/render');
+const path = require('path');
 const locations = require('./locations');
 
 module.exports = async (ctx) => {
@@ -41,21 +44,22 @@ module.exports = async (ctx) => {
 
     const queries = {
         cate: '0',
-        subCate: ctx.params.subCate || '0',
-        city: ctx.params.city || '0',
-        college: ctx.params.college || '0',
-        recommendLevel: ctx.params.recommendLevel || '2',
-        sort: ctx.params.sort || '9',
+        subCate: ctx.params.subCate ?? '0',
+        city: ctx.params.city ?? '0',
+        college: ctx.params.college ?? '0',
+        recommendLevel: ctx.params.recommendLevel ?? '2',
+        sort: ctx.params.sort ?? '9',
+        limit: ctx.query.limit ?? '25',
     };
 
-    let query = ctx.params.query || '';
+    let query = ctx.params.query ?? '';
 
     if (query.indexOf('=') > -1) {
         for (const q of query.split('&')) {
             const kv = q.split('=');
             queries[kv[0]] = kv[1];
         }
-        queries.limit = '20';
+        queries.limit = '25';
         queries.page = '1';
     } else {
         switch (query) {
@@ -73,7 +77,7 @@ module.exports = async (ctx) => {
                 queries.recommendLevel = '2';
                 break;
             default:
-                queries.cate = ctx.params.query || '0';
+                queries.cate = ctx.params.query ?? '0';
         }
     }
 
@@ -89,18 +93,19 @@ module.exports = async (ctx) => {
     query = query.substr(0, query.length - 1);
 
     const rootUrl = 'https://www.zcool.com.cn';
-    const currentUrl = `${rootUrl}/discover.json?${query}`;
+    const currentUrl = `${rootUrl}/p1/discover/list?${query}`;
 
     const response = await got({
         method: 'get',
         url: currentUrl,
     });
 
-    const list = response.data.data.data.map((item) => ({
-        title: item.object.title,
-        link: item.object.pageUrl,
-        pubDate: new Date(item.object.publishTime),
-        author: item.object.creatorObj.username,
+    const list = response.data.datas.map((item) => ({
+        title: item.content.title,
+        link: item.content.pageUrl,
+        pubDate: parseDate(item.content.publishTime),
+        author: item.content.creatorObj.username,
+        category: item.content.tags,
     }));
 
     const items = await Promise.all(
@@ -121,11 +126,18 @@ module.exports = async (ctx) => {
                         if (i >= videos.length) {
                             return;
                         }
-                        content(this).append(`<video src="${videos[i].match(/source: '(https:\/\/video\.zcool\.cn\/.*)'/)[1]}" controls="controls">`);
+
+                        content(this).append(
+                            art(path.join(__dirname, 'templates/description.art'), {
+                                video: videos[i].match(/source: '(https:\/\/video\.zcool\.cn\/.*)'/)[1],
+                            })
+                        );
                     });
                 }
 
-                item.description = item.link.includes('article') ? content('.work-content-wrap').html() : content('.article-content-wraper').html();
+                item.description = art(path.join(__dirname, 'templates/description.art'), {
+                    description: item.link.includes('article') ? content('.articleContentWrapper').html() : content('.workShowBox').parent().html(),
+                });
 
                 return item;
             })
@@ -133,7 +145,7 @@ module.exports = async (ctx) => {
     );
 
     ctx.state.data = {
-        title: `${categories[queries.cate]}${queries.subCate === '0' ? '' : ` - ${subCategories[queries.cate][queries.subCate]}`} - 站酷`,
+        title: `站酷 - ${categories[queries.cate]}${queries.subCate === '0' ? '' : ` - ${subCategories[queries.cate][queries.subCate]}`}`,
         link: `${rootUrl}/discover?${query}`,
         item: items,
     };

package/lib/v2/zcool/maintainer.js

@@ -0,0 +1,7 @@
+module.exports = {
+    '/discover/:type?': ['junbaor', 'nczitzk'],
+    '/discover/:query?': ['nczitzk'],
+    '/discover/:query?/:subCate?/:hasVideo?/:city?/:college?/:recommendLevel?/:sort?': ['nczitzk'],
+    '/top/:type': ['mexunco'],
+    '/user/:uid': ['junbaor'],
+};

package/lib/v2/zcool/radar.js

@@ -0,0 +1,55 @@
+module.exports = {
+    'zcool.com.cn': {
+        _name: '站酷',
+        www: [
+            {
+                title: '发现',
+                docs: 'https://docs.rsshub.app/design.html#zhan-ku',
+                source: ['/discover', '/'],
+                target: (params, url) => `/zcool/discover/${new URL(url).toString().split('?').pop()}`,
+            },
+            {
+                title: '发现 - 精选 - 全部推荐',
+                docs: 'https://docs.rsshub.app/design.html#zhan-ku',
+                source: '',
+                target: '/zcool/discover/all',
+            },
+            {
+                title: '发现 - 精选 - 首页推荐',
+                docs: 'https://docs.rsshub.app/design.html#zhan-ku',
+                source: '',
+                target: '/zcool/discover/home',
+            },
+            {
+                title: '发现 - 精选 - 编辑精选',
+                docs: 'https://docs.rsshub.app/design.html#zhan-ku',
+                source: '',
+                target: '/zcool/discover/home',
+            },
+            {
+                title: '发现 - 精选 - 文章 - 编辑精选',
+                docs: 'https://docs.rsshub.app/design.html#zhan-ku',
+                source: '',
+                target: '/zcool/discover/article',
+            },
+            {
+                title: '作品榜单',
+                docs: 'https://docs.rsshub.app/design.html#zhan-ku',
+                source: '',
+                target: '/zcool/top/design',
+            },
+            {
+                title: '文章榜单',
+                docs: 'https://docs.rsshub.app/design.html#zhan-ku',
+                source: '',
+                target: '/zcool/top/article',
+            },
+            {
+                title: '用户作品',
+                docs: 'https://docs.rsshub.app/design.html#zhan-ku',
+                source: ['/u/:id'],
+                target: `/zcool/user/:id`,
+            },
+        ],
+    },
+};

package/lib/v2/zcool/router.js

@@ -0,0 +1,5 @@
+module.exports = function (router) {
+    router.get('/discover/:query?/:subCate?/:hasVideo?/:city?/:college?/:recommendLevel?/:sort?', require('./discover'));
+    router.get('/top/:type', require('./top'));
+    router.get('/user/:uid', require('./user'));
+};

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

@@ -0,0 +1,8 @@
+{{ if video }}
+<video controls>
+<source src="{{ video }}" type="video/mp4">
+</video>
+{{ /if }}
+{{ if description }}
+{{@ description }}
+{{ /if }}

package/lib/v2/zcool/templates/work.art

@@ -0,0 +1,11 @@
+{{ if data.description }}
+    {{@ data.description }}
+{{ /if }}
+{{ if data.productImages }}
+    {{ each data.productImages image }}
+        <img src="{{ image.urlBig.includes('?x-oss-process') ? image.urlBig.split('?')[0] : image.urlBig }}">
+        {{ if image.description }}
+            {{@ image.description }}
+        {{ /if }}
+    {{ /each }}
+{{ /if }}