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

package/lib/v2/xmanhua/index.js

@@ -0,0 +1,74 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const uid = ctx.params.uid;
+    const host = 'https://xmanhua.com';
+    const url = `https://xmanhua.com/${uid}/`;
+    const response = await got({
+        method: 'get',
+        url,
+        headers: {
+            Referer: host,
+        },
+    });
+
+    const data = response.data;
+    const $ = cheerio.load(data);
+    const list = $('div #chapterlistload').find('.detail-list-form-item');
+    // 作者
+    const autherName = $('body > div.detail-info-1 > div > div > p.detail-info-tip > span:nth-child(1)').text().split('：')[1];
+    // 检查漫画是否已经完结
+    const finished_text = $('div.detail-list-form-title').clone().children().remove().end().text();
+    let finished = false;
+    let newOneDate = finished_text.split(',')[1];
+    if (newOneDate.includes('月') && newOneDate.includes('號')) {
+        const month = parseInt(newOneDate.split('月')[0]);
+        const date = parseInt(newOneDate.split('月')[1].split('號')[0]);
+        const year = new Date().getFullYear();
+        newOneDate = new Date(year, month - 1, date + 1);
+    } else {
+        newOneDate = new Date(newOneDate);
+        newOneDate.setDate(newOneDate.getDate() + 1);
+    }
+    if (finished_text.includes('已完結') || finished_text.includes('已完结')) {
+        finished = true;
+    }
+    // 最新一话的地址
+    const updatedOne = $('div.detail-list-form-title span.s a').attr('href');
+    const items = list
+        .map((index, item) => {
+            item = $(item);
+            const itemTitle = item.text();
+            const itemUrl = item.attr('href');
+            let itemDate;
+            if (itemUrl === updatedOne) {
+                itemDate = parseDate(newOneDate);
+            } else {
+                itemDate = '';
+            }
+            return {
+                title: itemTitle,
+                link: host + itemUrl,
+                auther: autherName,
+                pubDate: itemDate,
+                guid: host + itemUrl,
+            };
+        })
+        .get();
+    const name = $('body > div.detail-info-1 > div > div > p.detail-info-title').text();
+    let description_ = '';
+    if (finished) {
+        description_ = '已完结';
+    } else {
+        description_ = '连载中';
+    }
+    ctx.state.data = {
+        title: `x漫画  ${name}`,
+        link: `https://xmanhua.com/${uid}`,
+        description: description_,
+        allowEmpty: true,
+        item: items,
+    };
+};

package/lib/v2/xmanhua/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'xmanhua.com': {
+        _name: 'X 漫画',
+        '.': [
+            {
+                title: '最新动态',
+                docs: 'https://docs.rsshub.app/anime.html#x-man-hua',
+                source: ['/:uid'],
+                target: '/xmanhua/:uid',
+            },
+        ],
+    },
+};

package/lib/v2/xmanhua/router.js

@@ -0,0 +1,3 @@
+module.exports = (router) => {
+    router.get('/:uid', require('./index'));
+};

package/lib/{routes → v2}/zhibo8/forum.js

