rsshub 1.0.0-master.f992838 → 1.0.0-master.f9a482d

package/lib/v2/ecust/e/news.js

@@ -0,0 +1,44 @@
+const got = require('@/utils/got');
+const timezone = require('@/utils/timezone');
+const { parseDate } = require('@/utils/parse-date');
+
+const baseUrl = 'https://e.ecust.edu.cn';
+
+module.exports = async (ctx) => {
+    const { data: response } = await got.post(`${baseUrl}/engine2/general/1301/type/more-datas`, {
+        form: {
+            engineInstanceId: 1732458,
+            pageNum: 1,
+            pageSize: 20,
+            typeId: 4562497,
+            topTypeId: '',
+            sw: '',
+        },
+    });
+
+    const list = response.data.datas.datas.map((item) => ({
+        title: item['1'].value,
+        link: item.url.startsWith('http') ? item.url : `${baseUrl}/engine2/d/${item.id}/${item.engineInstanceId}/0`,
+        pubDate: timezone(parseDate(item['6'].value), +8),
+    }));
+
+    const items = await Promise.all(
+        list.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                if (item.link.includes('toPhoneSign')) {
+                    return item;
+                }
+                const { data: response } = await got(item.link);
+                item.description = JSON.parse(response.match(/"content":(".*")(?:,"sequence":\d+)?,"typePath"/)[1]);
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: '华东理工继续教育学院',
+        description: '学院公告',
+        link: `${baseUrl}/engine2/m/38F638B77773ADD3`,
+        item: items,
+    };
+};

package/lib/v2/ecust/gschool/yjs.js

@@ -0,0 +1,27 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const baseUrl = 'https://gschool.ecust.edu.cn';
+    const link = `${baseUrl}/12753/list.htm`;
+    const response = await got(link);
+    const $ = cheerio.load(response.data);
+    const list = $('#wp_news_w6 li');
+
+    ctx.state.data = {
+        title: '华东理工大学研究生院',
+        link,
+        description: '华东理工大学研究生院通知公告',
+        item:
+            list &&
+            list.toArray().map((item) => {
+                item = $(item);
+                return {
+                    title: item.find('a').attr('title'),
+                    link: `${baseUrl}${item.find('a').attr('href')}`,
+                    pubDate: parseDate(item.find('.news_meta').text()),
+                };
+            }),
+    };
+};

package/lib/v2/ecust/maintainer.js

@@ -0,0 +1,4 @@
+module.exports = {
+    '/jxjy/news': ['jialinghui'],
+    '/yjs': ['shengmaosu'],
+};

package/lib/v2/ecust/radar.js

@@ -0,0 +1,21 @@
+module.exports = {
+    'ecust.edu.cn': {
+        _name: '华东理工大学',
+        e: [
+            {
+                title: '继续教育学院 - 学院公告',
+                docs: 'https://docs.rsshub.app/university.html#hua-dong-li-gong-da-xue',
+                source: ['/engine2/m/38F638B77773ADD3', '/'],
+                target: '/ecust/jxjy/news',
+            },
+        ],
+        gschool: [
+            {
+                title: '研究生院通知公告',
+                docs: 'https://docs.rsshub.app/university.html#hua-dong-li-gong-da-xue',
+                source: ['/12753/list.htm', '/'],
+                target: '/ecust/yjs',
+            },
+        ],
+    },
+};

package/lib/v2/ecust/router.js

@@ -0,0 +1,4 @@
+module.exports = function (router) {
+    router.get('/jxjy/news', require('./e/news'));
+    router.get('/yjs', require('./gschool/yjs'));
+};

package/lib/v2/ehentai/ehapi.js

@@ -192,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/embassy/radar.js

@@ -226,7 +226,7 @@ module.exports = {
             {
                 title: '通知公告 - 名古屋总领事馆',
                 docs: 'https://docs.rsshub.app/government.html#zhong-guo-zhu-wai-shi-ling-guan',
-                source: '',
+                source: '/',
                 target: '/embassy/jp/nagoya',
             },
         ],

package/lib/v2/embassy/supportedList.js

