rsshub 1.0.0-master.f7add90 → 1.0.0-master.f7bfacc

package/lib/v2/yomiuri/news.js

@@ -4,126 +4,76 @@ const timezone = require('@/utils/timezone');
 const { parseDate } = require('@/utils/parse-date');
 
 module.exports = async (ctx) => {
-    const category = ctx.params.category;
+    const { category = 'news' } = ctx.params;
     const url = `https://www.yomiuri.co.jp/${category}`;
 
-    const response = await got({
-        method: 'get',
-        url,
-    });
+    const response = await got(url);
     const data = response.data;
     const $ = cheerio.load(data);
 
-    let categoryName;
-    let list = null;
+    let list;
     if (category === 'news') {
-        categoryName = '新着・速報';
-
-        list = $('div#latest_list_news').find('article').append($('div#latest_list_news_more').find('article'));
-
-        list = list.map((index, item) => {
-            item = $(item);
-            // remove matome title
-            const matomeTitle = item.find('div.c-matome-title');
-            if (matomeTitle.length !== 0) {
-                matomeTitle.remove();
-            }
-            // remove member only
-            const lockedIcon = item.find('svg[class=icon-locked]');
-            if (lockedIcon.length === 0) {
-                return item;
-            } else {
-                return null;
-            }
-        });
+        list = $('.news-top-latest__list .news-top-latest__list-item__inner')
+            .toArray()
+            .map((item) => {
+                item = $(item);
+                const a = item.find('h3 a');
+                return {
+                    title: a.text(),
+                    link: a.attr('href'),
+                    pubDate: timezone(parseDate(item.find('time').attr('datetime')), +9),
+                    locked: item.find('.icon-locked').length,
+                };
+            });
     } else {
-        let parentSelector = 'div.p-category-organization,.p-category-time-series';
-        // igoshougi channel sepcial div selector
-        if (category === 'igoshougi') {
-            parentSelector = 'div.uni-news-igoshougi-top';
-        }
-        categoryName = $('h1.p-header-category-current-title,h1.p-header-category-content-title').text();
-        // p-header-category-content-title
-        list = $(parentSelector).find('li').not('.p-member-only').not('.p-ad-list-item');
-        list = list.map((index, item) => {
-            item = $(item);
-            // remove matome title
-            const matomeTitle = item.find('div.c-matome-title');
-            if (matomeTitle.length !== 0) {
-                matomeTitle.remove();
-            }
-            return item;
-        });
-    }
-
-    // format category name
-    let formattedCategoryName = categoryName;
-    if (categoryName !== '') {
-        formattedCategoryName = ' - ' + categoryName.trim();
+        $('.p-category-reading-recommend').remove();
+        list = $('.layout-contents__main .c-list-title')
+            .toArray()
+            .map((item) => {
+                item = $(item);
+                const a = item.find('h3 a');
+                const parent = item.parent();
+                return {
+                    title: a.text(),
+                    link: a.attr('href'),
+                    pubDate: timezone(parseDate(parent.find('time').attr('datetime')), +9),
+                    locked: parent.find('.c-list-member-only').length,
+                };
+            });
     }
 
     const items = await Promise.all(
-        list
-            .map(async (index, item) => {
-                item = $(item);
-
-                let link = '';
-                if (categoryName === '新着・速報') {
-                    link = item.find('h3').children('a').attr('href');
-                } else {
-                    link = item.find('a').attr('href');
+        list.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                if (item.locked) {
+                    return item;
                 }
 
-                const description = await ctx.cache.tryGet(link, async () => {
-                    const response = await got(link);
-                    const $ = cheerio.load(response.data);
-                    const mainContent = $('div.p-main-contents');
-                    // remove articles recomended
-                    const recommendNode = mainContent.find('aside.ev-article-manual-related__article-inline');
-                    if (recommendNode.length !== 0) {
-                        recommendNode.remove();
-                    }
-                    return mainContent.html();
+                const response = await got(item.link);
+                const $ = cheerio.load(response.data);
+                const mainContent = $('.p-main-contents');
+
+                mainContent.find('[class^=ev-article], svg').remove();
+                mainContent.find('img').each((_, img) => {
+                    img.attribs.src = img.attribs.src.split('?')[0];
                 });
 
-                let tag = '';
-                if (categoryName === '新着・速報') {
-                    const tag_table = {
-                        news: '新着・速報',
-                        national: '社会',
-                        politics: '政治',
-                        economy: '経済',
-                        sports: 'スポーツ',
-                        world: '国際',
-                        science: '科学・ＩＴ',
-                        election: '選挙・世論調査',
-                        culture: 'エンタメ・文化',
-                        igoshougi: '囲碁・将棋',
-                        life: 'ライフ',
-                        local: '地域',
-                        editorial: '社説',
-                        medical: '医療・健康',
-                        olympic: 'オリンピック',
-                        koushitsu: '皇室',
-                    };
-                    const tag_value = tag_table[link.split('/')[3]];
-                    tag = tag_value ? tag_value : 'その他';
-                    tag = '[' + tag + '] ';
-                }
+                item.description = mainContent.html();
+                item.pubDate = parseDate($('meta[property="article:published_time"]').attr('content')); // 2023-05-17T22:33:00+09:00
+                item.updated = parseDate($('meta[property="article:modified_time"]').attr('content'));
 
-                return {
-                    title: tag + item.find('a').text(),
-                    description,
-                    pubDate: timezone(parseDate(item.find('time').prop('datetime')), +9),
-                    link,
-                };
+                const tag = $('.p-header-category-breadcrumbs li a').last().text();
+                item.category = tag;
+                item.title = `[${tag}] ${item.title}`;
+                return item;
             })
-            .get()
+        )
     );
 
     ctx.state.data = {
-        title: '読売新聞' + formattedCategoryName,
+        title: $('head title').text(),
         link: url,
+        image: 'https://www.yomiuri.co.jp/apple-touch-icon.png',
         item: items,
     };
 };

package/lib/v2/yomiuri/radar.js

@@ -3,10 +3,10 @@ module.exports = {
         _name: '読売新聞',
         www: [
             {
-                title: '読売新聞',
+                title: '新聞',
                 docs: 'https://docs.rsshub.app/traditional-media.html#du-mai-xin-wen',
-                source: ['/:category'],
-                target: '/yomiuri/:category',
+                source: ['/:category?'],
+                target: '/yomiuri/:category?',
             },
         ],
     },

package/lib/v2/youtube/user.js

@@ -17,7 +17,7 @@ module.exports = async (ctx) => {
         const link = `https://www.youtube.com/${username}`;
         const response = await got(link);
         const $ = cheerio.load(response.data);
-        const channelId = $('meta[itemprop="channelId"]').attr('content');
+        const channelId = $('meta[itemprop="identifier"]').attr('content');
         channelName = $('meta[itemprop="name"]').attr('content');
         playlistId = (await utils.getChannelWithId(channelId, 'contentDetails', ctx.cache)).data.items[0].contentDetails.relatedPlaylists.uploads;
     }

package/lib/v2/zcool/radar.js

@@ -11,37 +11,37 @@ module.exports = {
             {
                 title: '发现 - 精选 - 全部推荐',
                 docs: 'https://docs.rsshub.app/design.html#zhan-ku',
-                source: '',
+                source: '/',
                 target: '/zcool/discover/all',
             },
             {
                 title: '发现 - 精选 - 首页推荐',
                 docs: 'https://docs.rsshub.app/design.html#zhan-ku',
-                source: '',
+                source: '/',
                 target: '/zcool/discover/home',
             },
             {
                 title: '发现 - 精选 - 编辑精选',
                 docs: 'https://docs.rsshub.app/design.html#zhan-ku',
-                source: '',
+                source: '/',
                 target: '/zcool/discover/home',
             },
             {
                 title: '发现 - 精选 - 文章 - 编辑精选',
                 docs: 'https://docs.rsshub.app/design.html#zhan-ku',
-                source: '',
+                source: '/',
                 target: '/zcool/discover/article',
             },
             {
                 title: '作品榜单',
                 docs: 'https://docs.rsshub.app/design.html#zhan-ku',
-                source: '',
+                source: '/',
                 target: '/zcool/top/design',
             },
             {
                 title: '文章榜单',
                 docs: 'https://docs.rsshub.app/design.html#zhan-ku',
-                source: '',
+                source: '/',
                 target: '/zcool/top/article',
             },
             {

package/lib/v2/zhihu/answers.js

@@ -19,16 +19,20 @@ module.exports = async (ctx) => {
     let name = data[0].author.name;
 
     if (name === '知乎用户') {
-        const info = await got({
-            method: 'get',
-            url: `https://www.zhihu.com/api/v4/members/${id}/activities?limit=1`,
-            headers: {
-                ...utils.header,
-                Referer: `https://www.zhihu.com/people/${id}/activities`,
-                Authorization: 'oauth c3cef7c66a1843f8b3a9e6a1e3160e20', // hard-coded in js
-            },
+        const userProfile = await ctx.cache.tryGet(`zhihu:profile:${id}`, async () => {
+            const apiPath = `/api/v4/profile/${id}/infinity`;
+
+            const { data } = await got({
+                method: 'get',
+                url: `https://www.zhihu.com${apiPath}`,
+                headers: {
+                    ...utils.header,
+                    Referer: `https://www.zhihu.com/people/${id}`,
+                },
+            });
+            return data.data;
         });
-        name = info.data.data[0].actor.name;
+        name = userProfile.name;
     }
 
     const items = await Promise.all(

package/lib/v2/zhihu/radar.js

@@ -93,13 +93,13 @@ module.exports = {
             {
                 title: '日报',
                 docs: 'https://docs.rsshub.app/social-media.html#zhi-hu',
-                source: '',
+                source: '/',
                 target: '/zhihu/daily',
             },
             {
                 title: '日报',
                 docs: 'https://docs.rsshub.app/social-media.html#zhi-hu',
-                source: '/*tpath',
+                source: '/*',
                 target: '/zhihu/daily',
             },
         ],

package/lib/v2/zhubai/maintainer.js

@@ -1,3 +1,4 @@
 module.exports = {
+    '/top20': ['nczitzk'],
     '/:id': ['naixy28'],
 };

package/lib/v2/zhubai/radar.js

@@ -8,5 +8,12 @@ module.exports = {
                 source: ['/'],
             },
         ],
+        analy: [
+            {
+                title: 'TOP 20',
+                docs: 'https://docs.rsshub.app/blog.html#zhu-bai',
+                source: ['/'],
+            },
+        ],
     },
 };

package/lib/v2/zhubai/router.js

@@ -1,3 +1,4 @@
 module.exports = function (router) {
+    router.get('/top20', require('./top20'));
     router.get('/:id', require('./index'));
 };

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

@@ -0,0 +1,31 @@
+{{ each content c }}
+  {{ if c.text }}
+    {{ c.text }}
+  {{ else if c.type === 'paragraph' }}
+    <p>{{@ c.children | parseContent }}</p>
+  {{ else if c.type === 'link' }}
+    <a href="{{ c.url }}">{{@ c.children | parseContent }}</a>
+  {{ else if c.type === 'image' }}
+    <img src="{{ c.url }}" height="{{ c.naturalHeight }}" width="{{ c.naturalWidth }}">
+  {{ else if c.type === 'list-item' }}
+    <li>{{@ c.children | parseContent }}</li>
+  {{ else if c.type === 'bulleted-list' }}
+    <ul>{{@ c.children | parseContent }}</ul>
+  {{ else if c.type === 'numbered-list' }}
+    <ol>{{@ c.children | parseContent }}</ol>
+  {{ else if c.type === 'block-quote' }}
+    <blockquote>{{@ c.children | parseContent }}</blockquote>
+  {{ else if c.type === 'heading-one' }}
+    <h1>{{@ c.children | parseContent }}</h1>
+  {{ else if c.type === 'heading-two' }}
+    <h2>{{@ c.children | parseContent }}</h2>
+  {{ else if c.type === 'heading-three' }}
+    <h3>{{@ c.children | parseContent }}</h3>
+  {{ else if c.type === 'heading-four' }}
+    <h4>{{@ c.children | parseContent }}</h4>
+  {{ else if c.type === 'heading-five' }}
+    <h5>{{@ c.children | parseContent }}</h5>
+  {{ else if c.type === 'heading-six' }}
+    <h6>{{@ c.children | parseContent }}</h6>
+  {{ /if }}
+{{ /each }}

package/lib/v2/zhubai/top20.js

@@ -0,0 +1,57 @@
+const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
+const { art } = require('@/utils/render');
+const path = require('path');
+
+const parseContent = (content) =>
+    art(path.join(__dirname, 'templates/description.art'), {
+        content,
+    });
+
+art.defaults.imports.parseContent = parseContent;
+
+module.exports = async (ctx) => {
+    const limit = ctx.query.limit ? parseInt(ctx.query.limit) : 20;
+
+    const rootUrl = 'https://analy.zhubai.wiki';
+    const apiRootUrl = 'https://open.zhubai.wiki';
+    const apiUrl = `${apiRootUrl}/a/zb/s/ht/pl/wk`;
+
+    const response = await got({
+        method: 'post',
+        url: apiUrl,
+    });
+
+    let items = response.data.data.slice(0, limit).map((item) => ({
+        link: item.fp ?? item.pq ?? item.pu,
+    }));
+
+    items = await Promise.all(
+        items.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const matches = item.link.match(/\/(fp|pq|pu)\/([\w-]+)\/(\d+)/);
+
+                const detailResponse = await got({
+                    method: 'get',
+                    url: `https://${matches[2]}.zhubai.love/api/posts/${matches[3]}`,
+                });
+
+                const data = detailResponse.data;
+
+                item.title = data.title;
+                item.author = data.author.name;
+                item.pubDate = parseDate(data.created_at);
+                item.description = parseContent(JSON.parse(data.content));
+                item.link = `https://${matches[2]}.zhubai.love/posts/${matches[3]}`;
+
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: '竹白 - TOP20',
+        link: rootUrl,
+        item: items,
+    };
+};

package/lib/v2/zju/radar.js

@@ -46,7 +46,7 @@ module.exports = {
             {
                 title: '软件学院 - 全部通知',
                 docs: 'https://docs.rsshub.app/university.html#zhe-jiang-da-xue',
-                source: ['', '/*tpath'],
+                source: ['/*'],
                 target: '/zju/cst/0',
             },
             {

package/lib/v2/zyw/hot.js

@@ -0,0 +1,63 @@
+const got = require('@/utils/got');
+
+module.exports = async (ctx) => {
+    const site = ctx.params.site ?? '';
+
+    const rootUrl = 'https://hot.zyw.asia';
+    const apiRootUrl = 'https://api-hot.zyw.asia';
+
+    let response = await got({
+        method: 'get',
+        url: rootUrl,
+    });
+
+    const jsUrl = `${rootUrl}${response.data.match(/crossorigin src="(\/assets\/index-\w+\.js)">/)[1]}`;
+
+    response = await got({
+        method: 'get',
+        url: jsUrl,
+    });
+
+    const sites = response.data
+        .match(/label:"(.*?)",value:"(.*?)",order/g)
+        .map((a) => {
+            const matches = a.match(/label:"(.*?)",value:"(.*?)"/);
+            return {
+                label: matches[1],
+                value: matches[2],
+            };
+        })
+        .filter((a) => (site ? a.label === site || a.value === site : true));
+
+    const currentUrl = `${rootUrl}${site ? `/#/list?type=${sites[0].value}` : ''}`;
+
+    const items = [];
+
+    await Promise.all(
+        sites.map(async (a) => {
+            const detailResponse = await got({
+                method: 'get',
+                url: `${apiRootUrl}/${a.value}`,
+                headers: {
+                    referer: rootUrl,
+                },
+            });
+
+            for (const d of detailResponse.data.data) {
+                items.push({
+                    link: d.url,
+                    title: d.title,
+                    description: d.desc,
+                });
+            }
+
+            return;
+        })
+    );
+
+    ctx.state.data = {
+        title: `今日热榜${site ? ` - ${sites[0].label}` : ''}`,
+        link: currentUrl,
+        item: items,
+    };
+};

package/lib/v2/zyw/maintainer.js

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

package/lib/v2/zyw/radar.js

@@ -0,0 +1,16 @@
+module.exports = {
+    'zyw.asia': {
+        _name: 'zyw',
+        hot: [
+            {
+                title: '今日热榜',
+                docs: 'https://docs.rsshub.app/new-media.html#zyw-jin-ri-re-bang',
+                source: ['/'],
+                target: (params, url) => {
+                    const matches = new URL(url).href.match(/type=(\w+)/);
+                    return `/zyw/hot${matches ? `/${matches[1]}` : ''}`;
+                },
+            },
+        ],
+    },
+};

package/lib/v2/zyw/router.js

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

package/lib/views/error.art

@@ -26,13 +26,17 @@
         a {
             color: #F5712C;
         }
+
+        img {
+            filter: grayscale(1);
+        }
     </style>
 </head>
 
 <body>
     <div class="content">
         <p>
-            <img src="https://i.loli.net/2019/09/04/lmBbNQoLzrKGgiM.jpg" alt="RSSHub" width="120">
+            <img src="/logo.png" alt="RSSHub" width="120">
         </p>
 
         <h1>Looks like something went wrong</h1>
@@ -46,14 +50,14 @@ Node version: {{@ nodeVersion}}
 Git Hash: {{@ gitHash}}
         </pre>
         <pre class="message">
-如果您认为 RSSHub 导致了该错误，请在Github按照模版，复制本页面信息进行<a href="https://github.com/DIYgod/RSSHub/issues/new?assignees=&labels=RSS+bug&template=bug_report_zh.yml" target="_blank">汇报</a>
 If you believe this is an error caused by RSSHub, please <a href="https://github.com/DIYgod/RSSHub/issues/new?assignees=&labels=RSS+bug&template=bug_report_en.yml" target="_blank">report on github</a>
+如果您认为 RSSHub 导致了该错误，请在 GitHub 按照模版，复制本页面信息进行 <a href="https://github.com/DIYgod/RSSHub/issues/new?assignees=&labels=RSS+bug&template=bug_report_zh.yml" target="_blank">汇报</a>
         </pre>
 
         <div style="margin: 50px 0">
-            <p>在线文档与支持，请访问<a href="https://docs.rsshub.app/" target="_blank">docs.rsshub.app</a>。</p>
             <p>For online documentation and support please refer to
                 <a href="https://docs.rsshub.app/" target="_blank">docs.rsshub.app</a>.</p>
+            <p>在线文档与支持，请访问 <a href="https://docs.rsshub.app/" target="_blank">docs.rsshub.app</a>。</p>
         </div>
     </div>
 </body>

package/lib/views/rss.art

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rss  xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"
+<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"
 {{ if itunes_author || itunes_category || (item && item.some((i) => (i.itunes_item_image || i.itunes_duration))) }}
   xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd"
 {{ /if }}

package/lib/views/welcome.art

@@ -79,13 +79,13 @@
 <body>
     <div class="content">
         <p>
-            <img src="https://i.loli.net/2019/04/23/5cbeb7e41414c.png" alt="RSSHub" width="100">
+            <img src="/logo.png" alt="RSSHub" width="100">
         </p>
 
         <h1>Welcome to
             <span style="color: #F5712C;">RSSHub</span>!</h1>
 
-        <p>If you see this page, the RSSHub{{ if hash }} ({{ hash }}){{ /if }} is successfully installed and working.</p>
+        <p>If you see this page, the RSSHub is successfully installed and working.</p>
 
         <p>For online documentation and support please refer to
             <a href="https://docs.rsshub.app/" target="_blank">docs.rsshub.app</a>.</p>