rsshub 1.0.0-master.fcb92f0 → 1.0.0-master.fcc0fab

package/lib/v2/18comic/index.js

@@ -1,12 +1,14 @@
-const { rootUrl, ProcessItems } = require('./utils');
+const { defaultDomain, getRootUrl, ProcessItems } = require('./utils');
 
 module.exports = async (ctx) => {
     const category = ctx.params.category ?? 'all';
     const keyword = ctx.params.keyword ?? '';
     const time = ctx.params.time ?? 'a';
     const order = ctx.params.order ?? 'mr';
+    const { domain = defaultDomain } = ctx.query;
+    const rootUrl = getRootUrl(domain, ctx);
 
     const currentUrl = `${rootUrl}/albums${category !== 'all' ? `/${category}` : ''}${keyword ? `?screen=${keyword}` : '?'}${time !== 'a' ? `&t=${time}` : ''}${order !== 'mr' ? `&o=${order}` : ''}`;
 
-    ctx.state.data = await ProcessItems(ctx, currentUrl);
+    ctx.state.data = await ProcessItems(ctx, currentUrl, rootUrl);
 };

package/lib/v2/18comic/radar.js

@@ -3,25 +3,25 @@ const _18comic = {
     '.': [
         {
             title: '成人 A 漫',
-            docs: 'https://docs.rsshub.app/anime.html#jin-man-tian-tang-cheng-ren-a-man',
+            docs: 'https://docs.rsshub.app/routes/anime#jin-man-tian-tang-cheng-ren-a-man',
             source: ['/'],
             target: '/18comic/:category?/:time?/:order?/:keyword?',
         },
         {
             title: '搜索',
-            docs: 'https://docs.rsshub.app/anime.html#jin-man-tian-tang-sou-suo',
+            docs: 'https://docs.rsshub.app/routes/anime#jin-man-tian-tang-sou-suo',
             source: ['/'],
             target: '/18comic/search/:option?/:category?:keyword?/:time?/:order?',
         },
         {
             title: '专辑',
-            docs: 'https://docs.rsshub.app/anime.html#jin-man-tian-tang-zhuan-ji',
+            docs: 'https://docs.rsshub.app/routes/anime#jin-man-tian-tang-zhuan-ji',
             source: ['/'],
             target: '/18comic/album/:id',
         },
         {
             title: '文庫',
-            docs: 'https://docs.rsshub.app/anime.html#jin-man-tian-tang-wen-ku',
+            docs: 'https://docs.rsshub.app/routes/anime#jin-man-tian-tang-wen-ku',
             source: ['/'],
             target: '/18comic/blogs/:category?',
         },

package/lib/v2/18comic/search.js

@@ -1,4 +1,4 @@
-const { rootUrl, ProcessItems } = require('./utils');
+const { defaultDomain, getRootUrl, ProcessItems } = require('./utils');
 
 module.exports = async (ctx) => {
     const option = ctx.params.option ?? 'photos';
@@ -6,8 +6,10 @@ module.exports = async (ctx) => {
     const keyword = ctx.params.keyword ?? '';
     const time = ctx.params.time ?? 'a';
     const order = ctx.params.order ?? 'mr';
+    const { domain = defaultDomain } = ctx.query;
+    const rootUrl = getRootUrl(domain, ctx);
 
     const currentUrl = `${rootUrl}/search/${option}${category !== 'all' ? `/${category}` : ''}${keyword ? `?search_query=${keyword}` : '?'}${time !== 'a' ? `&t=${time}` : ''}${order !== 'mr' ? `&o=${order}` : ''}`;
 
-    ctx.state.data = await ProcessItems(ctx, currentUrl);
+    ctx.state.data = await ProcessItems(ctx, currentUrl, rootUrl);
 };

package/lib/v2/18comic/utils.js

@@ -3,13 +3,24 @@ const cheerio = require('cheerio');
 const { parseDate } = require('@/utils/parse-date');
 const { art } = require('@/utils/render');
 const path = require('path');
+const config = require('@/config').value;
 
-const rootUrl = 'https://jmcomic.me';
-// list of address: https://jmcomic1.bet
+const defaultDomain = 'jmcomic1.me';
+// list of address: https://jmcomic2.bet
+const allowDomain = ['18comic.vip', '18comic.org', 'jmcomic.me', 'jmcomic1.me', 'jm-comic3.art', 'jm-comic.club', 'jm-comic2.ark'];
+
+const getRootUrl = (domain, ctx) => {
+    if (!config.feature.allow_user_supply_unsafe_domain && !allowDomain.includes(domain)) {
+        ctx.throw(403, `This RSS is disabled unless 'ALLOW_USER_SUPPLY_UNSAFE_DOMAIN' is set to 'true'.`);
+    }
+
+    return `https://${domain}`;
+};
 
 module.exports = {
-    rootUrl,
-    ProcessItems: async (ctx, currentUrl) => {
+    defaultDomain,
+    getRootUrl,
+    ProcessItems: async (ctx, currentUrl, rootUrl) => {
         currentUrl = currentUrl.replace(/\?$/, '');
 
         const response = await got(currentUrl);

package/lib/v2/19lou/radar.js

@@ -4,7 +4,7 @@ module.exports = {
         '.': [
             {
                 title: '头条',
-                docs: 'https://docs.rsshub.app/bbs.html#19-lou-tou-tiao',
+                docs: 'https://docs.rsshub.app/routes/bbs#19-lou-tou-tiao',
                 source: ['/'],
                 target: (params, url) => `/19lou/${new URL(url).toString().match(/\/\/(.*?)\.19lou/)[1]}`,
             },
@@ -12,7 +12,7 @@ module.exports = {
         www: [
             {
                 title: '头条',
-                docs: 'https://docs.rsshub.app/bbs.html#19-lou-tou-tiao',
+                docs: 'https://docs.rsshub.app/routes/bbs#19-lou-tou-tiao',
                 source: ['/'],
                 target: '/19lou/www',
             },
@@ -20,7 +20,7 @@ module.exports = {
         jiaxing: [
             {
                 title: '头条',
-                docs: 'https://docs.rsshub.app/bbs.html#19-lou-tou-tiao',
+                docs: 'https://docs.rsshub.app/routes/bbs#19-lou-tou-tiao',
                 source: ['/'],
                 target: '/19lou/jiaxing',
             },

package/lib/v2/1point3acres/radar.js

@@ -4,7 +4,7 @@ module.exports = {
         blog: [
             {
                 title: '博客',
-                docs: 'https://docs.rsshub.app/bbs.html#yi-mu-san-fen-di',
+                docs: 'https://docs.rsshub.app/routes/bbs#yi-mu-san-fen-di',
                 source: ['/:category'],
                 target: '/1point3acres/blog/:category?',
             },
@@ -12,31 +12,31 @@ module.exports = {
         instant: [
             {
                 title: '帖子',
-                docs: 'https://docs.rsshub.app/bbs.html#yi-mu-san-fen-di',
+                docs: 'https://docs.rsshub.app/routes/bbs#yi-mu-san-fen-di',
                 source: ['/'],
                 target: '/1point3acres/thread/:type?/:order?',
             },
             {
                 title: '分区',
-                docs: 'https://docs.rsshub.app/bbs.html#yi-mu-san-fen-di',
+                docs: 'https://docs.rsshub.app/routes/bbs#yi-mu-san-fen-di',
                 source: ['/section/:id', '/'],
                 target: '/1point3acres/section/:id?/:type?/:order?',
             },
             {
                 title: '标签',
-                docs: 'https://docs.rsshub.app/bbs.html#yi-mu-san-fen-di',
+                docs: 'https://docs.rsshub.app/routes/bbs#yi-mu-san-fen-di',
                 source: ['/section/:id', '/'],
                 target: '/1point3acres/category/:id?/:type?/:order?',
             },
             {
                 title: '用户主题帖',
-                docs: 'https://docs.rsshub.app/bbs.html#yi-mu-san-fen-di',
+                docs: 'https://docs.rsshub.app/routes/bbs#yi-mu-san-fen-di',
                 source: ['/profile/:id', '/'],
                 target: '/1point3acres/user/:id/threads',
             },
             {
                 title: '用户回帖',
-                docs: 'https://docs.rsshub.app/bbs.html#yi-mu-san-fen-di',
+                docs: 'https://docs.rsshub.app/routes/bbs#yi-mu-san-fen-di',
                 source: ['/profile/:id', '/'],
                 target: '/1point3acres/user/:id/posts',
             },
@@ -44,7 +44,7 @@ module.exports = {
         offer: [
             {
                 title: '录取结果',
-                docs: 'https://docs.rsshub.app/bbs.html#yi-mu-san-fen-di',
+                docs: 'https://docs.rsshub.app/routes/bbs#yi-mu-san-fen-di',
                 source: ['/'],
                 target: '/1point3acres/offer',
             },

package/lib/v2/2047/radar.js

@@ -4,7 +4,7 @@ module.exports = {
         '.': [
             {
                 title: '分类',
-                docs: 'https://docs.rsshub.app/bbs.html#2047-fen-lei',
+                docs: 'https://docs.rsshub.app/routes/bbs#2047-fen-lei',
                 source: ['/'],
                 target: '/2047/:category?/:sort?',
             },

package/lib/v2/2048/index.js

@@ -17,6 +17,7 @@ module.exports = async (ctx) => {
     });
 
     const $ = cheerio.load(response.data);
+    const currentHost = `https://${new URL(response.url).host}`; // redirected host
 
     $('#shortcut').remove();
     $('tr[onmouseover="this.className=\'tr3 t_two\'"]').remove();
@@ -24,19 +25,20 @@ module.exports = async (ctx) => {
     const list = $('#ajaxtable tbody .tr2')
         .last()
         .nextAll('.tr3')
-        .map((_, item) => {
+        .toArray()
+        .map((item) => {
             item = $(item).find('.subject');
 
             return {
                 title: item.text(),
-                link: `${rootUrl}/2048/${item.attr('href')}`,
+                link: `${currentHost}/2048/${item.attr('href')}`,
+                guid: `${rootUrl}/2048/${item.attr('href')}`,
             };
-        })
-        .get();
+        });
 
     const items = await Promise.all(
         list.map((item) =>
-            ctx.cache.tryGet(item.link, async () => {
+            ctx.cache.tryGet(item.guid, async () => {
                 const detailResponse = await got({
                     method: 'get',
                     url: item.link,

package/lib/v2/2048/radar.js

@@ -4,7 +4,7 @@ module.exports = {
         '.': [
             {
                 title: '论坛',
-                docs: 'https://docs.rsshub.app/multimedia.html#_2048-he-ji-di',
+                docs: 'https://docs.rsshub.app/routes/multimedia#2048-he-ji-di',
                 source: ['/2048/thread.php?fid-3.html'],
                 target: (_, url) => `/2048/${url.match(/fid-(\d+?)\.html/)[1]}`,
             },

package/lib/v2/2cycd/radar.js

@@ -4,7 +4,7 @@ module.exports = {
         '.': [
             {
                 title: '板块',
-                docs: 'https://docs.rsshub.app/bbs.html#er-ci-yuan-chong-dong',
+                docs: 'https://docs.rsshub.app/routes/bbs#er-ci-yuan-chong-dong',
                 source: '/:path',
                 target: (params, url) => {
                     let pid, sort;

package/lib/v2/35photo/radar.js

@@ -4,37 +4,37 @@ module.exports = {
         '.': [
             {
                 title: 'New photos',
-                docs: 'https://docs.rsshub.app/picture.html#35photo-new-photos',
+                docs: 'https://docs.rsshub.app/routes/picture#35photo-new-photos',
                 source: ['/new', '/'],
                 target: '/35photo/new',
             },
             {
                 title: 'Featured photos',
-                docs: 'https://docs.rsshub.app/picture.html#35photo-featured-photos',
+                docs: 'https://docs.rsshub.app/routes/picture#35photo-featured-photos',
                 source: ['/new/actual', '/'],
                 target: '/35photo/actual',
             },
             {
                 title: 'New interesting',
-                docs: 'https://docs.rsshub.app/picture.html#35photo-new-interesting',
+                docs: 'https://docs.rsshub.app/routes/picture#35photo-new-interesting',
                 source: ['/new/interesting', '/'],
                 target: '/35photo/interesting',
             },
             {
                 title: 'Photos on the world map',
-                docs: 'https://docs.rsshub.app/picture.html#35photo-photos-on-the-world-map',
+                docs: 'https://docs.rsshub.app/routes/picture#35photo-photos-on-the-world-map',
                 source: ['/new/map', '/'],
                 target: '/35photo/map',
             },
             {
                 title: 'Genre',
-                docs: 'https://docs.rsshub.app/picture.html#35photo-genre',
+                docs: 'https://docs.rsshub.app/routes/picture#35photo-genre',
                 source: ['/'],
                 target: (params, url) => `/35photo/genre/${url.match(/genre_(\d+)/)[1]}`,
             },
             {
                 title: 'Author',
-                docs: 'https://docs.rsshub.app/picture.html#35photo-author',
+                docs: 'https://docs.rsshub.app/routes/picture#35photo-author',
                 source: ['/:id', '/'],
                 target: '/35photo/author/:id',
             },

package/lib/v2/36kr/hot-list.js

@@ -0,0 +1,59 @@
+const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
+
+const { rootUrl, ProcessItem } = require('./utils');
+
+const categories = {
+    24: {
+        title: '24小时热榜',
+        key: 'homeData.data.hotlist.data',
+    },
+    renqi: {
+        title: '资讯人气榜',
+        key: 'hotListData.topList',
+    },
+    zonghe: {
+        title: '资讯综合榜',
+        key: 'hotListData.hotList',
+    },
+    shoucang: {
+        title: '资讯综合榜',
+        key: 'hotListData.collectList',
+    },
+};
+
+module.exports = async (ctx) => {
+    const category = ctx.params.category ?? '24';
+
+    const currentUrl = category === '24' ? rootUrl : `${rootUrl}/hot-list/catalog`;
+
+    const response = await got({
+        method: 'get',
+        url: currentUrl,
+    });
+
+    const getProperty = (object, key) => key.split('.').reduce((o, k) => o && o[k], object);
+    const data = getProperty(JSON.parse(response.data.match(/window.initialState=({.*})/)[1]), categories[category].key);
+
+    let items = data
+        .slice(0, ctx.query.limit ? parseInt(ctx.query.limit) : 10)
+        .filter((item) => item.itemType !== 0)
+        .map((item) => {
+            item = item.templateMaterial ?? item;
+            return {
+                title: item.widgetTitle.replace(/<\/?em>/g, ''),
+                author: item.authorName,
+                pubDate: parseDate(item.publishTime),
+                link: `${rootUrl}/p/${item.itemId}`,
+                description: item.summary,
+            };
+        });
+
+    items = await Promise.all(items.map((item) => ProcessItem(item, ctx.cache.tryGet)));
+
+    ctx.state.data = {
+        title: `36氪 - ${categories[category].title}`,
+        link: currentUrl,
+        item: items,
+    };
+};

package/lib/v2/36kr/index.js

@@ -1,7 +1,8 @@
 const got = require('@/utils/got');
 const cheerio = require('cheerio');
 const { parseDate } = require('@/utils/parse-date');
-const CryptoJS = require('crypto-js');
+
+const { rootUrl, ProcessItem } = require('./utils');
 
 const shortcuts = {
     '/information': '/information/web_news',
@@ -15,7 +16,6 @@ const shortcuts = {
 module.exports = async (ctx) => {
     const path = ctx.path.replace(/^\/news(?!flashes)/, '/information').replace(/\/search\/article/, '/search/articles');
 
-    const rootUrl = 'https://www.36kr.com';
     const currentUrl = `${rootUrl}${shortcuts.hasOwnProperty(path) ? shortcuts[path] : path}`;
 
     const response = await got({
@@ -42,34 +42,7 @@ module.exports = async (ctx) => {
         });
 
     if (!/^\/(search|newsflashes)/.test(path)) {
-        items = await Promise.all(
-            items.map((item) =>
-                ctx.cache.tryGet(item.link, async () => {
-                    const detailResponse = await got({
-                        method: 'get',
-                        url: item.link,
-                    });
-
-                    const cipherTextList = detailResponse.data.match(/{"state":"(.*)","isEncrypt":true}/) ?? [];
-                    if (cipherTextList.length !== 0) {
-                        const key = CryptoJS.enc.Utf8.parse('efabccee-b754-4c');
-                        const content = JSON.parse(
-                            CryptoJS.AES.decrypt(cipherTextList[1], key, {
-                                mode: CryptoJS.mode.ECB,
-                                padding: CryptoJS.pad.Pkcs7,
-                            })
-                                .toString(CryptoJS.enc.Utf8)
-                                .toString()
-                        ).articleDetail.articleDetailData.data;
-                        item.description = content.widgetContent;
-                    } else {
-                        const $ = cheerio.load(detailResponse.body);
-                        item.description = $('div.articleDetailContent').html();
-                    }
-                    return item;
-                })
-            )
-        );
+        items = await Promise.all(items.map((item) => ProcessItem(item, ctx.cache.tryGet)));
     }
 
     ctx.state.data = {

package/lib/v2/36kr/maintainer.js

@@ -1,4 +1,5 @@
 module.exports = {
+    '/hot-list/:category?': ['nczitzk'],
     '/information/:category?': ['nczitzk'],
     '/motif/:id': ['nczitzk'],
     '/newsflashes': ['hillerliao', 'nczitzk'],

package/lib/v2/36kr/radar.js

@@ -4,46 +4,52 @@ module.exports = {
         '.': [
             {
                 title: '资讯',
-                docs: 'https://docs.rsshub.app/new-media.html#_36kr-zi-xun',
+                docs: 'https://docs.rsshub.app/routes/new-media#36kr-zi-xun',
                 source: ['/information/:category', '/'],
                 target: '/36kr/information/:category',
             },
             {
                 title: '快讯',
-                docs: 'https://docs.rsshub.app/new-media.html#_36kr-kuai-xun',
+                docs: 'https://docs.rsshub.app/routes/new-media#36kr-kuai-xun',
                 source: ['/newsflashes', '/'],
                 target: '/36kr/newsflashes',
             },
             {
                 title: '用户文章',
-                docs: 'https://docs.rsshub.app/new-media.html#_36kr-yong-hu-wen-zhang',
+                docs: 'https://docs.rsshub.app/routes/new-media#36kr-yong-hu-wen-zhang',
                 source: ['/user/:id', '/'],
                 target: '/36kr/user/:id',
             },
             {
                 title: '主题文章',
-                docs: 'https://docs.rsshub.app/new-media.html#_36kr-zhu-ti-wen-zhang',
+                docs: 'https://docs.rsshub.app/routes/new-media#36kr-zhu-ti-wen-zhang',
                 source: ['/motif/:id', '/'],
                 target: '/36kr/motif/:id',
             },
             {
                 title: '专题文章',
-                docs: 'https://docs.rsshub.app/new-media.html#_36kr-zhuan-ti-wen-zhang',
+                docs: 'https://docs.rsshub.app/routes/new-media#36kr-zhuan-ti-wen-zhang',
                 source: ['/topics/:id', '/'],
                 target: '/36kr/topics/:id',
             },
             {
                 title: '搜索文章',
-                docs: 'https://docs.rsshub.app/new-media.html#_36kr-sou-suo-wen-zhang',
+                docs: 'https://docs.rsshub.app/routes/new-media#36kr-sou-suo-wen-zhang',
                 source: ['/search/articles/:keyword', '/'],
                 target: '/36kr/search/articles/:keyword',
             },
             {
                 title: '搜索快讯',
-                docs: 'https://docs.rsshub.app/new-media.html#_36kr-sou-suo-kuai-xun',
+                docs: 'https://docs.rsshub.app/routes/new-media#36kr-sou-suo-kuai-xun',
                 source: ['/search/newsflashes/:keyword', '/'],
                 target: '/36kr/search/newsflashes/:keyword',
             },
+            {
+                title: '资讯热榜',
+                docs: 'https://docs.rsshub.app/routes/new-media#36kr-zi-xun-re-bang',
+                source: ['/hot-list/:category', '/'],
+                target: '/36kr/hot-list/:category',
+            },
         ],
     },
 };

package/lib/v2/36kr/router.js

@@ -1,3 +1,4 @@
 module.exports = (router) => {
+    router.get('/hot-list/:category?', require('./hot-list'));
     router.get(/([\w-/]+)?/, require('./index'));
 };

package/lib/v2/36kr/utils.js

@@ -0,0 +1,36 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const CryptoJS = require('crypto-js');
+
+const rootUrl = 'https://www.36kr.com';
+
+module.exports = {
+    rootUrl,
+    ProcessItem: (item, tryGet) =>
+        tryGet(item.link, async () => {
+            const detailResponse = await got({
+                method: 'get',
+                url: item.link,
+            });
+
+            const cipherTextList = detailResponse.data.match(/{"state":"(.*)","isEncrypt":true}/) ?? [];
+
+            if (cipherTextList.length !== 0) {
+                const key = CryptoJS.enc.Utf8.parse('efabccee-b754-4c');
+                const content = JSON.parse(
+                    CryptoJS.AES.decrypt(cipherTextList[1], key, {
+                        mode: CryptoJS.mode.ECB,
+                        padding: CryptoJS.pad.Pkcs7,
+                    })
+                        .toString(CryptoJS.enc.Utf8)
+                        .toString()
+                ).articleDetail.articleDetailData.data;
+                item.description = content.widgetContent;
+            } else {
+                const $ = cheerio.load(detailResponse.body);
+                item.description = $('div.articleDetailContent').html();
+            }
+
+            return item;
+        }),
+};

package/lib/v2/3dmgame/radar.js

@@ -4,13 +4,13 @@ module.exports = {
         '.': [
             {
                 title: '新闻中心',
-                docs: 'https://docs.rsshub.app/game.html#_3dmgame',
+                docs: 'https://docs.rsshub.app/routes/game#3dmgame',
                 source: ['/news/:category?', '/news'],
                 target: '/3dmgame/news/:category?',
             },
             {
                 title: '游戏资讯',
-                docs: 'https://docs.rsshub.app/game.html#_3dmgame',
+                docs: 'https://docs.rsshub.app/routes/game#3dmgame',
                 source: ['/games/:name/:type'],
                 target: '/3dmgame/:name/:type?',
             },