rsshub 1.0.0-master.fb68956 → 1.0.0-master.fbabfc2

package/lib/v2/gamme/category.js

@@ -1,9 +1,13 @@
 const got = require('@/utils/got');
 const cheerio = require('cheerio');
 const parser = require('@/utils/rss-parser');
+const { isValidHost } = require('@/utils/valid-host');
 
 module.exports = async (ctx) => {
     const { domain = 'news', category } = ctx.params;
+    if (!isValidHost(domain)) {
+        throw Error('Invalid domain');
+    }
     const baseUrl = `https://${domain}.gamme.com.tw`;
     const feed = await parser.parseURL(`${baseUrl + (category ? `/category/${category}` : '')}/feed`);
 

package/lib/v2/gamme/tag.js

@@ -1,9 +1,13 @@
 const got = require('@/utils/got');
 const cheerio = require('cheerio');
 const { parseDate } = require('@/utils/parse-date');
+const { isValidHost } = require('@/utils/valid-host');
 
 module.exports = async (ctx) => {
     const { domain = 'news', tag } = ctx.params;
+    if (!isValidHost(domain)) {
+        throw Error('Invalid domain');
+    }
     const baseUrl = `https://${domain}.gamme.com.tw`;
     const pageUrl = `${baseUrl}/tag/${tag}`;
 

package/lib/v2/gelonghui/hot-article.js

@@ -0,0 +1,33 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseItem } = require('./utils');
+
+module.exports = async (ctx) => {
+    const type = ctx.params.type === 'week' ? 1 : 0;
+    const baseUrl = `https://www.gelonghui.com`;
+    const { data: response } = await got(baseUrl);
+    const $ = cheerio.load(response);
+
+    const list = $('#hot-article ul')
+        .eq(type)
+        .find('li')
+        .toArray()
+        .map((item) => {
+            item = $(item);
+            const a = item.find('a');
+            return {
+                title: a.text(),
+                link: `${baseUrl}${a.attr('href')}`,
+            };
+        });
+
+    const items = await Promise.all(list.map((item) => parseItem(item, ctx.cache.tryGet)));
+
+    ctx.state.data = {
+        title: `最热文章 - ${type === 0 ? '日排行' : '周排行'} - 格隆汇`,
+        description: '格隆汇为中国投资者出海投资及中国公司出海融资,提供海外投资,港股开户行情,科创板股票发行数据、资讯、研究、交易等一站式服务,目前业务范围主要涉及港股与美股两大市场,未来将陆续开通台湾、日本、印度、欧洲等市场.',
+        image: 'https://cdn.gelonghui.com/static/web/www.ico.la.ico',
+        link: baseUrl,
+        item: items,
+    };
+};

package/lib/v2/gelonghui/live.js

@@ -0,0 +1,31 @@
+const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
+const { art } = require('@/utils/render');
+const path = require('path');
+
+const baseUrl = 'https://www.gelonghui.com';
+
+module.exports = async (ctx) => {
+    const apiUrl = `${baseUrl}/api/live-channels/all/lives/v4`;
+    const {
+        data: { result },
+    } = await got(apiUrl);
+
+    const items = result.map((i) => ({
+        title: i.title || i.content,
+        description: art(path.join(__dirname, 'templates/live.art'), {
+            i,
+        }),
+        link: i.route,
+        category: i.source,
+        pubDate: parseDate(i.createTimestamp, 'X'),
+    }));
+
+    ctx.state.data = {
+        title: '格隆汇快讯-7x24小时市场快讯-财经市场热点',
+        description: '格隆汇快讯栏目提供外汇投资实时行情,外汇投资交易,外汇投资炒股,证券等内容,实时更新,格隆汇未来将陆续开通台湾、日本、印度、欧洲等市场.',
+        image: 'https://cdn.gelonghui.com/static/web/www.ico.la.ico',
+        link: `${baseUrl}/live`,
+        item: items,
+    };
+};

package/lib/v2/gelonghui/radar.js

@@ -8,12 +8,24 @@ module.exports = {
                 source: ['/tag/:tag', '/'],
                 target: (params) => `/gelonghui/home${params.tag ? `/${params.tag}` : ''}`,
             },
+            {
+                title: '最热文章',
+                docs: 'https://docs.rsshub.app/finance.html#ge-long-hui',
+                source: ['/'],
+                target: '/gelonghui/hot-article',
+            },
             {
                 title: '搜索关键字',
                 docs: 'https://docs.rsshub.app/finance.html#ge-long-hui',
                 source: ['/search'],
                 target: (_, url) => `/gelonghui/keyword/${new URL(url).searchParams.get('keyword')}`,
             },
+            {
+                title: '实时快讯',
+                docs: 'https://docs.rsshub.app/finance.html#ge-long-hui',
+                source: ['/live', '/'],
+                target: '/gelonghui/live',
+            },
             {
                 title: '主题文章',
                 docs: 'https://docs.rsshub.app/finance.html#ge-long-hui',

package/lib/v2/gelonghui/router.js

@@ -1,6 +1,8 @@
 module.exports = (router) => {
     router.get('/home/:tag?', require('./home'));
+    router.get('/hot-article/:type?', require('./hot-article'));
     router.get('/keyword/:keyword', require('./keyword'));
+    router.get('/live', require('./live'));
     router.get('/subject/:id', require('./subject'));
     router.get('/user/:id', require('./user'));
 };

package/lib/v2/gelonghui/templates/live.art

@@ -0,0 +1,7 @@
+{{ i.content }}
+{{ if i.pictures }}
+    <br>
+    {{ each i.pictures p }}
+        <img src="{{ p }}">
+    {{ /each }}
+{{ /if }}

package/lib/v2/gelonghui/utils.js

@@ -1,5 +1,7 @@
 const got = require('@/utils/got');
 const cheerio = require('cheerio');
+const { parseDate, parseRelativeDate } = require('@/utils/parse-date');
+const timezone = require('@/utils/timezone');
 
 const parseItem = (item, tryGet) =>
     tryGet(item.link, async () => {
@@ -12,6 +14,10 @@ const parseItem = (item, tryGet) =>
             // article
             item.title = $('.article-title').text().trim();
             item.description = $('.article-summary').html() + $('article.article-with-html').html();
+            if (!item.pubDate) {
+                const isRelativeDate = $('time.date').text().includes('前') || $('time.date').text().includes('天');
+                item.pubDate = isRelativeDate ? parseRelativeDate($('time.date').text()) : timezone(parseDate($('time.date').text(), 'MM-DD HH:mm'), +8);
+            }
         }
         return item;
     });

package/lib/v2/github/maintainer.js

@@ -12,4 +12,5 @@ module.exports = {
     '/topics/:name/:qs?': ['queensferryme'],
     '/trending/:since/:language?/:spoken_language?': ['DIYgod', 'jameschensmith'],
     '/user/followers/:user': ['HenryQW'],
+    '/wiki/:user/:repo/:page?': ['TonyRL'],
 };

package/lib/v2/github/radar.js

@@ -3,34 +3,28 @@ module.exports = {
         _name: 'GitHub',
         '.': [
             {
-                title: 'Issues / Pull Requests 评论',
-                docs: 'https://docs.rsshub.app/programming.html#github',
-                source: ['/:user/:repo/:type/:number'],
-                target: '/github/comments/:user/:repo/:number',
-            },
-            {
-                title: '用户仓库',
+                title: '仓库 Branches',
                 docs: 'https://docs.rsshub.app/programming.html#github',
-                source: '/:user',
-                target: '/github/repos/:user',
+                source: ['/:user/:repo/branches', '/:user/:repo'],
+                target: '/github/branches/:user/:repo',
             },
             {
-                title: '用户 Followers',
+                title: 'Issues / Pull Requests 评论',
                 docs: 'https://docs.rsshub.app/programming.html#github',
-                source: '/:user',
-                target: '/github/user/followers/:user',
+                source: ['/:user/:repo/:type/:number'],
+                target: '/github/comments/:user/:repo/:number',
             },
             {
-                title: 'Trending',
+                title: '仓库 Contributors',
                 docs: 'https://docs.rsshub.app/programming.html#github',
-                source: '/trending',
-                target: '/github/trending/:since',
+                source: ['/:user/:repo/graphs/contributors', '/:user/:repo'],
+                target: '/github/contributors/:user/:repo',
             },
             {
-                title: 'Trending',
+                title: '文件 Commits',
                 docs: 'https://docs.rsshub.app/programming.html#github',
-                source: '/topics',
-                target: '/github/topics/:name/:qs?',
+                source: '/:user/:repo/blob/:branch/*filepath',
+                target: '/github/file/:user/:repo/:branch/:filepath',
             },
             {
                 title: '仓库 Issue',
@@ -44,6 +38,12 @@ module.exports = {
                 source: ['/:user/:repo/pulls', '/:user/:repo/pulls/:id', '/:user/:repo'],
                 target: '/github/pull/:user/:repo',
             },
+            {
+                title: '用户仓库',
+                docs: 'https://docs.rsshub.app/programming.html#github',
+                source: '/:user',
+                target: '/github/repos/:user',
+            },
             {
                 title: '仓库 Stars',
                 docs: 'https://docs.rsshub.app/programming.html#github',
@@ -51,28 +51,34 @@ module.exports = {
                 target: '/github/stars/:user/:repo',
             },
             {
-                title: '仓库 Branches',
+                title: '用户 Starred Repositories',
                 docs: 'https://docs.rsshub.app/programming.html#github',
-                source: ['/:user/:repo/branches', '/:user/:repo'],
-                target: '/github/branches/:user/:repo',
+                source: '/:user',
+                target: '/github/starred_repos/:user',
             },
             {
-                title: '文件 Commits',
+                title: 'Topics',
                 docs: 'https://docs.rsshub.app/programming.html#github',
-                source: '/:user/:repo/blob/:branch/*filepath',
-                target: '/github/file/:user/:repo/:branch/:filepath',
+                source: '/topics',
+                target: '/github/topics/:name/:qs?',
             },
             {
-                title: '用户 Starred Repositories',
+                title: 'Trending',
+                docs: 'https://docs.rsshub.app/programming.html#github',
+                source: '/trending',
+                target: '/github/trending/:since',
+            },
+            {
+                title: '用户 Followers',
                 docs: 'https://docs.rsshub.app/programming.html#github',
                 source: '/:user',
-                target: '/github/starred_repos/:user',
+                target: '/github/user/followers/:user',
             },
             {
-                title: '仓库 Contributors',
+                title: 'Wiki 历史',
                 docs: 'https://docs.rsshub.app/programming.html#github',
-                source: ['/:user/:repo/graphs/contributors', '/:user/:repo'],
-                target: '/github/contributors/:user/:repo',
+                source: ['/:user/:repo/wiki/:page/_history', '/:user/:repo/wiki/:page', '/:user/:repo/wiki/_history', '/:user/:repo/wiki'],
+                target: '/github/wiki/:user/:repo/:page',
             },
         ],
     },

package/lib/v2/github/router.js

@@ -13,4 +13,5 @@ module.exports = function (router) {
     router.get('/topics/:name/:qs?', require('./topic'));
     router.get('/trending/:since/:language/:spoken_language?', require('./trending'));
     router.get('/user/followers/:user', require('./follower'));
+    router.get('/wiki/:user/:repo/:page?', require('./wiki'));
 };

package/lib/v2/github/wiki.js

@@ -0,0 +1,32 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+
+const baseUrl = 'https://github.com';
+
+module.exports = async (ctx) => {
+    const { user, repo, page } = ctx.params;
+
+    const url = `${baseUrl}/${user}/${repo}/wiki${page ? `/${page}` : ''}/_history`;
+
+    const { data } = await got(url);
+    const $ = cheerio.load(data);
+
+    const items = $('.js-wiki-history-revision')
+        .toArray()
+        .map((item) => {
+            item = $(item);
+            return {
+                title: item.find('.h5').text(),
+                author: item.find('.mt-1 a').text(),
+                pubDate: parseDate(item.find('relative-time').attr('datetime')),
+                link: `${baseUrl}${item.find('.text-mono a').attr('href')}`,
+            };
+        });
+
+    ctx.state.data = {
+        title: `${$('.gh-header-title').text()} - ${user}/${repo}`,
+        link: url,
+        item: items,
+    };
+};

package/lib/v2/google/maintainer.js

@@ -3,6 +3,7 @@ module.exports = {
     '/citations/:id': ['KellyHwong'],
     '/doodles/:language?': ['xyqfer'],
     '/fonts/:sort?': ['Fatpandac'],
+    '/news/:category/:locale': ['zoenglinghou'],
     '/scholar/:query': ['HenryQW'],
     '/sites/:id': ['hoilc'],
     '/sites/recentChanges/:id': ['nczitzk'],

package/lib/v2/google/news.js

@@ -1,84 +1,66 @@
 const got = require('@/utils/got');
 const cheerio = require('cheerio');
-const url = require('url');
+const { parseDate } = require('@/utils/parse-date');
+const { art } = require('@/utils/render');
+const path = require('path');
+
+const baseUrl = 'https://news.google.com';
 
 module.exports = async (ctx) => {
     const category = ctx.params.category;
     const locale = ctx.params.locale;
 
-    const category_url = await ctx.cache.tryGet([locale, category], async () => {
-        const front_page = await got({
-            method: 'get',
-            url: `https://news.google.com/?${locale}`,
-        });
-
-        const front_data = front_page.data;
+    const categoryUrls = await ctx.cache.tryGet(`google:news:${locale}`, async () => {
+        const { data: front_data } = await got(`${baseUrl}/?${locale}`);
 
         const $ = cheerio.load(front_data);
-        const category_list = $('a.wmzpFf.yETrXb');
-
-        const category_text = [];
-        category_list.each((index, item) => {
-            category_text.push($(item).text());
-        });
-
-        return url.resolve('https://news.google.com', category_list.eq(category_text.indexOf(category)).attr('href'));
-    });
-
-    const response = await got({
-        method: 'get',
-        url: category_url,
+        return [
+            ...$('a.brSCsc')
+                .toArray()
+                .slice(3) // skip Home, For you and Following
+                .map((item) => {
+                    item = $(item);
+                    return {
+                        category: item.text(),
+                        url: new URL(item.attr('href'), baseUrl).href,
+                    };
+                }),
+            ...$('a.aqvwYd') // Home
+                .toArray()
+                .map((item) => {
+                    item = $(item);
+                    return {
+                        category: item.text(),
+                        url: new URL(item.attr('href'), baseUrl).href,
+                    };
+                }),
+        ];
     });
+    const categoryUrl = categoryUrls.find((item) => item.category === category).url;
 
-    const data = response.data;
+    const { data } = await got(categoryUrl);
     const $ = cheerio.load(data);
-    const list = $('div.xrnccd');
 
-    let itemPicUrl;
-    let meta;
-    let description;
-    let link;
+    const list = [...$('.UwIKyb'), ...$('.IBr9hb'), ...$('.IFHyqb')]; // 3 rows of news, 3-rows-wide news, single row news
+
+    const items = list.map((item) => {
+        item = $(item);
+        const title = item.find('h4').text();
+        return {
+            title,
+            description: art(path.join(__dirname, 'templates/news.art'), {
+                img: item.find('img.Quavad').attr('src'),
+                brief: title,
+            }),
+            pubDate: parseDate(item.find('time').attr('datetime')),
+            author: item.find('.oovtQ').text(),
+            link: new URL(item.find('a.WwrzSb').first().attr('href'), baseUrl).href,
+        };
+    });
 
     ctx.state.data = {
         title: $('title').text(),
-        link: category_url,
-        item:
-            list &&
-            list
-                .map((index, item) => {
-                    item = $(item);
-                    itemPicUrl = item.find('img').attr('src');
-
-                    meta = item.find('div.SVJrMe').first();
-
-                    description = item
-                        .find('h4.ipQwMb')
-                        .removeAttr('class')
-                        .each((index, item) => {
-                            $(item)
-                                .children()
-                                .removeAttr('class')
-                                .attr('href', url.resolve('https://news.google.com', $(item).children().attr('href')));
-                        })
-                        .toString();
-
-                    link = url.resolve('https://news.google.com', item.find('a.VDXfz').first().attr('href'));
-
-                    if (itemPicUrl !== undefined) {
-                        description = `${description}<img src="${itemPicUrl}">`;
-                    }
-                    if (description === null) {
-                        description = link;
-                    }
-
-                    return {
-                        title: item.find('h3').children().text(),
-                        description,
-                        pubDate: meta.find('time').first().attr('datetime'),
-                        author: meta.find('a.wEwyrc').first().text(),
-                        link,
-                    };
-                })
-                .get(),
+        link: categoryUrl,
+        item: items,
     };
 };

package/lib/v2/google/router.js

@@ -3,6 +3,7 @@ module.exports = function (router) {
     router.get('/citations/:id', require('./citations'));
     router.get('/doodles/:language?', require('./doodles'));
     router.get('/fonts/:sort?', require('./fonts'));
+    router.get('/news/:category/:locale', require('./news'));
     router.get('/scholar/:query', require('./scholar'));
     router.get('/sites/recentChanges/:id', require('./sitesRecentChanges'));
     router.get('/sites/:id', require('./sites'));

package/lib/v2/google/templates/news.art

@@ -0,0 +1,5 @@
+{{ if img }}
+<img src="{{ img }}">
+<br>
+{{ /if }}
+{{ brief }}

package/lib/v2/gov/maintainer.js

@@ -69,6 +69,7 @@ module.exports = {
     '/shenzhen/zzb/:caty/:page?': ['zlasd'],
     '/sichuan/deyang/govpulicinfo/:countyName': ['zytomorrow'],
     '/taiyuan/rsj/:caty/:page?': ['2PoL'],
+    '/wuhan/sy/whyw': ['nczitzk'],
     '/xinyi/:path+': ['ShuiHuo'],
     '/xuzhou/hrss/:category?': ['nczitzk'],
 };

package/lib/v2/gov/radar.js

@@ -973,6 +973,17 @@ module.exports = {
             },
         ],
     },
+    'wuhan.gov.cn': {
+        _name: '武汉市人民政府',
+        '.': [
+            {
+                title: '武汉要闻',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zheng-fu-wang',
+                source: ['/sy/whyw/', '/whyw', '/'],
+                target: '/gov/wuhan/sy/whyw',
+            },
+        ],
+    },
     'xz.gov.cn': {
         _name: '徐州市人民政府',
         hrss: [

package/lib/v2/gov/router.js

@@ -60,6 +60,7 @@ module.exports = function (router) {
     router.get('/shenzhen/zzb/:caty/:page?', require('./shenzhen/zzb/index'));
     router.get('/sichuan/deyang/govpulicinfo/:countyName', require('./sichuan/deyang/govpulicinfo'));
     router.get('/taiyuan/rsj/:caty/:page?', require('./taiyuan/rsj'));
+    router.get('/wuhan/sy/whyw', require('./wuhan/whyw'));
     router.get(/xinyi(\/[\w/-]+)?/, require('./xinyi/xinyi'));
     router.get('/xuzhou/hrss/:category?', require('./xuzhou/hrss'));
 };

package/lib/v2/gov/wuhan/whyw.js

@@ -0,0 +1,44 @@
+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 rootUrl = 'http://www.wuhan.gov.cn';
+    const currentUrl = `${rootUrl}/sy/whyw/`;
+    const response = await got(currentUrl);
+
+    const $ = cheerio.load(response.data);
+
+    const list = $('.articleList li')
+        .toArray()
+        .map((item) => {
+            item = $(item);
+            const a = item.find('a');
+            return {
+                title: a.text(),
+                link: new URL(a.attr('href'), currentUrl).href,
+                pubDate: timezone(parseDate(item.find('.time').text()), +8),
+            };
+        });
+
+    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);
+
+                item.description = content('.view').html();
+                item.author = content('meta[name=ContentSource]').attr('content');
+
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: `${$('h2').text()} - 武汉市人民政府`,
+        link: currentUrl,
+        item: items,
+    };
+};

package/lib/v2/gq/maintainer.js

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

package/lib/v2/gq/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'gq.com.tw': {
+        _name: 'GQ Taiwan',
+        '.': [
+            {
+                title: 'GQ Taiwan',
+                docs: 'https://docs.rsshub.app/new-media.html#gq',
+                source: ['/*path'],
+                target: '/gq/tw/:path',
+            },
+        ],
+    },
+};

package/lib/v2/gq/router.js

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

package/lib/v2/gq/templates/embed-article.art

@@ -0,0 +1 @@
+<a href="{{ url }}" target="_blank">{{ text }}</a>

package/lib/v2/gq/templates/embed-product.art

@@ -0,0 +1,4 @@
+{{@ img }}
+{{ productProps.dangerousHed }}<br>
+{{ if productProps.offerRetailer }}{{ productProps.offerRetailer }} {{ /if }}{{ if productProps.multipleOffers }}{{ productProps.multipleOffers[0].price }}{{ /if }}
+{{ if productProps.offerUrl }}<br><a href="{{ productProps.offerUrl }}" target="_blank">Buy It</a>{{ /if }}

package/lib/v2/gq/templates/img.art

@@ -0,0 +1,6 @@
+{{ if src }}
+<figure>
+    <img src="{{ src }}"{{ if alt }} alt="{{@ alt }}"{{ /if }}>
+    {{ if alt }}<figcaption>{{@ alt }}</figcaption>{{ /if }}
+</figure>
+{{ /if }}

package/lib/v2/gq/templates/tw.art

@@ -0,0 +1,3 @@
+{{ if dangerousDek }}<div>{{@ dangerousDek }}</div>{{ /if }}
+{{ if lede }}{{@ lede }}{{ /if }}
+{{ if articleBody }}{{@ articleBody }}{{ /if }}

package/lib/v2/gq/templates/videoObject.art

@@ -0,0 +1,6 @@
+<video controls preload="none" poster="{{ poster }}">
+{{ each sources source }}
+    <source src="{{ source.src }}" type="{{ source.contentType }}">
+{{ /each }}
+</video>
+{{@ articleBody }}

package/lib/v2/gq/templates/youtube.art

@@ -0,0 +1,3 @@
+{{ if videoId }}
+<iframe id="ytplayer" type="text/html" width="640" height="360" src="https://www.youtube-nocookie.com/embed/{{ videoId }}" frameborder="0" allowfullscreen></iframe>
+{{ /if }}