rsshub 1.0.0-master.fe69819 → 1.0.0-master.febd623

package/lib/middleware/template.js

@@ -2,6 +2,7 @@ const art = require('art-template');
 const path = require('path');
 const config = require('@/config').value;
 const typeRegex = /\.(atom|rss|debug\.json)$/;
+const { collapseWhitespace, convertDateToISO8601 } = require('@/utils/common-utils');
 
 module.exports = async (ctx, next) => {
     if (ctx.headers['user-agent'] && ctx.headers['user-agent'].includes('Reeder')) {
@@ -27,7 +28,8 @@ module.exports = async (ctx, next) => {
     if (!ctx.body) {
         let template;
 
-        switch (ctx.state.type[1]) {
+        const outputType = ctx.state.type[1];
+        switch (outputType) {
             case 'atom':
                 template = path.resolve(__dirname, '../views/atom.art');
                 break;
@@ -40,10 +42,14 @@ module.exports = async (ctx, next) => {
         }
 
         if (ctx.state.data) {
+            ctx.state.data.title = collapseWhitespace(ctx.state.data.title);
+            ctx.state.data.subtitle = collapseWhitespace(ctx.state.data.subtitle);
+            ctx.state.data.author = collapseWhitespace(ctx.state.data.author);
+
             ctx.state.data.item &&
                 ctx.state.data.item.forEach((item) => {
                     if (item.title) {
-                        item.title = item.title.trim();
+                        item.title = collapseWhitespace(item.title);
                         // trim title length
                         for (let length = 0, i = 0; i < item.title.length; i++) {
                             length += Buffer.from(item.title[i]).length !== 1 ? 2 : 1;
@@ -54,10 +60,17 @@ module.exports = async (ctx, next) => {
                         }
                     }
 
-                    if (item.enclosure_length) {
-                        const itunes_duration =
-                            Math.floor(item.enclosure_length / 3600) + ':' + (Math.floor((item.enclosure_length % 3600) / 60) / 100).toFixed(2).slice(-2) + ':' + (((item.enclosure_length % 3600) % 60) / 100).toFixed(2).slice(-2);
-                        item.itunes_duration = itunes_duration;
+                    item.author = collapseWhitespace(item.author);
+
+                    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;
+                        item.itunes_duration =
+                            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') {
+                        item.pubDate = convertDateToISO8601(item.pubDate);
+                        item.updated = convertDateToISO8601(item.updated);
                     }
                 });
         }

package/lib/radar-rules.js

@@ -131,134 +131,6 @@ module.exports = {
             },
         ],
     },
-    'youtube.com': {
-        _name: 'YouTube',
-        www: [
-            {
-                title: '用户',
-                docs: 'https://docs.rsshub.app/social-media.html#youtube',
-                source: '/user/:username',
-                target: '/youtube/user/:username',
-            },
-            {
-                title: '频道',
-                docs: 'https://docs.rsshub.app/social-media.html#youtube',
-                source: '/channel/:id',
-                target: '/youtube/channel/:id',
-            },
-            {
-                title: '播放列表',
-                docs: 'https://docs.rsshub.app/social-media.html#youtube',
-                source: '/playlist',
-                target: (params, url) => `/youtube/playlist/${new URL(url).searchParams.get('list')}`,
-            },
-        ],
-    },
-    'zhihu.com': {
-        _name: '知乎',
-        www: [
-            {
-                title: '收藏夹',
-                docs: 'https://docs.rsshub.app/social-media.html#zhi-hu',
-                source: '/collection/:id',
-                target: '/zhihu/collection/:id',
-            },
-            {
-                title: '用户动态',
-                docs: 'https://docs.rsshub.app/social-media.html#zhi-hu',
-                source: '/people/:id',
-                target: '/zhihu/people/activities/:id',
-            },
-            {
-                title: '用户回答',
-                docs: 'https://docs.rsshub.app/social-media.html#zhi-hu',
-                source: '/people/:id/answers',
-                target: '/zhihu/people/answers/:id',
-            },
-            {
-                title: '用户想法',
-                docs: 'https://docs.rsshub.app/social-media.html#zhi-hu',
-                source: '/people/:id/pins',
-                target: '/zhihu/people/pins/:id',
-            },
-            {
-                title: '用户文章',
-                docs: 'https://docs.rsshub.app/social-media.html#zhi-hu',
-                source: '/:usertype/:id/posts',
-                target: '/zhihu/posts/:usertype/:id',
-            },
-
-            {
-                title: '热榜',
-                docs: 'https://docs.rsshub.app/social-media.html#zhi-hu',
-                source: '/hot',
-                target: '/zhihu/hotlist',
-            },
-            {
-                title: '想法热榜',
-                docs: 'https://docs.rsshub.app/social-media.html#zhi-hu',
-                target: '/zhihu/pin/hotlist',
-            },
-            {
-                title: '问题',
-                docs: 'https://docs.rsshub.app/social-media.html#zhi-hu',
-                source: '/question/:questionId',
-                target: '/zhihu/question/:questionId',
-            },
-            {
-                title: '话题',
-                docs: 'https://docs.rsshub.app/social-media.html#zhi-hu',
-                source: '/topic/:topicId/:type',
-                target: '/zhihu/topic/:topicId',
-            },
-            {
-                title: '新书',
-                docs: 'https://docs.rsshub.app/social-media.html#zhi-hu',
-                source: '/zhihu/bookstore/newest',
-                target: '/zhihu/pin/hotlist',
-            },
-            {
-                title: '想法-24 小时新闻汇总',
-                docs: 'https://docs.rsshub.app/social-media.html#zhi-hu',
-                source: '/pin/special/972884951192113152',
-                target: '/zhihu/pin/daily',
-            },
-            {
-                title: '书店-周刊',
-                docs: 'https://docs.rsshub.app/social-media.html#zhi-hu',
-                source: '/pub/weekly',
-                target: '/zhihu/weekly',
-            },
-            {
-                title: '专栏',
-                docs: 'https://docs.rsshub.app/social-media.html#zhi-hu',
-                source: '/column/:id',
-                target: '/zhihu/zhuanlan/:id',
-            },
-        ],
-        zhuanlan: [
-            {
-                title: '专栏',
-                docs: 'https://docs.rsshub.app/social-media.html#zhi-hu',
-                source: '/:id',
-                target: '/zhihu/zhuanlan/:id',
-            },
-        ],
-        daily: [
-            {
-                title: '日报',
-                docs: 'https://docs.rsshub.app/social-media.html#zhi-hu',
-                source: '',
-                target: '/zhihu/daily',
-            },
-            {
-                title: '日报',
-                docs: 'https://docs.rsshub.app/social-media.html#zhi-hu',
-                source: '/*tpath',
-                target: '/zhihu/daily',
-            },
-        ],
-    },
     'smzdm.com': {
         _name: '什么值得买',
         www: [
@@ -312,47 +184,6 @@ module.exports = {
             },
         ],
     },
-    'juejin.cn': {
-        _name: '掘金',
-        '.': [
-            {
-                title: '标签',
-                docs: 'https://docs.rsshub.app/programming.html#jue-jin-biao-qian',
-                source: '/tag/:tag',
-                target: '/juejin/tag/:tag',
-            },
-            {
-                title: '小册',
-                docs: 'https://docs.rsshub.app/programming.html#jue-jin-xiao-ce',
-                source: '/books',
-                target: '/juejin/books',
-            },
-            {
-                title: '沸点',
-                docs: 'https://docs.rsshub.app/programming.html#jue-jin-fei-dian',
-                source: ['/pins/:type', '/pins/topic/:type'],
-                target: (params) => (params.type !== 'recommended' ? '/juejin/pins/:type' : '/juejin/pins'),
-            },
-            {
-                title: '专栏',
-                docs: 'https://docs.rsshub.app/programming.html#jue-jin-zhuan-lan',
-                source: ['/user/:id', '/user/:id/posts'],
-                target: '/juejin/posts/:id',
-            },
-            {
-                title: '收藏集',
-                docs: 'https://docs.rsshub.app/programming.html#jue-jin-shou-cang-ji',
-                source: ['/user/:id', '/user/:id/collections'],
-                target: '/juejin/collections/:id',
-            },
-            {
-                title: '单个收藏夹',
-                docs: 'https://docs.rsshub.app/programming.html#jue-jin-dan-ge-shou-cang-jia',
-                source: '/collection/:collectionId',
-                target: '/juejin/collection/:collectionId',
-            },
-        ],
-    },
     'anime1.me': {
         _name: 'Anime1',
         '.': [
@@ -466,77 +297,6 @@ module.exports = {
             },
         ],
     },
-    'pianyuan.la': {
-        _name: '片源网',
-        '.': [
-            {
-                title: '电影和剧集',
-                docs: 'https://docs.rsshub.app/multimedia.html#pian-yuan',
-                source: '/',
-            },
-        ],
-    },
-    'sspai.com': {
-        _name: '少数派',
-        '.': [
-            {
-                title: '最新上架付费专栏',
-                docs: 'https://docs.rsshub.app/new-media.html#shao-shu-pai-sspai',
-                source: '/series',
-                target: '/sspai/series',
-            },
-            {
-                title: 'Matrix',
-                docs: 'https://docs.rsshub.app/new-media.html#shao-shu-pai-sspai',
-                source: '/matrix',
-                target: '/sspai/matrix',
-            },
-            {
-                title: '专栏',
-                docs: 'https://docs.rsshub.app/new-media.html#shao-shu-pai-sspai',
-                source: '/column/:id',
-                target: '/sspai/column/:id',
-            },
-            {
-                title: '作者动态',
-                docs: 'https://docs.rsshub.app/new-media.html#shao-shu-pai-sspai',
-                source: '/u/:id/updates',
-                target: '/sspai/activity/:id',
-            },
-            {
-                title: '作者已发布文章',
-                docs: 'https://docs.rsshub.app/new-media.html#shao-shu-pai-sspai',
-                source: '/u/:id/posts',
-                target: '/sspai/author/:id',
-            },
-            {
-                title: '专题',
-                docs: 'https://docs.rsshub.app/new-media.html#shao-shu-pai-sspai',
-                source: '/topics',
-                target: '/sspai/topics',
-            },
-            {
-                title: '专题内文章更新',
-                docs: 'https://docs.rsshub.app/new-media.html#shao-shu-pai-sspai',
-                source: '/topic/:id',
-                target: '/sspai/topic/:id',
-            },
-            {
-                title: '标签订阅',
-                docs: 'https://docs.rsshub.app/new-media.html#shao-shu-pai-sspai',
-                source: '/tag/:keyword',
-                target: '/sspai/tag/:keyword',
-            },
-        ],
-        shortcuts: [
-            {
-                title: 'Shortcuts Gallery',
-                docs: 'https://docs.rsshub.app/new-media.html#shao-shu-pai-sspai',
-                source: ['', '/*tpath'],
-                target: '/sspai/shortcuts',
-            },
-        ],
-    },
     'baidu.com': {
         _name: '贴吧',
         tieba: [
@@ -1238,71 +998,6 @@ module.exports = {
             },
         ],
     },
-    'zju.edu.cn': {
-        _name: '浙江大学',
-        cst: [
-            {
-                title: '软件学院 - 全部通知',
-                docs: 'https://docs.rsshub.app/university.html#zhe-jiang-da-xue',
-                source: ['', '/*tpath'],
-                target: '/zju/cst/0',
-            },
-            {
-                title: '软件学院 - 招生信息',
-                docs: 'https://docs.rsshub.app/university.html#zhe-jiang-da-xue',
-                source: '/32178/list.htm',
-                target: '/zju/cst/1',
-            },
-            {
-                title: '软件学院 - 教务管理',
-                docs: 'https://docs.rsshub.app/university.html#zhe-jiang-da-xue',
-                source: '/36216/list.htm',
-                target: '/zju/cst/2',
-            },
-            {
-                title: '软件学院 - 论文管理',
-                docs: 'https://docs.rsshub.app/university.html#zhe-jiang-da-xue',
-                source: '/36217/list.htm',
-                target: '/zju/cst/3',
-            },
-            {
-                title: '软件学院 - 思政工作',
-                docs: 'https://docs.rsshub.app/university.html#zhe-jiang-da-xue',
-                source: '/36192/list.htm',
-                target: '/zju/cst/4',
-            },
-            {
-                title: '软件学院 - 评奖评优',
-                docs: 'https://docs.rsshub.app/university.html#zhe-jiang-da-xue',
-                source: '/36228/list.htm',
-                target: '/zju/cst/5',
-            },
-            {
-                title: '软件学院 - 实习就业',
-                docs: 'https://docs.rsshub.app/university.html#zhe-jiang-da-xue',
-                source: '/36193/list.htm',
-                target: '/zju/cst/6',
-            },
-            {
-                title: '软件学院 - 国际实习',
-                docs: 'https://docs.rsshub.app/university.html#zhe-jiang-da-xue',
-                source: '/36235/list.htm',
-                target: '/zju/cst/7',
-            },
-            {
-                title: '软件学院 - 国内合作科研',
-                docs: 'https://docs.rsshub.app/university.html#zhe-jiang-da-xue',
-                source: '/36194/list.htm',
-                target: '/zju/cst/8',
-            },
-            {
-                title: '软件学院 - 国际合作科研',
-                docs: 'https://docs.rsshub.app/university.html#zhe-jiang-da-xue',
-                source: '/36246/list.htm',
-                target: '/zju/cst/9',
-            },
-        ],
-    },
     'kuaidi100.com': {
         _name: '快递100',
         '.': [
@@ -1658,134 +1353,6 @@ module.exports = {
             },
         ],
     },
-    'qq.com': {
-        _name: '腾讯',
-        'mp.weixin': [
-            {
-                title: '微信公众号栏目',
-                docs: 'https://docs.rsshub.app/new-media.html#gong-zhong-hao-lan-mu-fei-tui-song-li-shi-xiao-xi',
-                source: '/mp/homepage',
-                target: (params, url) => `/wechat/mp/homepage/${new URL(url).searchParams.get('__biz')}/${new URL(url).searchParams.get('hid')}/${new URL(url).searchParams.get('cid') ? new URL(url).searchParams.get('cid') : ''}`,
-            },
-            {
-                title: '微信公众号话题',
-                docs: 'https://docs.rsshub.app/new-media.html#wei-xin-gong-zhong-hao-wen-zhang-hua-ti-tag',
-                source: '/mp/appmsgalbum',
-                target: (params, url) => `/wechat/mp/msgalbum/${new URL(url).searchParams.get('__biz')}/${new URL(url).searchParams.get('album_id')}`,
-            },
-        ],
-        egame: [
-            {
-                title: '企鹅电竞直播间',
-                docs: 'https://docs.rsshub.app/live.html#qi-e-dian-jing-zhi-bo-jian-kai-bo',
-                source: '/:id',
-                target: (params) => {
-                    if (params.id.match(/^\d+$/)) {
-                        return '/egameqq/room/:id';
-                    }
-                },
-            },
-        ],
-        v: [
-            {
-                title: '视频 - 播放列表',
-                docs: 'https://docs.rsshub.app/multimedia.html#teng-xun-shi-pin',
-                source: '/x/cover/:id',
-                target: (params) => {
-                    const id = params.id.match('(.*).html')[1];
-                    return id ? `/tencentvideo/playlist/${id}` : '';
-                },
-            },
-            {
-                title: '视频 - 播放列表',
-                docs: 'https://docs.rsshub.app/multimedia.html#teng-xun-shi-pin',
-                source: '/x/cover/:id/:detail',
-                target: '/tencentvideo/playlist/:id',
-            },
-        ],
-    },
-    'javbus.com': {
-        _name: 'JavBus',
-        www: [
-            {
-                title: '首页',
-                docs: 'https://docs.rsshub.app/multimedia.html#javbus',
-                source: '/',
-                target: '/javbus/home',
-            },
-            {
-                title: '分类',
-                docs: 'https://docs.rsshub.app/multimedia.html#javbus',
-                source: '/genre/:gid',
-                target: '/javbus/genre/:gid',
-            },
-            {
-                title: '演员',
-                docs: 'https://docs.rsshub.app/multimedia.html#javbus',
-                source: '/star/:sid',
-                target: '/javbus/star/:sid',
-            },
-            {
-                title: '系列',
-                docs: 'https://docs.rsshub.app/multimedia.html#javbus',
-                source: '/series/:seriesid',
-                target: '/javbus/series/:seriesid',
-            },
-            {
-                title: '首页 / 步兵',
-                docs: 'https://docs.rsshub.app/multimedia.html#javbus',
-                source: '/uncensored',
-                target: '/javbus/uncensored/home',
-            },
-            {
-                title: '分类 / 步兵',
-                docs: 'https://docs.rsshub.app/multimedia.html#javbus',
-                source: '/uncensored/genre/:gid',
-                target: '/javbus/uncensored/genre/:gid',
-            },
-            {
-                title: '演员 / 步兵',
-                docs: 'https://docs.rsshub.app/multimedia.html#javbus',
-                source: '/uncensored/star/:sid',
-                target: '/javbus/uncensored/star/:sid',
-            },
-            {
-                title: '系列 / 步兵',
-                docs: 'https://docs.rsshub.app/multimedia.html#javbus',
-                source: '/uncensored/series/:seriesid',
-                target: '/javbus/uncensored/series/:seriesid',
-            },
-        ],
-    },
-    'javbus.one': {
-        _name: 'JavBus',
-        www: [
-            {
-                title: '首页 / 欧陆风云',
-                docs: 'https://docs.rsshub.app/multimedia.html#javbus',
-                source: '/',
-                target: '/javbus/western/home',
-            },
-            {
-                title: '分类 / 欧陆风云',
-                docs: 'https://docs.rsshub.app/multimedia.html#javbus',
-                source: '/genre/:gid',
-                target: '/javbus/western/genre/:gid',
-            },
-            {
-                title: '演员 / 欧陆风云',
-                docs: 'https://docs.rsshub.app/multimedia.html#javbus',
-                source: '/star/:sid',
-                target: '/javbus/western/star/:sid',
-            },
-            {
-                title: '系列 / 欧陆风云',
-                docs: 'https://docs.rsshub.app/multimedia.html#javbus',
-                source: '/series/:seriesid',
-                target: '/javbus/western/series/:seriesid',
-            },
-        ],
-    },
     'onejav.com': {
         _name: 'OneJAV BT',
         '.': [
@@ -1977,18 +1544,6 @@ module.exports = {
             },
         ],
     },
-    'lofter.com': {
-        _name: 'Lofter',
-        www: [
-            {
-                title: '话题 (标签)',
-                docs: 'https://docs.rsshub.app/social-media.html#lofter',
-                source: ['/tag/:name', '/tag/:name/:type'],
-                target: (params) => `/lofter/tag/${params.name}/${params.type || ''}`,
-            },
-        ],
-    },
-
     'yuque.com': {
         _name: '语雀',
         www: [
@@ -2069,43 +1624,6 @@ module.exports = {
             },
         ],
     },
-    'okjike.com': {
-        _name: '即刻',
-        m: [
-            {
-                title: '用户动态',
-                docs: 'https://docs.rsshub.app/social-media.html#ji-ke-yong-hu-dong-tai',
-                source: '/reposts/:repostId',
-                target: (params, url, document) => {
-                    const uid = document.querySelector('.avatar').getAttribute('href').replace('/users/', '');
-                    return uid ? `/jike/user/${uid}` : '';
-                },
-            },
-            {
-                title: '圈子',
-                docs: 'https://docs.rsshub.app/social-media.html#ji-ke-quan-zi',
-                source: '/topics/:id',
-                target: '/jike/topic/:id',
-            },
-            {
-                title: '圈子 - 纯文字',
-                docs: 'https://docs.rsshub.app/social-media.html#ji-ke-quan-zi-chun-wen-zi',
-                source: '/topics/:id',
-                target: '/jike/topic/text/:id',
-            },
-        ],
-    },
-    'ems.com.cn': {
-        _name: '中国邮政速递物流',
-        www: [
-            {
-                title: '新闻',
-                docs: 'https://docs.rsshub.app/other.html#zhong-guo-you-zheng-su-di-wu-liu',
-                source: '/aboutus/xin_wen_yu_shi_jian.html',
-                target: '/ems/news',
-            },
-        ],
-    },
     'popiapp.cn': {
         _name: 'Popi 提问箱',
         www: [
@@ -2155,31 +1673,6 @@ module.exports = {
             },
         ],
     },
-    'behance.net': {
-        _name: 'Behance',
-        www: [
-            {
-                title: 'User',
-                docs: 'https://docs.rsshub.app/design.html#behance-user-works',
-                source: ['/:user'],
-                target: (params, url, document) => {
-                    const uid1 = document && document.querySelector('html').innerHTML.match(/([^/]+)\/insights/)[1];
-                    return `/behance/${uid1}`;
-                },
-            },
-        ],
-    },
-    'picuki.com': {
-        _name: 'Picuki',
-        www: [
-            {
-                title: '用户',
-                docs: 'https://docs.rsshub.app/social-media.html#picuki-yong-hu',
-                source: '/profile/:id',
-                target: '/picuki/profile/:id',
-            },
-        ],
-    },
     'jjmhw.cc': {
         _name: '漫小肆',
         www: [
@@ -2388,33 +1881,6 @@ module.exports = {
             },
         ],
     },
-    'eagle.cool': {
-        _name: 'Eagle',
-        cn: [
-            {
-                title: '更新日志',
-                docs: 'https://docs.rsshub.app/program-update.html#eagle',
-                source: '/changelog',
-                target: '/eagle/changelog/cn',
-            },
-        ],
-        tw: [
-            {
-                title: '更新日誌',
-                docs: 'https://docs.rsshub.app/program-update.html#eagle',
-                source: '/changelog',
-                target: '/eagle/changelog/tw',
-            },
-        ],
-        en: [
-            {
-                title: 'Release Notes',
-                docs: 'https://docs.rsshub.app/program-update.html#eagle',
-                source: '/changelog',
-                target: '/eagle/changelog/en',
-            },
-        ],
-    },
     'furaffinity.net': {
         _name: 'Fur Affinity',
         www: [