@@ -1,5 +1,7 @@
 const got = require('@/utils/got');
 const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+const timezone = require('@/utils/timezone');
 
 module.exports = async (ctx) => {
     const id = ctx.params.id;
@@ -13,7 +15,7 @@ module.exports = async (ctx) => {
 
     const out = await Promise.all(
         list
-            .map(async (index, item) => {
+            .map(async (_, item) => {
                 item = $(item);
                 const title = item.find('td:nth-child(1) > a:nth-child(2)').text();
                 const author = item.find('td:nth-child(2) cite a').text();
@@ -24,25 +26,15 @@ module.exports = async (ctx) => {
                     title,
                     author,
                     link,
-                    pubDate: new Date(date).toUTCString(),
+                    pubDate: timezone(parseDate(date, 'YYYY-MM-DD HH:mm'), +8),
                 };
 
-                const key = link;
-                const value = await ctx.cache.get(key);
-                if (value) {
-                    single.description = value;
-                } else {
+                single.description = await ctx.cache.tryGet(link, async () => {
                     const response = await got.get(link);
                     const $ = cheerio.load(response.data);
-                    $('.detail_ent img').each(function () {
-                        const $img = $(this);
-                        const src = $img.attr('src');
-                        $img.attr('src', 'https:' + src);
-                    });
-                    single.description = $('.detail_ent').html();
-                    ctx.cache.set(key, single.description);
-                }
-                return Promise.resolve(single);
+                    return $('.detail_ent').html();
+                });
+                return single;
             })
             .get()
     );

package/lib/v2/zhibo8/maintainer.js

@@ -0,0 +1,5 @@
+module.exports = {
+    '/forum/:id': ['LogicJake'],
+    '/more/:category?': ['nczitzk'],
+    '/post/:id': ['LogicJake'],
+};

package/lib/v2/zhibo8/more.js

@@ -0,0 +1,82 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const timezone = require('@/utils/timezone');
+const { parseDate } = require('@/utils/parse-date');
+
+const categories = {
+    nba: 'NBA',
+    zuqiu: '足球',
+    dianjing: '电竞',
+    other: '综合',
+};
+
+module.exports = async (ctx) => {
+    const category = ctx.params.category ?? 'nba';
+
+    const rootUrl = 'https://news.zhibo8.cc';
+
+    let list,
+        apiUrl = '',
+        currentUrl = '',
+        response;
+
+    if (category === 'nba' || category === 'zuqiu') {
+        currentUrl = `${rootUrl}/${category}/more.htm`;
+
+        response = await got({
+            method: 'get',
+            url: currentUrl,
+        });
+
+        const $ = cheerio.load(response.data);
+
+        list = $('ul.articleList li')
+            .slice(0, 30)
+            .map((_, item) => {
+                item = $(item);
+                const a = item.find('a');
+
+                return {
+                    title: a.text(),
+                    link: `http:${a.attr('href')}`,
+                    pubDate: timezone(parseDate(item.find('span.postTime').text()), +8),
+                };
+            })
+            .get();
+    } else {
+        currentUrl = `${rootUrl}/${category}`;
+        apiUrl = `https://api.qiumibao.com/application/app/index.php?_url=/news/${category}List`;
+
+        response = await got({
+            method: 'get',
+            url: apiUrl,
+        });
+
+        list = response.data.data.list.map((item) => ({
+            title: item.title,
+            link: `https:${item.url}`,
+            pubDate: timezone(parseDate(item.createtime), +8),
+        }));
+    }
+
+    const items = await Promise.all(
+        list.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const res = await got({
+                    method: 'get',
+                    url: item.link,
+                });
+                const content = cheerio.load(res.data);
+
+                item.description = content('div.content').html();
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: `${categories[category]} - 直播吧`,
+        link: currentUrl,
+        item: items,
+    };
+};

package/lib/{routes → v2}/zhibo8/post.js

@@ -26,7 +26,7 @@ module.exports = async (ctx) => {
                     guid: floor,
                 };
 
-                return Promise.resolve(single);
+                return single;
             })
             .get()
     );

package/lib/v2/zhibo8/radar.js

@@ -0,0 +1,27 @@
+module.exports = {
+    'zhibo8.cc': {
+        _name: '直播吧',
+        bbs: [
+            {
+                title: '子论坛',
+                docs: 'https://docs.rsshub.app/bbs.html#zhi-bo-ba',
+                source: ['/'],
+                target: (_params, url) => `/zhibo8/forum/${new URL(url).searchParams.get('fid')}`,
+            },
+            {
+                title: '回帖',
+                docs: 'https://docs.rsshub.app/bbs.html#zhi-bo-ba',
+                source: ['/'],
+                target: (_params, url) => `/zhibo8/post/${new URL(url).searchParams.get('tid')}`,
+            },
+        ],
+        news: [
+            {
+                title: '滚动新闻',
+                docs: 'https://docs.rsshub.app/bbs.html#zhi-bo-ba',
+                source: ['/:category'],
+                target: '/zhibo8/more/:category',
+            },
+        ],
+    },
+};

package/lib/v2/zhibo8/router.js

@@ -0,0 +1,5 @@
+module.exports = (router) => {
+    router.get('/forum/:id', require('./forum'));
+    router.get('/more/:category?', require('./more'));
+    router.get('/post/:id', require('./post'));
+};

package/lib/views/error.art

@@ -39,14 +39,14 @@
 
         <pre class="message">Route requested: {{@ requestPath }}</pre>
         <pre class="message">Error message: {{@ message }}</pre>
-        <pre class="messaage">
-Helpful Information to provide when opening issue: 
+        <pre class="message">
+Helpful Information to provide when opening issue:
 Path: {{@ errorPath }}
 Node version: {{@ nodeVersion}}
         </pre>
         <pre class="message">
-如果您认为 RSSHub 导致了该错误，请在Github按照模版，复制本页面信息进行<a href="https://github.com/DIYgod/RSSHub/issues/new?assignees=&labels=&template=bug_report.md" target="_blank">汇报</a>
-If you believe this is an error caused by RSSHub, please <a href="https://github.com/DIYgod/RSSHub/issues/new?assignees=&labels=&template=bug_report.md" target="_blank">report on github</a>
+如果您认为 RSSHub 导致了该错误，请在Github按照模版，复制本页面信息进行<a href="https://github.com/DIYgod/RSSHub/issues/new?assignees=&labels=RSS+bug&template=bug_report_zh.yml" target="_blank">汇报</a>
+If you believe this is an error caused by RSSHub, please <a href="https://github.com/DIYgod/RSSHub/issues/new?assignees=&labels=RSS+bug&template=bug_report_en.yml" target="_blank">report on github</a>
         </pre>
 
         <div style="margin: 50px 0">

package/lib/views/rss.art

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rss  xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"
-{{ if itunes_author }}
+{{ if itunes_author || itunes_category || (item && item.some((i) => (i.itunes_item_image || i.itunes_duration))) }}
   xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd"
-{{ else if item && item.some((i) => i.media) }}
+{{ /if }}
+{{ if item && item.some((i) => i.media) }}
   xmlns:media="http://search.yahoo.com/mrss/"
 {{ /if }}
 >
@@ -13,7 +14,7 @@
         <description><![CDATA[{{@ description || title }} - Made with love by RSSHub(https://github.com/DIYgod/RSSHub)]]></description>
         <generator>RSSHub</generator>
         <webMaster>i@diygod.me (DIYgod)</webMaster>
-        {{ if itunes_author }}<itunes:author>{{ itunes_author}}</itunes:author>{{ /if }}
+        {{ if itunes_author }}<itunes:author>{{ itunes_author }}</itunes:author>{{ /if }}
         {{ if itunes_category }}<itunes:category text="{{ itunes_category }}"/>{{ /if }}
         {{ if itunes_author }}<itunes:explicit>{{ itunes_explicit || 'clean' }}</itunes:explicit>{{ /if }}
         <language>{{ language || 'zh-cn' }}</language>
@@ -35,7 +36,7 @@
             <link>{{ $value.link }}</link>
             {{ if $value.itunes_item_image }}<itunes:image href="{{ $value.itunes_item_image }}"/>{{ /if }}
             {{ if $value.enclosure_url }}<enclosure url="{{ $value.enclosure_url }}" {{ if $value.enclosure_length }}length="{{ $value.enclosure_length }}"{{ /if }} {{ if $value.enclosure_type }}type="{{ $value.enclosure_type }}"{{ /if }} />{{ /if }}
-            {{ if itunes_author && $value.itunes_duration }}<itunes:duration>{{ $value.itunes_duration }}</itunes:duration> {{ /if }}
+            {{ if $value.itunes_duration }}<itunes:duration>{{ $value.itunes_duration }}</itunes:duration> {{ /if }}
             {{ if $value.author }}<author><![CDATA[{{ $value.author }}]]></author>{{ /if }}
             {{ if typeof $value.category === 'string' }}
             <category>{{ $value.category }}</category>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsshub",
-  "version": "1.0.0-master.fe69819",
+  "version": "1.0.0-master.fe775f5",
   "description": "Make RSS Great Again!",
   "main": "lib/pkg.js",
   "files": [
@@ -44,22 +44,22 @@
     "@types/cheerio": "0.22.31",
     "@types/got": "9.6.12",
     "@types/koa": "2.13.4",
-    "@vercel/nft": "0.17.5",
+    "@vercel/nft": "0.18.0",
     "@vuepress/plugin-back-to-top": "1.9.7",
     "@vuepress/plugin-google-analytics": "1.9.7",
     "@vuepress/plugin-pwa": "1.9.7",
     "ci-info": "3.3.0",
     "cross-env": "7.0.3",
-    "eslint": "8.9.0",
-    "eslint-config-prettier": "8.3.0",
+    "eslint": "8.11.0",
+    "eslint-config-prettier": "8.5.0",
     "eslint-plugin-prettier": "4.0.0",
     "eslint-plugin-yml": "0.14.0",
-    "fs-extra": "10.0.0",
+    "fs-extra": "10.0.1",
     "jest": "27.5.1",
     "mockdate": "3.0.5",
     "nock": "13.2.4",
     "nodemon": "2.0.15",
-    "prettier": "2.5.1",
+    "prettier": "2.6.0",
     "prettier-check": "2.0.0",
     "pretty-quick": "3.1.3",
     "remark": "13.0.0",
@@ -78,23 +78,23 @@
   "dependencies": {
     "@koa/router": "10.1.1",
     "@postlight/mercury-parser": "2.2.1",
-    "@sentry/node": "6.17.9",
+    "@sentry/node": "6.18.2",
     "aes-js": "3.1.2",
     "art-template": "4.13.2",
     "bbcodejs": "0.0.4",
     "cheerio": "1.0.0-rc.10",
-    "chrono-node": "2.3.7",
+    "chrono-node": "2.3.8",
     "city-timezones": "1.2.0",
     "crypto-js": "4.1.1",
     "currency-symbol-map": "5.0.1",
-    "dayjs": "1.10.7",
+    "dayjs": "1.11.0",
     "dotenv": "16.0.0",
     "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": "95.0.0",
+    "googleapis": "97.0.0",
     "got": "11.8.3",
     "https-proxy-agent": "5.0.0",
     "iconv-lite": "0.6.3",
@@ -110,28 +110,29 @@
     "koa-basic-auth": "4.0.0",
     "koa-favicon": "2.1.0",
     "koa-mount": "4.0.0",
-    "lru-cache": "6.0.0",
+    "lru-cache": "7.7.1",
     "lz-string": "1.4.4",
     "mailparser": "3.4.0",
-    "markdown-it": "12.2.0",
+    "markdown-it": "12.3.2",
     "module-alias": "2.2.2",
     "parse-torrent": "9.1.4",
     "pidusage": "3.0.0",
     "plist": "3.0.4",
-    "puppeteer": "11.0.0",
+    "puppeteer": "13.5.1",
     "query-string": "7.1.1",
     "require-all": "3.0.0",
     "rss-parser": "3.12.0",
-    "showdown": "2.0.0",
+    "showdown": "2.0.3",
     "simplecc-wasm": "0.1.4",
     "socks-proxy-agent": "6.1.1",
     "string-similarity": "4.0.4",
-    "tiny-async-pool": "1.2.0",
+    "tiny-async-pool": "2.0.1",
     "torrent-search-api": "2.1.4",
     "tough-cookie": "4.0.0",
     "tunnel": "0.0.6",
     "twit": "2.2.11",
-    "winston": "3.5.1"
+    "winston": "3.6.0",
+    "xml2js": "0.4.23"
   },
   "jest": {
     "testMatch": [

package/lib/routes/36kr/news.js

@@ -1,94 +0,0 @@
-const url = require('url');
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-
-const config = {
-    latest: {
-        link: '/information/web_news/latest',
-        title: '最新',
-    },
-    recommend: {
-        link: '/information/web_recommend',
-        title: '推荐',
-    },
-    contact: {
-        link: '/information/contact',
-        title: '创投',
-    },
-    ccs: {
-        link: '/information/ccs',
-        title: '中概股',
-    },
-    travel: {
-        link: '/information/travel',
-        title: '汽车',
-    },
-    technology: {
-        link: '/technology',
-        title: '科技',
-    },
-    enterpriseservice: {
-        link: '/information/enterpriseservice',
-        title: '企服',
-    },
-    banking: {
-        link: '/information/banking',
-        title: '金融',
-    },
-    life: {
-        link: '/information/happy_life',
-        title: '生活',
-    },
-    innovate: {
-        link: '/information/innovate',
-        title: '创新',
-    },
-    estate: {
-        link: '/information/real_estate',
-        title: '房产',
-    },
-    workplace: {
-        link: '/information/web_zhichang',
-        title: '职场',
-    },
-    other: {
-        link: '/information/other',
-        title: '其他',
-    },
-};
-
-module.exports = async (ctx) => {
-    const cfg = config[ctx.params.caty];
-    if (!cfg) {
-        throw Error('Bad category. See <a href="https://docs.rsshub.app/government.html#bei-jing-shi-wei-sheng-jian-kang-wei-yuan-hui">docs</a>');
-    }
-
-    const newsUrl = url.resolve(`https://36kr.com/`, cfg.link);
-    const response = await got({
-        method: 'get',
-        url: newsUrl,
-    });
-
-    const data = JSON.parse(response.data.match(/<script>window\.initialState=(.*?)<\/script>/)[1]);
-
-    const informationList = data.information.informationList.itemList.map((item) => ({
-        title: item.templateMaterial.widgetTitle,
-        link: `https://36kr.com/p/${item.itemId}`,
-        pubDate: new Date(item.templateMaterial.publishTime).toUTCString(),
-    }));
-
-    ctx.state.data = {
-        title: `36氪资讯 - ${cfg.title}`,
-        link: newsUrl,
-        item: await Promise.all(
-            informationList.map((item) =>
-                ctx.cache.tryGet(item.link, async () => {
-                    const contentResponse = await got({ method: 'get', url: item.link });
-                    const content = cheerio.load(contentResponse.data);
-                    item.description = content('div.common-width.content.articleDetailContent.kr-rich-text-wrapper').html();
-                    return item;
-                })
-            )
-        ),
-    };
-};

package/lib/routes/8kcos/article.js

@@ -1,17 +0,0 @@
-const Cheerio = require('cheerio');
-const got = require('got');
-async function loadArticle(link) {
-    const resp = await got(link);
-    const article = Cheerio.load(resp.body);
-    const title = article('.entry-title').text();
-    const entry_children = article('div.entry-content').children().toArray();
-    const imgs = Cheerio.load(entry_children.shift()).text(); // 去除懒加载代码减少返回体积
-    const txt = Cheerio.load(entry_children).html();
-    return {
-        title,
-        description: imgs.concat(txt),
-        pubDate: article('time')[0].attribs.datetime.replace('>', ''),
-        link,
-    };
-}
-module.exports = loadArticle;

package/lib/routes/8kcos/cat.js

@@ -1,28 +0,0 @@
-const got = require('got');
-const Cheerio = require('cheerio');
-const { SUB_NAME_PREFIX, SUB_URL } = require('./const');
-const loadArticle = require('./article');
-module.exports = async (ctx) => {
-    const { cat = '8kasianidol' } = ctx.params;
-    const url = `${SUB_URL}category/${cat}/`;
-    const resp = await got(url);
-    const $ = Cheerio.load(resp.body);
-    ctx.state.data = resp.body
-        ? {
-              title: `${SUB_NAME_PREFIX}-${$('#wrap > div > div > div > div.sec-panel-head > h1 > span').text()}`,
-              link: url,
-              item: await Promise.all(
-                  Cheerio.load(resp.body)('#wrap > div > div > div > ul > li.item')
-                      .map((_, e) => {
-                          const { href } = Cheerio.load(e)('h2 > a')[0].attribs;
-                          return ctx.cache.tryGet(href, () => loadArticle(href));
-                      })
-                      .toArray()
-              ),
-          }
-        : {
-              title: `${SUB_NAME_PREFIX}-${cat}`,
-              link: url,
-              item: [{ title: '获取失败' }],
-          };
-};

package/lib/routes/8kcos/latest.js

@@ -1,27 +0,0 @@
-const got = require('got');
-const Cheerio = require('cheerio');
-const { SUB_NAME_PREFIX, SUB_URL } = require('./const');
-const loadArticle = require('./article');
-const url = SUB_URL;
-
-module.exports = async (ctx) => {
-    const response = await got(url);
-    ctx.state.data = {
-        title: `${SUB_NAME_PREFIX}-最新`,
-        link: url,
-        item: response.body
-            ? await Promise.all(
-                  Cheerio.load(response.body)('#wrap > div > div > div > ul > li.item')
-                      .map((_, e) => {
-                          const { href } = Cheerio.load(e)('div > h2 > a')[0].attribs;
-                          return ctx.cache.tryGet(href, () => loadArticle(href));
-                      })
-                      .toArray()
-              )
-            : [
-                  {
-                      title: '获取失败！',
-                  },
-              ],
-    };
-};

package/lib/routes/95mm/tab.js

@@ -1,9 +0,0 @@
-const utils = require('./utils');
-
-module.exports = async (ctx) => {
-    ctx.params.tab = ctx.params.tab || '最新';
-
-    const rootUrl = `https://www.95mm.net/home-ajax/index.html?tabcid=${ctx.params.tab}&page=1`;
-
-    ctx.state.data = await utils(ctx, ctx.params.tab, rootUrl);
-};

package/lib/routes/95mm/tag.js

@@ -1,7 +0,0 @@
-const utils = require('./utils');
-
-module.exports = async (ctx) => {
-    const rootUrl = `https://www.95mm.net/tag-${ctx.params.tag}/page-1/index.html`;
-
-    ctx.state.data = await utils(ctx, ctx.params.tag, rootUrl);
-};

package/lib/routes/95mm/utils.js

@@ -1,51 +0,0 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-
-module.exports = async (ctx, title, rootUrl) => {
-    const response = await got({
-        method: 'get',
-        url: rootUrl,
-        header: {
-            Referer: 'https://www.95mm.net',
-        },
-    });
-
-    const $ = cheerio.load(response.data);
-
-    const list = $('div.list-body')
-        .map((_, item) => {
-            item = $(item);
-            const a = item.find('a');
-            return {
-                title: a.text(),
-                link: a.attr('href'),
-            };
-        })
-        .get();
-
-    const items = await Promise.all(
-        list.map((item) =>
-            ctx.cache.tryGet(item.link, async () => {
-                const detailResponse = await got({
-                    method: 'get',
-                    url: item.link,
-                });
-                const images = detailResponse.data.match(/src": '(.*?)',"width/g);
-
-                item.description = '';
-
-                for (const i of images) {
-                    item.description += `<img src="${i.split("'")[1]}">`;
-                }
-
-                return item;
-            })
-        )
-    );
-
-    return {
-        title: `${title} - MM范`,
-        link: rootUrl,
-        item: items,
-    };
-};