rsshub 1.0.0-master.fe99193 → 1.0.0-master.fe9c82a

package/README.md

@@ -6,9 +6,9 @@
 > 🍰 Everything is RSSible
 
 [![telegram](https://img.shields.io/badge/chat-telegram-brightgreen.svg?logo=telegram&style=flat-square)](https://t.me/rsshub)
-[![npm publish](https://img.shields.io/github/workflow/status/DIYgod/RSSHub/publish/master?label=npm%20publish&logo=npm&style=flat-square)](https://www.npmjs.com/package/rsshub)
-[![docker publish](https://img.shields.io/github/workflow/status/DIYgod/RSSHub/%5Bdocker%5D%20CI%20for%20releases/master?label=docker%20publish&logo=docker&style=flat-square)](https://hub.docker.com/r/diygod/rsshub)
-[![test](https://img.shields.io/github/workflow/status/DIYgod/RSSHub/test/master?label=test&logo=github&style=flat-square)](https://github.com/DIYgod/RSSHub/actions/workflows/test.yml?query=event%3Apush+branch%3Amaster)
+[![npm publish](https://img.shields.io/github/actions/workflow/status/DIYgod/RSSHub/npm-publish.yml?branch=master&label=npm%20publish&logo=npm&style=flat-square)](https://www.npmjs.com/package/rsshub)
+[![docker publish](https://img.shields.io/github/actions/workflow/status/DIYgod/RSSHub/docker-release.yml?branch=master&label=docker%20publish&logo=docker&style=flat-square)](https://hub.docker.com/r/diygod/rsshub)
+[![test](https://img.shields.io/github/actions/workflow/status/DIYgod/RSSHub/test.yml?branch=master&label=test&logo=github&style=flat-square)](https://github.com/DIYgod/RSSHub/actions/workflows/test.yml?query=event%3Apush+branch%3Amaster)
 [![Test coverage](https://img.shields.io/codecov/c/github/DIYgod/RSSHub.svg?style=flat-square&logo=codecov)](https://app.codecov.io/gh/DIYgod/RSSHub/branch/master)
 [![Foresight Docs](https://api-public.service.runforesight.com/api/v1/badge/success?repoId=5da20e56-cecf-4b05-9bcd-cab097fb2dca)](https://docs.runforesight.com/)
 

package/lib/config.js

@@ -97,6 +97,7 @@ const calculateValue = () => {
         feature: {
             allow_user_hotlink_template: envs.ALLOW_USER_HOTLINK_TEMPLATE === 'true',
             filter_regex_engine: envs.FILTER_REGEX_ENGINE || 're2',
+            allow_user_supply_unsafe_domain: envs.ALLOW_USER_SUPPLY_UNSAFE_DOMAIN === 'true',
         },
         suffix: envs.SUFFIX,
         titleLengthLimit: parseInt(envs.TITLE_LENGTH_LIMIT) || 150,
@@ -123,6 +124,9 @@ const calculateValue = () => {
             username: envs.DIDA365_USERNAME,
             password: envs.DIDA365_PASSWORD,
         },
+        discord: {
+            authorization: envs.DISCORD_AUTHORIZATION,
+        },
         discuz: {
             cookies: discuz_cookies,
         },
@@ -184,6 +188,7 @@ const calculateValue = () => {
             username: envs.IG_USERNAME,
             password: envs.IG_PASSWORD,
             proxy: envs.IG_PROXY,
+            cookie: envs.IG_COOKIE,
         },
         iwara: {
             cookie: envs.IWARA_COOKIE,
@@ -220,12 +225,15 @@ const calculateValue = () => {
         pianyuan: {
             cookie: envs.PIANYUAN_COOKIE,
         },
+        pixabay: {
+            key: envs.PIXABAY_KEY,
+        },
         pixiv: {
             refreshToken: envs.PIXIV_REFRESHTOKEN,
             bypassCdn: envs.PIXIV_BYPASS_CDN !== '0' && envs.PIXIV_BYPASS_CDN !== 'false',
             bypassCdnHostname: envs.PIXIV_BYPASS_HOSTNAME || 'public-api.secure.pixiv.net',
             bypassCdnDoh: envs.PIXIV_BYPASS_DOH || 'https://1.1.1.1/dns-query',
-            imgProxy: envs.PIXIV_IMG_PROXY || 'https://i.pixiv.cat',
+            imgProxy: envs.PIXIV_IMG_PROXY || 'https://i.pixiv.re',
         },
         pkubbs: {
             cookie: envs.PKUBBS_COOKIE,
@@ -278,9 +286,6 @@ const calculateValue = () => {
             clientSecret: envs.YOUTUBE_CLIENT_SECRET,
             refreshToken: envs.YOUTUBE_REFRESH_TOKEN,
         },
-        yuque: {
-            token: envs.YUQUE_TOKEN,
-        },
         zhihu: {
             cookies: envs.ZHIHU_COOKIES,
         },

package/lib/middleware/parameter.js

@@ -139,6 +139,13 @@ module.exports = async (ctx, next) => {
                 });
 
                 item.description = $('body').html() + '' + (config.suffix || '');
+
+                if (item._extra?.links && $('.rsshub-quote').length) {
+                    item._extra?.links?.map((e) => {
+                        e.content_html = $.html($('.rsshub-quote'));
+                        return e;
+                    });
+                }
             }
             return item;
         };
@@ -181,7 +188,7 @@ module.exports = async (ctx, next) => {
                     const title = item.title || '';
                     const description = item.description || title;
                     const author = item.author || '';
-                    const category = item.category || [];
+                    const category = item.category ? (Array.isArray(item.category) ? item.category : [item.category]) : [];
                     const isFilter =
                         title.match(makeRegex(ctx.query.filter)) || description.match(makeRegex(ctx.query.filter)) || author.match(makeRegex(ctx.query.filter)) || category.some((c) => c.match(makeRegex(ctx.query.filter)));
                     return isFilter;
@@ -194,7 +201,7 @@ module.exports = async (ctx, next) => {
                     const title = item.title || '';
                     const description = item.description || title;
                     const author = item.author || '';
-                    const category = item.category || [];
+                    const category = item.category ? (Array.isArray(item.category) ? item.category : [item.category]) : [];
                     let isFilter = true;
                     ctx.query.filter_title && (isFilter = title.match(makeRegex(ctx.query.filter_title)));
                     ctx.query.filter_description && (isFilter = isFilter && description.match(makeRegex(ctx.query.filter_description)));
@@ -213,7 +220,7 @@ module.exports = async (ctx, next) => {
                     const title = item.title;
                     const description = item.description || title;
                     const author = item.author || '';
-                    const category = item.category || [];
+                    const category = item.category ? (Array.isArray(item.category) ? item.category : [item.category]) : [];
                     let isFilter = true;
                     ctx.query.filterout_title && (isFilter = !title.match(makeRegex(ctx.query.filterout_title)));
                     ctx.query.filterout_description && (isFilter = isFilter && !description.match(makeRegex(ctx.query.filterout_description)));
@@ -266,7 +273,7 @@ module.exports = async (ctx, next) => {
                     });
 
                     item.author = author || (parsed_result ? parsed_result.author : '');
-                    item.description = parsed_result ? entities.decodeXML(parsed_result.content) : description;
+                    item.description = parsed_result && parsed_result.content.length > 40 ? entities.decodeXML(parsed_result.content) : description;
                 });
                 await Promise.all(tasks);
             }
@@ -306,7 +313,7 @@ module.exports = async (ctx, next) => {
                         }
                     });
                 } else {
-                    throw Error(`Invalid parameter <code>brief=${ctx.query.brief}</code>. Please check the doc https://docs.rsshub.app/parameter.html#shu-chu-jian-xun`);
+                    throw Error(`Invalid parameter brief. Please check the doc https://docs.rsshub.app/parameter.html#shu-chu-jian-xun`);
                 }
             }
 

package/lib/middleware/template.js

@@ -1,7 +1,7 @@
-const art = require('art-template');
+const { art, json } = require('@/utils/render');
 const path = require('path');
 const config = require('@/config').value;
-const typeRegex = /\.(atom|rss|debug\.json)$/;
+const typeRegex = /\.(atom|rss|debug\.json|json)$/;
 const { collapseWhitespace, convertDateToISO8601 } = require('@/utils/common-utils');
 
 module.exports = async (ctx, next) => {
@@ -14,21 +14,25 @@ module.exports = async (ctx, next) => {
 
     await next();
 
-    if (ctx.state.type[1] === 'debug.json' && config.debugInfo) {
+    const outputType = ctx.state.type[1] || 'rss';
+
+    if (outputType === 'debug.json' && config.debugInfo) {
         ctx.set({
             'Content-Type': 'application/json; charset=UTF-8',
         });
         if (ctx.state.json) {
             ctx.body = JSON.stringify(ctx.state.json, null, 4);
         } else {
-            ctx.body = JSON.stringify({ message: 'plugin does not set json' });
+            ctx.body = JSON.stringify({ message: 'plugin does not set debug json' });
         }
     }
+    if (outputType === 'json') {
+        ctx.set({ 'Content-Type': 'application/feed+json; charset=UTF-8' });
+    }
 
     if (!ctx.body) {
         let template;
 
-        const outputType = ctx.state.type[1];
         switch (outputType) {
             case 'atom':
                 template = path.resolve(__dirname, '../views/atom.art');
@@ -60,7 +64,16 @@ module.exports = async (ctx, next) => {
                         }
                     }
 
-                    item.author = collapseWhitespace(item.author);
+                    if (typeof item.author === 'string') {
+                        item.author = collapseWhitespace(item.author);
+                    } else if (typeof item.author === 'object' && item.author !== null) {
+                        for (const a of item.author) {
+                            a.name = collapseWhitespace(a.name);
+                        }
+                        if (outputType !== 'json') {
+                            item.author = item.author.map((a) => a.name).join(', ');
+                        }
+                    }
 
                     if (item.itunes_duration && ((typeof item.itunes_duration === 'string' && item.itunes_duration.indexOf(':') === -1) || (typeof item.itunes_duration === 'number' && !isNaN(item.itunes_duration)))) {
                         item.itunes_duration = +item.itunes_duration;
@@ -68,7 +81,7 @@ module.exports = async (ctx, next) => {
                             Math.floor(item.itunes_duration / 3600) + ':' + (Math.floor((item.itunes_duration % 3600) / 60) / 100).toFixed(2).slice(-2) + ':' + (((item.itunes_duration % 3600) % 60) / 100).toFixed(2).slice(-2);
                     }
 
-                    if (outputType === 'atom') {
+                    if (outputType !== 'rss') {
                         item.pubDate = convertDateToISO8601(item.pubDate);
                         item.updated = convertDateToISO8601(item.updated);
                     }
@@ -86,10 +99,15 @@ module.exports = async (ctx, next) => {
         };
         if (config.isPackage) {
             ctx.body = data;
-        } else {
-            if (template) {
-                ctx.body = art(template, data);
-            }
+            return;
+        }
+        if (!template) {
+            return;
+        }
+        if (outputType !== 'json') {
+            ctx.body = art(template, data);
+            return;
         }
+        ctx.body = json(data);
     }
 };

package/lib/radar-rules.js

@@ -1,68 +1,4 @@
 module.exports = {
-    'weibo.com': {
-        _name: '微博',
-        '.': [
-            {
-                title: '博主',
-                docs: 'https://docs.rsshub.app/social-media.html#wei-bo',
-                source: ['/u/:id', '/:id'],
-                target: (params, url, document) => {
-                    let uid = document?.documentElement.innerHTML.match(/\$CONFIG\['oid']='(\d+)'/)?.[1];
-                    if (!uid && !isNaN(params.id)) {
-                        uid = params.id;
-                    }
-                    return uid ? `/weibo/user/${uid}` : '';
-                },
-            },
-            {
-                title: '关键词',
-                docs: 'https://docs.rsshub.app/social-media.html#wei-bo',
-            },
-            {
-                title: '超话',
-                docs: 'https://docs.rsshub.app/social-media.html#wei-bo',
-                source: '/p/:id/super_index',
-                target: '/weibo/super_index/:id',
-            },
-        ],
-        s: [
-            {
-                title: '热搜榜',
-                docs: 'https://docs.rsshub.app/social-media.html#wei-bo',
-                source: '/top/summary',
-                target: '/weibo/search/hot',
-            },
-        ],
-    },
-    'weibo.cn': {
-        _name: '微博',
-        m: [
-            {
-                title: '博主',
-                docs: 'https://docs.rsshub.app/social-media.html#wei-bo',
-                source: ['/u/:uid', '/profile/:uid'],
-                target: '/weibo/user/:uid',
-            },
-        ],
-    },
-    'smzdm.com': {
-        _name: '什么值得买',
-        www: [
-            {
-                title: '排行榜',
-                docs: 'https://docs.rsshub.app/shopping.html#shen-me-zhi-de-mai',
-                source: '/top',
-            },
-        ],
-        search: [
-            {
-                title: '关键词',
-                docs: 'https://docs.rsshub.app/shopping.html#shen-me-zhi-de-mai',
-                source: '/',
-                target: (params, url) => `/smzdm/keyword/${new URL(url).searchParams.get('s')}`,
-            },
-        ],
-    },
     'ximalaya.com': {
         _name: '喜马拉雅',
         '.': [
@@ -295,30 +231,6 @@ module.exports = {
             },
         ],
     },
-    'qdaily.com': {
-        _name: '好奇心日报',
-        www: [
-            {
-                title: '标签',
-                docs: 'https://docs.rsshub.app/new-media.html#hao-qi-xin-ri-bao',
-                source: '/tags/:idd',
-                target: (params) => `/qdaily/tag/${params.idd.replace('.html', '')}`,
-            },
-            {
-                title: '栏目',
-                docs: 'https://docs.rsshub.app/new-media.html#hao-qi-xin-ri-bao',
-                source: '/special_columns/:idd',
-                target: (params) => `/qdaily/column/${params.idd.replace('.html', '')}`,
-            },
-            {
-                title: '分类',
-                docs: 'https://docs.rsshub.app/new-media.html#hao-qi-xin-ri-bao',
-                source: '/categories/:idd',
-                target: (params) => `/qdaily/category/${params.idd.replace('.html', '')}`,
-            },
-        ],
-    },
-
     '3ycy.com': {
         _name: '三界异次元',
         www: [
@@ -459,95 +371,6 @@ module.exports = {
             },
         ],
     },
-    '163.com': {
-        _name: '网易',
-        ds: [
-            {
-                title: '大神',
-                docs: 'https://docs.rsshub.app/game.html#wang-yi-da-shen',
-                source: '/user/:id',
-                target: '/netease/ds/:id',
-            },
-        ],
-        open: [
-            {
-                title: '公开课 - 精品课程',
-                docs: 'https://docs.rsshub.app/study.html#wang-yi-gong-kai-ke',
-                source: '/',
-                target: '/open163/vip',
-            },
-            {
-                title: '公开课 - 最新课程',
-                docs: 'https://docs.rsshub.app/study.html#wang-yi-gong-kai-ke',
-                source: '/',
-                target: '/open163/latest',
-            },
-        ],
-        music: [
-            {
-                title: '云音乐 - 用户歌单',
-                docs: 'https://docs.rsshub.app/multimedia.html#wang-yi-yun-yin-yue',
-                source: '/',
-                target: (params, url) => {
-                    const id = new URL(url).hash.match(/home\?id=(.*)/)[1];
-                    return id ? `/ncm/user/playlist/${id}` : '';
-                },
-            },
-            {
-                title: '云音乐 - 歌单歌曲',
-                docs: 'https://docs.rsshub.app/multimedia.html#wang-yi-yun-yin-yue',
-                source: '/',
-                target: (params, url) => {
-                    const id = new URL(url).hash.match(/playlist\?id=(.*)/)[1];
-                    return id ? `/ncm/playlist/${id}` : '';
-                },
-            },
-            {
-                title: '云音乐 - 歌手专辑',
-                docs: 'https://docs.rsshub.app/multimedia.html#wang-yi-yun-yin-yue',
-                source: '/',
-                target: (params, url) => {
-                    const id = new URL(url).hash.match(/album\?id=(.*)/)[1];
-                    return id ? `/ncm/artist/${id}` : '';
-                },
-            },
-            {
-                title: '云音乐 - 电台节目',
-                docs: 'https://docs.rsshub.app/multimedia.html#wang-yi-yun-yin-yue',
-                source: '/',
-                target: (params, url) => {
-                    const id = new URL(url).hash.match(/djradio\?id=(.*)/)[1];
-                    return id ? `/ncm/djradio/${id}` : '';
-                },
-            },
-        ],
-        'y.music': [
-            {
-                title: '云音乐 - 用户歌单',
-                docs: 'https://docs.rsshub.app/multimedia.html#wang-yi-yun-yin-yue',
-                source: '/m/user',
-                target: (params, url) => `/ncm/playlist/${new URL(url).searchParams.get('id')}`,
-            },
-            {
-                title: '云音乐 - 歌单歌曲',
-                docs: 'https://docs.rsshub.app/multimedia.html#wang-yi-yun-yin-yue',
-                source: '/m/playlist',
-                target: (params, url) => `/ncm/playlist/${new URL(url).searchParams.get('id')}`,
-            },
-            {
-                title: '云音乐 - 歌手专辑',
-                docs: 'https://docs.rsshub.app/multimedia.html#wang-yi-yun-yin-yue',
-                source: '/m/album',
-                target: (params, url) => `/ncm/playlist/${new URL(url).searchParams.get('id')}`,
-            },
-            {
-                title: '云音乐 - 播单声音',
-                docs: 'https://docs.rsshub.app/multimedia.html#wang-yi-yun-yin-yue',
-                source: ['/m/radio', '/m/djradio'],
-                target: (params, url) => `/ncm/playlist/${new URL(url).searchParams.get('id')}`,
-            },
-        ],
-    },
     'suzhou.gov.cn': {
         _name: '苏州市政府',
         www: [
@@ -1264,28 +1087,6 @@ module.exports = {
             },
         ],
     },
-    'yuque.com': {
-        _name: '语雀',
-        www: [
-            {
-                title: '知识库',
-                docs: 'https://docs.rsshub.app/study.html#yu-que',
-                source: ['/:space/:book'],
-                target: (params, url, document) => {
-                    const match = document.documentElement.innerHTML.match(/JSON\.parse\(decodeURIComponent\("(.*)"\)/);
-                    if (match && match[1]) {
-                        const dataStr = match[1];
-                        try {
-                            const appData = JSON.parse(decodeURIComponent(dataStr));
-                            return `/yuque/doc/${appData.book.id}`;
-                        } catch (e) {
-                            // pass
-                        }
-                    }
-                },
-            },
-        ],
-    },
     'bjeea.com': {
         _name: '北京考试院',
         www: [
@@ -1458,21 +1259,6 @@ module.exports = {
             },
         ],
     },
-    'instagram.com': {
-        _name: 'Instagram',
-        www: [
-            {
-                title: '用户',
-                docs: 'https://docs.rsshub.app/social-media.html#instagram',
-                source: '/:id',
-                target: (params) => {
-                    if (params.id !== 'explore' && params.id !== 'developer') {
-                        return '/instagram/user/:id';
-                    }
-                },
-            },
-        ],
-    },
     'huya.com': {
         _name: '虎牙直播',
         '.': [