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

package/lib/v2/economist/radar.js

@@ -24,4 +24,15 @@ module.exports = {
             },
         ],
     },
+    'businessreview.global': {
+        _name: 'The Economist',
+        '.': [
+            {
+                title: '商论',
+                docs: 'https://docs.rsshub.app/traditional-media.html#the-economist',
+                source: ['/'],
+                target: '/economist/global-business-review',
+            },
+        ],
+    },
 };

package/lib/v2/economist/router.js

@@ -2,5 +2,6 @@ module.exports = (router) => {
     router.get('/download', require('./download'));
     router.get('/espresso', require('./espresso'));
     router.get('/gre-vocabulary', require('./gre-vocabulary'));
+    router.get('/global-business-review/:language?', require('./global-business-review'));
     router.get('/:endpoint', require('./full'));
 };

package/lib/v2/ehentai/ehapi.js

@@ -50,15 +50,27 @@ async function parsePage(cache, data, get_bittorrent = false, embed_thumb = fals
     // "l" for Compact
     // "e" for Extended
     // "t" for Thumbnail
-    const layout = $('div#dms option[selected]').attr('value');
-
-    let galleries;
-    if (layout !== 't') {
-        galleries = $('table[class^="itg glt"] tbody');
-    } else {
-        // Thumbnail layout has different page structure
-        // resolve it here
-        galleries = $('div[class^="itg gld"]');
+    let layout = 't';
+
+    // "itg gld" for Thumbnail
+    let galleries = $('div[class^="itg gld"]');
+    // "itg gltm" for Minimal or Minimal+
+    if (galleries.length <= 0) {
+        galleries = $('table[class^="itg gltm"] tbody');
+        layout = 'm';
+    }
+    // "itg gltc" for Compact
+    if (galleries.length <= 0) {
+        galleries = $('table[class^="itg gltc"] tbody');
+        layout = 'l';
+    }
+    // "itg glte" for Extended
+    if (galleries.length <= 0) {
+        galleries = $('table[class^="itg glte"] tbody');
+        layout = 'e';
+    }
+    if (galleries.length <= 0) {
+        return [];
     }
 
     async function parseElement(cache, element) {
@@ -108,12 +120,11 @@ async function parsePage(cache, data, get_bittorrent = false, embed_thumb = fals
             if ('le'.includes(layout)) {
                 // artist tags will only show in Compact or Extended layout
                 // get artist names as author
-                const artist = $(el)
+                item.author = $(el)
                     .find('div.gt[title^="artist:"]')
                     .toArray()
-                    .map((i, tag) => $(tag).text())
+                    .map((tag) => $(tag).text())
                     .join(' / ');
-                item.author = artist;
             }
             return item;
         }
@@ -181,25 +192,30 @@ async function gatherItemsByPage(cache, url, get_bittorrent = false, embed_thumb
     return updateBittorrent_url(cache, items);
 }
 
-async function getFavoritesItems(cache, page, favcat, inline_set, get_bittorrent = false, embed_thumb = false) {
+async function getFavoritesItems(cache, favcat, inline_set, page = undefined, get_bittorrent = false, embed_thumb = false) {
     const response = await ehgot(`favorites.php?favcat=${favcat}&inline_set=${inline_set}`);
-    if (parseInt(page) === 0) {
+    if (page) {
+        return gatherItemsByPage(cache, `favorites.php?favcat=${favcat}&next=${page}`, get_bittorrent, embed_thumb);
+    } else {
         const items = await parsePage(cache, response.data, get_bittorrent, embed_thumb);
         return updateBittorrent_url(cache, items);
     }
-    return gatherItemsByPage(cache, `favorites.php?page=${page}&favcat=${favcat}`, get_bittorrent, embed_thumb);
 }
 
 function getSearchItems(cache, params, page = undefined, get_bittorrent = false, embed_thumb = false) {
     if (page) {
-        return gatherItemsByPage(cache, `?page=${page}&${params}`, get_bittorrent, embed_thumb);
+        return gatherItemsByPage(cache, `?${params}&next=${page}`, get_bittorrent, embed_thumb);
     } else {
         return gatherItemsByPage(cache, `?${params}`, get_bittorrent, embed_thumb);
     }
 }
 
 function getTagItems(cache, tag, page, get_bittorrent = false, embed_thumb = false) {
-    return gatherItemsByPage(cache, `tag/${tag}/${page}`, get_bittorrent, embed_thumb);
+    if (page) {
+        return gatherItemsByPage(cache, `tag/${tag}?next=${page}`, get_bittorrent, embed_thumb);
+    } else {
+        return gatherItemsByPage(cache, `tag/${tag}`, get_bittorrent, embed_thumb);
+    }
 }
 
 module.exports = { getFavoritesItems, getSearchItems, getTagItems, has_cookie, from_ex };

package/lib/v2/ehentai/favorites.js

@@ -5,12 +5,12 @@ module.exports = async (ctx) => {
         throw 'Ehentai favorites RSS is disabled due to the lack of <a href="https://docs.rsshub.app/install/#pei-zhi-bu-fen-rss-mo-kuai-pei-zhi">relevant config</a>';
     }
     const favcat = ctx.params.favcat ? parseInt(ctx.params.favcat) : 0;
-    const page = ctx.params.page ? parseInt(ctx.params.page) : 0;
+    const page = ctx.params.page;
     const routeParams = new URLSearchParams(ctx.params.routeParams);
     const bittorrent = routeParams.get('bittorrent') || false;
     const embed_thumb = routeParams.get('embed_thumb') || false;
     const inline_set = ctx.params.order === 'posted' ? 'fs_p' : 'fs_f';
-    const items = await EhAPI.getFavoritesItems(ctx.cache, page, favcat, inline_set, bittorrent, embed_thumb);
+    const items = await EhAPI.getFavoritesItems(ctx.cache, favcat, inline_set, page, bittorrent, embed_thumb);
 
     if (EhAPI.from_ex) {
         ctx.state.data = {

package/lib/v2/ehentai/search.js

@@ -9,8 +9,8 @@ module.exports = async (ctx) => {
     let items;
     if (page) {
         // 如果定义了page，就要覆盖params
-        params = params.replace(/&*page=[^&]$/, '').replace(/page=[^&]&/, '');
-        items = await EhAPI.getSearchItems(ctx.cache, params, parseInt(page), bittorrent, embed_thumb);
+        params = params.replace(/&*next=[^&]$/, '').replace(/next=[^&]&/, '');
+        items = await EhAPI.getSearchItems(ctx.cache, params, page, bittorrent, embed_thumb);
     } else {
         items = await EhAPI.getSearchItems(ctx.cache, params, undefined, bittorrent, embed_thumb);
     }

package/lib/v2/ehentai/tag.js

@@ -1,7 +1,7 @@
 const EhAPI = require('./ehapi');
 
 module.exports = async (ctx) => {
-    const page = ctx.params.page ? parseInt(ctx.params.page) : 0;
+    const page = ctx.params.page;
     const tag = ctx.params.tag;
     const routeParams = new URLSearchParams(ctx.params.routeParams);
     const bittorrent = routeParams.get('bittorrent') || false;

package/lib/v2/eleduck/jobs.js

@@ -0,0 +1,38 @@
+const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const { data: response } = await got('https://svc.eleduck.com/api/v1/posts', {
+        searchParams: {
+            category: 5,
+        },
+    });
+
+    const data = response.posts.map((item) => ({
+        id: item.id,
+        title: item.title,
+        link: `https://eleduck.com/posts/${item.id}`,
+        author: item.user.nickname,
+        description: item.summary,
+        pubDate: parseDate(item.published_at),
+        category: item.tags.map((tag) => tag.name),
+    }));
+
+    const out = await Promise.all(
+        data.map((job) =>
+            ctx.cache.tryGet(job.link, async () => {
+                const { data: jobDetail } = await got(`https://svc.eleduck.com/api/v1/posts/${job.id}`);
+
+                job.description = jobDetail.post.content;
+
+                return job;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: '招聘 | 电鸭社区',
+        link: 'https://eleduck.com/category/5',
+        item: out,
+    };
+};

package/lib/v2/eleduck/maintainer.js

@@ -0,0 +1,4 @@
+module.exports = {
+    '/jobs': ['sfyumi'],
+    '/posts/:id?': ['running-grass'],
+};

package/lib/v2/eleduck/posts.js

@@ -0,0 +1,41 @@
+const got = require('@/utils/got');
+
+const getCateName = async (ctx, cid = 0) => {
+    const key = 'eleduck-categories';
+    const cates = await ctx.cache.tryGet(key, async () => {
+        const res = await got(`https://svc.eleduck.com/api/v1/categories`);
+        const map = {};
+        res.data.categories.forEach((item) => {
+            map[item.id] = item.name;
+        });
+        return map;
+    });
+
+    return cates[cid] || '全部';
+};
+
+module.exports = async (ctx) => {
+    const cid = ctx.params.id || 0;
+
+    const response = await got(`https://svc.eleduck.com/api/v1/posts?category=${cid}&sort=-published_at&page=1`);
+
+    const { posts } = response.data;
+    if (posts === undefined) {
+        throw new Error('没有获取到数据');
+    }
+
+    const cname = await getCateName(ctx, cid);
+
+    ctx.state.data = {
+        title: `电鸭社区的文章--${cname}`,
+        link: `https://eleduck.com/categories/${cid}`,
+        description: `电鸭社区的文章,栏目为${cname}`,
+        item: posts.map((item) => ({
+            title: item.title,
+            description: item.summary,
+            pubDate: item.published_at,
+            link: `https://eleduck.com/${item.category.id === 22 ? 'tposts' : 'posts'}/${item.id}`,
+            author: item.user.nickname,
+        })),
+    };
+};

package/lib/v2/eleduck/radar.js

@@ -0,0 +1,25 @@
+module.exports = {
+    'eleduck.com': {
+        _name: '电鸭社区',
+        '.': [
+            {
+                title: '工作机会',
+                docs: 'https://docs.rsshub.app/bbs.html#dian-ya-she-qu-fen-lei-wen-zhang',
+                source: ['/categories/5', '/'],
+                target: '/eleduck/jobs',
+            },
+            {
+                title: '分类文章',
+                docs: 'https://docs.rsshub.app/bbs.html#dian-ya-she-qu-fen-lei-wen-zhang',
+                source: '/categories/:cid',
+                target: (params) => `/eleduck/posts/${params.cid}`,
+            },
+            {
+                title: '全部文章',
+                docs: 'https://docs.rsshub.app/bbs.html#dian-ya-she-qu-fen-lei-wen-zhang',
+                source: ['/', '*'],
+                target: () => '/eleduck/posts',
+            },
+        ],
+    },
+};

package/lib/v2/eleduck/router.js

@@ -0,0 +1,4 @@
+module.exports = (router) => {
+    router.get('/jobs', require('./jobs'));
+    router.get('/posts/:id?', require('./posts'));
+};

package/lib/v2/eprice/rss.js

@@ -4,9 +4,13 @@ const cheerio = require('cheerio');
 const { parseDate } = require('@/utils/parse-date');
 const { art } = require('@/utils/render');
 const path = require('path');
+const allowRegion = ['tw', 'hk'];
 
 module.exports = async (ctx) => {
     const region = ctx.params.region ?? 'tw';
+    if (!allowRegion.includes(region)) {
+        throw Error('Invalid region');
+    }
 
     const feed = await parser.parseURL(`https://www.eprice.com.${region}/news/rss.xml`);
 
@@ -17,9 +21,7 @@ module.exports = async (ctx) => {
     const items = await Promise.all(
         feed.items.map((item) =>
             ctx.cache.tryGet(item.link, async () => {
-                const response = await got({
-                    method: 'get',
-                    url: item.link,
+                const response = await got(item.link, {
                     headers: {
                         Referer: `https://www.eprice.com.${region}`,
                     },
@@ -48,7 +50,6 @@ module.exports = async (ctx) => {
                             art(path.join(__dirname, 'templates/image.art'), {
                                 alt: e.attr('title'),
                                 src: e.attr('href'),
-                                title: e.attr('title'),
                             })
                         );
                         e.remove();
@@ -57,14 +58,7 @@ module.exports = async (ctx) => {
                 $('img').each((_, e) => {
                     e = $(e);
                     if (e.attr('data-original')) {
-                        e.after(
-                            art(path.join(__dirname, 'templates/image.art'), {
-                                alt: e.attr('title'),
-                                src: e.attr('data-original'),
-                                title: e.attr('title'),
-                            })
-                        );
-                        e.remove();
+                        e.attr('src', e.attr('data-original'));
                     }
                 });
 
@@ -76,10 +70,8 @@ module.exports = async (ctx) => {
                 delete item.enclosure;
                 delete item.isoDate;
 
-                item.description = art(path.join(__dirname, 'templates/description.art'), {
-                    // tw || tw || hk || hk
-                    desc: $('div.user-comment-block').html() || $('div.content').html() || $('li.inner').html() || $('div.section-content').html(),
-                });
+                // tw || tw || hk || hk || hk
+                item.description = $('div.user-comment-block').html() || $('div.content').html() || $('li.inner').html() || $('div.section-content').html() || $('.article__content').html();
                 item.pubDate = parseDate(item.pubDate);
 
                 return item;

package/lib/v2/eprice/templates/image.art

@@ -1 +1,4 @@
-<img alt="{{ alt }}" src="{{ src }}" title="{{ alt }}">
+<figure>
+  <img src="{{ src }}" alt="{{ alt }}" title="{{ alt }}">
+  <figcaption>{{ alt }}</figcaption>
+</figure>

package/lib/v2/famitsu/category.js

@@ -0,0 +1,62 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+const timezone = require('@/utils/timezone');
+
+const baseUrl = 'https://www.famitsu.com';
+
+module.exports = async (ctx) => {
+    const { category = 'new-article' } = ctx.params;
+    const url = `${baseUrl}/search/?category=${category}`;
+    const { data } = await got(url);
+    const $ = cheerio.load(data);
+
+    const list = $('.col-12 .card__body')
+        .toArray()
+        .map((item) => {
+            item = $(item);
+            return {
+                title: item.find('.card__title').text(),
+                link: new URL(item.find('.card__title a').attr('href'), baseUrl).href,
+                pubDate: timezone(parseDate(item.find('time').attr('datetime'), 'YYYY.MM.DDTHH:mm'), +9),
+            };
+        })
+        .filter((item) => item.link.startsWith('https://www.famitsu.com/news/'));
+
+    const items = await Promise.all(
+        list.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const { data } = await got(item.link);
+                const $ = cheerio.load(data);
+
+                // remove ads
+                $('.article-body__contents-pr-primary').remove();
+
+                // fix header image
+                $('.article-body div.media-image').each((_, e) => {
+                    e.tagName = 'img';
+                    e.attribs.src = e.attribs.style.match(/url\((.+?)\);/)[1];
+                    delete e.attribs['data-src'];
+                    delete e.attribs.style;
+                });
+
+                // remove white space
+                $('.article-body__contents-img-block, .article-body__contents-img-common-col').each((_, e) => {
+                    delete e.attribs.style;
+                });
+
+                item.description = $('.article-body').html();
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: $('head title').text(),
+        description: $('head meta[name="description"]').attr('content'),
+        image: 'https://www.famitsu.com/img/1812/favicons/apple-touch-icon.png',
+        link: url,
+        item: items,
+        language: 'ja',
+    };
+};

package/lib/v2/famitsu/maintainer.js

@@ -0,0 +1,3 @@
+module.exports = {
+    '/category/:category?': ['TonyRL'],
+};

package/lib/v2/famitsu/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'famitsu.com': {
+        _name: 'ファミ通',
+        '.': [
+            {
+                title: '分类',
+                docs: 'https://docs.rsshub.app/game.html#ファミ-tong',
+                source: ['/search'],
+                target: (_, url) => `/famitsu/category/${new URL(url).searchParams.get('category')}`,
+            },
+        ],
+    },
+};

package/lib/v2/famitsu/router.js

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

package/lib/v2/ff14/ff14_global.js

@@ -2,11 +2,16 @@ const got = require('@/utils/got');
 const { parseDate } = require('@/utils/parse-date');
 const { art } = require('@/utils/render');
 const path = require('path');
+const { isValidHost } = require('@/utils/valid-host');
 
 module.exports = async (ctx) => {
     const lang = ctx.params.lang;
     const type = ctx.params.type ?? 'all';
 
+    if (!isValidHost(lang)) {
+        throw Error('Invalid lang');
+    }
+
     const response = await got({
         method: 'get',
         url: `https://lodestonenews.com/news/${type}?locale=${lang}`,

package/lib/v2/fffdm/maintainer.js

@@ -0,0 +1,3 @@
+module.exports = {
+    '/manhua/:id/:cdn?': ['zytomorrow'],
+};

package/lib/v2/fffdm/manhua/manhua.js

@@ -0,0 +1,55 @@
+const got = require('@/utils/got');
+const domain = 'manhua.fffdm.com';
+const host = `https://${domain}`;
+const { art } = require('@/utils/render');
+const path = require('path');
+const { parseDate } = require('@/utils/parse-date');
+
+const get_pic = async (url) => {
+    const response = await got(url);
+    const data = response.data;
+    return {
+        comicTitle: data.mhinfo.title,
+        chapterTitle: data.title,
+        pics: data.cont,
+        pubDate: parseDate(data.mh.time),
+    };
+};
+
+module.exports = async (ctx) => {
+    const id = ctx.params.id;
+    const count = ctx.query.limit || 99999;
+    const cdnNum = ctx.params.cdn || 5;
+    let cdn = '';
+    if (!isNaN(parseInt(cdnNum)) && 1 <= parseInt(cdnNum) && parseInt(cdnNum) <= 5) {
+        cdn = `https://p${cdnNum}.fzacg.com`;
+    } else {
+        cdn = `https://p5.fzacg.com`;
+    }
+
+    // 获取漫画清单
+    const response = await got(`${host}/api/manhua/${id}`);
+    const data = response.data;
+
+    const chapter_detail = await Promise.all(
+        data.mhlist.splice(0, count).map((item) => {
+            const url = `${host}/api/manhua/${id}/${item.url}`;
+            return ctx.cache.tryGet(url, async () => {
+                const picContent = await get_pic(url);
+                return {
+                    title: picContent.chapterTitle,
+                    description: art(path.join(__dirname, '../templates/manhua.art'), { pic: picContent.pics, cdn }),
+                    link: `${host}/${id}/${item.url}/`,
+                    comicTitle: picContent.comicTitle,
+                    pubDate: picContent.pubDate,
+                };
+            });
+        })
+    );
+    ctx.state.data = {
+        title: '风之动漫 - ' + chapter_detail[0].comicTitle,
+        link: `${host}/${id}`,
+        description: '风之动漫',
+        item: chapter_detail,
+    };
+};

package/lib/v2/fffdm/radar.js

@@ -0,0 +1,14 @@
+const fffdm = {
+    title: '在线漫画',
+    docs: 'https://docs.rsshub.app/anime.html#feng-zhi-dong-man',
+    source: ['/manhua/:id', '/:id'],
+    target: '/fffdm/manhua/:id',
+};
+
+module.exports = {
+    'fffdm.com': {
+        _name: '风之动漫',
+        manhua: [fffdm],
+        www: [fffdm],
+    },
+};

package/lib/v2/fffdm/router.js

@@ -0,0 +1,3 @@
+module.exports = function (router) {
+    router.get('/manhua/:id/:cdn?', require('./manhua/manhua'));
+};

package/lib/v2/fffdm/templates/manhua.art

@@ -0,0 +1,5 @@
+<div>
+    {{ each pic }}
+        <img src='{{cdn}}/{{$value}}'/><br/>
+    {{/each }}
+</div>

package/lib/v2/fjksbm/index.js

@@ -0,0 +1,53 @@
+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 category = ctx.params.category ?? '0';
+
+    const id = parseInt(category);
+    const isNumber = !isNaN(id);
+
+    const rootUrl = 'https://fjksbm.com';
+    const currentUrl = `${rootUrl}/portal${isNumber ? '' : `/${category}`}`;
+
+    const response = await got(currentUrl);
+
+    const $ = cheerio.load(response.data);
+
+    const list = (isNumber ? $('.panel-body').eq(id).find('.examName a') : $('.panel-body ul li a')).toArray().map((item) => {
+        item = $(item);
+        const link = item.attr('href');
+
+        return {
+            title: item.text(),
+            link: !link.startsWith('//') ? `${rootUrl}${link}/news/bulletin` : !link.startsWith('https') ? `https:${link}` : link,
+        };
+    });
+
+    const items = await Promise.all(
+        list.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const detailResponse = await got(item.link);
+                const content = cheerio.load(detailResponse.data);
+
+                content('h3').remove();
+                content('.panel-body div').eq(0).remove();
+
+                item.description = content('.panel-body').html();
+                item.pubDate = timezone(parseDate(detailResponse.data.match(/发布时间：(\d{4}-\d{2}-\d{2} \d{2}:\d{2})/)[1]), 8);
+
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: `${$('.panel-heading')
+            .eq(isNumber ? id : 1)
+            .text()} - 福建考试报名网`,
+        link: currentUrl,
+        item: items,
+    };
+};

package/lib/v2/fjksbm/maintainer.js

@@ -0,0 +1,3 @@
+module.exports = {
+    '/:category?': ['nczitzk'],
+};

package/lib/v2/fjksbm/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'fjksbm.com': {
+        _name: '福建考试报名网',
+        '.': [
+            {
+                title: '分类',
+                docs: 'https://docs.rsshub.app/study.html#fu-jian-kao-shi-bao-ming-wang',
+                source: ['/portal/:category?', '/portal'],
+                target: '/fjksbm/:category?',
+            },
+        ],
+    },
+};

package/lib/v2/fjksbm/router.js

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

package/lib/v2/flyert/utils.js

@@ -33,10 +33,10 @@ async function load(link) {
     return { description };
 }
 
-const ProcessFeed = async (list, caches) => {
+const ProcessFeed = (list, caches) => {
     const host = 'https://www.flyert.com';
 
-    return await Promise.all(
+    return Promise.all(
         list.map(async (item) => {
             const $ = cheerio.load(item);
 
@@ -54,7 +54,7 @@ const ProcessFeed = async (list, caches) => {
 
             // 使用tryGet方法从缓存获取内容。
             // 当缓存中无法获取到链接内容的时候，则使用load方法加载文章内容。
-            const other = await caches.tryGet(itemUrl, async () => await load(itemUrl));
+            const other = await caches.tryGet(itemUrl, () => load(itemUrl));
 
             // 合并解析后的结果集作为该篇文章最终的输出结果
             return Promise.resolve(Object.assign({}, single, other));