rsshub 1.0.0-master.fdbb6fa → 1.0.0-master.fdc59d2

package/lib/v2/35photo/utils.js

@@ -5,13 +5,28 @@ const rootUrl = 'https://35photo.pro';
 
 module.exports = {
     rootUrl,
-    ProcessItems: async (currentUrl) => {
-        const response = await got({
+    ProcessItems: async (currentUrl, apiUrl) => {
+        let $, response;
+
+        response = await got({
             method: 'get',
             url: currentUrl,
         });
 
-        const $ = cheerio.load(response.data);
+        const data = response.data;
+
+        $ = cheerio.load(data);
+
+        const title = $('h1').text();
+
+        if (apiUrl) {
+            response = await got({
+                method: 'get',
+                url: `${apiUrl}&lastId=${$('div.countLike').last().attr('photo-id')}`,
+            });
+
+            $ = cheerio.load(data + response.data.data);
+        }
 
         const items = $('.item')
             .toArray()
@@ -34,7 +49,7 @@ module.exports = {
             });
 
         return {
-            title: `${$('h1').text()} - 35PHOTO`,
+            title: `${title} - 35PHOTO`,
             link: currentUrl,
             item: items,
         };

package/lib/v2/8world/index.js

@@ -3,10 +3,10 @@ const cheerio = require('cheerio');
 const { parseDate } = require('@/utils/parse-date');
 
 module.exports = async (ctx) => {
-    const category = ctx.params.category ?? 'realtime';
+    const path = ctx.path === '/' ? '/realtime' : ctx.path;
 
     const rootUrl = 'https://www.8world.com';
-    const currentUrl = `${rootUrl}/${category}`;
+    const currentUrl = `${rootUrl}${path}`;
 
     const response = await got({
         method: 'get',
@@ -15,19 +15,19 @@ module.exports = async (ctx) => {
 
     const $ = cheerio.load(response.data);
 
-    const list = $('div[data-column="Two-Third"] .article-title .article-link')
-        .map((_, item) => {
+    let items = $('div[data-column="Two-Third"] .article-title .article-link')
+        .toArray()
+        .map((item) => {
             item = $(item);
 
             return {
                 title: item.text(),
                 link: `${rootUrl}${item.attr('href')}`,
             };
-        })
-        .get();
+        });
 
-    const items = await Promise.all(
-        list.map((item) =>
+    items = await Promise.all(
+        items.map((item) =>
             ctx.cache.tryGet(item.link, async () => {
                 const detailResponse = await got({
                     method: 'get',

package/lib/v2/8world/maintainer.js

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

package/lib/v2/8world/radar.js

@@ -8,6 +8,12 @@ module.exports = {
                 source: ['/:category', '/'],
                 target: '/8world/:category?',
             },
+            {
+                title: '标签',
+                docs: 'https://docs.rsshub.app/new-media.html#_8-shi-jie-biao-qian',
+                source: ['/topic/:id', '/'],
+                target: '/8world/topic/:id',
+            },
         ],
     },
 };

package/lib/v2/8world/router.js

@@ -1,3 +1,3 @@
 module.exports = function (router) {
-    router.get('/:category?', require('./index'));
+    router.get(/([\w-/]+)?/, require('./index'));
 };

package/lib/v2/aicaijing/index.js

@@ -0,0 +1,73 @@
+const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
+const { art } = require('@/utils/render');
+const path = require('path');
+
+module.exports = async (ctx) => {
+    const category = ctx.params.category ?? 'latest';
+    const id = ctx.params.id ?? 14;
+
+    const titles = {
+        14: '热点 - 最新',
+        5: '热点 - 科技',
+        9: '热点 - 消费',
+        7: '热点 - 出行',
+        13: '热点 - 文娱',
+        10: '热点 - 教育',
+        25: '热点 - 地产',
+        11: '热点 - 更多',
+        28: '深度 - 出行',
+        29: '深度 - 科技',
+        31: '深度 - 消费',
+        33: '深度 - 教育',
+        34: '深度 - 更多',
+        8: '深度 - 地产',
+        6: '深度 - 文娱',
+    };
+
+    const categories = {
+        latest: {
+            url: '',
+            title: '最新文章',
+        },
+        recommend: {
+            url: '&isRecommend=true',
+            title: '推荐资讯',
+        },
+        cover: {
+            url: '&position=1',
+            title: '封面文章',
+        },
+        information: {
+            url: `&categoryId=${id}`,
+            title: titles[id],
+        },
+    };
+
+    const rootUrl = 'https://www.aicaijing.com.cn';
+    const apiRootUrl = 'https://api.aicaijing.com.cn';
+    const apiUrl = `${apiRootUrl}/article/detail/list?size=${ctx.query.limit ?? 50}&page=1${categories[category].url}`;
+
+    const response = await got({
+        method: 'get',
+        url: apiUrl,
+    });
+
+    const items = response.data.data.items.map((item) => ({
+        title: item.title,
+        link: `${rootUrl}/article/${item.articleId}`,
+        author: item.userInfo.nickname,
+        pubDate: parseDate(item.createTime),
+        category: [item.category.name].concat(item.tags.map((t) => t.name)),
+        description: art(path.join(__dirname, 'templates/description.art'), {
+            image: item.cover,
+            description: item.content,
+        }),
+    }));
+
+    ctx.state.data = {
+        title: `AI 财经社 - ${categories[category].title}`,
+        link: rootUrl,
+        item: items,
+    };
+};

package/lib/v2/aicaijing/maintainer.js

@@ -0,0 +1,6 @@
+module.exports = {
+    '/cover': ['nczitzk'],
+    '/information/:id?': ['nczitzk'],
+    '/latest': ['nczitzk'],
+    '/recommend': ['nczitzk'],
+};

package/lib/v2/aicaijing/radar.js

@@ -0,0 +1,31 @@
+module.exports = {
+    'aicaijing.com': {
+        _name: 'AI 财经社',
+        www: [
+            {
+                title: '最新文章',
+                docs: 'https://docs.rsshub.app/finance.html#ai-cai-jing-she-zui-xin-wen-zhang',
+                source: ['/'],
+                target: '/aicaijing/latest',
+            },
+            {
+                title: '封面文章',
+                docs: 'https://docs.rsshub.app/finance.html#ai-cai-jing-she-feng-mian-wen-zhang',
+                source: ['/'],
+                target: '/aicaijing/cover',
+            },
+            {
+                title: '推荐资讯',
+                docs: 'https://docs.rsshub.app/finance.html#ai-cai-jing-she-tui-jian-zi-xun',
+                source: ['/'],
+                target: '/aicaijing/recommend',
+            },
+            {
+                title: '热点 & 深度',
+                docs: 'https://docs.rsshub.app/finance.html#ai-cai-jing-she-re-dian-shen-du',
+                source: ['/information/:id', '/'],
+                target: '/aicaijing/information/:id?',
+            },
+        ],
+    },
+};

package/lib/v2/aicaijing/router.js

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

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

@@ -0,0 +1,4 @@
+{{ if image }}
+<img src="{{ image }}">
+{{ /if }}
+{{@ description }}

package/lib/v2/aliyundrive/files.js

@@ -0,0 +1,63 @@
+const got = require('@/utils/got');
+
+module.exports = async (ctx) => {
+    const { share_id, parent_file_id } = ctx.params;
+    const url = `https://www.aliyundrive.com/s/${share_id}${parent_file_id ? `/folder/${parent_file_id}` : ''}`;
+
+    const shareRes = await got.post('https://api.aliyundrive.com/adrive/v3/share_link/get_share_by_anonymous', {
+        params: {
+            share_id,
+        },
+        json: {
+            share_id,
+        },
+        headers: {
+            referer: 'https://www.aliyundrive.com/',
+            origin: 'https://www.aliyundrive.com',
+            'x-canary': 'client=web,app=share,version=v2.3.1',
+        },
+    });
+
+    const tokenRes = await got.post('https://api.aliyundrive.com/v2/share_link/get_share_token', {
+        headers: {
+            referer: 'https://www.aliyundrive.com/',
+            origin: 'https://www.aliyundrive.com',
+            'x-canary': 'client=web,app=share,version=v2.3.1',
+        },
+        json: {
+            share_id,
+        },
+    });
+    const share_token = tokenRes.data.share_token;
+
+    const listRes = await got.post('https://api.aliyundrive.com/v2/file/list', {
+        headers: {
+            referer: 'https://www.aliyundrive.com/',
+            origin: 'https://www.aliyundrive.com',
+            'x-canary': 'client=web,app=share,version=v2.3.1',
+            'x-share-token': share_token,
+        },
+        json: {
+            limit: 100,
+            order_by: 'created_at',
+            order_direction: 'DESC',
+            parent_file_id: parent_file_id || 'root',
+            share_id,
+        },
+    });
+
+    const result = listRes.data.items.map((item) => ({
+        title: item.name,
+        description: item.name + (item.thumbnail ? `<img src="${item.thumbnail}">` : ''),
+        link: url,
+        pubDate: item.created_at,
+        updated: item.updated_at,
+        guid: item.file_id,
+    }));
+
+    ctx.state.data = {
+        title: `${shareRes.data.display_name || `${share_id}${parent_file_id ? `-${parent_file_id}` : ''}`}-阿里云盘`,
+        link: url,
+        item: result,
+    };
+};

package/lib/v2/aliyundrive/maintainer.js

@@ -0,0 +1,3 @@
+module.exports = {
+    '/files/:share_id/:parent_file_id?': ['DIYgod'],
+};

package/lib/v2/aliyundrive/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'aliyundrive.com': {
+        _name: '阿里云盘',
+        www: [
+            {
+                title: '文件列表',
+                docs: 'https://docs.rsshub.app/programming.html#a-li-yun-pan',
+                source: ['/s/:share_id', '/s/:share_id/folder/:parent_file_id'],
+                target: '/aliyundrive/files/:share_id/:parent_file_id?',
+            },
+        ],
+    },
+};

package/lib/v2/aliyundrive/router.js

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

package/lib/v2/aljazeera/index.js

@@ -0,0 +1,87 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+const { art } = require('@/utils/render');
+const path = require('path');
+
+const languages = {
+    arabic: {
+        rootUrl: 'https://www.aljazeera.net',
+        rssUrl: 'rss',
+    },
+    chinese: {
+        rootUrl: 'https://chinese.aljazeera.net',
+        rssUrl: undefined,
+    },
+    english: {
+        rootUrl: 'https://www.aljazeera.com',
+        rssUrl: 'xml/rss/all.xml',
+    },
+};
+
+module.exports = async (ctx) => {
+    const params = ctx.path === '/' ? ['arabic'] : ctx.path.replace(/^\//, '').split('/');
+
+    if (!languages.hasOwnProperty(params[0])) {
+        params.unshift('arabic');
+    }
+
+    const language = params.shift();
+    const isRSS = params.length === 1 && params.at(-1) === 'rss' && languages[language].rssUrl;
+
+    const rootUrl = languages[language].rootUrl;
+    const currentUrl = `${rootUrl}/${isRSS ? languages[language].rssUrl : params.join('/')}`;
+
+    const response = await got({
+        method: 'get',
+        url: currentUrl,
+    });
+
+    const $ = cheerio.load(response.data);
+
+    let items = isRSS
+        ? response.data.match(new RegExp('<link>' + rootUrl + '/(.*?)</link>', 'g')).map((item) => ({
+              link: item.match(/<link>(.*?)<\/link>/)[1],
+          }))
+        : $('.u-clickable-card__link')
+              .toArray()
+              .map((item) => {
+                  item = $(item);
+
+                  return {
+                      link: `${rootUrl}${item.attr('href')}`,
+                  };
+              });
+
+    items = await Promise.all(
+        items.slice(0, ctx.query.limit ? parseInt(ctx.query.limit) : 50).map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const detailResponse = await got({
+                    method: 'get',
+                    url: item.link,
+                });
+
+                const content = cheerio.load(detailResponse.data);
+
+                content('.more-on').parent().remove();
+                content('.responsive-image img').removeAttr('srcset');
+
+                item.title = content('h1').first().text();
+                item.author = content('.author').text();
+                item.pubDate = parseDate(detailResponse.data.match(/"datePublished": "(.*?)",/)[1]);
+                item.description = art(path.join(__dirname, 'templates/description.art'), {
+                    image: content('.article-featured-image').html(),
+                    description: content('.wysiwyg').html(),
+                });
+
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: $('title').first().text(),
+        link: currentUrl,
+        item: items,
+    };
+};

package/lib/v2/aljazeera/maintainer.js

@@ -0,0 +1,5 @@
+module.exports = {
+    '/:language?/:category?': ['nczitzk'],
+    '/:language?/tag/:id': ['nczitzk'],
+    '/:language?/rss': ['nczitzk'],
+};

package/lib/v2/aljazeera/radar.js

@@ -0,0 +1,62 @@
+module.exports = {
+    'aljazeera.com': {
+        _name: 'Aljazeera 半岛电视台',
+        '.': [
+            {
+                title: 'News',
+                docs: 'https://docs.rsshub.app/traditional-media.html#aljazeera-ban-dao-dian-shi-tai-xin-wen',
+                source: ['/:category', '/'],
+                target: '/aljazeera/english/:category',
+            },
+            {
+                title: 'Tag',
+                docs: 'https://docs.rsshub.app/traditional-media.html#aljazeera-ban-dao-dian-shi-tai-biao-qian',
+                source: ['/tag/:id', '/'],
+                target: '/aljazeera/english/tag/:id',
+            },
+            {
+                title: 'Official RSS',
+                docs: 'https://docs.rsshub.app/traditional-media.html#aljazeera-ban-dao-dian-shi-tai-guan-fang-rss',
+                source: ['/xml/rss/all.xml', '/'],
+                target: '/aljazeera/english/rss',
+            },
+        ],
+    },
+    'aljazeera.net': {
+        _name: 'Aljazeera 半岛电视台',
+        '.': [
+            {
+                title: 'News',
+                docs: 'https://docs.rsshub.app/traditional-media.html#aljazeera-ban-dao-dian-shi-tai-xin-wen',
+                source: ['/:category', '/'],
+                target: '/aljazeera/arbric/:category',
+            },
+            {
+                title: 'Tag',
+                docs: 'https://docs.rsshub.app/traditional-media.html#aljazeera-ban-dao-dian-shi-tai-biao-qian',
+                source: ['/tag/:id', '/'],
+                target: '/aljazeera/arbric/tag/:id',
+            },
+            {
+                title: 'Official RSS',
+                docs: 'https://docs.rsshub.app/traditional-media.html#aljazeera-ban-dao-dian-shi-tai-guan-fang-rss',
+                source: ['/rss', '/'],
+                target: '/aljazeera/arbric/rss',
+            },
+        ],
+        chinese: [
+            {
+                title: '新闻',
+                docs: 'https://docs.rsshub.app/traditional-media.html#aljazeera-ban-dao-dian-shi-tai-xin-wen',
+                source: ['/:category', '/'],
+                target: '/aljazeera/chinese/:category',
+            },
+            {
+                title: '标签',
+                docs: 'https://docs.rsshub.app/traditional-media.html#aljazeera-ban-dao-dian-shi-tai-biao-qian',
+                source: ['/tag/:id', '/'],
+                target: '/aljazeera/chinese/tag/:id',
+            },
+        ],
+    },
+};

package/lib/v2/aljazeera/router.js

@@ -0,0 +1,3 @@
+module.exports = function (router) {
+    router.get(/([\w/-]+)?/, require('./index'));
+};

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

@@ -0,0 +1,8 @@
+{{ if image }}
+<figure>
+{{@ image }}
+</figure>
+{{ /if }}
+{{ if description }}
+{{@ description }}
+{{ /if }}

package/lib/v2/anquanke/category.js

@@ -0,0 +1,39 @@
+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 api = 'https://api.anquanke.com/data/v1/posts?size=10&page=1&category=';
+    const type = ctx.params.category;
+    const fulltext = ctx.params.fulltext;
+    const host = 'https://www.anquanke.com';
+    const res = await got(`${api}${type}`);
+    const dataArray = res.data.data;
+
+    const items = await Promise.all(
+        dataArray.map(async (item) => {
+            const art_url = `${host}/${type === 'week' ? 'week' : 'post'}/id/${item.id}`;
+            return {
+                title: item.title,
+                description:
+                    fulltext === 'fulltext' || fulltext === 'quanwen'
+                        ? await ctx.cache.tryGet(art_url, async () => {
+                              const { data: res } = await got(art_url);
+                              const content = cheerio.load(res);
+                              return content('#js-article').html();
+                          })
+                        : item.desc,
+                pubDate: timezone(parseDate(item.date), +8),
+                link: art_url,
+                author: item.author.nickname,
+            };
+        })
+    );
+
+    ctx.state.data = {
+        title: `安全客-${dataArray[0].category_name}`,
+        link: `https://www.anquanke.com/${type === 'week' ? 'week-list' : type}`,
+        item: items,
+    };
+};

package/lib/v2/anquanke/maintainer.js

@@ -0,0 +1,4 @@
+module.exports = {
+    // '/vul': ['qwertyuiop6'],
+    '/:category/:fulltext?': ['qwertyuiop6'],
+};

package/lib/v2/anquanke/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'anquanke.com': {
+        _name: '安全客',
+        '.': [
+            {
+                title: '分类订阅',
+                docs: 'https://docs.rsshub.app/programming.html#an-quan-ke',
+                source: ['/:category', '/'],
+                target: (params) => `/anquanke/${params.category === 'week-list' ? 'week' : params.category}`,
+            },
+        ],
+    },
+};

package/lib/v2/anquanke/router.js

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

package/lib/{routes/aqk → v2/anquanke}/vul.js

@@ -1,10 +1,11 @@
 const got = require('@/utils/got');
 const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
 
 module.exports = async (ctx) => {
     const url = 'https://www.anquanke.com';
 
-    const response = await got.get(`${url}/vul`);
+    const response = await got(`${url}/vul`);
     const $ = cheerio.load(response.data);
     const list = $('table>tbody>tr').get();
 
@@ -14,7 +15,7 @@ module.exports = async (ctx) => {
         const title = item.find('td:first-child a').text();
         const cve = item.find('td:nth-child(2)').text();
         const pla = item.find('.vul-type-item').text().replace(/\s+/g, '');
-        const date = new Date(item.find('td:nth-last-child(2)').text().replace(/\s+/g, '')).toUTCString();
+        const date = parseDate(item.find('td:nth-last-child(2)').text().replace(/\s+/g, ''));
         const href = item.find('a').attr('href');
 
         return {

package/lib/v2/apnews/topics.js

@@ -7,8 +7,8 @@ const HOME_PAGE = 'https://apnews.com';
 
 module.exports = async (ctx) => {
     const { topic = 'trending-news' } = ctx.params;
-    const urlLink = `${HOME_PAGE}/hub/${topic}`;
-    const response = await got(urlLink);
+    const url = `${HOME_PAGE}/hub/${topic}`;
+    const response = await got(url);
     const $ = cheerio.load(response.data);
     const data = JSON.parse(
         $('script')
@@ -18,26 +18,28 @@ module.exports = async (ctx) => {
     );
     const meta = data.hub.data[`/${topic}`];
 
-    const items = meta.cards.map((item) => {
-        const description = cheerio.load(item.contents[0].storyHTML, null, false);
-        description('.ad-placeholder').remove();
-        return {
-            title: item.contents[0].headline,
-            description: art(path.join(__dirname, 'templates/description.art'), {
-                media: item.contents[0].media,
-                description: description.html(),
-            }),
-            link: `${HOME_PAGE}/article/${item.contents[0].canonicalUrl}-${item.contents[0].shortId}`,
-            author: item.contents[0].bylines ? item.contents[0].bylines.slice(3) : null,
-            pubDate: parseDate(item.contents[0].published),
-            category: item.contents[0].tagObjs.map((tag) => tag.name),
-        };
-    });
+    const items = meta.cards
+        .filter((c) => c.id.startsWith('urn:publicid:ap.org:'))
+        .map((item) => {
+            const description = cheerio.load(item.contents[0].storyHTML, null, false);
+            description('.ad-placeholder').remove();
+            return {
+                title: item.contents[0].headline,
+                description: art(path.join(__dirname, 'templates/description.art'), {
+                    media: item.contents[0].media,
+                    description: description.html(),
+                }),
+                link: `${HOME_PAGE}/article/${item.contents[0].canonicalUrl}-${item.contents[0].shortId}`,
+                author: item.contents[0].bylines ? item.contents[0].bylines.slice(3) : null,
+                pubDate: parseDate(item.contents[0].published),
+                category: item.contents[0].tagObjs.map((tag) => tag.name),
+            };
+        });
 
     ctx.state.data = {
         title: meta.tagObjs[0].seoTitle,
         description: meta.tagObjs[0].seoDescription,
-        link: urlLink,
+        link: url,
         item: items,
         language: $('html').attr('lang'),
     };