rsshub 1.0.0-master.f7cdf8b → 1.0.0-master.f812e91

package/lib/v2/huxiu/radar.js

@@ -3,44 +3,52 @@ module.exports = {
         _name: '虎嗅',
         '.': [
             {
-                title: '首页资讯',
-                docs: 'https://docs.rsshub.app/routes/new-media#hu-xiu',
-                source: ['/article', '/'],
+                title: '资讯',
+                docs: 'https://docs.rsshub.app/routes/new-media#hu-xiu-zi-xun',
+                source: ['/article'],
                 target: '/huxiu/article',
             },
+            {
+                title: '频道',
+                docs: 'https://docs.rsshub.app/routes/new-media#hu-xiu-pin-dao',
+                source: ['/channel'],
+                target: (params) => `/huxiu/channel/${params.id.replace(/\.html$/, '')}`,
+            },
             {
                 title: '24小时',
-                docs: 'https://docs.rsshub.app/routes/new-media#hu-xiu',
-                source: ['/moment', '/'],
+                docs: 'https://docs.rsshub.app/routes/new-media#hu-xiu-24-xiao-shi',
+                source: ['/moment'],
                 target: '/huxiu/moment',
             },
             {
                 title: '标签',
-                docs: 'https://docs.rsshub.app/routes/new-media#hu-xiu',
+                docs: 'https://docs.rsshub.app/routes/new-media#hu-xiu-biao-qian',
                 source: ['/tags/:id'],
-                target: (params) => `/huxiu/tag/${params.id.replace('.html', '')}`,
+                target: (params) => `/huxiu/tag/${params.id.replace(/\.html$/, '')}`,
             },
             {
                 title: '搜索',
-                docs: 'https://docs.rsshub.app/routes/new-media#hu-xiu',
+                docs: 'https://docs.rsshub.app/routes/new-media#hu-xiu-sou-suo',
+                source: ['/'],
+                target: '/huxiu/search/:keyword',
             },
             {
                 title: '作者',
-                docs: 'https://docs.rsshub.app/routes/new-media#hu-xiu',
-                source: ['/member/:id/*', '/'],
-                target: '/huxiu/author/:id',
+                docs: 'https://docs.rsshub.app/routes/new-media#hu-xiu-zuo-zhe',
+                source: ['/member/:id/:type'],
+                target: (params) => `/huxiu/member/${params.id}/${params.type.replace(/\.html$/, '')}`,
             },
             {
                 title: '文集',
-                docs: 'https://docs.rsshub.app/routes/new-media#hu-xiu',
-                source: ['/collection/:id', '/'],
-                target: (params) => `/huxiu/collection/${params.id.replace('.html', '')}`,
+                docs: 'https://docs.rsshub.app/routes/new-media#hu-xiu-wen-ji',
+                source: ['/collection/:id'],
+                target: (params) => `/huxiu/collection/${params.id.replace(/\.html$/, '')}`,
             },
             {
                 title: '简报',
-                docs: 'https://docs.rsshub.app/routes/new-media#hu-xiu',
+                docs: 'https://docs.rsshub.app/routes/new-media#hu-xiu-jian-bao',
                 source: ['/briefColumn/:id', '/'],
-                target: (params) => `/huxiu/briefcolumn/${params.id.replace('.html', '')}`,
+                target: (params) => `/huxiu/briefcolumn/${params.id.replace(/\.html$/, '')}`,
             },
         ],
     },

package/lib/v2/huxiu/router.js

@@ -1,9 +1,12 @@
 module.exports = (router) => {
-    router.get('/article', require('./article'));
-    router.get('/author/:id', require('./author'));
+    router.get('/article', require('./channel'));
+    router.get('/author/:id/:type?', require('./member'));
+    router.get('/briefcolumn/:id', require('./briefColumn'));
+    router.get('/channel/:id?', require('./channel'));
+    router.get('/club/:id', require('./club'));
     router.get('/collection/:id', require('./collection'));
+    router.get('/member/:id/:type?', require('./member'));
     router.get('/moment', require('./moment'));
-    router.get('/tag/:id', require('./tag'));
     router.get('/search/:keyword', require('./search'));
-    router.get('/briefcolumn/:id', require('./briefColumn'));
+    router.get('/tag/:id', require('./tag'));
 };

package/lib/v2/huxiu/search.js

@@ -1,40 +1,35 @@
 const got = require('@/utils/got');
