rsshub 1.0.0-master.f78ad03 → 1.0.0-master.f796ff1

package/lib/v2/ehentai/ehapi.js

@@ -17,6 +17,10 @@ if (has_cookie) {
     }
 }
 
+if (config.star) {
+    headers.cookie += `;star=${config.star}`;
+}
+
 function ehgot(url) {
     if (from_ex) {
         return got({ method: 'get', url: `https://exhentai.org/${url}`, headers });
@@ -41,22 +45,53 @@ function ehgot_thumb(cache, thumb_url) {
 
 async function parsePage(cache, data, get_bittorrent = false, embed_thumb = false) {
     const $ = cheerio.load(data);
-    const table = $('table[class^="itg glt"] tbody');
-    if (!table) {
+    // "m" for Minimal
+    // "p" for Minimal+
+    // "l" for Compact
+    // "e" for Extended
+    // "t" for Thumbnail
+    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 parseTableRow(cache, element) {
+    async function parseElement(cache, element) {
         const el = $(element);
         const title = el.find('div.glink').html();
         const pubDate = el.find('div[id^="posted_"]').html();
-        // match "Minimal", "Minimal+" and "Compact"
-        let el_a = el.find('td[class^="gl3"] a');
-        let el_img = el.find('td[class^=gl2] div.glthumb div img');
-        // if not, match "Extended"
-        if (!(el_a.length && el_img.length)) {
+        let el_a;
+        let el_img;
+        // match layout
+        if ('mpl'.includes(layout)) {
+            // Minimal, Minimal+, Compact
+            el_a = el.find('td[class^="gl3"] a');
+            el_img = el.find('td[class^=gl2] div.glthumb div img');
+        } else if (layout === 'e') {
+            // Extended
             el_a = el.find('td[class^="gl1"] a');
             el_img = el_a.find('img');
+        } else if (layout === 't') {
+            // Thumbnail
+            el_a = el.find('div[class^="gl3t"] a');
+            el_img = el_a.find('img');
         }
         const link = el_a.attr('href');
         let thumbnail = el_img.attr('data-src') ? el_img.attr('data-src') : el_img.attr('src');
@@ -82,13 +117,23 @@ 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)
+                    .find('div.gt[title^="artist:"]')
+                    .toArray()
+                    .map((i, tag) => $(tag).text())
+                    .join(' / ');
+                item.author = artist;
+            }
             return item;
         }
     }
 
     const item_Promises = [];
-    table.children('tr').each((index, element) => {
-        item_Promises.push(parseTableRow(cache, element));
+    galleries.children().each((index, element) => {
+        item_Promises.push(parseElement(cache, element));
     });
     const items_with_null = await Promise.all(item_Promises);
 

package/lib/v2/ehentai/maintainer.js

@@ -1,5 +1,5 @@
 module.exports = {
-    '/favorites/:favcat?/:order?/:page?/:routeParams?': ['yindaheng98'],
-    '/search/:params?/:page?/:routeParams?': ['yindaheng98'],
-    '/tag/:tag/:page?/:routeParams?': ['yindaheng98'],
+    '/favorites/:favcat?/:order?/:page?/:routeParams?': ['yindaheng98', 'syrinka'],
+    '/search/:params?/:page?/:routeParams?': ['yindaheng98', 'syrinka'],
+    '/tag/:tag/:page?/:routeParams?': ['yindaheng98', 'syrinka'],
 };

package/lib/v2/fantia/maintainer.js

@@ -0,0 +1,4 @@
+module.exports = {
+    '/search/:type?/:caty?/:peroid?/:order?/:rating?/:keyword?': ['nczitzk'],
+    '/user/:id': ['nczitzk'],
+};

package/lib/v2/fantia/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'fantia.jp': {
+        _name: 'Fantia',
+        '.': [
+            {
+                title: '用户投稿',
+                docs: 'https://docs.rsshub.app/picture.html#fantia',
+                source: ['/fanclubs/:id'],
+                target: '/fantia/user/:id',
+            },
+        ],
+    },
+};

package/lib/v2/fantia/router.js

@@ -0,0 +1,4 @@
+module.exports = (router) => {
+    router.get('/search/:type?/:caty?/:period?/:order?/:rating?/:keyword?', require('./search'));
+    router.get('/user/:id', require('./user'));
+};

package/lib/{routes → v2}/fantia/search.js

@@ -1,4 +1,6 @@
 const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
+const Config = require('@/config').value.fantia;
 
 module.exports = async (ctx) => {
     const type = ctx.params.type || 'posts';
@@ -6,15 +8,18 @@ module.exports = async (ctx) => {
     const order = ctx.params.order || 'updater';
     const rating = ctx.params.rating || 'all';
     const keyword = ctx.params.keyword || '';
-    const peroid = ctx.params.peroid || '';
+    const period = ctx.params.period || '';
 
     const rootUrl = 'https://fantia.jp';
-    const apiUrl = `${rootUrl}/api/v1/search/${type}?keyword=${keyword}&peroid=${peroid}&brand_type=0&category=${caty === 'all' ? '' : caty}&order=${order}${
+    const apiUrl = `${rootUrl}/api/v1/search/${type}?keyword=${keyword}&peroid=${period}&brand_type=0&category=${caty === 'all' ? '' : caty}&order=${order}${
         rating === 'all' ? '' : rating === 'general' ? '&rating=general' : '&adult=1'
     }&per_page=30`;
     const response = await got({
         method: 'get',
         url: apiUrl,
+        headers: {
+            Cookie: Config.cookies ? Config.cookies : '',
+        },
     });
 
     let items = {};
@@ -32,7 +37,7 @@ module.exports = async (ctx) => {
             items = response.data.posts.map((item) => ({
                 title: item.title,
                 link: `${rootUrl}/posts/${item.id}`,
-                pubDate: new Date(item.posted_at).toUTCString(),
+                pubDate: parseDate(item.posted_at),
                 author: item.fanclub.fanclub_name_with_creator_name,
                 description: `${item.comment ? `<p>${item.comment}</p>` : ''}<img src="${item.thumb ? item.thumb.main : item.thumb_micro}">`,
             }));

package/lib/{routes → v2}/fantia/user.js

@@ -1,4 +1,6 @@
 const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
+const Config = require('@/config').value.fantia;
 
 module.exports = async (ctx) => {
     const rootUrl = 'https://fantia.jp';
@@ -6,25 +8,28 @@ module.exports = async (ctx) => {
     const response = await got({
         method: 'get',
         url: userUrl,
+        headers: {
+            Cookie: Config.cookies ? Config.cookies : '',
+        },
     });
-
     const list = response.data.fanclub.recent_posts.map((item) => ({
         title: item.title,
         link: `${rootUrl}/api/v1/posts/${item.id}`,
         description: `<p>${item.comment}</p>`,
-        pubDate: new Date(item.posted_at).toUTCString(),
+        pubDate: parseDate(item.posted_at),
     }));
-
     const items = await Promise.all(
         list.map((item) =>
             ctx.cache.tryGet(item.link, async () => {
                 const contentResponse = await got({
                     method: 'get',
                     url: item.link,
+                    headers: {
+                        Cookie: Config.cookies ? Config.cookies : '',
+                    },
                 });
-
                 item.link = item.link.replace('api/v1/', '');
-                item.description += `<img src="${contentResponse.data.post.thumb.large}">`;
+                item.description += `<img src="${contentResponse.data.post?.thumb?.large ? contentResponse.data.post?.thumb?.large : contentResponse.data.post.thumb_micro}">`;
 
                 return item;
             })

package/lib/v2/fastbull/express-news.js

@@ -0,0 +1,33 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const rootUrl = 'https://www.fastbull.cn';
+    const currentUrl = `${rootUrl}/express-news`;
+
+    const response = await got({
+        method: 'get',
+        url: currentUrl,
+    });
+
+    const $ = cheerio.load(response.data);
+
+    const items = $('.news-list')
+        .toArray()
+        .map((item) => {
+            item = $(item);
+
+            return {
+                title: item.find('.title_name').text(),
+                pubDate: parseDate(parseInt(item.attr('data-date'))),
+                link: `${rootUrl}${item.find('.title_name').attr('href')}`,
+            };
+        });
+
+    ctx.state.data = {
+        title: '实时财经快讯 - FastBull',
+        link: currentUrl,
+        item: items,
+    };
+};

package/lib/v2/fastbull/maintainer.js

@@ -0,0 +1,5 @@
+module.exports = {
+    '/express-news': ['nczitzk'],
+    '/news': ['nczitzk'],
+    '/': ['nczitzk'],
+};

package/lib/v2/fastbull/news.js

@@ -0,0 +1,57 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+const { art } = require('@/utils/render');
+const path = require('path');
+
+module.exports = async (ctx) => {
+    const rootUrl = 'https://www.fastbull.cn';
+    const currentUrl = `${rootUrl}/news`;
+
+    const response = await got({
+        method: 'get',
+        url: currentUrl,
+    });
+
+    const $ = cheerio.load(response.data);
+
+    let items = $('.trending_type')
+        .toArray()
+        .map((item) => {
+            item = $(item);
+
+            return {
+                title: item.find('.title').text(),
+                link: `${rootUrl}${item.attr('href')}`,
+                author: item.find('.resource').text(),
+                description: item.find('.tips').text(),
+                pubDate: parseDate(parseInt(item.find('.new_time').attr('data-date'))),
+            };
+        });
+
+    items = await Promise.all(
+        items.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const detailResponse = await got({
+                    method: 'get',
+                    url: item.link,
+                });
+
+                const content = cheerio.load(detailResponse.data);
+
+                item.description = art(path.join(__dirname, 'templates/description.art'), {
+                    tips: item.description,
+                    description: content('.news-detail-content').html(),
+                });
+
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: '财经头条、财经新闻、最新资讯 - FastBull',
+        link: currentUrl,
+        item: items,
+    };
+};

package/lib/v2/fastbull/radar.js

@@ -0,0 +1,19 @@
+module.exports = {
+    'fastbull.cn': {
+        _name: '法布财经',
+        '.': [
+            {
+                title: '新闻',
+                docs: 'https://docs.rsshub.app/finance.html#fa-bu-cai-jing-xin-wen',
+                source: ['/news', '/'],
+                target: '/fastbull/news',
+            },
+            {
+                title: '快讯',
+                docs: 'https://docs.rsshub.app/finance.html#fa-bu-cai-jing-kuai-xun',
+                source: ['/express-news', '/'],
+                target: '/fastbull/express-news',
+            },
+        ],
+    },
+};

package/lib/v2/fastbull/router.js

@@ -0,0 +1,5 @@
+module.exports = function (router) {
+    router.get('/express-news', require('./express-news'));
+    router.get('/news', require('./news'));
+    router.get('/', require('./news'));
+};

package/lib/v2/fastbull/templates/description.art

@@ -0,0 +1,7 @@
+{{ if tips }}
+<b>摘要</b>：
+<p>{{ tips }}</p>
+{{ /if }}
+{{ if description }}
+{{@ description }}
+{{ /if }}

package/lib/v2/finviz/maintainer.js

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

package/lib/v2/finviz/news.js

@@ -0,0 +1,45 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const timezone = require('@/utils/timezone');
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const category = ctx.params.category ?? 'news';
+
+    const rootUrl = 'https://finviz.com';
+    const currentUrl = `${rootUrl}/news.ashx`;
+
+    const response = await got({
+        method: 'get',
+        url: currentUrl,
+    });
+
+    const $ = cheerio.load(response.data);
+
+    const items = $('.table-fixed')
+        .eq(category === 'blog' ? 1 : 0)
+        .find('.nn')
+        .toArray()
+        .map((item) => {
+            item = $(item);
+
+            const a = item.find('.nn-tab-link');
+
+            return {
+                title: a.text(),
+                link: a.attr('href'),
+                pubDate: timezone(parseDate(item.find('.nn-date').text(), ['MMM-DD', 'HH:mmA']), -4),
+                description:
+                    item
+                        .find('td[data-boxover]')
+                        .attr('data-boxover')
+                        ?.match(/<td class='news_tooltip-tab'>([\s\S]*)<\/td>/)[1] ?? '',
+            };
+        });
+
+    ctx.state.data = {
+        title: `finviz - ${category}`,
+        link: currentUrl,
+        item: items,
+    };
+};

package/lib/{routes/finviz/news.js → v2/finviz/quote.js}

@@ -1,13 +1,13 @@
 const got = require('@/utils/got');
 const cheerio = require('cheerio');
-const dateParser = require('@/utils/dateParser');
+const { parseDate } = require('@/utils/parse-date');
 
 module.exports = async (ctx) => {
     const link = `https://finviz.com/quote.ashx?t=${ctx.params.ticker}`;
-    const response = await got.get(link);
+    const response = await got(link);
 
     const $ = cheerio.load(response.body);
-    const data = $('table.fullview-news-outer tr').slice(0, 10);
+    const data = $('table.fullview-news-outer tr');
 
     let dateRow = '';
     const item = await Promise.all(
@@ -21,8 +21,8 @@ module.exports = async (ctx) => {
                 }
                 return {
                     title: $(e).find('a').text(),
-                    pubDate: dateParser(date, 'MMM-DD-YY HH:mmA'),
-                    authors: $(e).find('span').text(),
+                    pubDate: parseDate(date, 'MMM-DD-YY HH:mmA'),
+                    author: $(e).find('span').text(),
                     link: $(e).find('a').attr('href'),
                 };
             })

package/lib/v2/finviz/radar.js

@@ -0,0 +1,19 @@
+module.exports = {
+    'finviz.com': {
+        _name: 'finviz',
+        '.': [
+            {
+                title: 'News',
+                docs: 'https://docs.rsshub.app/finance.html#finviz-news',
+                source: ['/news.ashx', '/'],
+                target: '/finviz/:category?',
+            },
+            {
+                title: 'US Stock News',
+                docs: 'https://docs.rsshub.app/finance.html#finviz-mei-gu-gu-piao-xin-wen',
+                source: ['/quote.ashx', '/'],
+                target: '/finviz/news/:category?',
+            },
+        ],
+    },
+};

package/lib/v2/finviz/router.js

@@ -0,0 +1,4 @@
+module.exports = function (router) {
+    router.get('/news/:ticker', require('./quote'));
+    router.get('/:category?', require('./news'));
+};

package/lib/v2/foresightnews/index.js

@@ -1,6 +1,7 @@
 const got = require('@/utils/got');
 const cheerio = require('cheerio');
 const { parseDate } = require('@/utils/parse-date');
+const zlib = require('zlib');
 
 const categories = {
     '': {
@@ -28,12 +29,11 @@ module.exports = async (ctx) => {
     const rootUrl = 'https://foresightnews.pro';
     const currentUrl = `${rootUrl}/v1/${categories[category].id}?page=1&size=${ctx.query.limit ?? 30}${category === 'column' ? `&column_id=${id}` : ''}`;
 
-    const response = await got({
-        method: 'get',
-        url: currentUrl,
-    });
+    const response = await got(currentUrl);
 
-    let items = response.data.data.list.map((item) =>
+    const list = JSON.parse(zlib.inflateSync(Buffer.from(response.data.data.list, 'base64')).toString());
+
+    let items = list.map((item) =>
         item.source_type
             ? {
                   type: item.source_type,
@@ -47,8 +47,8 @@ module.exports = async (ctx) => {
             : {
                   type: category,
                   title: item.title,
-                  author: item?.author?.username ?? undefined,
-                  link: `${rootUrl}/${category === 'article' ? 'article' : 'news'}/detail/${item.id}`,
+                  author: item.author?.username ?? undefined,
+                  link: `${rootUrl}/${category === 'article' || category === 'column' ? 'article' : 'news'}/detail/${item.id}`,
                   category: item.tags ? item.tags.map((tag) => tag.name) : undefined,
                   description: item.content ?? '',
                   pubDate: parseDate(item.publishDate),
@@ -63,10 +63,7 @@ module.exports = async (ctx) => {
         items.map((item) =>
             ctx.cache.tryGet(item.link, async () => {
                 if (item.type !== 'news') {
-                    const detailResponse = await got({
-                        method: 'get',
-                        url: item.link,
-                    });
+                    const detailResponse = await got(item.link);
 
                     const content = cheerio.load(detailResponse.data);
 

package/lib/v2/ft/maintainer.js

@@ -1,4 +1,4 @@
 module.exports = {
-    '/ft/myft/:key': ['HenryQW'],
-    '/ft/:language/:channel?': ['HenryQW', 'xyqfer'],
+    '/myft/:key': ['HenryQW'],
+    '/:language/:channel?': ['HenryQW', 'xyqfer'],
 };

package/lib/v2/ft/utils.js

@@ -2,9 +2,9 @@ const got = require('@/utils/got');
 const parser = require('@/utils/rss-parser');
 const cheerio = require('cheerio');
 
-const ProcessFeed = ($, link) => {
+const ProcessFeed = (i, $, link) => {
     const title = $('h1').text();
-    let content = $('div.story-container');
+    let content = $('div.story-container').eq(i);
 
     // 处理封面图片
     content.find('div.story-image > figure').each((_, e) => {
@@ -59,17 +59,20 @@ const getData = async ({ site = 'www', channel, ctx }) => {
     }
 
     const items = await Promise.all(
-        feed.items.splice(0, 10).map((item) => {
+        feed.items.map((item) => {
             item.link = item.link.replace('http://', 'https://');
             return ctx.cache.tryGet(item.link, async () => {
                 const response = await got.get(`${item.link}?full=y&archive`);
 
                 const $ = cheerio.load(response.data);
-                const result = ProcessFeed($, item.link);
+                const results = [];
+                for (let i = 0; i < $('div.story-container').length; i++) {
+                    results.push(ProcessFeed(i, $, item.link));
+                }
 
-                item.title = result.title;
-                item.description = result.content;
-                item.author = result.author;
+                item.title = results[0].title;
+                item.description = results.map((result) => result.content).join('');
+                item.author = results[0].author;
                 return item;
             });
         })

package/lib/v2/gamme/category.js

@@ -0,0 +1,46 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const parser = require('@/utils/rss-parser');
+
+module.exports = async (ctx) => {
+    const { domain = 'news', category } = ctx.params;
+    const baseUrl = `https://${domain}.gamme.com.tw`;
+    const feed = await parser.parseURL(`${baseUrl + (category ? `/category/${category}` : '')}/feed`);
+
+    await Promise.all(
+        feed.items.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const { data } = await got(item.link);
+                const $ = cheerio.load(data);
+
+                $('.entry img').each((_, img) => {
+                    if (img.attribs['data-original'] || img.attribs['data-src']) {
+                        img.attribs.src = img.attribs['data-original'] || img.attribs['data-src'];
+                        delete img.attribs['data-original'];
+                        delete img.attribs['data-src'];
+                    }
+                });
+
+                item.author = $('.author_name').text().trim();
+                item.category = $('.tags a')
+                    .toArray()
+                    .map((tag) => $(tag).text());
+                $('.social_block, .tags').remove();
+                item.description = $('.entry').html();
+
+                delete item.content;
+                delete item.contentSnippet;
+                delete item.isoDate;
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: feed.title,
+        link: feed.link,
+        image: domain === 'news' ? `${baseUrl}/blogico.ico` : `${baseUrl}/favicon.ico`,
+        description: feed.description,
+        item: feed.items,
+    };
+};

package/lib/v2/gamme/maintainer.js

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

package/lib/v2/gamme/radar.js

@@ -0,0 +1,33 @@
+module.exports = {
+    'gamme.com.tw': {
+        _name: '卡卡洛普',
+        news: [
+            {
+                title: '宅宅新聞 - 分類',
+                docs: 'https://docs.rsshub.app/new-media.html#ka-ka-luo-pu',
+                source: ['/category/:category', '/'],
+                target: (params) => `/gamme/news${params.category ? `/${params.category}` : ''}`,
+            },
+            {
+                title: '宅宅新聞 - 標籤',
+                docs: 'https://docs.rsshub.app/new-media.html#ka-ka-luo-pu',
+                source: ['/tag/:tag'],
+                target: '/gamme/news/tag/:tag',
+            },
+        ],
+        sexynews: [
+            {
+                title: '西斯新聞 - 分類',
+                docs: 'https://docs.rsshub.app/new-media.html#ka-ka-luo-pu',
+                source: ['/category/:category', '/'],
+                target: (params) => `/gamme/sexynews${params.category ? `/${params.category}` : ''}`,
+            },
+            {
+                title: '西斯新聞 - 標籤',
+                docs: 'https://docs.rsshub.app/new-media.html#ka-ka-luo-pu',
+                source: ['/tag/:tag'],
+                target: '/gamme/sexynews/tag/:tag',
+            },
+        ],
+    },
+};

package/lib/v2/gamme/router.js

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