@@ -178,11 +178,11 @@ module.exports = {
     sg: {
         country: 'sg',
         countryCN: '新加坡',
-        link: 'http://sg.china-embassy.org/chn/lsfw/zytzs/',
-        list: '#docMore a',
+        link: 'http://sg.china-embassy.gov.cn/lsfw_0/zytz/',
+        list: 'div.news-list a[target=_blank]',
         title: '#News_Body_Title',
-        description: '#News_Body_Txt_A',
-        pubDate: '#News_Body_Time',
+        description: 'div.trs_editor_view',
+        pubDate: 'div.view-date',
     },
     uk: {
         country: 'uk',

package/lib/v2/epicgames/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'epicgames.com': {
+        _name: 'Epic Games Store',
+        store: [
+            {
+                title: '免费游戏',
+                docs: 'https://docs.rsshub.app/game.html#epic-games-store',
+                source: ['/:locale/free-games'],
+                target: '/epicgames/freegames/:locale',
+            },
+        ],
+    },
+};

package/lib/v2/feng/maintainer.js

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

package/lib/v2/ff14/radar.js

@@ -0,0 +1,30 @@
+const finalfantasyxiv = [
+    {
+        title: '国际服 （Lodestone）',
+        docs: 'https://docs.rsshub.app/game.html#zui-zhong-huan-xiang-14',
+        source: ['/lodestone/news', '/'],
+        target: (_, url) => `/ff14/global/${url.match(/\/\/(\w+?)\.finalfantasyxiv\.com/)[1]}`,
+    },
+];
+
+module.exports = {
+    'finalfantasyxiv.com': {
+        _name: '最终幻想 14',
+        eu: finalfantasyxiv,
+        fr: finalfantasyxiv,
+        de: finalfantasyxiv,
+        jp: finalfantasyxiv,
+        na: finalfantasyxiv,
+    },
+    'sdo.com': {
+        _name: '最终幻想 14',
+        'ff.web': [
+            {
+                title: '国服',
+                docs: 'https://docs.rsshub.app/game.html#zui-zhong-huan-xiang-14',
+                source: ['/web8/index.html'],
+                target: '/ff14/zh',
+            },
+        ],
+    },
+};

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/firecore/index.js

@@ -0,0 +1,37 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const host = 'https://firecore.com/releases';
+    const { data } = await got(host);
+    const $ = cheerio.load(data);
+    const items = $(`div.tab-pane.fade#${ctx.params.os}`)
+        .find('.release-date')
+        .toArray()
+        .map((item) => {
+            item = $(item);
+            const title = item
+                .parent()
+                .contents()
+                .filter((_, el) => el.nodeType === 3)
+                .text();
+            const pubDate = parseDate(item.text().match(/(\d{4}-\d{2}-\d{2})/)[1]);
+
+            const next = item.parent().nextUntil('hr');
+            return {
+                title,
+                description: next
+                    .toArray()
+                    .map((item) => $(item).html())
+                    .join(''),
+                pubDate,
+            };
+        });
+
+    ctx.state.data = {
+        title: `Infuse Release Notes (${ctx.params.os})`,
+        link: 'https://firecore.com/releases',
+        item: items,
+    };
+};

package/lib/v2/firecore/maintainer.js

@@ -0,0 +1,3 @@
+module.exports = {
+    '/:os': ['NathanDai'],
+};

package/lib/v2/firecore/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'firecore.com': {
+        _name: 'Infuse',
+        '.': [
+            {
+                title: 'Release Notes',
+                docs: 'https://docs.rsshub.app/program-update.html#infuse',
+                source: ['/releases', '/'],
+                target: '/firecore/:os?',
+            },
+        ],
+    },
+};

package/lib/v2/firecore/router.js

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

package/lib/v2/fishshell/index.js

@@ -0,0 +1,27 @@
+const cheerio = require('cheerio');
+const got = require('@/utils/got');
+const config = require('@/config').value;
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const link = 'https://fishshell.com/docs/current/relnotes.html';
+    const data = await ctx.cache.tryGet(link, async () => (await got(link)).data, config.cache.contentExpire, false);
+    const $ = cheerio.load(data);
+    ctx.state.data = {
+        link,
+        title: 'Release notes — fish-shell',
+        language: 'en',
+        item: $('#release-notes > section')
+            .map((_, item) => {
+                const title = $(item).find('h2').contents().first().text();
+                const date = title.match(/\(released (.+?)\)/)?.[1];
+                return {
+                    title,
+                    link: new URL($(item).find('a').attr('href'), link).href,
+                    pubDate: date ? parseDate(date, 'MMMM D, YYYY') : undefined,
+                    description: $(item).html(),
+                };
+            })
+            .get(),
+    };
+};

package/lib/v2/fishshell/maintainer.js

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

package/lib/v2/fishshell/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'fishshell.com': {
+        _name: 'fish shell',
+        '.': [
+            {
+                title: 'Release Notes',
+                docs: 'https://docs.rsshub.app/program-update.html#fish-shell',
+                source: ['/'],
+                target: '/fishshell',
+            },
+        ],
+    },
+};

package/lib/v2/flyert/creditcard.js

@@ -54,6 +54,9 @@ module.exports = async (ctx) => {
         case 'huaqi':
             bankname = '花旗银行';
             break;
+        case 'shanghai':
+            bankname = '上海银行';
+            break;
         case 'wuka':
             bankname = '无卡支付';
             break;

package/lib/v2/flyert/utils.js

@@ -16,27 +16,33 @@ async function load(link) {
     $('script, style').remove();
     $('#loginDialog').remove();
 
+    // 获取第一个帖子对象
+    const firstpost = $('.firstpost');
+
     // 修改图片中的链接
-    $('ignore_js_op img').each(function () {
-        const new_src = $('ignore_js_op img').attr('file');
-        $(this).attr('src', new_src);
+    firstpost.find('ignore_js_op img').each(function () {
+        $(this).attr('src', $(this).attr('file'));
+        // remove useless atrributes
+        for (const attr of ['id', 'aid', 'zoomfile', 'file', 'zoomfile', 'class', 'onclick', 'title', 'inpost', 'alt', 'onmouseover']) {
+            $(this).removeAttr(attr);
+        }
     });
 
     // 去除全文中图片的多余标签
-    const images = $('ignore_js_op img');
-    $('ignore_js_op').remove();
-    $("[class*='post_message']").append(images);
+    const images = firstpost.find('ignore_js_op img');
+    firstpost.find('ignore_js_op').remove();
+    firstpost.append(images);
 
-    // 提取内容
-    const description = $("[class*='post_message']").html();
+    // // 提取内容
+    const description = firstpost.html();
 
     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 +60,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));