rsshub 1.0.0-master.fe69819 → 1.0.0-master.fe775f5

package/lib/routes/touhougarakuta/index.js

@@ -16,7 +16,7 @@ module.exports = async (ctx) => {
 
     const response = await got({
         method: 'get',
-        url: `${baseUrl}/page-data/${type}/page-data.json`,
+        url: `${baseUrl}/page-data/${type === 'interviews' ? 'tags/interviews' : type}/page-data.json`,
     });
 
     ctx.state.data = {
@@ -33,6 +33,7 @@ module.exports = async (ctx) => {
             try {
                 switch (article.type) {
                     case 'index_interview':
+                    case 'column':
                         result.description = j2h.indexInterview(article, language);
                         break;
                     case 'index_comic':
@@ -42,6 +43,7 @@ module.exports = async (ctx) => {
                         result.description = j2h.indexNovel(article, language);
                         break;
                     case 'interview':
+                    case 'report':
                         result.description = j2h.interview(article, language);
                         break;
                     case 'novel':
@@ -54,7 +56,7 @@ module.exports = async (ctx) => {
                         result.description = j2h.uncategorized(article);
                 }
             } catch (error) {
-                error.message += ` (at article ${i}: ${article.title})`;
+                error.message += `(at article ${i}: ${article.title})`;
                 throw error;
             }
             return result;

package/lib/routes/touhougarakuta/json2html.js

@@ -1,17 +1,26 @@
-const indexInterview = (article, language) => ogpImage(article) + article.index.about + index(article, language);
+const indexInterview = (article, language) => {
+    if (article.hasOwnProperty('index')) {
+        return ogpImage(article) + article.ogpSettings.ogp.description + index(article, language);
+    }
+    return ogpImage(article);
+};
 
 const indexComic = (article, language) => ogpImage(article) + article.index.about + authors(article.index.authors) + `<img src="${article.indexCover.cover.sourceUrl}">` + index(article, language);
 
 const indexNovel = (article, language) => ogpImage(article) + article.index.about + authors(article.index.authors) + `<img src="${article.indexCover.cover.sourceUrl}">` + index(article, language);
 
 const interview = (article, language) => {
-    const leading = article.interviewContents.leading;
+    if (article.hasOwnProperty('interviewContents')) {
+        const leading = article.interviewContents.leading;
 
-    let result = ogpImage(article) + linkToIndex(article, language) + '<hr/>' + (leading ? leading : '');
-    for (const block of article.interviewContents.block) {
-        result += `<h2 style="text-align: center;">${block.head}</h2>` + block.content;
+        let result = ogpImage(article) + linkToIndex(article, language) + '<hr/>' + (leading ? leading : '');
+        for (const block of article.interviewContents.block) {
+            result += `<h2 style="text-align: center;">${block.head}</h2>` + block.content;
+        }
+        return result;
     }
-    return result;
+
+    return ogpImage(article) + linkToIndex(article, language);
 };
 
 const novel = (article, language) =>
@@ -38,9 +47,9 @@ const comic = (article, language) => {
 const uncategorized = (article, language) => ogpImage(article) + linkToIndex(article, language) + '<hr/>' + article.contents.texts;
 
 /**
- * 生成超链接，并将 edit 替换为对应语言
+ * 生成超链接，并将 edit 替换为对应语言; 从 article.index.item 会有带 edit 的 url 进来
  */
-const href = (text, url, language) => `<a href="${url.replace(/\/\/edit/, `//${language}`)}">${text}</a>`;
+const href = (text, url, language) => `<a href="${url.replace(/\/\/edit/, `//${language === 'ja' ? '' : language}`)}">${text}</a>`;
 
 /**
  * 处理 authors
@@ -75,8 +84,11 @@ const ogpImage = (article) => `<img src="${article.ogpSettings.ogp.image.sourceU
  * 处理 linkToIndex
  */
 const linkToIndex = (article, language) => {
-    const index = article.linkToIndex.linktoindex;
-    return index ? `<p>Index：${href(index.title, index.url, language)}</p>` : '';
+    if (article.hasOwnProperty('linkToIndex') && article.linkToIndex.linktoindex !== null) {
+        const index = article.linkToIndex.linktoindex;
+        return `<p>Index：${href(index.title, index.url, language)}</p>`;
+    }
+    return '';
 };
 
 /**

package/lib/routes/universities/hitwh/today.js

@@ -1,6 +1,6 @@
 const got = require('@/utils/got');
 const cheerio = require('cheerio');
-const url = require('url');
+const { parseDate } = require('@/utils/parse-date');
 
 const baseUrl = 'http://today.hitwh.edu.cn';
 
@@ -9,10 +9,10 @@ module.exports = async (ctx) => {
     const { data } = response;
     const $ = cheerio.load(data);
     const type = (filename) => filename.split('.').pop();
-    const links = $('#righ_list ul li')
+    const links = $('.list_list_wrap > ul > li')
         .map((_, el) => ({
-            pubDate: new Date($(el).find('font').text().substr(-10, 10)).toUTCString(),
-            link: url.resolve(baseUrl, $('a', el).attr('href')),
+            pubDate: parseDate($(el).find('.news-time2').text()),
+            link: new URL($(el).find('a').attr('href'), baseUrl).toString(),
             title: $(el).find('a').text(),
         }))
         .get();
@@ -30,8 +30,8 @@ module.exports = async (ctx) => {
                             $('div.wp_articlecontent').html() &&
                             $('div.wp_articlecontent')
                                 .html()
-                                .replace(/src="\//g, `src="${url.resolve(baseUrl, '.')}`)
-                                .replace(/href="\//g, `href="${url.resolve(baseUrl, '.')}`)
+                                .replace(/src="\//g, `src="${baseUrl}/`)
+                                .replace(/href="\//g, `href="${baseUrl}/`)
                                 .trim();
                         return item;
                     } else {

package/lib/routes/weibo/timeline.js

@@ -11,12 +11,14 @@ module.exports = async (ctx) => {
     const routeParams = ctx.params.routeParams || undefined;
     const token = await ctx.cache.get('weibotimelineuid' + uid, false);
     let displayVideo = '1';
+    let displayArticle = '0';
     if (routeParams) {
         if (routeParams === '1' || routeParams === '0') {
             displayVideo = routeParams;
         } else {
             const routeParams = querystring.parse(ctx.params.routeParams);
             displayVideo = fallback(undefined, queryToBoolean(routeParams.displayVideo), true) ? '1' : '0';
+            displayArticle = fallback(undefined, queryToBoolean(routeParams.displayArticle), false) ? '1' : '0';
         }
     }
 
@@ -76,7 +78,22 @@ module.exports = async (ctx) => {
 
                 // 视频的处理
                 if (displayVideo === '1') {
-                    description = weiboUtils.formatVideo(description, item);
+                    // 含被转发微博时需要从被转发微博中获取视频
+                    if (item.retweeted_status) {
+                        description = weiboUtils.formatVideo(description, item.retweeted_status);
+                    } else {
+                        description = weiboUtils.formatVideo(description, item);
+                    }
+                }
+
+                // 文章的处理
+                if (displayArticle === '1') {
+                    // 含被转发微博时需要从被转发微博中获取文章
+                    if (item.retweeted_status) {
+                        description = await weiboUtils.formatArticle(ctx, description, item.retweeted_status);
+                    } else {
+                        description = await weiboUtils.formatArticle(ctx, description, item);
+                    }
                 }
 
                 return {

package/lib/routes/weibo/user.js

@@ -8,12 +8,14 @@ const { fallback, queryToBoolean } = require('@/utils/readable-social');
 module.exports = async (ctx) => {
     const uid = ctx.params.uid;
     let displayVideo = '1';
+    let displayArticle = '0';
     if (ctx.params.routeParams) {
         if (ctx.params.routeParams === '1' || ctx.params.routeParams === '0') {
             displayVideo = ctx.params.routeParams;
         } else {
             const routeParams = querystring.parse(ctx.params.routeParams);
             displayVideo = fallback(undefined, queryToBoolean(routeParams.displayVideo), true) ? '1' : '0';
+            displayArticle = fallback(undefined, queryToBoolean(routeParams.displayArticle), false) ? '1' : '0';
         }
     }
 
@@ -92,13 +94,27 @@ module.exports = async (ctx) => {
                 const link = `https://weibo.com/${uid}/${item.mblog.bid}`;
                 const formatExtended = weiboUtils.formatExtended(ctx, item.mblog);
                 let description = formatExtended.description;
-                const formattedTitle = formatExtended.title;
-                const title = formattedTitle;
+                const title = formatExtended.title;
                 const pubDate = item.mblog.created_at;
 
                 // 视频的处理
                 if (displayVideo === '1') {
-                    description = weiboUtils.formatVideo(description, item.mblog);
+                    // 含被转发微博时需要从被转发微博中获取视频
+                    if (item.mblog.retweeted_status) {
+                        description = weiboUtils.formatVideo(description, item.mblog.retweeted_status);
+                    } else {
+                        description = weiboUtils.formatVideo(description, item.mblog);
+                    }
+                }
+
+                // 文章的处理
+                if (displayArticle === '1') {
+                    // 含被转发微博时需要从被转发微博中获取文章
+                    if (item.mblog.retweeted_status) {
+                        description = await weiboUtils.formatArticle(ctx, description, item.mblog.retweeted_status);
+                    } else {
+                        description = await weiboUtils.formatArticle(ctx, description, item.mblog);
+                    }
                 }
 
                 return {

package/lib/routes/weibo/utils.js

@@ -1,5 +1,6 @@
 const querystring = require('querystring');
 const got = require('@/utils/got');
+const cheerio = require('cheerio');
 const { fallback, queryToBoolean, queryToInteger } = require('@/utils/readable-social');
 
 const weiboUtils = {
@@ -50,12 +51,12 @@ const weiboUtils = {
         let htmlNewLineUnreplaced = (status.longText && status.longText.longTextContent) || status.text || '';
         // 表情图标转换为文字
         if (!showEmojiInDescription) {
-            htmlNewLineUnreplaced = htmlNewLineUnreplaced.replace(/<span class="url-icon"><img.*?alt="?(.*?)"? [\s\S]*?\/><\/span>/g, '$1');
+            htmlNewLineUnreplaced = htmlNewLineUnreplaced.replace(/<span class=["']url-icon["']><img\s[^>]*?alt=["']?([^>]+?)["']?\s[^>]*?\/><\/span>/g, '$1');
         }
-        // 去掉外部链接的图标，保留 a 标签链接
-        htmlNewLineUnreplaced = htmlNewLineUnreplaced.replace(/<span class=["|']url-icon["|']>.*?(<a.*?>).*?<\/span><span class="surl-text">(.*?)<\/span>/g, '$1$2</a>');
-        // 去掉乱七八糟的图标
-        // htmlNewLineUnreplaced = htmlNewLineUnreplaced.replace(/<span class=["|']url-icon["|']>(.*?)<\/span>/g, '');
+        // 去掉外部链接的图标，保留 a 标签链接  // 不能去掉，否则像超话这样的有意义的图标也会被去掉
+        // htmlNewLineUnreplaced = htmlNewLineUnreplaced.replace(/(<a\s[^>]*>)<span class=["']url-icon["']><img\s[^>]*><\/span>[^<>]*?<span class="surl-text">([^<>]*?)<\/span><\/a>/g, '$1$2</a>');
+        // 去掉乱七八糟的图标  // 不能去掉，否则像超话这样的有意义的图标也会被去掉
+        // htmlNewLineUnreplaced = htmlNewLineUnreplaced.replace(/<span class=["']url-icon["']>(<img\s[^>]*?>)<\/span>/g, '');
         // 去掉全文
         htmlNewLineUnreplaced = htmlNewLineUnreplaced.replace(/全文<br>/g, '<br>');
         htmlNewLineUnreplaced = htmlNewLineUnreplaced.replace(/<a href="(.*?)">全文<\/a>/g, '');
@@ -83,6 +84,22 @@ const weiboUtils = {
             html = usernameAndAvatar + html;
         }
 
+        // 添加文章头图，此处不需要回落到被转发的微博，后续处理被转发的微博时，还会执行到这里
+        if (status.page_info && status.page_info.type === 'article' && status.page_info.page_pic && status.page_info.page_pic.url) {
+            // 如果以后后续流程会用到其他字段，记得修改这里
+            const pagePic = {
+                large: {
+                    url: status.page_info.page_pic.url,
+                },
+            };
+            // 文章微博一般不会有配图，但也有可能有：https://weibo.com/6882481489/Lh85BkS3m
+            if (status.pics) {
+                status.pics.push(pagePic);
+            } else {
+                status.pics = [pagePic];
+            }
+        }
+
         // 添加微博配图
         if (status.pics) {
             if (readable) {
@@ -174,6 +191,8 @@ const weiboUtils = {
         }
         if (!status.retweeted_status || showRetweetTextInTitle) {
             title += htmlNewLineUnreplaced
+                .replace(/<span class=["']url-icon["']><img\s[^>]*?alt=["']?([^>]+?)["']?\s[^>]*?\/><\/span>/g, '$1') // 表情转换
+                .replace(/<span class=["']url-icon["']>(<img\s[^>]*?>)<\/span>/g, '') // 去掉所有图标
                 .replace(/<img[\s\S]*?>/g, '[图片]')
                 .replace(/<.*?>/g, '')
                 .replace('\n', '');
@@ -181,6 +200,8 @@ const weiboUtils = {
         if (status.retweeted_status) {
             title += showEmojiForRetweet ? '🔁 ' : ' - 转发 ';
             title += retweeted
+                .replace(/<span class=["']url-icon["']><img\s[^>]*?alt=["']?([^>]+?)["']?\s[^>]*?\/><\/span>/g, '$1') // 表情转换
+                .replace(/<span class=["']url-icon["']>(<img\s[^>]*?>)<\/span>/g, '') // 去掉所有图标
                 .replace(/<img[\s\S]*?>/g, '[图片]')
                 .replace(/<.*?>/g, '')
                 .replace('\n', '');
@@ -240,6 +261,93 @@ const weiboUtils = {
         }
         return itemDesc;
     },
+    formatArticle: async (ctx, itemDesc, status) => {
+        const pageInfo = status.page_info;
+        if (pageInfo && pageInfo.type === 'article' && pageInfo.page_url) {
+            const pageUrl = pageInfo.page_url;
+            const articleIdMatch = pageUrl.match(/id=(\d+)/);
+            if (!articleIdMatch) {
+                return itemDesc;
+            }
+            const articleId = articleIdMatch[1];
+            const link = `https://card.weibo.com/article/m/aj/detail?id=${articleId}`;
+            const response = await ctx.cache.tryGet(link, async () => {
+                const _response = await got.get(link, {
+                    headers: {
+                        Referer: `https://card.weibo.com/article/m/show/id/${articleId}`,
+                        'MWeibo-Pwa': 1,
+                        'X-Requested-With': 'XMLHttpRequest',
+                        'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1',
+                    },
+                });
+                return _response.data;
+            }); // cache it!
+            const article = response.data;
+            if (article && article.title && article.content) {
+                const title = article.title;
+                const content = article.content;
+                const summary = article.summary;
+                const createAt = article.create_at;
+                const readCount = article.read_count;
+                const isOriginal = article.is_original;
+                const isArticleNonFree = article.is_article_free; // 微博起错了字段名，它为 1 时才是收费文章
+
+                // 许多微博文章都给文字设置了白色背景，这里也只好使用白色背景了
+                let html = '<br clear="both" /><br clear="both" />';
+                html += '<div style="clear: both"></div><div style="background: #fff;border:5px solid #80808030;margin:0;padding:3% 5%;overflow-wrap: break-word">';
+
+                html += `<h1 style="font-size: 1.5rem;line-height: 1.25;color: #333;">${title}</h1>`; // 加入标题
+
+                // 加入文章信息
+                const iconStyle =
+                    'display: inline-block;margin-inline: 0.25rem;width: 2.25rem; height: 1.125rem; background: #eee; border-radius: 2px; box-sizing: border-box; text-align: center; line-height: 1.0625rem; font-size: 0.75rem; color: #aaa;';
+                let articleMeta = '<p style="line-height: 1.66; color: #999;margin: 0 0 0.75rem;font-size: 0.75rem;padding: 0">';
+                if (isArticleNonFree) {
+                    articleMeta += `<span style="${iconStyle}">试读</span> `;
+                }
+                if (isOriginal) {
+                    articleMeta += `<span style="${iconStyle}">原创</span> `;
+                }
+                articleMeta += `<span style="margin-inline: 0.25rem;">发布时间: ${createAt}</span> `; // 发布时间
+                articleMeta += `<span style="margin-inline: 0.25rem;">阅读量: ${readCount}</span> `; // 阅读量
+                articleMeta += '</p>';
+                html += articleMeta;
+
+                if (summary) {
+                    html += `<p style="color: #999;line-height: 1.5rem;padding: 0.0625rem 0 0.875rem;margin: 0">${summary}</p>`; // 摘要
+                }
+
+                html += '<div style="height: 0;border-bottom: 1px dashed #999;margin-bottom: 0.75rem;"></div>'; // 分割线
+
+                // 正文处理，加入一些在微博文章页的 CSS 中定义的不可或缺的样式
+                const $ = cheerio.load(content);
+                $('p').each((_, elem) => {
+                    elem = $(elem);
+                    let style = elem.attr('style') || '';
+                    style = 'margin: 0;padding: 0;border: 0;' + style;
+                    elem.attr('style', style);
+                });
+                $('.image').each((_, elem) => {
+                    elem = $(elem);
+                    let style = elem.attr('style') || '';
+                    style = 'display: table;text-align: center;margin-left: auto;margin-right: auto;clear: both;min-width: 50px;' + style;
+                    elem.attr('style', style);
+                });
+                $('img').each((_, elem) => {
+                    elem = $(elem);
+                    let style = elem.attr('style') || '';
+                    style = 'display: block;max-width: 100%;margin-left: auto;margin-right: auto;min-width: 50px;' + style;
+                    elem.attr('style', style);
+                });
+                const contentHtml = $.html();
+                html += `<div style="line-height: 1.59;text-align: justify;font-size: 1.0625rem;color: #333;">${contentHtml}</div>`; // 正文
+
+                html += '</div>';
+                itemDesc += html;
+            }
+        }
+        return itemDesc;
+    },
 };
 
 module.exports = weiboUtils;

package/lib/routes/ximalaya/album.js

@@ -179,7 +179,7 @@ module.exports = async (ctx) => {
         const itunesItemImage = item.coverLarge ? item.coverLarge : albumCover;
         const link = baseUrl + albumUrl + trackId;
         const pubDate = new Date(item.createdAt).toUTCString();
-        const enclosureLength = item.duration; // 时间长度：单位（秒）
+        const duration = item.duration; // 时间长度：单位（秒）
         const enclosureUrl = item.playPathAacv224 || item.playPathAacv164;
 
         let resultItem = {
@@ -199,7 +199,7 @@ module.exports = async (ctx) => {
             resultItem = {
                 ...resultItem,
                 enclosure_url: enclosureUrl,
-                enclosure_length: enclosureLength,
+                itunes_duration: duration,
                 enclosure_type: 'audio/x-m4a',
             };
         }

package/lib/routes/yyets/todayfilelist.js

@@ -28,7 +28,6 @@ module.exports = async (ctx) => {
             // 文章链接
             link: `${item.magnet_url}&tr=http://tr.cili001.com:8070/announce&tr=udp://p4p.arenabg.com:1337&tr=udp://tracker.opentrackr.org:1337/announce&tr=udp://open.demonii.com:1337`,
             enclosure_url: `${item.magnet_url}&tr=http://tr.cili001.com:8070/announce&tr=udp://p4p.arenabg.com:1337&tr=udp://tracker.opentrackr.org:1337/announce&tr=udp://open.demonii.com:1337`, // 磁力链接
-            enclosure_length: '', // 时间戳 (播放长度) , 一般是秒数，可选
             enclosure_type: 'application/x-bittorrent', // 固定为 'application/x-bittorrent'
         })),
     };

package/lib/routes/zhihu/activities.js

@@ -19,6 +19,7 @@ module.exports = async (ctx) => {
     ctx.state.data = {
         title: `${data[0].actor.name}的知乎动态`,
         link: `https://www.zhihu.com/people/${id}/activities`,
+        image: data[0].actor.avatar_url,
         description: data[0].actor.headline || data[0].actor.description,
         item: data.map((item) => {
             const detail = item.target;

package/lib/routes/zhihu/daily.js

@@ -49,6 +49,7 @@ module.exports = async (ctx) => {
         title: '知乎日报',
         link: 'https://daily.zhihu.com',
         description: '每天3次，每次7分钟',
+        image: 'http://static.daily.zhihu.com/img/new_home_v3/mobile_top_logo.png',
         item: items,
     };
 };

package/lib/routes/zhihu/daily_section.js

@@ -49,6 +49,7 @@ module.exports = async (ctx) => {
         title: `${listRes.data.name} - 知乎日报`,
         link: 'https://daily.zhihu.com',
         description: '每天3次，每次7分钟',
+        image: 'http://static.daily.zhihu.com/img/new_home_v3/mobile_top_logo.png',
         item: resultItem,
     };
 };

package/lib/routes/zhihu/hot.js

@@ -1,4 +1,5 @@
 const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
 
 const titles = {
     total: '全站',
@@ -23,9 +24,9 @@ module.exports = async (ctx) => {
     });
 
     const items = response.data.data.map((item) => ({
-        link: item.target.url,
+        link: `https://www.zhihu.com/question/${item.target.id}`,
         title: item.target.title,
-        pubDate: new Date(item.target.created * 1000).toUTCString(),
+        pubDate: parseDate(item.target.created * 1000),
         description: item.target.excerpt ? `<p>${item.target.excerpt}</p>` : '',
     }));
 

package/lib/utils/puppeteer.js

@@ -2,7 +2,7 @@ const config = require('@/config').value;
 const puppeteer = require('puppeteer');
 
 const options = {
-    args: ['--no-sandbox', '--disable-setuid-sandbox', '--disable-infobars', '--window-position=0,0', '--ignore-certifcate-errors', '--ignore-certifcate-errors-spki-list', `--user-agent=${config.ua}`],
+    args: ['--no-sandbox', '--disable-setuid-sandbox', '--disable-infobars', '--window-position=0,0', '--ignore-certificate-errors', '--ignore-certificate-errors-spki-list', `--user-agent=${config.ua}`],
     headless: true,
     ignoreHTTPSErrors: true,
 };

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

@@ -0,0 +1,7 @@
+const { rootUrl, ProcessItems } = require('./utils');
+
+module.exports = async (ctx) => {
+    const currentUrl = `${rootUrl}/new/actual`;
+
+    ctx.state.data = await ProcessItems(currentUrl);
+};

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

@@ -0,0 +1,9 @@
+const { rootUrl, ProcessItems } = require('./utils');
+
+module.exports = async (ctx) => {
+    const id = ctx.params.id;
+
+    const currentUrl = `${rootUrl}/${id}`;
+
+    ctx.state.data = await ProcessItems(currentUrl);
+};

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

@@ -0,0 +1,9 @@
+const { rootUrl, ProcessItems } = require('./utils');
+
+module.exports = async (ctx) => {
+    const id = ctx.params.id;
+
+    const currentUrl = `${rootUrl}/genre_${id}`;
+
+    ctx.state.data = await ProcessItems(currentUrl);
+};

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

@@ -0,0 +1,7 @@
+const { rootUrl, ProcessItems } = require('./utils');
+
+module.exports = async (ctx) => {
+    const currentUrl = `${rootUrl}/new/interesting`;
+
+    ctx.state.data = await ProcessItems(currentUrl);
+};

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

@@ -0,0 +1,8 @@
+module.exports = {
+    '/actual': ['nczitzk'],
+    '/author/:id': ['nczitzk'],
+    '/genre/:id': ['nczitzk'],
+    '/interesting': ['nczitzk'],
+    '/map': ['nczitzk'],
+    '/new': ['nczitzk'],
+};

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

@@ -0,0 +1,7 @@
+const { rootUrl, ProcessItems } = require('./utils');
+
+module.exports = async (ctx) => {
+    const currentUrl = `${rootUrl}/new/map`;
+
+    ctx.state.data = await ProcessItems(currentUrl);
+};

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

@@ -0,0 +1,7 @@
+const { rootUrl, ProcessItems } = require('./utils');
+
+module.exports = async (ctx) => {
+    const currentUrl = `${rootUrl}/new`;
+
+    ctx.state.data = await ProcessItems(currentUrl);
+};

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

@@ -0,0 +1,43 @@
+module.exports = {
+    '35photo.pro': {
+        _name: '35PHOTO',
+        '.': [
+            {
+                title: 'New photos',
+                docs: 'https://docs.rsshub.app/picture.html#35photo-new-photos',
+                source: ['/new', '/'],
+                target: '/35photo/new',
+            },
+            {
+                title: 'Featured photos',
+                docs: 'https://docs.rsshub.app/picture.html#35photo-featured-photos',
+                source: ['/new/actual', '/'],
+                target: '/35photo/actual',
+            },
+            {
+                title: 'New interesting',
+                docs: 'https://docs.rsshub.app/picture.html#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',
+                source: ['/new/map', '/'],
+                target: '/35photo/map',
+            },
+            {
+                title: 'Genre',
+                docs: 'https://docs.rsshub.app/picture.html#35photo-genre',
+                source: ['/'],
+                target: (params, url) => `/35photo/genre/${url.match(/genre_(\d+)/)[1]}`,
+            },
+            {
+                title: 'Author',
+                docs: 'https://docs.rsshub.app/picture.html#35photo-author',
+                source: ['/:id', '/'],
+                target: '/35photo/author/:id',
+            },
+        ],
+    },
+};

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

@@ -0,0 +1,8 @@
+module.exports = function (router) {
+    router.get('/actual', require('./actual'));
+    router.get('/author/:id', require('./author'));
+    router.get('/genre/:id', require('./genre'));
+    router.get('/interesting', require('./interesting'));
+    router.get('/map', require('./map'));
+    router.get('/new', require('./new'));
+};

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

@@ -0,0 +1,42 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+
+const rootUrl = 'https://35photo.pro';
+
+module.exports = {
+    rootUrl,
+    ProcessItems: async (currentUrl) => {
+        const response = await got({
+            method: 'get',
+            url: currentUrl,
+        });
+
+        const $ = cheerio.load(response.data);
+
+        const items = $('.item')
+            .toArray()
+            .map((item) => {
+                item = $(item);
+
+                const image = item.find('.showPrevPhoto');
+
+                return {
+                    title: image.attr('title').replace(/Photographer\\'s photo - /, ''),
+                    link: image.parent().attr('href'),
+                    author: item.next().find('.userName').text().replace(/© /, ''),
+                    category: image
+                        .attr('alt')
+                        .replace(/photo preview/g, '')
+                        .split(/,|#/)
+                        .map((c) => c.trim()),
+                    description: `<img src="${rootUrl}/photos_main/${image.attr('src').match(/sizes\/(.*)_/)[1]}.jpg">`,
+                };
+            });
+
+        return {
+            title: `${$('h1').text()} - 35PHOTO`,
+            link: currentUrl,
+            item: items,
+        };
+    },
+};

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

@@ -0,0 +1,7 @@
+module.exports = {
+    '/motif/:mid': ['nczitzk'],
+    '/news/:category?': ['nczitzk'],
+    '/newsflashes': ['hillerliao'],
+    '/search/article/:keyword': ['xyqfer', 'kt286'],
+    '/user/:uid': ['nczitzk'],
+};

package/lib/{routes → v2}/36kr/motif.js

@@ -1,4 +1,5 @@
 const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
 
 module.exports = async (ctx) => {
     const motifUrl = `https://36kr.com/motif/${ctx.params.mid}`;
@@ -13,7 +14,7 @@ module.exports = async (ctx) => {
     const articleList = motifArticleList.map((item) => ({
         title: item.templateMaterial.widgetTitle,
         link: `https://36kr.com/${item.route.split('?')[0] === 'detail_video' ? 'video' : 'p'}/${item.itemId}`,
-        pubDate: new Date(item.templateMaterial.publishTime).toUTCString(),
+        pubDate: parseDate(item.templateMaterial.publishTime),
     }));
 
     ctx.state.data = {