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

package/lib/v2/zhiy/post.js

@@ -0,0 +1,69 @@
+const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
+const { baseUrl, fetchUserDate } = require('./utils');
+const { art } = require('@/utils/render');
+const path = require('path');
+const dayjs = require('dayjs');
+
+module.exports = async (ctx) => {
+    art.defaults.imports = {
+        dayjs,
+        ...art.defaults.imports,
+    };
+
+    const { author } = ctx.params;
+
+    const userData = await fetchUserDate(author);
+    const { author_id: authorId } = userData;
+
+    const {
+        data: { result: posts },
+    } = await got(`${baseUrl}/api/app/share/garden/users/${authorId}/posts`, {
+        searchParams: {
+            page: 1,
+            limit: ctx.query.limit ? parseInt(ctx.query.limit) : 100,
+        },
+    });
+
+    const list = posts.map((item) => ({
+        title: item.title,
+        pubDate: parseDate(item.create_time, 'X'),
+        link: `${baseUrl}/b${item.share_md5}`,
+        guid: `${baseUrl}/b${item.share_md5}:${item.link_amount}:${item.note_amount}`,
+        postId: item.id,
+        shareMD5: item.share_md5,
+    }));
+
+    const items = await Promise.all(
+        list.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const { data: postMeta } = await got(`${baseUrl}/api/app/share/posts/${item.shareMD5}`);
+
+                const {
+                    data: { result: posts },
+                } = await got(`${baseUrl}/api/app/share/posts/${item.postId}/notes`, {
+                    searchParams: {
+                        page: 1,
+                        limit: 100,
+                    },
+                });
+
+                item.description = art(path.join(__dirname, 'templates/post.art'), {
+                    postMeta,
+                    postDate: dayjs(postMeta.create_time, 'X').format('YYYY-MM-DD HH:mm:ss'),
+                    posts,
+                });
+
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: userData.author_name,
+        link: `${baseUrl}/${author}`,
+        description: userData.author_signature,
+        image: userData.author_avatar_url,
+        item: items,
+    };
+};

package/lib/v2/zhiy/radar.js

@@ -0,0 +1,19 @@
+module.exports = {
+    'zhiy.cc': {
+        _name: '知园',
+        '.': [
+            {
+                title: 'Newsletter',
+                docs: 'https://docs.rsshub.app/new-media.html#zhi-yuan',
+                source: ['/:author'],
+                target: '/zhiy/letters/:author',
+            },
+            {
+                title: '笔记',
+                docs: 'https://docs.rsshub.app/new-media.html#zhi-yuan',
+                source: ['/:author'],
+                target: '/zhiy/posts/:author',
+            },
+        ],
+    },
+};

package/lib/v2/zhiy/router.js

@@ -0,0 +1,4 @@
+module.exports = (router) => {
+    router.get('/letters/:author', require('./letter'));
+    router.get('/posts/:author', require('./post'));
+};

package/lib/v2/zhiy/templates/post.art

@@ -0,0 +1,12 @@
+{{ postMeta.visit_amount }}阅读 {{ postMeta.note_amount }}条笔记 创建于{{ postDate }}
+<br>
+{{ each posts post }}
+    {{ each post.struct.items item }}
+        {{ if item.type === 'text' }}<span>{{@ item.content.replace(/\n/g, '<br>') }}</span>{{ /if }}
+        {{ if item.type === 'url' }}<a href="{{ item.url }}">{{ item.content }}</a>{{ /if }}
+        {{ if item.type === 'link' }}<span>{{@ item.content.replace(/\n/g, '<br>') }}</span>{{ /if }}
+    {{ /each }}
+<br>
+{{ dayjs(post.publish_time_timestamp, 'X').format('YYYY-MM-DD HH:mm:ss') }}
+<hr>
+{{ /each }}

package/lib/v2/zhiy/utils.js

@@ -0,0 +1,13 @@
+const got = require('@/utils/got');
+
+const baseUrl = 'https://zhiy.cc';
+
+const fetchUserDate = async (author) => {
+    const { data: userData } = await got(`${baseUrl}/api/app/share/garden/users/${author}`);
+    return userData;
+};
+
+module.exports = {
+    baseUrl,
+    fetchUserDate,
+};

package/lib/v2/zhubai/index.js

@@ -1,9 +1,13 @@
 const got = require('@/utils/got');
 const { parseDate } = require('@/utils/parse-date');