-const utils = require('./utils');
+
+const { rootUrl, apiSearchRootUrl, generateSignature, processItems, fetchData } = require('./util');
 
 module.exports = async (ctx) => {
     const { keyword } = ctx.params;
-    const url = `${utils.searchApi}/api/article`;
-    const link = utils.baseUrl;
+    const limit = ctx.query.limit ? parseInt(ctx.query.limit, 10) : 20;
 
-    const { data } = await got.post(url, {
-        headers: {
-            Referer: utils.baseUrl,
-        },
+    const apiUrl = new URL('api/article', apiSearchRootUrl).href;
+    const currentUrl = rootUrl;
+
+    const { data: response } = await got.post(apiUrl, {
         searchParams: {
             platform: 'www',
             s: keyword,
             sort: '',
             page: 1,
-            pagesize: 20,
-            appid: 'hx_search',
-            ...utils.generateSignature(),
+            pagesize: limit,
+            appid: 'hx_search_202303',
+            ...generateSignature(),
         },
     });
 
-    const list = data.data.datalist.map((d) => ({
-        title: d.title,
-        link: d.url.includes('article') ? `${d.url}.html` : d.url,
-        description: d.content,
-        author: d.author,
-    }));
+    const items = await processItems(response.data.datalist, limit, ctx.cache.tryGet);
+
+    const data = await fetchData(currentUrl);
+    data.title = `${keyword}-搜索结果-${data.title}`;
 
-    const items = await utils.ProcessFeed(list, ctx.cache);
+    ctx.state.json = response.data.datalist;
 
-    const info = `虎嗅网 - ${keyword}`;
     ctx.state.data = {
-        title: info,
-        link,
-        description: info,
         item: items,
+        ...data,
     };
 };

package/lib/v2/huxiu/tag.js

@@ -1,38 +1,26 @@
 const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const utils = require('./utils');
-const { parseDate } = require('@/utils/parse-date');
-const timezone = require('@/utils/timezone');
+
+const { rootUrl, processItems, fetchData } = require('./util');
 
 module.exports = async (ctx) => {
     const { id } = ctx.params;
-    const link = `${utils.baseUrl}/tags/${id}.html`;
-    const { data } = await got(link, {
-        https: {
-            rejectUnauthorized: false,
+    const limit = ctx.query.limit ? parseInt(ctx.query.limit, 10) : 10;
+
+    const apiUrl = new URL('v2_action/tag_article_list', rootUrl).href;
+    const currentUrl = new URL(`tags/${id}.html`, rootUrl).href;
+
+    const { data: response } = await got.post(apiUrl, {
+        form: {
+            tag_id: id,
         },
     });
 
-    const $ = cheerio.load(data);
-    const list = $('.related-article li')
-        .toArray()
-        .map((e) => {
-            e = $(e);
-            const a = e.find('a');
-            return {
-                title: a.text(),
-                link: `${utils.baseUrl}${a.attr('href')}`,
-                pubDate: timezone(parseDate(e.find('.time').text()), 8),
-            };
-        });
+    const items = await processItems(response.data, limit, ctx.cache.tryGet);
 
-    const items = await utils.ProcessFeed(list, ctx.cache);
+    const data = await fetchData(currentUrl);
 
-    const info = `虎嗅 - ${$('h1').text()}`;
     ctx.state.data = {
-        title: info,
-        link,
-        description: info,
         item: items,
+        ...data,
     };
 };

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

@@ -0,0 +1,46 @@
+{{ if (!video || !video.src) && image?.src }}
+  <figure>
+    <img 
+      {{ if image.width }}
+        width={{ image.width }}
+      {{ /if }}
+      {{ if image.height }}
+        height={{ image.height }}
+      {{ /if }}
+    src="{{ image.src }}">
+  </figure>
+{{ /if }}
+
+{{ if audio?.src }}
+  <audio controls>
+    <source src="{{ audio.src }}" type="{{ audio.type }}">
+  </audio>
+{{ /if }}
+
+{{ if video?.src }}
+  <video
+    {{ set poster = video.poster || image?.src }}
+    {{ if poster }}
+      poster="{{ poster }}"
+    {{ /if }}
+    controls>
+    <source
+      src="{{ video.src }}"
+      type="{{ video.type }}">
+    <object data="{{ video.src }}">
+      <embed src="{{ video.src }}">
+    </object>
+  </video>
+{{ /if }}
+
+{{ if preface }}
+  {{@ preface }}
+{{ /if }}
+
+{{ if summary }}
+  {{@ summary }}
+{{ /if }}
+
+{{ if description }}
+  {{@ description }}
+{{ /if }}