+const { isValidHost } = require('@/utils/valid-host');
 
 module.exports = async (ctx) => {
     const { id } = ctx.params;
     const limit = ctx.query.limit ? parseInt(ctx.query.limit) : 20;
+    if (!isValidHost(id)) {
+        throw Error('Invalid id');
+    }
 
     const response = await got({
         method: 'get',

package/lib/views/json.js

@@ -0,0 +1,46 @@
+/**
+ * This function should be used by RSSHub middleware only.
+ * @param {object} data ctx.state.data
+ * @returns `JSON.stringify`-ed [JSON Feed](https://www.jsonfeed.org/)
+ */
+const json = (data) => {
+    const jsonFeed = {
+        version: 'https://jsonfeed.org/version/1.1',
+        title: data.title || 'RSSHub',
+        home_page_url: data.link || 'https://docs.rsshub.app',
+        feed_url: data.feedLink,
+        description: `${data.description || data.title} - Made with love by RSSHub(https://github.com/DIYgod/RSSHub)`,
+        icon: data.image,
+        authors: typeof data.author === 'string' ? [{ name: data.author }] : data.author,
+        language: data.language || 'zh-cn',
+        items: data.item.map((item) => ({
+            id: item.guid || item.id || item.link,
+            url: item.link,
+            title: item.title,
+            content_html: (item.content && item.content.html) || item.description || item.title,
+            content_text: item.content && item.content.text,
+            image: item.image,
+            banner_image: item.banner,
+            date_published: item.pubDate,
+            date_modified: item.updated,
+            authors: typeof item.author === 'string' ? [{ name: item.author }] : item.author,
+            tags: typeof item.category === 'string' ? [item.category] : item.category,
+            language: item.language,
+            attachments: item.enclosure_url
+                ? [
+                      {
+                          url: item.enclosure_url,
+                          mime_type: item.enclosure_type,
+                          title: item.enclosure_title,
+                          size_in_bytes: item.enclosure_length,
+                          duration_in_seconds: item.itunes_duration,
+                      },
+                  ]
+                : undefined,
+            _extra: item._extra || undefined,
+        })),
+    };
+    return JSON.stringify(jsonFeed, null, 4);
+};
+
+module.exports = json;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsshub",
-  "version": "1.0.0-master.fe99193",
+  "version": "1.0.0-master.fe9c82a",
   "description": "Make RSS Great Again!",
   "main": "lib/pkg.js",
   "files": [
@@ -48,26 +48,27 @@
   },
   "homepage": "https://github.com/DIYgod/RSSHub#readme",
   "devDependencies": {
+    "@microsoft/eslint-formatter-sarif": "3.0.0",
     "@napi-rs/pinyin": "1.7.1",
     "@types/koa": "2.13.5",
-    "@vercel/nft": "0.22.1",
-    "@vuepress/plugin-back-to-top": "1.9.7",
-    "@vuepress/plugin-google-analytics": "1.9.7",
-    "@vuepress/plugin-pwa": "1.9.7",
-    "@vuepress/shared-utils": "1.9.7",
+    "@vercel/nft": "0.22.6",
+    "@vuepress/plugin-back-to-top": "1.9.9",
+    "@vuepress/plugin-google-analytics": "1.9.9",
+    "@vuepress/plugin-pwa": "1.9.9",
+    "@vuepress/shared-utils": "1.9.9",
     "cross-env": "7.0.3",
-    "eslint": "8.25.0",
-    "eslint-config-prettier": "8.5.0",
+    "eslint": "8.35.0",
+    "eslint-config-prettier": "8.6.0",
     "eslint-plugin-prettier": "4.2.1",
-    "eslint-plugin-yml": "1.2.0",
-    "fs-extra": "10.1.0",
-    "jest": "29.2.1",
-    "jest-junit": "14.0.1",
-    "meilisearch": "0.28.0",
+    "eslint-plugin-yml": "1.5.0",
+    "fs-extra": "11.1.0",
+    "jest": "29.4.3",
+    "jest-junit": "15.0.0",
+    "meilisearch": "0.31.1",
     "mockdate": "3.0.5",
-    "nock": "13.2.9",
-    "nodemon": "2.0.20",
-    "prettier": "2.7.1",
+    "nock": "13.3.0",
+    "nodemon": "2.0.21",
+    "prettier": "2.8.4",
     "prettier-check": "2.0.0",
     "pretty-quick": "3.1.3",
     "remark": "13.0.0",
@@ -80,74 +81,73 @@
     "request-promise-native": "1.0.9",
     "staged-git-files": "1.3.0",
     "string-width": "4.2.3",
-    "supertest": "6.3.0",
+    "supertest": "6.3.3",
     "tosource": "2.0.0-alpha.3",
     "unified": "9.2.2",
-    "vuepress": "1.9.7",
-    "vuepress-plugin-meilisearch": "0.12.4",
+    "vuepress": "1.9.9",
+    "vuepress-plugin-meilisearch": "0.13.0",
     "vuepress-plugin-sitemap": "2.3.1",
     "yorkie": "2.0.0"
   },
   "dependencies": {
     "@koa/router": "12.0.0",
-    "@postlight/parser": "2.2.2",
-    "@sentry/node": "7.15.0",
+    "@postlight/parser": "2.2.3",
+    "@sentry/node": "7.40.0",
     "aes-js": "3.1.2",
     "art-template": "4.13.2",
     "bbcodejs": "0.0.4",
     "cheerio": "1.0.0-rc.12",
-    "chrono-node": "2.4.1",
+    "chrono-node": "2.5.0",
     "city-timezones": "1.2.1",
     "crypto-js": "4.1.1",
     "currency-symbol-map": "5.1.0",
-    "dayjs": "1.11.5",
+    "dayjs": "1.11.7",
     "dotenv": "16.0.3",
     "emailjs-imap-client": "3.1.0",
     "entities": "3.0.1",
     "etag": "1.8.1",
     "fanfou-sdk": "4.2.0",
     "git-rev-sync": "3.0.2",
-    "googleapis": "108.0.0",
-    "got": "11.8.5",
+    "googleapis": "112.0.0",
+    "got": "11.8.6",
     "https-proxy-agent": "5.0.1",
     "iconv-lite": "0.6.3",
     "instagram-private-api": "1.45.3",
-    "ioredis": "5.2.3",
+    "ioredis": "5.3.1",
     "ip-regex": "4.3.0",
     "is-localhost-ip": "2.0.0",
-    "jsdom": "20.0.1",
+    "jsdom": "21.1.0",
     "json-bigint": "1.0.0",
-    "json5": "2.2.1",
-    "koa": "2.13.4",
+    "json5": "2.2.3",
+    "koa": "2.14.1",
     "koa-basic-auth": "4.0.0",
     "koa-favicon": "2.1.0",
     "koa-mount": "4.0.0",
-    "lru-cache": "7.14.0",
+    "lru-cache": "7.18.1",
     "lz-string": "1.4.4",
-    "mailparser": "3.5.0",
+    "mailparser": "3.6.3",
     "markdown-it": "13.0.1",
     "module-alias": "2.2.2",
     "parse-torrent": "9.1.5",
-    "pidusage": "3.0.1",
+    "pidusage": "3.0.2",
     "plist": "3.0.6",
-    "proxy-chain": "2.1.1",
-    "puppeteer": "19.0.0",
-    "puppeteer-extra": "3.3.4",
-    "puppeteer-extra-plugin-stealth": "2.11.1",
-    "query-string": "7.1.1",
-    "rand-user-agent": "1.0.86",
-    "re2": "1.17.7",
+    "proxy-chain": "2.2.1",
+    "puppeteer": "19.7.2",
+    "puppeteer-extra": "3.3.6",
+    "puppeteer-extra-plugin-stealth": "2.11.2",
+    "query-string": "7.1.3",
+    "rand-user-agent": "1.0.109",
+    "re2": "1.18.0",
     "require-all": "3.0.0",
     "rss-parser": "3.12.0",
     "showdown": "2.1.0",
-    "simplecc-wasm": "0.1.4",
+    "simplecc-wasm": "0.1.5",
     "socks-proxy-agent": "7.0.0",
     "string-similarity": "4.0.4",
     "tiny-async-pool": "2.1.0",
     "torrent-search-api": "2.1.4",
     "tough-cookie": "4.1.2",
-    "tunnel": "0.0.6",
-    "twitter-api-v2": "1.12.8",
+    "twitter-api-v2": "1.14.2",
     "winston": "3.8.2",
     "xml2js": "0.4.23"
   },

package/lib/routes/apkpure/versions.js

@@ -1,23 +0,0 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-
-module.exports = async (ctx) => {
-    const { region, pkg } = ctx.params;
-    const link = `https://apkpure.com/${region}/${pkg}/versions`;
-    const $ = await got.get(link).then((r) => cheerio.load(r.data));
-    const img = new URL($('.ver-top img').attr('src'));
-    img.searchParams.delete('w'); // get full resolution icon
-    ctx.state.data = {
-        title: $('.ver-top-h1').text(),
-        description: `<img src="${img.href}"> ` + $('.ver-top-title>h2').text(),
-        link: decodeURI(link),
-        item: $('.ver li')
-            .toArray()
-            .map((ver) => ({
-                title: $(ver).find('.ver-item-n').text(),
-                description: $(ver).find('a').attr('title'),
-                link: `https://apkpure.com${decodeURI($(ver).find('a').attr('href').split('?from')[0])}`,
-                pubDate: new Date($(ver).find('.update-on').text().replace(/年|月/g, '-').replace('日', '')).toUTCString(),
-            })),
-    };
-};

package/lib/routes/baidu/topwords.js

@@ -1,38 +0,0 @@
-const got = require('@/utils/got');
-
-module.exports = async (ctx) => {
-    const { boardId = 1 } = ctx.params;
-    const response = await got({
-        method: 'get',
-        url: `http://top.baidu.com/mobile_v2/buzz?b=${boardId}`,
-    });
-
-    const { board, topwords, descs } = response.data.result;
-    const items = topwords.map((item, index) => {
-        const title = item.keyword;
-        const content = descs[index].content;
-        const desc = content
-            ? content.data[0]
-            : {
-                  originlink: `https://www.baidu.com/s?ie=utf-8&wd=${encodeURIComponent(title)}`,
-                  title,
-                  description: title,
-                  pubDate: Date.now(),
-              };
-
-        return {
-            title,
-            description: `
-        <a href="${desc.originlink}">${desc.title}</a><br>
-        ${desc.description || ''}
-      `,
-            link: desc.originlink,
-            pubDate: new Date(desc.pubDate).toUTCString(),
-        };
-    });
-
-    ctx.state.data = {
-        title: `百度搜索风云榜-${board.boardname}`,
-        item: items,
-    };
-};

package/lib/routes/bjp/apod.js

@@ -1,48 +0,0 @@
-const cheerio = require('cheerio');
-const got = require('@/utils/got');
-
-module.exports = async (ctx) => {
-    const baseUrl = 'http://www.bjp.org.cn';
-    const indexUrl = baseUrl + '/mryt/index.shtml';
-
-    const res = await got.get(indexUrl);
-
-    const $ = cheerio.load(res.data);
-
-    const list = $('b > a')
-        .slice(0, 10)
-        .get()
-        .map((e) => $(e));
-
-    const items = await Promise.all(
-        list.map(async (e) => {
-            const link = `${baseUrl}${e.attr('href')}`;
-
-            const cache = await ctx.cache.get(link);
-            if (cache) {
-                return Promise.resolve(JSON.parse(cache));
-            }
-
-            const data = await got.get(link);
-            const $ = cheerio.load(data.data);
-
-            const content = $($('body > table')[1]);
-
-            const item = {
-                title: $(e).attr('title'),
-                pubDate: new Date(data.data.match(/\d{4}-\d{2}-\d{2}/)[0]).toUTCString(),
-                description: content.find('table').last().html(),
-                link,
-                guid: link,
-            };
-            ctx.cache.set(link, JSON.stringify(item));
-
-            return item;
-        })
-    );
-    ctx.state.data = {
-        title: '北京天文馆每日一图',
-        link: indexUrl,
-        item: items,
-    };
-};

package/lib/routes/blogs/foreverblog.js

@@ -1,33 +0,0 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-
-module.exports = async (ctx) => {
-    const response = await got({
-        method: 'get',
-        url: 'https://www.foreverblog.cn/feeds.html',
-    });
-
-    const data = response.data;
-
-    const $ = cheerio.load(data);
-    const list = $('article[class="post post-type-normal"]');
-
-    ctx.state.data = {
-        title: '十年之约 - 订阅',
-        link: 'https://www.foreverblog.cn/feeds.html',
-        language: 'zh-cn',
-        item:
-            list &&
-            list
-                .map((index, item) => {
-                    item = $(item);
-                    return {
-                        title: item.find('a.post-title-link>span').text(),
-                        description: item.find('div.post-author').text(),
-                        link: item.find('a.post-title-link').attr('href'),
-                        pubDate: item.find('time.post-time').text(),
-                    };
-                })
-                .get(),
-    };
-};

package/lib/routes/caixin/article.js

@@ -1,46 +0,0 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-
-module.exports = async (ctx) => {
-    const response = await got({
-        method: 'get',
-        url: 'http://mapiv5.caixin.com//m/api/getWapIndexListByPage?page=1&callback=&_=1560140003179',
-        headers: {
-            Referer: `http://mapiv5.caixin.com/`,
-            Host: 'mapiv5.caixin.com',
-        },
-    });
-
-    const data = response.data.data.list;
-
-    const items = await Promise.all(
-        data.map(async (item) => {
-            const link = item.web_url;
-            const summary = `<blockquote><p>${item.summary}</p></blockquote><img src="${item.pics}">`;
-            const key = 'caixin_article_' + link;
-
-            const fullText = await ctx.cache.tryGet(key, async () => {
-                const result = await got.get(link);
-
-                const $ = cheerio.load(result.data);
-
-                return $('div#Main_Content_Val.text').html();
-            });
-
-            return {
-                title: item.title,
-                description: fullText ? summary + fullText : summary,
-                link,
-                pubDate: new Date(item.time * 1000),
-                author: item.author_name,
-            };
-        })
-    );
-
-    ctx.state.data = {
-        title: `财新网 - 首页`,
-        link: `http://www.caixin.com/`,
-        description: '财新网 - 首页',
-        item: items,
-    };
-};

package/lib/routes/caixin/blog.js

@@ -1,58 +0,0 @@
-const got = require('@/utils/got');
-const parser = require('@/utils/rss-parser');
-const cheerio = require('cheerio');
-
-async function load(link, need_feed_description) {
-    const response = await got.get(link);
-    const $ = cheerio.load(response.data);
-    const article = $('.blog_content').removeAttr('style');
-    article.find('img').removeAttr('style');
-    article
-        .find('div')
-        // Non-breaking space U+00A0, ` ` in html
-        // element.children[0].data === $(element, article).text()
-        .filter((_, element) => element.children[0].data === String.fromCharCode(160))
-        .remove();
-    const description = article.html();
-
-    const item = { description };
-
-    if (need_feed_description) {
-        const author = $('div.widget.author_detail p:nth-child(2)');
-        // workaround to split author name and author article
-        const author_name = author.find('strong');
-        author_name.text(author_name.text() + '，');
-        item.feed_description = author.text();
-    }
-    return item;
-}
-
-module.exports = async (ctx) => {
-    const { column } = ctx.params;
-    const link = `http://${column}.blog.caixin.com`;
-    const feed_url = `${link}/feed`;
-    const feed = await parser.parseURL(feed_url);
-
-    const title = `财新博客 - ${/[^»]*$/.exec(feed.title)[0]}`;
-
-    const items = await Promise.all(
-        feed.items.slice(0, 10).map(async (item, index) => {
-            const link = item.link;
-            const single = {
-                title: item.title,
-                pubDate: item.pubDate,
-                link,
-                author: item['dc:creator'],
-            };
-            const other = await ctx.cache.tryGet(link, () => load(link, index === 0));
-            return Promise.resolve(Object.assign({}, single, other));
-        })
-    );
-
-    ctx.state.data = {
-        title,
-        link,
-        description: items[0].feed_description,
-        item: items,
-    };
-};

package/lib/routes/caixin/category.js

@@ -1,44 +0,0 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-
-module.exports = async (ctx) => {
-    const category = ctx.params.category;
-    const column = ctx.params.column;
-    const url = `http://${column}.caixin.com/${category}`;
-
-    const response = await got({
-        method: 'get',
-        url,
-        headers: {
-            Referer: url,
-        },
-    });
-
-    const $ = cheerio.load(response.data);
-    const title = $('title').text();
-    const list = $('.stitXtuwen_list dl dd');
-    const items = [];
-
-    for (let i = 0; i < list.length; i++) {
-        const item = {
-            title: $(list[i]).children('h4').children().text(),
-            desc: $(list[i]).children('p').text(),
-            pubDate: new Date($(list[i]).children('span').text().replace('年', '-').replace('月', '-').replace('日', '')).toUTCString(),
-            url: $(list[i]).children('h4').children().attr('href'),
-        };
-        items.push(item);
-    }
-
-    ctx.state.data = {
-        title,
-        link: url,
-        description: '财新网 - 提供财经新闻及资讯服务',
-        item: items.map((item) => ({
-            title: item.title,
-            description: item.desc,
-            guid: item.title,
-            link: item.url,
-            pubDate: item.pubDate,
-        })),
-    };
-};